M-Labs
/
web2019
5
0
Fork 2
Code Issues 20 Pull Requests 3 Releases Wiki Activity

Add more order options and enhance the look of them 

Signed-off-by: Egor Savkin <es@m-labs.hk>
This commit is contained in:
Egor Savkin 2024-01-31 11:40:33 +08:00
parent bcc8db6819
commit 0b5797b1ba
6 changed files with 84 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sass/css/_shop.scss
View File

@ -393,6 +393,15 @@ button {
font-size: 0.9rem;
line-height: 1.1;
}
.options-group {
margin-top: 1rem;
padding: 0.5rem;
}
.shop-radio-label {
font-weight: bold;
}
}
.crate {

2
static/js/shop.bundle.js
View File

File diff suppressed because one or more lines are too long

2
static/js/shop/OrderOptions.jsx
View File

@ -31,7 +31,7 @@ export function OrderOptions() {
});
return (
<div className="order-bar border rounded">
<div className="order-bar">
{options}
</div>
)

2
static/js/shop/options/Options.jsx
View File

@ -24,7 +24,7 @@ export function ProcessOptions({options, data, target, id}) {
return componentsList[options.type](target, id + options.type, data, options.args);
} else if (options.type === "Group") {
return (
<div className="border rounded" key={id + "group"}>
<div className="border rounded options-group" key={id + "group"}>
{ProcessOptions({
options: json_logic_apply(options.items, data),
data: data,

4
static/js/shop/options/components/Radio.jsx
View File

@ -36,13 +36,13 @@ class Radio extends Component {
let key = this.props.id + this.props.outvar;
return (
<div className="shop-radio" key={this.props.id}>
<div style={{"display": "inline"}}>
<div style={{"display": "inline"}} className="shop-radio-label">
{this.props.icon && <img src={`/images${this.props.icon}`} className="options-icon"/>}
{this.props.title}
</div>
{this.props.tip && <Tip id={this.props.id + "tooltip"} tip={this.props.tip}/>}
{this.props.variants.map((variant, _) => (
<div className="form-check" key={key + variant}>
<div className="form-check shop-radio-variant" key={key + variant}>
<input
className="form-check-input"
type="radio"

39
static/js/shop_data.js
View File

@ -48,6 +48,7 @@ const shop_data = {
orderOptions: {
options: [
{"type": "Group", items:[
{type: "Switch", args: {
title: "Include optional pre-installed Intel® NUC mini-computer",
outvar: "nuc",
@ -84,6 +85,44 @@ const shop_data = {
]},
]
},
]},
{"type": "Group", items: [
{
type: "Radio",
args: {
title: "Shipping options",
outvar: "shipping",
variants: [
"Incoterms 2020 FCA",
"Incoterms 2020 DAP",
"Prepay and add shipping (only available to credit customers)"
],
fallback: 0
}
},
{"if": [
{"==": [{"var": "shipping"}, "Incoterms 2020 FCA"]},
{type: "Line", args: {title: "Please provide your carrier account information and/or other shipping instructions",
outvar: "shipping_instructions", fallback: ""}}
]},
{"if": [
{"==": [{"var": "shipping"}, "Incoterms 2020 DAP"]},
{type: "Line", args: {title: "Please provide delivery address",
outvar: "shipping_instructions", fallback: "",
tip: "Additional customs fees may be charged to you by the carrier at the time of delivery."}}
]},
{"if": [
{"==": [{"var": "shipping"}, "Prepay and add shipping (only available to credit customers)"]},
[{type: "Radio", args: {title: "In case of additional customs fees",
outvar: "prepay_fees_handling", fallback: 0,
variants: [
"Add to your final invoice",
"Carrier bills you directly"
]}},
{type: "Line", args: {title: "Please provide delivery address",
outvar: "shipping_instructions", fallback: "",}}],
]},
]}
],
prices: [{