Merge branch 'bugfix/get-the-grand-total' into release-week-45

mollie · Nov 13, 2023 · d6e3d75 · d6e3d75
2 parents b09e519 + 7ec19ce
commit d6e3d75
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/templates/e2e/Dockerfile b/.github/workflows/templates/e2e/Dockerfile
@@ -2,6 +2,7 @@ FROM cypress/included:12.1.0
 
 WORKDIR /e2e
 
+RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
 RUN npm i @cypress/webpack-preprocessor cypress-mollie cypress-testrail --save-dev
 
 CMD tail -f /dev/null

diff --git a/Controller/ApplePay/ShippingMethods.php b/Controller/ApplePay/ShippingMethods.php
@@ -90,6 +90,7 @@ public function execute()
             'totals' => array_map(function (AddressTotal $total) {
                 return [
                     'type' => 'final',
+                    'code' => $total->getCode(),
                     'label' => $total->getData('title'),
                     'amount' => number_format($total->getData('value'), 2, '.', ''),
                 ];

diff --git a/view/frontend/web/js/view/product/apple-pay-button.js b/view/frontend/web/js/view/product/apple-pay-button.js
@@ -223,15 +223,17 @@ define([
 
         getLineItems: function () {
             let totals = [...this.quoteTotals];
-            totals.pop();
+
+            // Delete the item that has code == grand_total
+            totals.splice(totals.findIndex(total => total.code === 'grand_total'), 1);
 
             return totals;
         },
 
         getTotal: function () {
             let totals = [...this.quoteTotals];
 
-            var total = totals.pop();
+            const total = totals.find(total => total.code === 'grand_total');
 
             total.label = this.storeName;