From 51663894b703f31eb1f6dca8ae91cbaeb48ab491 Mon Sep 17 00:00:00 2001 From: Fabiano Mallmann <25328512+fabiano-mallmann@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:50:38 -0300 Subject: [PATCH 1/2] fix: checkout value does not include taxes --- .../web/js/core/checkout/PaymentMethodController.js | 8 ++++---- view/frontend/web/js/core/checkout/Tds.js | 2 +- view/frontend/web/js/core/models/CreditCardModel.js | 2 +- view/frontend/web/js/view/payment/default.js | 3 ++- view/frontend/web/js/view/payment/googlepay.js | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/view/frontend/web/js/core/checkout/PaymentMethodController.js b/view/frontend/web/js/core/checkout/PaymentMethodController.js index 02c2b567..074da976 100644 --- a/view/frontend/web/js/core/checkout/PaymentMethodController.js +++ b/view/frontend/web/js/core/checkout/PaymentMethodController.js @@ -109,7 +109,7 @@ define([ totalAmount += parseFloat(amount); } - if (totalAmount === _self.platformConfig.updateTotals.getTotals()().grand_total) { + if (totalAmount === _self.platformConfig.updateTotals.getTotals()().base_grand_total) { return; } @@ -392,7 +392,7 @@ define([ formObject.inputAmount.on('keyup', function () { const element = $(this); - const originalValue = paymentMethodController.platformConfig.updateTotals.getTotals()().grand_total; + const originalValue = paymentMethodController.platformConfig.updateTotals.getTotals()().base_grand_total; let orderAmount = (originalValue).toFixed(2).replace(/\d(?=(\d{3})+\.)/g, '$&,'); orderAmount = orderAmount.replace(/[^0-9]/g, ''); orderAmount = Number(orderAmount); @@ -754,7 +754,7 @@ define([ } fillCardAmount(formObject, count, card = null) { - const orderAmount = this.platformConfig.updateTotals.getTotals()().grand_total / count; + const orderAmount = this.platformConfig.updateTotals.getTotals()().base_grand_total / count; let amount = orderAmount.toFixed(this.platformConfig.currency.precision); const separator = "."; @@ -763,7 +763,7 @@ define([ if (card === 1) { const orderAmountOriginal = amount.replace(this.platformConfig.currency.decimalSeparator, "."); - const amountBalance = (this.platformConfig.updateTotals.getTotals()().grand_total - orderAmountOriginal).toFixed(2); + const amountBalance = (this.platformConfig.updateTotals.getTotals()().base_grand_total - orderAmountOriginal).toFixed(2); formObject.inputAmount.val(amountBalance.replace(".", this.platformConfig.currency.decimalSeparator)); return; } diff --git a/view/frontend/web/js/core/checkout/Tds.js b/view/frontend/web/js/core/checkout/Tds.js index 1a4ff403..45bf0d21 100644 --- a/view/frontend/web/js/core/checkout/Tds.js +++ b/view/frontend/web/js/core/checkout/Tds.js @@ -115,7 +115,7 @@ define([ phones : customerPhones, card_expiry_date : cardExpiryDate, purchase : { - amount : quote.totals().grand_total * 100, + amount : quote.totals().base_grand_total * 100, date : new Date().toISOString() , diff --git a/view/frontend/web/js/core/models/CreditCardModel.js b/view/frontend/web/js/core/models/CreditCardModel.js index 31b245d2..ef37d34d 100644 --- a/view/frontend/web/js/core/models/CreditCardModel.js +++ b/view/frontend/web/js/core/models/CreditCardModel.js @@ -86,7 +86,7 @@ define([ const configCard = window.checkoutConfig.payment.pagarme_creditcard; return configCard['tds_active'] === true - && quote.totals().grand_total * 100 >= configCard['tds_min_amount'] * 100 + && quote.totals().base_grand_total * 100 >= configCard['tds_min_amount'] * 100 && this.brandIsVisaOrMaster(); } brandIsVisaOrMaster() { diff --git a/view/frontend/web/js/view/payment/default.js b/view/frontend/web/js/view/payment/default.js index 422c861b..9a2585a4 100644 --- a/view/frontend/web/js/view/payment/default.js +++ b/view/frontend/web/js/view/payment/default.js @@ -58,7 +58,7 @@ define( const platFormConfig = window.checkoutConfig; platFormConfig.moduleUrls = {}; const installmentsUrl = installmentsAction(); - platFormConfig.grand_total = quote.getTotals()().grand_total; + platFormConfig.grand_total = quote.getTotals()().base_grand_total; const baseUrl = platFormConfig.payment.ccform.base_url; @@ -157,6 +157,7 @@ define( } const total = quote.getTotals()(); + debugger; let subTotalIndex = null; for (let i = 0, len = total.total_segments.length; i < len; i++) { if (total.total_segments[i].code == "grand_total") { diff --git a/view/frontend/web/js/view/payment/googlepay.js b/view/frontend/web/js/view/payment/googlepay.js index 3b406ea5..b1fcbc04 100644 --- a/view/frontend/web/js/view/payment/googlepay.js +++ b/view/frontend/web/js/view/payment/googlepay.js @@ -122,7 +122,7 @@ define([ countryCode: "BR", currencyCode: quote.totals().base_currency_code, totalPriceStatus: "FINAL", - totalPrice: quote.totals().grand_total.toFixed(2), + totalPrice: quote.totals().base_grand_total.toFixed(2), }; }, From 401190453e2a85eea69734159efeb72b0c74bc8e Mon Sep 17 00:00:00 2001 From: Fabiano Mallmann <25328512+fabiano-mallmann@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:01:22 -0300 Subject: [PATCH 2/2] fix: remove debugger --- view/frontend/web/js/view/payment/default.js | 1 - 1 file changed, 1 deletion(-) diff --git a/view/frontend/web/js/view/payment/default.js b/view/frontend/web/js/view/payment/default.js index 9a2585a4..8502c1ac 100644 --- a/view/frontend/web/js/view/payment/default.js +++ b/view/frontend/web/js/view/payment/default.js @@ -157,7 +157,6 @@ define( } const total = quote.getTotals()(); - debugger; let subTotalIndex = null; for (let i = 0, len = total.total_segments.length; i < len; i++) { if (total.total_segments[i].code == "grand_total") {