addio-admin-sdk 1.7.190 → 1.7.191

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.
@@ -45,5 +45,5 @@ jobs:
45
45
  echo "NEXT_PUBLIC_SERVICE_DATABASE_URL=https://db-test.addiocommerce.com/" >> .env
46
46
  echo "NEXT_PUBLIC_SERVICE_DATABASE_TOKEN=$SERVICE_DATABASE_TOKEN" >> .env
47
47
  echo "NEXT_PUBLIC_API_URL=https://api-test.addiocommerce.com/v1" >> .env
48
- yarn tests
48
+ yarn test
49
49
 
@@ -70,6 +70,7 @@ export interface ICartPromoApplied {
70
70
  readonly after: number;
71
71
  };
72
72
  readonly exclude_services_and_fees?: boolean;
73
+ readonly exclude_discounted_products?: boolean;
73
74
  readonly refunded?: boolean;
74
75
  }
75
76
  export default interface ICart extends IBaseClass {
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Interfaces/Cart/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Interfaces/Cart/index.ts"],"names":[],"mappings":"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"}
@@ -33,6 +33,7 @@ export default interface IDiscountRule {
33
33
  readonly action_is_amount?: boolean;
34
34
  readonly apply_on_discounted_price?: boolean;
35
35
  readonly exclude_services_and_fees?: boolean;
36
+ readonly exclude_discounted_products?: boolean;
36
37
  };
37
38
  readonly authorization?: {
38
39
  readonly date: Date;
@@ -1 +1 @@
1
- {"version":3,"file":"IDiscountRule.js","sourceRoot":"","sources":["../../../src/Interfaces/Rules/IDiscountRule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IDiscountRule.js","sourceRoot":"","sources":["../../../src/Interfaces/Rules/IDiscountRule.ts"],"names":[],"mappings":"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"}
@@ -190,7 +190,7 @@ export default class Cart extends BaseServiceClass<ICart> {
190
190
  private _getDefaultTaxesForCart;
191
191
  calculateTotals: (currency?: string, forcedPromos?: ICartPromoApplied[]) => Promise<Error | undefined>;
192
192
  private _getSubtotal;
193
- _getSubtotalToCheck: (space: Space, feePromosTotalRemoved: number, removeServiceFees?: boolean) => number;
193
+ _getSubtotalToCheck: (space: Space, itemPromos: ICartPromoApplied[], removeServiceFees?: boolean, removeDiscounted?: boolean) => number;
194
194
  calculateSubtotal: (space: Space, forcedPromos?: ICartPromoApplied[]) => number;
195
195
  calculateTotal: (canCartBeEmpty: boolean, currency?: string) => number;
196
196
  getAssociatedTransferRequests: () => Promise<import("../../services/database/DatabaseService").IDatabaseRef[]>;
@@ -2119,18 +2119,26 @@ class Cart extends baseService_1.BaseServiceClass {
2119
2119
  let newPromo;
2120
2120
  const action = (_b = discountWithSamePromoCode.result.action) !== null && _b !== void 0 ? _b : '';
2121
2121
  if (action === IDiscountRule_1.ResultActionEnum.FREE_SHIPPING || action === IDiscountRule_1.ResultActionEnum.FLATERATE_SHIPPING) {
2122
- newPromo = Object.assign({ promo_name: (0, locale_1.getPrincipalWord)(discountWithSamePromoCode.name, space), applies_to: (0, discount_1.getCartPromoType)(discountWithSamePromoCode), amount_removed: 2, amount_unit: action, item_given: '', item_given_amount: 0, free_shipping: action === IDiscountRule_1.ResultActionEnum.FREE_SHIPPING, stackable: discountWithSamePromoCode.is_stackable, discount_id: discountWithSamePromoCode.id, flatrate_shipping: action === IDiscountRule_1.ResultActionEnum.FLATERATE_SHIPPING ? Number(discountWithSamePromoCode.result.action_value) : 0, promo_code: promoCode }, (typeof discountWithSamePromoCode.result.exclude_services_and_fees === 'boolean'
2122
+ newPromo = Object.assign(Object.assign({ promo_name: (0, locale_1.getPrincipalWord)(discountWithSamePromoCode.name, space), applies_to: (0, discount_1.getCartPromoType)(discountWithSamePromoCode), amount_removed: 2, amount_unit: action, item_given: '', item_given_amount: 0, free_shipping: action === IDiscountRule_1.ResultActionEnum.FREE_SHIPPING, stackable: discountWithSamePromoCode.is_stackable, discount_id: discountWithSamePromoCode.id, flatrate_shipping: action === IDiscountRule_1.ResultActionEnum.FLATERATE_SHIPPING ? Number(discountWithSamePromoCode.result.action_value) : 0, promo_code: promoCode }, (typeof discountWithSamePromoCode.result.exclude_services_and_fees === 'boolean'
2123
2123
  ? {
2124
2124
  exclude_services_and_fees: discountWithSamePromoCode.result.exclude_services_and_fees
2125
2125
  }
2126
+ : {})), (typeof discountWithSamePromoCode.result.exclude_discounted_products === 'boolean'
2127
+ ? {
2128
+ exclude_discounted_products: discountWithSamePromoCode.result.exclude_discounted_products
2129
+ }
2126
2130
  : {}));
2127
2131
  this._data = Object.assign(Object.assign({}, cartData), { cart_promos_applied: [...(cartData.cart_promos_applied || []), newPromo], free_shipping: discountWithSamePromoCode.result.action === IDiscountRule_1.ResultActionEnum.FREE_SHIPPING });
2128
2132
  }
2129
2133
  else {
2130
- newPromo = Object.assign({ promo_name: (0, locale_1.getPrincipalWord)(discountWithSamePromoCode.name, space), applies_to: (0, discount_1.getCartPromoType)(discountWithSamePromoCode), amount_removed: (0, toNumber_1.default)(discountWithSamePromoCode.result.action_value), amount_unit: action || IDiscountRule_1.ResultActionEnum.PERCENT, item_given: (0, discount_1.getResultAppliedDiscountSkus)(this._data.items, discountWithSamePromoCode), item_given_amount: 0, free_shipping: false, flatrate_shipping: 0, promo_code: promoCode, stackable: discountWithSamePromoCode.is_stackable, discount_id: discountWithSamePromoCode.id }, (typeof discountWithSamePromoCode.result.exclude_services_and_fees === 'boolean'
2134
+ newPromo = Object.assign(Object.assign({ promo_name: (0, locale_1.getPrincipalWord)(discountWithSamePromoCode.name, space), applies_to: (0, discount_1.getCartPromoType)(discountWithSamePromoCode), amount_removed: (0, toNumber_1.default)(discountWithSamePromoCode.result.action_value), amount_unit: action || IDiscountRule_1.ResultActionEnum.PERCENT, item_given: (0, discount_1.getResultAppliedDiscountSkus)(this._data.items, discountWithSamePromoCode), item_given_amount: 0, free_shipping: false, flatrate_shipping: 0, promo_code: promoCode, stackable: discountWithSamePromoCode.is_stackable, discount_id: discountWithSamePromoCode.id }, (typeof discountWithSamePromoCode.result.exclude_services_and_fees === 'boolean'
2131
2135
  ? {
2132
2136
  exclude_services_and_fees: discountWithSamePromoCode.result.exclude_services_and_fees
2133
2137
  }
2138
+ : {})), (typeof discountWithSamePromoCode.result.exclude_discounted_products === 'boolean'
2139
+ ? {
2140
+ exclude_discounted_products: discountWithSamePromoCode.result.exclude_discounted_products
2141
+ }
2134
2142
  : {}));
2135
2143
  this._data = Object.assign(Object.assign({}, cartData), { cart_promos_applied: [...(cartData.cart_promos_applied || []), newPromo], free_shipping: false });
2136
2144
  }
@@ -2439,24 +2447,13 @@ class Cart extends baseService_1.BaseServiceClass {
2439
2447
  return (0, round_1.default)(((0, isNumber_1.default)(itemPrice) ? Number(itemPrice) : 0) * item.qte, space.data().product_preferences.decimals || 2);
2440
2448
  });
2441
2449
  };
2442
- this._getSubtotalToCheck = (space, feePromosTotalRemoved, removeServiceFees) => {
2443
- // ** NEW - Now excludes escompte supp. products from services when checking subtotal for promotions
2444
- const serviceFeeProducts = !!!removeServiceFees
2445
- ? []
2446
- : this.data().items.filter((i) => !!i.is_service && !(0, g2_1.isEscompteSuppItem)(i.sku));
2447
- const serviceFeeSubtotal = !!!serviceFeeProducts.length
2448
- ? 0
2449
- : (0, sumBy_1.default)(serviceFeeProducts, (i) => {
2450
- const itemPrice = this.getLowestPrice(i);
2451
- return (0, round_1.default)(((0, isNumber_1.default)(itemPrice) ? Number(itemPrice) : 0) * i.qte, space.data().product_preferences.decimals || 2);
2452
- });
2453
- let totalRemoved = serviceFeeSubtotal;
2454
- // If there is a service and fees total, calculates the service and fees total after taking into account their promos
2455
- if (!!totalRemoved) {
2456
- totalRemoved -= feePromosTotalRemoved;
2457
- }
2458
- // Removes that calculated total from the current subtotal to get the subtotal without services and fees, in order to calculate the right promo amount
2459
- return this._data.subtotal - totalRemoved;
2450
+ this._getSubtotalToCheck = (space, itemPromos, removeServiceFees, removeDiscounted) => {
2451
+ const excludedTotal = (0, discount_1.getExcludedItemsSubtotal)(this.data().items, itemPromos, {
2452
+ excludeServices: !!removeServiceFees,
2453
+ excludeDiscounted: !!removeDiscounted,
2454
+ decimals: space.data().product_preferences.decimals || 2
2455
+ });
2456
+ return this._data.subtotal - excludedTotal;
2460
2457
  };
2461
2458
  this.calculateSubtotal = (space, forcedPromos) => {
2462
2459
  var _b;
@@ -2487,7 +2484,7 @@ class Cart extends baseService_1.BaseServiceClass {
2487
2484
  }
2488
2485
  return 2;
2489
2486
  });
2490
- let feePromosTotal = 0;
2487
+ const productPromos = cartPromos.filter((p) => p.applies_to === Cart_1.CartPromoAppliesToEnum.PRODUCT);
2491
2488
  for (let aPromo of cartPromos) {
2492
2489
  if (this._data.subtotal > 0 &&
2493
2490
  !!aPromo &&
@@ -2496,10 +2493,10 @@ class Cart extends baseService_1.BaseServiceClass {
2496
2493
  let amountToRemove = 0;
2497
2494
  const amountUnit = aPromo.amount_unit || IDiscountRule_1.ResultActionEnum.PERCENT;
2498
2495
  const appliesToProduct = aPromo.applies_to === Cart_1.CartPromoAppliesToEnum.PRODUCT;
2499
- const subtotalToCheck = !!aPromo.exclude_services_and_fees &&
2496
+ const subtotalToCheck = (!!aPromo.exclude_services_and_fees || !!aPromo.exclude_discounted_products) &&
2500
2497
  !![IDiscountRule_1.ResultActionEnum.PERCENT, IDiscountRule_1.ResultActionEnum.PERCENT_SKU, IDiscountRule_1.ResultActionEnum.PERCENT_CATEGORY].includes(amountUnit) &&
2501
2498
  !!!appliesToProduct
2502
- ? this._getSubtotalToCheck(space, feePromosTotal, true)
2499
+ ? this._getSubtotalToCheck(space, productPromos, !!aPromo.exclude_services_and_fees, !!aPromo.exclude_discounted_products)
2503
2500
  : this._data.subtotal;
2504
2501
  if (aPromo.applies_to === Cart_1.CartPromoAppliesToEnum.PRODUCT) {
2505
2502
  let skuArray = [];
@@ -2511,8 +2508,6 @@ class Cart extends baseService_1.BaseServiceClass {
2511
2508
  const newAmountToRemove = (0, data_1.getPromoTotalAmount)(this._data.items, aPromo, 'number', anItem.sku);
2512
2509
  if (typeof newAmountToRemove !== 'number')
2513
2510
  continue;
2514
- if (!!anItem && !!anItem.is_service)
2515
- feePromosTotal += newAmountToRemove;
2516
2511
  amountToRemove += newAmountToRemove;
2517
2512
  }
2518
2513
  }