dimorder-orderapp-lib 0.1.220 → 0.1.221
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.
|
@@ -21,7 +21,7 @@ function calculateLocalBatchItem(item, order) {
|
|
|
21
21
|
let newTotal = 0;
|
|
22
22
|
if (modifier.type === 'COMBORULE') {
|
|
23
23
|
if (lodash_1.default.isEmpty(hasMERCHANTModifier)) {
|
|
24
|
-
newTotal = Number(modifier.amount);
|
|
24
|
+
newTotal = total * (100 + Number(modifier.percent)) / 100 + Number(modifier.amount);
|
|
25
25
|
}
|
|
26
26
|
else {
|
|
27
27
|
newTotal = total;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,kEAAyC;AAEzC,SAAwB,uBAAuB,CAC7C,IAAmB,EACnB,KAAgB;;IAEhB,oDAAoD;IACpD,MAAM,YAAY,GAAG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IAEpF,mBAAmB;IACnB,IAAI,SAAS,GAAG,CAAC,OAAC,IAAI,CAAC,mBAAmB,mCAAI,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,YAAY,CAAC,CAAA;IAC3F,eAAe;IACf,IAAI,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAA,CAAC,yBAAyB;IAC/D,IAAI,aAAa,GAAG,CAAC,CAAA,CAAC,SAAS;IAC/B,IAAI,cAAc,GAAG,CAAC,CAAA,CAAC,SAAS;IAChC,MAAM,SAAS,GAAqB,EAAE,CAAA;IACtC,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;IACzF,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;QACpD,IAAI,QAAQ,GAAG,CAAC,CAAA;QAChB,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE;YACjC,IAAI,gBAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;gBAClC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ function getFormatBatchItemStatus(item, isSummary = false) {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
else if (modifier.type === 'COMBORULE' && lodash_1.default.isEmpty(hasMERCHANTModifier)) {
|
|
38
|
-
discountText += getDisplayRoundNumber_1.default(modifier.amount
|
|
38
|
+
discountText += getDisplayRoundNumber_1.default(modifier.amount) + '$';
|
|
39
39
|
}
|
|
40
40
|
modifierDiscounts.push(discountText);
|
|
41
41
|
if (modifier.type === 'MERCHANT') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFormatBatchItemStatus.js","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,oFAA2D;AAE3D,8BAA8B;AAC9B,SAAwB,wBAAwB,CAAE,IAAmB,EAAE,YAAqB,KAAK;IAC/F,qBAAqB;IACrB,sBAAsB;IACtB,sDAAsD;IACtD,iBAAiB;IACjB,+DAA+D;IAC/D,IAAI;IAEJ,YAAY;IACZ,MAAM,iBAAiB,GAAa,EAAE,CAAA;IACtC,MAAM,eAAe,GAAa,EAAE,CAAA;IACpC,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;IACzF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChC,IAAI,YAAY,GAAG,EAAE,CAAA;YACrB,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE;gBACjC,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE;oBAC3B,WAAW;oBACT,YAAY,IAAI,QAAQ,CAAC,IAAI,CAAA;iBAC9B;gBACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC3B,SAAS;oBACP,YAAY,IAAI,+BAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,GAAG,CAAA;iBAC7D;gBACD,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE;oBAC5B,UAAU;oBACR,YAAY,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;iBAC/C;aACF;iBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,gBAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;gBAC1E,YAAY,IAAI,+BAAqB,CAAC,QAAQ,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"getFormatBatchItemStatus.js","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":";;;;;AAAA,oDAAsB;AACtB,oFAA2D;AAE3D,8BAA8B;AAC9B,SAAwB,wBAAwB,CAAE,IAAmB,EAAE,YAAqB,KAAK;IAC/F,qBAAqB;IACrB,sBAAsB;IACtB,sDAAsD;IACtD,iBAAiB;IACjB,+DAA+D;IAC/D,IAAI;IAEJ,YAAY;IACZ,MAAM,iBAAiB,GAAa,EAAE,CAAA;IACtC,MAAM,eAAe,GAAa,EAAE,CAAA;IACpC,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;IACzF,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE;QAC1B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChC,IAAI,YAAY,GAAG,EAAE,CAAA;YACrB,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,EAAE;gBACjC,IAAI,QAAQ,CAAC,IAAI,IAAI,IAAI,EAAE;oBAC3B,WAAW;oBACT,YAAY,IAAI,QAAQ,CAAC,IAAI,CAAA;iBAC9B;gBACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC3B,SAAS;oBACP,YAAY,IAAI,+BAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,GAAG,CAAA;iBAC7D;gBACD,IAAI,QAAQ,CAAC,OAAO,KAAK,CAAC,EAAE;oBAC5B,UAAU;oBACR,YAAY,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA;iBAC/C;aACF;iBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,gBAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE;gBAC1E,YAAY,IAAI,+BAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,GAAG,CAAA;aAC7D;YACD,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACpC,IAAI,QAAQ,CAAC,IAAI,KAAK,UAAU,EAAE;gBAChC,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;aACnC;QACH,CAAC,CAAC,CAAA;KACH;IAED,MAAM,OAAO,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAClH,MAAM,IAAI,GAAG,gBAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;QACzC,CAAC,CAAC,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,gBAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAA;IAEhB,MAAM,MAAM,GAAG,gBAAC,CAAC,MAAM;IACrB,YAAY;IACZ,OAAO,EACP,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EACrB,OAAO,EACP,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAChD,CAAA;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAClD,CAAC;AArDD,2CAqDC"}
|