sitero 0.0.11 → 0.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/cms/client/applications/resources/order/helpers/process-order-form-data.js +4 -2
- package/dist/src/cms/client/interfaces/pages/dashboard/commerce/order/tw/page.js +1 -1
- package/dist/types/src/cms/client/applications/resources/order/helpers/process-order-form-data.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -21,10 +21,11 @@ function createProcessOrderFormData({
|
|
|
21
21
|
items,
|
|
22
22
|
config: promotionConfig
|
|
23
23
|
});
|
|
24
|
+
const freeShippingSubtotalAmount = promotionResult.subtotalAmount - promotionResult.discountAmount;
|
|
24
25
|
const shippingFeeAmount = formData.recipient ? calculateShippingFeeAmount({
|
|
25
26
|
config: shippingFeeConfig,
|
|
26
27
|
shippingMethod: formData.recipient.shippingMethod,
|
|
27
|
-
subtotalAmount:
|
|
28
|
+
subtotalAmount: freeShippingSubtotalAmount,
|
|
28
29
|
totalQuantity: getTotalQuantity(items)
|
|
29
30
|
}) : formData.shippingFeeAmount;
|
|
30
31
|
const totalAmount = calculateTotalAmount({
|
|
@@ -94,10 +95,11 @@ function createProcessOrderFormData({
|
|
|
94
95
|
return processOrderFormData({ formData, items });
|
|
95
96
|
}
|
|
96
97
|
function setShipping(formData, shippingMethod, recipient) {
|
|
98
|
+
const freeShippingSubtotalAmount = formData.subtotalAmount - formData.discountAmount;
|
|
97
99
|
const shippingFeeAmount = calculateShippingFeeAmount({
|
|
98
100
|
config: shippingFeeConfig,
|
|
99
101
|
shippingMethod,
|
|
100
|
-
subtotalAmount:
|
|
102
|
+
subtotalAmount: freeShippingSubtotalAmount,
|
|
101
103
|
totalQuantity: getTotalQuantity(formData.items)
|
|
102
104
|
});
|
|
103
105
|
const totalAmount = calculateTotalAmount({
|
|
@@ -51,7 +51,7 @@ function createOrderIndexPageTW({
|
|
|
51
51
|
titleProps: {
|
|
52
52
|
icon: ReceiptText,
|
|
53
53
|
title: t("resources.order.text"),
|
|
54
|
-
leftChildren: /* @__PURE__ */ jsx(Badge, { children: "\
|
|
54
|
+
leftChildren: /* @__PURE__ */ jsx(Badge, { children: "\u53F0\u7063\u5C08\u5340" })
|
|
55
55
|
},
|
|
56
56
|
createButtonProps: { className: "hidden" },
|
|
57
57
|
returnButtonProps: { className: "hidden" }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-order-form-data.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/cms/client/applications/resources/order/helpers/process-order-form-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,cAAc,EACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAIpF,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAGxB,wBAAgB,0BAA0B,CAAC,EACzC,iBAAiB,EACjB,eAAe,GAChB,EAAE;IACD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;CAClC;iDAKI;QACD,QAAQ,EAAE,mBAAmB,CAAC;QAC9B,KAAK,EAAE,UAAU,CAAC;KACnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"process-order-form-data.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/cms/client/applications/resources/order/helpers/process-order-form-data.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EACV,YAAY,EACZ,SAAS,EACT,cAAc,EACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAIpF,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,gBAAgB,CAAC;AAGxB,wBAAgB,0BAA0B,CAAC,EACzC,iBAAiB,EACjB,eAAe,GAChB,EAAE;IACD,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,eAAe,EAAE,eAAe,CAAC;CAClC;iDAKI;QACD,QAAQ,EAAE,mBAAmB,CAAC;QAC9B,KAAK,EAAE,UAAU,CAAC;KACnB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCA4CW,mBAAmB,YACnB,YAAY,EAAE,UAChB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BAsBJ,mBAAmB,QACvB,UAAU,CAAC,MAAM,CAAC,SACjB,CAAC,GAAG,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAiBH,mBAAmB,QACvB,UAAU,CAAC,MAAM,CAAC,YACd,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAiBQ,mBAAmB,QAAQ,UAAU,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAU3D,mBAAmB,kBACb,cAAc,cAClB,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCxB"}
|