rerobe-js-orm 3.6.7 → 3.6.9

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 (2) hide show
  1. package/lib/helpers/OrderHelpers.js +5 -7
  2. package/package.json +1 -1
package/lib/helpers/OrderHelpers.js CHANGED
@@ -434,10 +434,10 @@ class OrderHelpers {
434
434
  const saleDiscountPresentmentAmount = subtotalOriginalPresentment - subtotalPricePresentmentWithSalePrice;
435
435
  const creditDiscountPresentmentAmount = convertAndFixPrice(creditDiscountAmount || 0);
436
436
  const additionalDiscountPresentmentAmount = convertAndFixPrice(additionalDiscount || 0);
437
- const totalShippingPricePresentmentAmount = convertAndFixPrice(shippingPrice || 0);
438
- const itemsTaxPresentmentAmount = convertAndFixPrice(itemsTax || 0);
439
- const shippingFeeTaxPresentmentAmount = convertAndFixPrice(shippingFeeTax || 0);
440
- const totalTaxPresentmentAmount = convertAndFixPrice(totalTax || 0);
437
+ const totalShippingPricePresentmentAmount = convertAndFixPrice(shippingPrice + shippingFeeTax || 0, 5);
438
+ const itemsTaxPresentmentAmount = convertAndFixPrice(itemsTax || 0, 5);
439
+ const shippingFeeTaxPresentmentAmount = convertAndFixPrice(shippingFeeTax || 0, 5);
440
+ const totalTaxPresentmentAmount = convertAndFixPrice(totalTax || 0, 5);
441
441
  let subtotalPricePresentmentAmount = subtotalPricePresentmentWithSalePrice -
442
442
  Number(creditDiscountPresentmentAmount) -
443
443
  Number(additionalDiscountPresentmentAmount);
@@ -462,9 +462,7 @@ class OrderHelpers {
462
462
  subtotalPricePresentment: prepareMoneyObj(subtotalPricePresentmentAmount),
463
463
  totalDiscountPresentment: prepareMoneyObj(Number(creditDiscountPresentmentAmount) + Number(additionalDiscountPresentmentAmount)),
464
464
  totalShippingPricePresentment: prepareMoneyObj(totalShippingPricePresentmentAmount),
465
- totalPricePresentment: prepareMoneyObj(Number(subtotalPricePresentmentAmount) +
466
- Number(totalShippingPricePresentmentAmount) +
467
- Number(totalTaxPresentmentAmount)),
465
+ totalPricePresentment: prepareMoneyObj(Number(subtotalPricePresentmentAmount) + Number(totalShippingPricePresentmentAmount)),
468
466
  itemsTaxPresentment: prepareMoneyObj(itemsTaxPresentmentAmount),
469
467
  shippingFeeTaxPresentment: prepareMoneyObj(shippingFeeTaxPresentmentAmount),
470
468
  totalTaxPresentment: prepareMoneyObj(totalTaxPresentmentAmount),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rerobe-js-orm",
3
- "version": "3.6.7",
3
+ "version": "3.6.9",
4
4
  "description": "ReRobe's Javascript ORM Framework",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",