@managesome/eposmatic-toolkit 0.2.229 → 0.2.231

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.
@@ -382,43 +382,41 @@ function calculateCartOrderInfoAndSyncData(data, courses, listnerSettings, calcu
382
382
  // So in actual, payable price is the price of all items after applying all discounts and surcharges
383
383
  const payablePrice = subtotal - orderDiscount;
384
384
  const isDineInOrder = constants_1.PLATFORMS_BY_ORDER_TYPE[constants_1.ORDER_TYPE_ENUM.DINE_IN].includes(data.platform);
385
- const isDeliveryOrder = constants_1.PLATFORMS_BY_ORDER_TYPE.DELIVERY.includes(data.platform);
385
+ const isDeliveryOrder = constants_1.PLATFORMS_BY_ORDER_TYPE[constants_1.ORDER_TYPE_ENUM.DELIVERY].includes(data.platform);
386
386
  const isTakeawayOrder = constants_1.PLATFORMS_BY_ORDER_TYPE[constants_1.ORDER_TYPE_ENUM.TAKE_AWAY].includes(data.platform);
387
387
  const isPackagingOrder = isDeliveryOrder || isTakeawayOrder;
388
388
  let service_fee = data.service_fee ?? 0;
389
- if (listnerSettings != null) {
390
- if (!isDineInOrder) {
391
- service_fee = 0;
392
- }
393
- else if (listnerSettings.min_service_fee_order_value > 0 &&
394
- payablePrice < listnerSettings.min_service_fee_order_value) {
395
- service_fee = 0;
396
- }
397
- else {
398
- service_fee = listnerSettings.dinein_service_fee ?? service_fee;
389
+ if (isDineInOrder) {
390
+ if (listnerSettings != null) {
391
+ if (listnerSettings.min_service_fee_order_value > 0 &&
392
+ payablePrice < listnerSettings.min_service_fee_order_value) {
393
+ service_fee = 0;
394
+ }
395
+ else if (listnerSettings.dinein_service_fee > 0) {
396
+ service_fee = listnerSettings.dinein_service_fee;
397
+ }
399
398
  }
400
399
  }
401
- else if (!isDineInOrder) {
400
+ else {
402
401
  service_fee = 0;
403
402
  }
404
403
  let packaging_charges = data.packaging_charges ?? 0;
405
- if (listnerSettings != null) {
406
- if (!isPackagingOrder) {
407
- packaging_charges = 0;
408
- }
409
- else if (listnerSettings.min_packaging_charges_order_value > 0 &&
410
- payablePrice < listnerSettings.min_packaging_charges_order_value) {
411
- packaging_charges = 0;
412
- }
413
- else if (listnerSettings.packaging_charges_free_over > 0 &&
414
- payablePrice >= listnerSettings.packaging_charges_free_over) {
415
- packaging_charges = 0;
416
- }
417
- else {
418
- packaging_charges = listnerSettings.packaging_charges ?? packaging_charges;
404
+ if (isPackagingOrder) {
405
+ if (listnerSettings != null) {
406
+ if (listnerSettings.min_packaging_charges_order_value > 0 &&
407
+ payablePrice < listnerSettings.min_packaging_charges_order_value) {
408
+ packaging_charges = 0;
409
+ }
410
+ else if (listnerSettings.packaging_charges_free_over > 0 &&
411
+ payablePrice >= listnerSettings.packaging_charges_free_over) {
412
+ packaging_charges = 0;
413
+ }
414
+ else if (listnerSettings.packaging_charges > 0) {
415
+ packaging_charges = listnerSettings.packaging_charges;
416
+ }
419
417
  }
420
418
  }
421
- else if (!isPackagingOrder) {
419
+ else {
422
420
  packaging_charges = 0;
423
421
  }
424
422
  // Original items price is the price of all items without any discount
@@ -482,17 +480,19 @@ function calculateCartOrderInfoAndSyncData(data, courses, listnerSettings, calcu
482
480
  // ===============================><===============================
483
481
  // Add delivery fee to grand_total
484
482
  let delivery_cost = 0;
485
- if (listnerSettings != null) {
486
- delivery_cost = (0, utils_1.getDeliveryAmt)({
487
- platform: data.platform,
488
- contemporary_delivery_cost: data.delivery_details?.delivery_cost ?? 0,
489
- delivery_free_over: listnerSettings.delivery_free_over,
490
- delivery_min_cost: listnerSettings.delivery_min_cost,
491
- payable_price: payablePrice,
492
- });
493
- }
494
- else if (data.delivery_details != null) {
495
- delivery_cost = data.delivery_details.delivery_cost;
483
+ if (isDeliveryOrder) {
484
+ if (listnerSettings != null) {
485
+ delivery_cost = (0, utils_1.getDeliveryAmt)({
486
+ platform: data.platform,
487
+ contemporary_delivery_cost: data.delivery_details?.delivery_cost ?? 0,
488
+ delivery_free_over: listnerSettings.delivery_free_over,
489
+ delivery_min_cost: listnerSettings.delivery_min_cost,
490
+ payable_price: payablePrice,
491
+ });
492
+ }
493
+ else if (data.delivery_details != null) {
494
+ delivery_cost = data.delivery_details.delivery_cost;
495
+ }
496
496
  }
497
497
  grand_total += delivery_cost;
498
498
  // Add packaging fee to grand_total
@@ -36,7 +36,7 @@ function calculateTotalAmountWithCharges({ bank_percentage_charges, bank_fixed_c
36
36
  };
37
37
  }
38
38
  function getDeliveryAmt({ platform, delivery_free_over, delivery_min_cost, contemporary_delivery_cost, payable_price, }) {
39
- if (!constants_1.PLATFORMS_BY_ORDER_TYPE.DELIVERY.includes(platform))
39
+ if (!constants_1.PLATFORMS_BY_ORDER_TYPE[constants_1.ORDER_TYPE_ENUM.DELIVERY].includes(platform))
40
40
  return 0;
41
41
  else if (delivery_free_over > 0 && payable_price > delivery_free_over) {
42
42
  return 0;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@managesome/eposmatic-toolkit",
3
- "version": "0.2.229",
3
+ "version": "0.2.231",
4
4
  "description": "A Toolkit Library for Eposmatic",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",