dimorder-orderapp-lib 0.1.285 → 0.1.287

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.
Files changed (16) hide show
  1. package/dist/libs/calculateBatchItem.d.ts.map +1 -1
  2. package/dist/libs/calculateBatchItem.js +4 -0
  3. package/dist/libs/calculateBatchItem.js.map +1 -1
  4. package/dist/libs/calculateLocalBatchItem.d.ts.map +1 -1
  5. package/dist/libs/calculateLocalBatchItem.js +7 -3
  6. package/dist/libs/calculateLocalBatchItem.js.map +1 -1
  7. package/dist/libs/calculateLocalOrder.d.ts.map +1 -1
  8. package/dist/libs/calculateLocalOrder.js +5 -2
  9. package/dist/libs/calculateLocalOrder.js.map +1 -1
  10. package/dist/libs/calculateOrder.d.ts.map +1 -1
  11. package/dist/libs/calculateOrder.js +42 -40
  12. package/dist/libs/calculateOrder.js.map +1 -1
  13. package/dist/libs/getFormatBatchItemStatus.d.ts.map +1 -1
  14. package/dist/libs/getFormatBatchItemStatus.js +20 -18
  15. package/dist/libs/getFormatBatchItemStatus.js.map +1 -1
  16. package/package.json +1 -1
package/dist/libs/calculateBatchItem.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateBatchItem.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GACf,aAAa,CAoDf"}
1
+ {"version":3,"file":"calculateBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateBatchItem.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,kBAAkB,CACxC,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GACf,aAAa,CAwDf"}
package/dist/libs/calculateBatchItem.js CHANGED
@@ -16,6 +16,10 @@ function calculateBatchItem(item, order) {
16
16
  let totalDiscount = 0; // 統計全部折扣
17
17
  let totalSurcharge = 0; // 統計全部費用
18
18
  let total = item.modifiers.reduce((total, modifier) => {
19
+ if (modifier.deletedAt != null) {
20
+ // 被刪除的 modifier 不做計算
21
+ return total;
22
+ }
19
23
  const newTotal = total * (100 + modifier.percent) / 100 + modifier.amount;
20
24
  const diffAmount = newTotal - total;
21
25
  if (diffAmount < 0) {
package/dist/libs/calculateBatchItem.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateBatchItem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateBatchItem.ts"],"names":[],"mappings":"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"}
package/dist/libs/calculateLocalBatchItem.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GACf,aAAa,CAgFf"}
1
+ {"version":3,"file":"calculateLocalBatchItem.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,IAAI,EAAE,aAAa,EACnB,KAAK,EAAE,SAAS,GACf,aAAa,CAoFf"}
package/dist/libs/calculateLocalBatchItem.js CHANGED
@@ -16,11 +16,15 @@ function calculateLocalBatchItem(item, order) {
16
16
  let totalDiscount = 0; // 統計全部折扣
17
17
  let totalSurcharge = 0; // 統計全部費用
18
18
  const modifiers = [];
19
- const hasMERCHANTModifier = item.modifiers.find(modifier => modifier.type === 'MERCHANT');
19
+ const hasMerchantModifier = item.modifiers.find(modifier => modifier.type === 'MERCHANT' && modifier.deletedAt == null);
20
20
  let total = item.modifiers.reduce((total, modifier) => {
21
+ if (modifier.deletedAt != null) {
22
+ // 被刪除的 modifier 不做計算
23
+ return total;
24
+ }
21
25
  let newTotal = 0;
22
26
  if (modifier.type === 'COMBORULE') {
23
- if (lodash_1.default.isEmpty(hasMERCHANTModifier)) {
27
+ if (lodash_1.default.isEmpty(hasMerchantModifier)) {
24
28
  newTotal = total * (100 + Number(modifier.percent)) / 100 + Number(modifier.amount);
25
29
  }
26
30
  else {
@@ -45,7 +49,7 @@ function calculateLocalBatchItem(item, order) {
45
49
  }
46
50
  }
47
51
  else {
48
- if (modifier.type === 'MERCHANT' || (modifier.type === 'COMBORULE' && lodash_1.default.isEmpty(hasMERCHANTModifier))) {
52
+ if (modifier.type === 'MERCHANT' || (modifier.type === 'COMBORULE' && lodash_1.default.isEmpty(hasMerchantModifier))) {
49
53
  modifiers.push(modifier);
50
54
  }
51
55
  }
package/dist/libs/calculateLocalBatchItem.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateLocalBatchItem.js","sourceRoot":"","sources":["../../src/libs/calculateLocalBatchItem.ts"],"names":[],"mappings":"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"}
package/dist/libs/calculateLocalOrder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,CAiLhL"}
1
+ {"version":3,"file":"calculateLocalOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,EAAE,QAAQ,GAAE,cAAmC,GAAG,SAAS,CAwLhL"}
package/dist/libs/calculateLocalOrder.js CHANGED
@@ -30,7 +30,7 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
30
30
  surchargeTotal += lodash_1.default.sumBy(calculatedItems.filter(item => !item.excludedSurcharge), 'surcharge');
31
31
  itemDiscount = lodash_1.default.sumBy(calculatedItems, 'totalDiscount');
32
32
  itemtotalDiscount += lodash_1.default.sumBy(calculatedItems.filter(item => {
33
- const discountModifer = item.modifiers.find(modifier => modifier.type === 'DISCOUNT');
33
+ const discountModifer = item.modifiers.find(modifier => modifier.type === 'DISCOUNT' && modifier.deletedAt == null);
34
34
  return (((discountModifer === null || discountModifer === void 0 ? void 0 : discountModifer.percent) !== 0 || (discountModifer === null || discountModifer === void 0 ? void 0 : discountModifer.amount) !== 0) || !item.excludedDiscount);
35
35
  }), 'totalDiscount');
36
36
  subtotal += lodash_1.default.sumBy(calculatedItems, 'total') + itemDiscount;
@@ -63,8 +63,11 @@ function calculateLocalOrder(order, promoDiscount = 0, riceCoinDiscount = 0, rou
63
63
  let modifiers = [];
64
64
  // calculate order level modifiers
65
65
  modifiers = order.modifiers
66
- .filter(modifier => modifier.deletedAt == null)
67
66
  .map(modifier => {
67
+ if (modifier.deletedAt != null) {
68
+ // 被刪除的 modifier 不做計算
69
+ return Object.assign(Object.assign({}, modifier), { calculatedAmount: 0 });
70
+ }
68
71
  let newTotal = total;
69
72
  let newShippingFeeTotal = shippingFeeTotal;
70
73
  let calculatedAmount = 0;
package/dist/libs/calculateLocalOrder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateLocalOrder.js","sourceRoot":"","sources":["../../src/libs/calculateLocalOrder.ts"],"names":[],"mappings":"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"}
package/dist/libs/calculateOrder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateOrder.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,GAAG,SAAS,CA4I5H"}
1
+ {"version":3,"file":"calculateOrder.d.ts","sourceRoot":"","sources":["../../src/libs/calculateOrder.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,cAAc,CAAE,KAAK,EAAE,SAAS,EAAE,aAAa,GAAE,MAAU,EAAE,gBAAgB,GAAE,MAAU,GAAG,SAAS,CA8I5H"}
package/dist/libs/calculateOrder.js CHANGED
@@ -54,50 +54,52 @@ function calculateOrder(order, promoDiscount = 0, riceCoinDiscount = 0) {
54
54
  }
55
55
  // calculate order level modifiers
56
56
  order.modifiers.forEach(modifier => {
57
- let newTotal = total;
58
- let newShippingFeeTotal = shippingFeeTotal;
59
- // 全單折扣或 RiceCoin
60
- if (modifier.applyTo === 'ALL' || modifier.type === 'RICECOIN') {
61
- // 將 total 及 shippingFeeTotal 計算 percent 折扣
62
- newTotal = total * (100 + modifier.percent) / 100;
63
- newShippingFeeTotal = shippingFeeTotal * (100 + modifier.percent) / 100;
64
- // modifier amount 優先折在運費
65
- if (modifier.amount > shippingFeeTotal) {
66
- // 折扣金額大於運費，折完運費繼續折餐點
67
- shippingFeeTotal -= modifier.amount;
68
- newTotal -= (modifier.amount - newShippingFeeTotal);
57
+ if (modifier.deletedAt == null) {
58
+ let newTotal = total;
59
+ let newShippingFeeTotal = shippingFeeTotal;
60
+ // 全單折扣或 RiceCoin
61
+ if (modifier.applyTo === 'ALL' || modifier.type === 'RICECOIN') {
62
+ // 將 total 及 shippingFeeTotal 計算 percent 折扣
63
+ newTotal = total * (100 + modifier.percent) / 100;
64
+ newShippingFeeTotal = shippingFeeTotal * (100 + modifier.percent) / 100;
65
+ // modifier amount 優先折在運費
66
+ if (modifier.amount > shippingFeeTotal) {
67
+ // 折扣金額大於運費，折完運費繼續折餐點
68
+ shippingFeeTotal -= modifier.amount;
69
+ newTotal -= (modifier.amount - newShippingFeeTotal);
70
+ }
71
+ else {
72
+ // 只折在運費
73
+ newShippingFeeTotal -= modifier.amount;
74
+ }
75
+ }
76
+ // 餐點折扣或優惠碼和店家給的折扣
77
+ if (modifier.applyTo === 'PRODUCT' || modifier.type === 'PROMOCODE' || modifier.type === 'DISCOUNT') {
78
+ // 計算折價後總計運費
79
+ newTotal = total * (100 + modifier.percent) / 100 + modifier.amount;
80
+ }
81
+ // 運費折扣
82
+ if (modifier.applyTo === 'SHIPPING' || modifier.type === 'SHIPPING_DISCOUNT') {
83
+ // 計算折價後總計運費
84
+ newShippingFeeTotal = shippingFeeTotal * (100 + modifier.percent) / 100 + modifier.amount;
85
+ }
86
+ // 計算折了多少
87
+ const diffTotal = total - newTotal;
88
+ const diffShippingFee = shippingFeeTotal - newShippingFeeTotal;
89
+ // 累計折了多少
90
+ if (diffTotal > 0) {
91
+ // 折扣
92
+ calculatedDiscountTotal += diffTotal;
69
93
  }
70
94
  else {
71
- // 只折在運費
72
- newShippingFeeTotal -= modifier.amount;
95
+ // 費用
96
+ surchargeTotal += Math.abs(diffTotal);
73
97
  }
98
+ calculatedShippingFeeDiscount += diffShippingFee;
99
+ // 更新總計金額
100
+ total = newTotal;
101
+ shippingFeeTotal = newShippingFeeTotal;
74
102
  }
75
- // 餐點折扣或優惠碼和店家給的折扣
76
- if (modifier.applyTo === 'PRODUCT' || modifier.type === 'PROMOCODE' || modifier.type === 'DISCOUNT') {
77
- // 計算折價後總計運費
78
- newTotal = total * (100 + modifier.percent) / 100 + modifier.amount;
79
- }
80
- // 運費折扣
81
- if (modifier.applyTo === 'SHIPPING' || modifier.type === 'SHIPPING_DISCOUNT') {
82
- // 計算折價後總計運費
83
- newShippingFeeTotal = shippingFeeTotal * (100 + modifier.percent) / 100 + modifier.amount;
84
- }
85
- // 計算折了多少
86
- const diffTotal = total - newTotal;
87
- const diffShippingFee = shippingFeeTotal - newShippingFeeTotal;
88
- // 累計折了多少
89
- if (diffTotal > 0) {
90
- // 折扣
91
- calculatedDiscountTotal += diffTotal;
92
- }
93
- else {
94
- // 費用
95
- surchargeTotal += Math.abs(diffTotal);
96
- }
97
- calculatedShippingFeeDiscount += diffShippingFee;
98
- // 更新總計金額
99
- total = newTotal;
100
- shippingFeeTotal = newShippingFeeTotal;
101
103
  });
102
104
  // RiceCoin
103
105
  if (riceCoinDiscount > 0) {
package/dist/libs/calculateOrder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calculateOrder.js","sourceRoot":"","sources":["../../src/libs/calculateOrder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculateOrder.js","sourceRoot":"","sources":["../../src/libs/calculateOrder.ts"],"names":[],"mappings":"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"}
package/dist/libs/getFormatBatchItemStatus.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getFormatBatchItemStatus.d.ts","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAE,IAAI,EAAE,aAAa,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM,CAqDzG"}
1
+ {"version":3,"file":"getFormatBatchItemStatus.d.ts","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":"AAIA,MAAM,CAAC,OAAO,UAAU,wBAAwB,CAAE,IAAI,EAAE,aAAa,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM,CAuDzG"}
package/dist/libs/getFormatBatchItemStatus.js CHANGED
@@ -16,31 +16,33 @@ function getFormatBatchItemStatus(item, isSummary = false) {
16
16
  // 組合每一個變價字串
17
17
  const modifierDiscounts = [];
18
18
  const summaryModifier = [];
19
- const hasMERCHANTModifier = item.modifiers.find(modifier => modifier.type === 'MERCHANT');
19
+ const hasMerchantModifier = item.modifiers.find(modifier => modifier.type === 'MERCHANT' && modifier.deletedAt == null);
20
20
  if (item.modifiers != null) {
21
21
  item.modifiers.forEach(modifier => {
22
- let discountText = '';
23
- if (modifier.type !== 'COMBORULE') {
24
- if (modifier.name != null) {
25
- // 有名字時顯示名字
26
- discountText += modifier.name;
22
+ if (modifier.deletedAt == null) {
23
+ let discountText = '';
24
+ if (modifier.type !== 'COMBORULE') {
25
+ if (modifier.name != null) {
26
+ // 有名字時顯示名字
27
+ discountText += modifier.name;
28
+ }
29
+ if (modifier.amount !== 0) {
30
+ // 顯示更動金額
31
+ discountText += getDisplayRoundNumber_1.default(modifier.amount) + '$';
32
+ }
33
+ if (modifier.percent !== 0) {
34
+ // 顯示更動百分比
35
+ discountText += String(modifier.percent) + '%';
36
+ }
27
37
  }
28
- if (modifier.amount !== 0) {
29
- // 顯示更動金額
38
+ else if (modifier.type === 'COMBORULE' && lodash_1.default.isEmpty(hasMerchantModifier)) {
30
39
  discountText += getDisplayRoundNumber_1.default(modifier.amount) + '$';
31
40
  }
32
- if (modifier.percent !== 0) {
33
- // 顯示更動百分比
34
- discountText += String(modifier.percent) + '%';
41
+ modifierDiscounts.push(discountText);
42
+ if (modifier.type === 'MERCHANT') {
43
+ summaryModifier.push(discountText);
35
44
  }
36
45
  }
37
- else if (modifier.type === 'COMBORULE' && lodash_1.default.isEmpty(hasMERCHANTModifier)) {
38
- discountText += getDisplayRoundNumber_1.default(modifier.amount) + '$';
39
- }
40
- modifierDiscounts.push(discountText);
41
- if (modifier.type === 'MERCHANT') {
42
- summaryModifier.push(discountText);
43
- }
44
46
  });
45
47
  }
46
48
  const options = lodash_1.default.map(item.options, option => `${option.name}${option.quantity > 1 ? `x${option.quantity}` : ''}`);
package/dist/libs/getFormatBatchItemStatus.js.map CHANGED
@@ -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,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"}
1
+ {"version":3,"file":"getFormatBatchItemStatus.js","sourceRoot":"","sources":["../../src/libs/getFormatBatchItemStatus.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dimorder-orderapp-lib",
3
- "version": "0.1.285",
3
+ "version": "0.1.287",
4
4
  "main": "dist",
5
5
  "license": "UNLICENSED",
6
6
  "scripts": {