Merge branch 'release/1.1.0'

.gitlab-ci.yml

@@ -6,7 +6,7 @@ include:
 
 variables:
   SAST_EXCLUDED_ANALYZERS: 'eslint,semgrep'
-  DOCKWARE_VERSION: '6.4.19.0'
+  DOCKWARE_VERSION: '6.4.20.2'
   GIT_DEPTH: 10
   RELEASE_NAME: ${DOCKER_STACK}-${DOCKER_SERVICE}-${CI_COMMIT_REF_SLUG}
 
@@ -102,6 +102,7 @@ build-test:
       --cache=true
       --context "dir://${CI_PROJECT_DIR}"
       --dockerfile "./bin/docker/images/shopware/Dockerfile"
+      --build-arg DOCKWARE_VERSION=$DOCKWARE_VERSION
       --destination "$REGISTRY_CI/test-jobs-${DOCKER_STACK}-${DOCKER_SERVICE}_web:${CI_COMMIT_REF_SLUG}"
   except:
     variables:
@@ -330,6 +331,7 @@ build:
       --cache=true
       --context "dir://${CI_PROJECT_DIR}"
       --dockerfile "./bin/docker/images/shopware/Dockerfile"
+      --build-arg DOCKWARE_VERSION=$DOCKWARE_VERSION
       --destination "${REGISTRY_CD}/${DOCKER_STACK}-${DOCKER_SERVICE}-web:${CI_COMMIT_REF_SLUG}"
   tags:
     - small

CHANGELOG.md

@@ -1,8 +1,14 @@
 # CHANGELOG
 
+## Version 1.1.0
+
+- **Add** : Add cancel button option to hosted page
+- **Add** : Update Giropay Logo
+- **Fixed** :  Add `iDeal` bank choice when submitting checkout
+
 ## Version 1.0.3
 
-- **Fix** : EC-3315 - Fixed Database definition
+- **Fix** : Fixed Database definition
 
 ## Version 1.0.2
 

bin/docker/kubernetes/helm/templates/shopware-deployment.yaml

@@ -81,9 +81,6 @@ spec:
         name: shopware-{{ .Release.Name }}
         resources:
           requests:
-            memory: "4G"
-            cpu: "1000m"
-          limits:
             memory: "5G"
             cpu: "1200m"
         envFrom:
@@ -92,10 +89,3 @@ spec:
         ports:
           - containerPort: 80
             name: shopware
-      nodeSelector:
-        node_type: default
-      tolerations:
-        - key: cd_service
-          operator: Equal
-          value: only
-          effect: NoExecute

composer.json

@@ -2,7 +2,7 @@
   "name": "hipay/hipay-enterprise-shopware-6",
   "description": "HiPay enterprise plugin for Shopware 6",
   "license": "Apache-2.0",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "authors": [
     {
       "email": "support.tpp@hipay.com",
@@ -49,7 +49,7 @@
     }
   },
   "require": {
-    "hipay/hipay-fullservice-sdk-php": "^2.11",
+    "hipay/hipay-fullservice-sdk-php": "^2.14.0",
     "giggsey/libphonenumber-for-php": "^8.13"
   },
   "require-dev": {

src/PaymentMethod/AbstractPaymentMethod.php

@@ -307,6 +307,8 @@ private function generateRequestHostedPage(
         $orderRequest = $this->hydrateGenericOrderRequest(new HostedPaymentPageRequest(), $transaction, $locale);
         $orderRequest->payment_product_list = static::getProductCode();
 
+        $orderRequest->display_cancel_button = $this->config->isCancelButtonDisplayed();
+
         return $this->hydrateHostedPage($orderRequest, $transaction);
     }
 

src/Resources/app/storefront/src/payment/hipay-hosted-fields/hipay-hosted-fields.plugin.js

@@ -14,21 +14,23 @@ export default class HipayHostedFieldsPlugin extends Plugin {
     errorClass: 'is-invalid',
     errorPrefix: 'error',
     styles: null
-  } 
+  };
 
   /**
    * Plugin initialisation
    */
   init() {
     // ensure is a abstract class
     if (this.constructor === HipayHostedFieldsPlugin) {
-      throw new TypeError('Class "HipayHostedFieldsPlugin" cannot be instantiated directly');
+      throw new TypeError(
+        'Class "HipayHostedFieldsPlugin" cannot be instantiated directly'
+      );
     }
 
     this.options = {
       ...this.getPaymentDefaultOption(),
       ...this.options
-    }
+    };
 
     this._configHostedFields = this.getConfigHostedFields();
     this._form = document.querySelector('#' + this.options.idResponse).form;
@@ -53,10 +55,10 @@ export default class HipayHostedFieldsPlugin extends Plugin {
 
       let valid = false;
       // Generate
-      this._cardInstance.on('change', (response) => {
+      this._cardInstance.on('change', response => {
         valid = response.valid;
         if (valid) {
-          this._cardInstance.getPaymentData().then((result) => {
+          this._cardInstance.getPaymentData().then(result => {
             inputResponse.setAttribute('value', JSON.stringify(result));
           });
         } else {
@@ -65,19 +67,29 @@ export default class HipayHostedFieldsPlugin extends Plugin {
       });
 
       // handle errors on form validation
-      inputResponse.addEventListener('invalid', (e) => {
+      inputResponse.addEventListener('invalid', e => {
         if (!valid) {
           this._cardInstance.getPaymentData().then(
             () => {},
-            (result) => {
+            result => {
               inputResponse.setAttribute('value', '');
-              result.forEach((element) =>
+              result.forEach(element =>
                 this._errorHandler(element.field, true, element.error)
               );
             }
           );
         }
       });
+
+      this._form.addEventListener('submit', e => {
+        e.preventDefault();
+        const target = e.currentTarget;
+
+        this._cardInstance.getPaymentData().then(result => {
+          inputResponse.setAttribute('value', JSON.stringify(result));
+          target.submit();
+        });
+      });
     });
   }
 
@@ -99,9 +111,11 @@ export default class HipayHostedFieldsPlugin extends Plugin {
       node.classList.remove(this.options.errorClass);
     }
 
-    const errorNode = document.querySelector('#' + this.options.errorPrefix + '-' + targetId);
-    if(errorNode) {
-      errorNode.innerHTML= errorMessage;
+    const errorNode = document.querySelector(
+      '#' + this.options.errorPrefix + '-' + targetId
+    );
+    if (errorNode) {
+      errorNode.innerHTML = errorMessage;
     }
   }
 

src/Resources/config/config.xml

@@ -266,6 +266,12 @@
             <label lang="de-DE">One-Click-Zahlung</label>
         </input-field>
 
+        <input-field type="bool">
+            <name>cancelButton</name>
+            <label>Display cancel button</label>
+            <label lang="de-DE">Die Schaltfläche "Abbrechen" anzeigen</label>
+        </input-field>
+
         <!--<input-field
         type="bool">
             <name>rememberCart</name>

src/Service/ReadHipayConfigService.php

@@ -155,6 +155,14 @@ public function isOneClickPayment(): bool
         return $this->configHipay->getBool(HiPayPaymentPlugin::getModuleName().'.config.oneClickPayment');
     }
 
+    /**
+     * Check if the cancel button is displayed.
+     */
+    public function isCancelButtonDisplayed(): bool
+    {
+        return $this->configHipay->getBool(HiPayPaymentPlugin::getModuleName().'.config.cancelButton');
+    }
+
     /**
      * Check if cart remembering is activated.
      */

tests/Tools/PaymentMethodMockTrait.php

@@ -357,6 +357,7 @@ protected function getHostedPagePaymentRequest(string $classname, $redirectUri =
         $config = [
             'operationMode' => 'hostedPage',
             'captureMode' => 'auto',
+            'cancelButton' => true
         ];
 
         if (null === $redirectUri) {

tests/Unit/PaymentMethod/AbstractPaymentMethodTest.php

@@ -467,6 +467,7 @@ public function testPayValidWithHostedPage()
         $config = [
             'operationMode' => 'hostedPage',
             'captureMode' => 'auto',
+            'cancelButton' => true
         ];
 
         $hostedPaymentPageRequest = new HostedPaymentPageRequest();
@@ -521,6 +522,7 @@ public function testPayFail()
         $config = [
             'operationMode' => 'hostedPage',
             'captureMode' => 'auto',
+            'cancelButton' => true
         ];
 
         $responses = [

tests/Unit/Service/NotificationServiceTest.php

@@ -760,9 +760,9 @@ public function testDispatchExpiredNotification($notificationStatus, $hipayStatu
                 ],
                 'sort' => [
                     [
-                        'extensions' => [],
                         'field' => 'status',
                         'naturalSorting' => false,
+                        'extensions' => [],
                         'order' => 'ASC',
                     ],
                 ],
@@ -909,9 +909,9 @@ public function testDispatchNotification($notificationStatus, $hipayStatus, $ini
                 ],
                 'sort' => [
                     [
-                        'extensions' => [],
                         'field' => 'status',
                         'naturalSorting' => false,
+                        'extensions' => [],
                         'order' => 'ASC',
                     ],
                 ],
@@ -1218,9 +1218,9 @@ public function testDispatchNotificationAuthorizeAndSaveCard()
                 ],
                 'sort' => [
                     [
-                        'extensions' => [],
                         'field' => 'status',
                         'naturalSorting' => false,
+                        'extensions' => [],
                         'order' => 'ASC',
                     ],
                 ],

tests/Unit/Service/ReadHipayConfigServiceTest.php

@@ -256,6 +256,17 @@ public function testIsOneClickPayment()
         );
     }
 
+    public function testIsCancelButtonDisplayed()
+    {
+        $cancelButton = 0 === random_int(0, 1);
+        $mock = $this->generateService(['cancelButton' => $cancelButton]);
+
+        $this->assertEquals(
+            $cancelButton,
+            $mock->isCancelButtonDisplayed()
+        );
+    }
+
     public function testIsRememberCart()
     {
         $rembemberCart = 0 === random_int(0, 1);