Merge pull request #43 from Adyen/develop

Release v1.1.3
Adyen · Sep 7, 2023 · 95c1102 · 95c1102
2 parents 923b1c7 + 52037f8
commit 95c1102
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 20 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @Adyen/php
+* @Adyen/plugin-developers
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,14 @@
+changelog:
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - Breaking change
+    - title: New Features 💎
+      labels:
+        - Feature
+    - title: Fixes ⛑️
+      labels:
+        - Fix
+    - title: Other Changes 🖇️
+      labels:
+        - "*"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -0,0 +1,41 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "develop","main" ]
+  pull_request:
+    branches: [ "develop","main"]
+  schedule:
+    - cron: "6 1 * * 0"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ javascript ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: +security-and-quality
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{ matrix.language }}"
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "adyen/adyen-magento2-expresscheckout",
   "description": "Official Adyen Magento2 plugin to add express payment method shortcuts.",
   "type": "magento2-module",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "MIT",
   "repositories": [
     {

diff --git a/etc/module.xml b/etc/module.xml
@@ -11,7 +11,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Adyen_ExpressCheckout" setup_version="1.1.2">
+    <module name="Adyen_ExpressCheckout" setup_version="1.1.3">
         <sequence>
             <module name="Adyen_Payment"/>
         </sequence>

diff --git a/view/frontend/web/js/applepay/button.js b/view/frontend/web/js/applepay/button.js
@@ -282,28 +282,44 @@ define([
                                 self.shippingMethod = result[i].method_code;
                             }
                         }
+
+                        let address = {
+                            'countryId': self.shippingAddress.country_id,
+                            'region': self.shippingAddress.region,
+                            'regionId': getRegionId(self.shippingAddress.country_id, self.shippingAddress.region),
+                            'postcode': self.shippingAddress.postcode
+                        };
+
+
                         // Create payload to get totals
                         let totalsPayload = {
                             'addressInformation': {
-                                'address': {
-                                    'countryId': self.shippingAddress.country_id,
-                                    'region': self.shippingAddress.region,
-                                    'regionId': getRegionId(self.shippingAddress.country_id, self.shippingAddress.region),
-                                    'postcode': self.shippingAddress.postcode
-                                },
+                                'address': address,
                                 'shipping_method_code': self.shippingMethods[shippingMethods[0].identifier].method_code,
                                 'shipping_carrier_code': self.shippingMethods[shippingMethods[0].identifier].carrier_code
                             }
                         };
 
+                        // Create payload to update quote
+                        let shippingInformationPayload = {
+                            'addressInformation': {
+                                ...totalsPayload.addressInformation,
+                                'shipping_address': address,
+                                'billing_address': address
+                            }
+                        };
+
+                        delete shippingInformationPayload.addressInformation.address;
+                        setShippingInformation(shippingInformationPayload, this.isProductView);
+
                         setTotalsInfo(totalsPayload, this.isProductView)
                             .done((response) => {
                                 let applePayShippingContactUpdate = {};
 
                                 applePayShippingContactUpdate.newShippingMethods = shippingMethods;
                                 applePayShippingContactUpdate.newTotal = {
                                     label: $t('Grand Total'),
-                                    amount: response.grand_total.toString()
+                                    amount: (response.grand_total + response.tax_amount).toString()
                                 };
                                 applePayShippingContactUpdate.newLineItems = [
                                     {
@@ -317,6 +333,15 @@ define([
                                         amount: shippingMethods[0].amount.toString()
                                     }
                                 ];
+
+                                if (response.tax_amount > 0) {
+                                    applePayShippingContactUpdate.newLineItems.push({
+                                        type: 'final',
+                                        label: $t('Tax'),
+                                        amount: response.tax_amount.toString()
+                                    })
+                                }
+
                                 resolve(applePayShippingContactUpdate);
                                 // Pass shipping methods back
                             }).fail((e) => {
@@ -328,29 +353,42 @@ define([
 
             onShippingMethodSelect: function (resolve, reject, event) {
                 let self = this;
-
                 let shippingMethod = event.shippingMethod;
-                let payload = {
+
+                let address = {
+                    'countryId': self.shippingAddress.country_id,
+                    'region': self.shippingAddress.region,
+                    'regionId': getRegionId(self.shippingAddress.country_id, self.shippingAddress.region),
+                    'postcode': self.shippingAddress.postcode
+                };
+
+                let totalsPayload = {
                     'addressInformation': {
-                        'address': {
-                            'countryId': self.shippingAddress.country_id,
-                            'region': self.shippingAddress.region,
-                            'regionId': getRegionId(self.shippingAddress.country_id, self.shippingAddress.region),
-                            'postcode': self.shippingAddress.postcode
-                        },
+                        'address': address,
                         'shipping_method_code': self.shippingMethods[shippingMethod.identifier].method_code,
                         'shipping_carrier_code': self.shippingMethods[shippingMethod.identifier].carrier_code
                     }
                 };
 
-                setTotalsInfo(payload, this.isProductView)
+                let shippingInformationPayload = {
+                    'addressInformation': {
+                        ...totalsPayload.addressInformation,
+                        'shipping_address': address,
+                        'billing_address': address
+                    }
+                };
+
+                delete shippingInformationPayload.addressInformation.address;
+                setShippingInformation(shippingInformationPayload, this.isProductView);
+
+                setTotalsInfo(totalsPayload, this.isProductView)
                     .done((response) => {
                         let applePayShippingMethodUpdate = {};
 
                         applePayShippingMethodUpdate.newTotal = {
                             type: 'final',
                             label: $t('Grand Total'),
-                            amount: response.grand_total.toString()
+                            amount: (response.grand_total + response.tax_amount).toString()
                         };
                         applePayShippingMethodUpdate.newLineItems = [
                             {
@@ -364,6 +402,15 @@ define([
                                 amount: shippingMethod.amount.toString()
                             }
                         ];
+
+                        if (response.tax_amount > 0) {
+                            applePayShippingMethodUpdate.newLineItems.push({
+                                type: 'final',
+                                label: $t('Tax'),
+                                amount: response.tax_amount.toString()
+                            })
+                        }
+
                         self.shippingMethod = shippingMethod.identifier;
                         resolve(applePayShippingMethodUpdate);
                     }).fail((e) => {