From 432ee4439e519e98f4ce172b804f1076718910ec Mon Sep 17 00:00:00 2001
From: Ivascu Madalin <madalin.ivascu@arnia.ro>
Date: Mon, 30 Oct 2023 08:22:34 +0000
Subject: [PATCH 1/2] Add sonarqube

---
 .github/workflows/sonarqube.yml | 24 ++++++++++++++++++++++++
 sonar-project.properties        |  9 +++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 .github/workflows/sonarqube.yml
 create mode 100644 sonar-project.properties

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
new file mode 100644
index 0000000..ec147dc
--- /dev/null
+++ b/.github/workflows/sonarqube.yml
@@ -0,0 +1,24 @@
+name: SonarQube Analysis
+
+on:
+    push:
+        branches:
+        - master
+        - develop
+        - "releases/**"
+    pull_request:
+        types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    name: SonarQube Analysis
+    runs-on: ubuntu-latest
+    permissions: read-all
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
+      - uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 0000000..4b10ff8
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,9 @@
+# Unique key for the project
+sonar.projectKey=Hyva-Checkout
+
+# Display name and version for the SonarQube UI
+sonar.projectName=Hyva Checkout
+sonar.projectVersion=1.0
+
+# Path to the source code, relative to the sonar-project.properties file
+sonar.sources=.
\ No newline at end of file

From e5cd0bc655b6402006e9140a6557c61b810268b7 Mon Sep 17 00:00:00 2001
From: Ivascu Madalin <madalin.ivascu@arnia.ro>
Date: Mon, 30 Oct 2023 08:58:12 +0000
Subject: [PATCH 2/2] fix small issues

---
 Model/Magewire/Payment/PlaceOrderService.php  |  2 +-
 Model/Validation/Rules/Iban.php               |  2 +-
 .../templates/component/payment/before.phtml  | 47 +++++++++++++++----
 .../component/payment/method/afterpay.phtml   | 29 +++++++++---
 .../component/payment/method/afterpay20.phtml | 20 ++++++--
 .../component/payment/method/applepay.phtml   |  7 ++-
 .../component/payment/method/billink.phtml    | 16 +++++--
 .../component/payment/method/creditcard.phtml | 12 ++---
 .../payment/method/creditcards.phtml          | 44 ++++++++++++++---
 .../component/payment/method/giftcards.phtml  | 36 +++++++++++---
 .../component/payment/method/giropay.phtml    |  9 +++-
 .../component/payment/method/ideal.phtml      |  7 ++-
 .../component/payment/method/in3.phtml        | 18 +++++--
 .../component/payment/method/klarna.phtml     |  2 +-
 .../component/payment/method/mrcash.phtml     | 33 +++++++++++--
 .../payment/method/payperemail.phtml          | 30 ++++++++++--
 .../component/payment/method/sepaDirect.phtml |  9 +++-
 .../component/payment/method/tinka.phtml      | 18 +++++--
 .../component/payment/method/voucher.phtml    | 16 +++++--
 .../templates/total-segments/empty.phtml      |  2 -
 20 files changed, 286 insertions(+), 73 deletions(-)

diff --git a/Model/Magewire/Payment/PlaceOrderService.php b/Model/Magewire/Payment/PlaceOrderService.php
index c63f693..253d43d 100644
--- a/Model/Magewire/Payment/PlaceOrderService.php
+++ b/Model/Magewire/Payment/PlaceOrderService.php
@@ -49,4 +49,4 @@ private function hasRedirect(): bool
         $response = $this->getResponse();
         return !empty($response->RequiredAction->RedirectURL);
     }
-}
\ No newline at end of file
+}
diff --git a/Model/Validation/Rules/Iban.php b/Model/Validation/Rules/Iban.php
index f31d6ae..20cf248 100644
--- a/Model/Validation/Rules/Iban.php
+++ b/Model/Validation/Rules/Iban.php
@@ -41,7 +41,7 @@ public function check($value): bool
                $checksum %= 97;
            }
 
-           return ((98 - $checksum) == $check);
+           return (98 - $checksum) == $check;
        } else {
            return false;
        }
diff --git a/view/frontend/templates/component/payment/before.phtml b/view/frontend/templates/component/payment/before.phtml
index 36caf30..6113d8e 100644
--- a/view/frontend/templates/component/payment/before.phtml
+++ b/view/frontend/templates/component/payment/before.phtml
@@ -33,7 +33,11 @@
             });
 
             hyva.formValidation.addRule('bk-validateCardCvc', (value, options, field, context) => {
-                if (!BuckarooClientSideEncryption.V001.validateCvc(value, context.determineIssuer(context.cardNumber))) {
+                if (!BuckarooClientSideEncryption.V001.validateCvc(
+                    value,
+                    context.determineIssuer(context.cardNumber)
+                    )
+                ) {
                     return '<?= $escaper->escapeJs(__('Please enter a valid Cvc number.')) ?>';
                 };
                 return true;
@@ -106,7 +110,12 @@
         })
     }
 }" x-init="initModal()">
-    <div id="bk-modal" tabindex="-1" aria-hidden="true" class="fixed top-0 left-0 right-0 z-50 justify-center w-full p-4 items-center overflow-x-hidden overflow-y-auto md:inset-0 max-h-full h-full" x-bind:class="showModal ? 'flex': 'hidden'">
+    <div
+    id="bk-modal"
+    tabindex="-1"
+    aria-hidden="true"
+    class="fixed top-0 left-0 right-0 z-50 justify-center w-full p-4 items-center overflow-x-hidden overflow-y-auto md:inset-0 max-h-full h-full"
+    x-bind:class="showModal ? 'flex': 'hidden'">
         <div class="relative w-full max-w-md max-h-full"  @click.outside="close()">
             <!-- Modal content -->
             <div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
@@ -114,9 +123,24 @@
                 <div class="flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600">
                     <h3 class="text-xl font-semibold text-gray-900 dark:text-white" x-text="title">
                     </h3>
-                    <button type="button" @click="close()" class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white" data-modal-hide="defaultModal">
-                        <svg aria-hidden="true" class="w-5 h-5" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-                            <path fill-rule="evenodd" d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z" clip-rule="evenodd"></path>
+                    <button
+                        type="button"
+                        @click="close()"
+                        class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
+                        data-modal-hide="defaultModal"
+                    >
+                        <svg
+                            aria-hidden="true"
+                            class="w-5 h-5"
+                            fill="currentColor"
+                            viewBox="0 0 20 20"
+                            xmlns="http://www.w3.org/2000/svg"
+                        >
+                            <path
+                                fill-rule="evenodd"
+                                d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
+                                clip-rule="evenodd">
+                            </path>
                         </svg>
                         <span class="sr-only">Close modal</span>
                     </button>
@@ -131,14 +155,21 @@
                 <div class="flex items-center p-2 space-x-2 border-t border-gray-200 rounded-b dark:border-gray-600">
                     <template x-if="Array.isArray(buttons)">
                         <template x-for="(button, index) in buttons" :key="index">
-                            <button @click="typeof button.action === 'function' ? button.action() : close()" type="button" class="btn btn primary" x-text="button.label"></button>
+                            <button
+                                @click="typeof button.action === 'function' ? button.action() : close()"
+                                type="button"
+                                class="btn btn primary"
+                                x-text="button.label"
+                            ></button>
                         </template>
                     </template>
                     <template x-if="showClose">
-                        <button @click="close()" type="button" class="btn btn primary"><?= $escaper->escapeHtml(__('Close')); ?></button>
+                        <button @click="close()" type="button" class="btn btn primary">
+                            <?= $escaper->escapeHtml(__('Close')); ?>
+                        </button>
                     </template>
                 </div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/afterpay.phtml b/view/frontend/templates/component/payment/method/afterpay.phtml
index b91f1e4..34d6062 100644
--- a/view/frontend/templates/component/payment/method/afterpay.phtml
+++ b/view/frontend/templates/component/payment/method/afterpay.phtml
@@ -21,7 +21,13 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_afterpay_dob">
+            <input
+                type="date"
+                x-data
+                value="<?= $magewire->dateOfBirth ?>"
+                @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+                id="buckaroo_afterpay_dob"
+            >
             <?php if ($magewire->hasError('dateOfBirth')) : ?>
                 <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
@@ -47,8 +53,15 @@ use Magento\Framework\Escaper;
     <?php if ($magewire->showBusinessSelector()) {
     ?>
         <div class="flex flex-col gap-y-2 field field-reserved">
-            <label for="buckaroo_magento2_afterpay_selectedBusiness"><?= $escaper->escapeHtml(__('Business Model:')); ?></label>
-            <select name="issuer" id="buckaroo_magento2_afterpay_selectedBusiness" wire:model="selectedBusiness" class="form-select">
+            <label for="buckaroo_magento2_afterpay_selectedBusiness">
+                <?= $escaper->escapeHtml(__('Business Model:')); ?>
+            </label>
+            <select
+                name="issuer"
+                id="buckaroo_magento2_afterpay_selectedBusiness"
+                wire:model="selectedBusiness"
+                class="form-select"
+            >
                 <option value="1"><?= $escaper->escapeHtml(__('B2C - Business to Consumer')) ?></option>
                 <option value="2"><?= $escaper->escapeHtml(__('B2B - Business to Business')) ?></option>
             </select>
@@ -59,7 +72,7 @@ use Magento\Framework\Escaper;
     ?>
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay_iban">
-                <?= $escaper->escapeHtml(__( 'Bank Account Number:')); ?>
+                <?= $escaper->escapeHtml(__('Bank Account Number:')); ?>
                 <span class="text-red">*</span>
             </label>
             <input type="text" wire:model.lazy="iban" id="buckaroo_afterpay_iban">
@@ -99,10 +112,14 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay_tos"><?= $escaper->escapeHtml(__('Terms and Conditions:')); ?></label>
         <div class="flex flex-row gap-x-2">
             <input class="mt-1" type="checkbox" wire:model.lazy="tos" id="buckaroo_afterpay_tos">
-            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>"><?= $escaper->escapeHtml(__('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')) ?></a>
+            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>">
+                <?= $escaper->escapeHtml(
+                    __('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')
+                ) ?>
+            </a>
         </div>
         <?php if ($magewire->hasError('tos')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/afterpay20.phtml b/view/frontend/templates/component/payment/method/afterpay20.phtml
index 85bb73b..793dfd8 100644
--- a/view/frontend/templates/component/payment/method/afterpay20.phtml
+++ b/view/frontend/templates/component/payment/method/afterpay20.phtml
@@ -11,7 +11,12 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay20_tos_fullname">
             <?= $escaper->escapeHtml(__('Billing Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="fullName" disabled id="buckaroo_afterpay20_tos_fullname" class="bg-gray-200">
+        <input
+            type="text"
+            wire:model.lazy="fullName"
+            disabled id="buckaroo_afterpay20_tos_fullname"
+            class="bg-gray-200"
+        >
     </div>
 
     <?php if ($magewire->showBirth()) {
@@ -21,7 +26,12 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="date" x-data value="<?=$magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_afterpay20_dob">
+            <input type="date"
+                x-data
+                value="<?=$magewire->dateOfBirth ?>"
+                @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+                id="buckaroo_afterpay20_dob"
+            >
             <?php if ($magewire->hasError('dateOfBirth')): ?>
                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
@@ -80,7 +90,11 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay20_tos"><?= $escaper->escapeHtml(__('Terms and Conditions:')); ?></label>
         <div class="flex flex-row gap-x-2">
             <input class="mt-1" type="checkbox" wire:model.lazy="tos" id="buckaroo_afterpay20_tos">
-            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>"><?= $escaper->escapeHtml(__('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')) ?></a>
+            <a class="grow" href="<?= $escaper->escapeUrl($magewire->getTosLink()) ?>">
+                <?= $escaper->escapeHtml(
+                    __('Yes, I accept the terms and condition for the use of Riverty | Afterpay.')
+                ) ?>
+            </a>
         </div>
         <?php if ($magewire->hasError('tos')): ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
diff --git a/view/frontend/templates/component/payment/method/applepay.phtml b/view/frontend/templates/component/payment/method/applepay.phtml
index e3687d3..0330bb4 100644
--- a/view/frontend/templates/component/payment/method/applepay.phtml
+++ b/view/frontend/templates/component/payment/method/applepay.phtml
@@ -87,9 +87,8 @@ use Magento\Framework\Escaper;
         this.loadSdk().then(async () => {
             this.canDisplay = await BuckarooApplePay.checkPaySupport();
             const v = async () => {
-                if(this.canDisplay) {
-                    await this.beginPayment(); 
-                } 
+                if(this.canDisplay)
+                    await this.beginPayment();
             };
             window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
                 detail: {
@@ -104,4 +103,4 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Place Order')) ?>
         </button>
     </template>
-</form>
\ No newline at end of file
+</form>
diff --git a/view/frontend/templates/component/payment/method/billink.phtml b/view/frontend/templates/component/payment/method/billink.phtml
index eed7c65..c625951 100644
--- a/view/frontend/templates/component/payment/method/billink.phtml
+++ b/view/frontend/templates/component/payment/method/billink.phtml
@@ -38,7 +38,12 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_billink_dob">
+        <input
+            type="date"
+            x-data
+            value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+            id="buckaroo_billink_dob"
+        >
         <?php if ($magewire->hasError('dateOfBirth')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
         <?php endif; ?>
@@ -89,10 +94,15 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_billink_tos"><?= $escaper->escapeHtml(__('Terms and Conditions:')); ?></label>
         <div class="flex flex-row gap-x-2">
             <input class="mt-1" type="checkbox" wire:model.lazy="tos" id="buckaroo_billink_tos">
-            <a class="grow" href="https://www.billink.nl/app/uploads/2021/05/Gebruikersvoorwaarden-Billink_V11052021.pdf"><?= $escaper->escapeHtml(__('Accept terms of use')) ?></a>
+            <a
+                class="grow"
+                href="https://www.billink.nl/app/uploads/2021/05/Gebruikersvoorwaarden-Billink_V11052021.pdf"
+            >
+                <?= $escaper->escapeHtml(__('Accept terms of use')) ?>
+            </a>
         </div>
         <?php if ($magewire->hasError('tos')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/creditcard.phtml b/view/frontend/templates/component/payment/method/creditcard.phtml
index 1e0e0f6..aa34d35 100644
--- a/view/frontend/templates/component/payment/method/creditcard.phtml
+++ b/view/frontend/templates/component/payment/method/creditcard.phtml
@@ -11,13 +11,14 @@ $issuers = $magewire->getIssuers();
 <div class="col-span-6">
     <div class="flex flex-col gap-y-2">
         <?php if ($magewire->displayAsSelect()) { ?>
-            <label for="buckaroo_magento2_creditcard_issuer"><?= $escaper->escapeHtml(__('Select a Credit Card or Debit Card:')); ?></label>
+            <label for="buckaroo_magento2_creditcard_issuer">
+                <?= $escaper->escapeHtml(__('Select a Credit Card or Debit Card:')); ?>
+            </label>
             <select name="issuer" id="buckaroo_magento2_creditcard_issuer" wire:model="cardType" class="form-select">
                 <?php
                 foreach ($issuers as $issuer) {
                 ?>
-                    <option 
-                    value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
+                    <option value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
                         <?= $escaper->escapeHtml($issuer["name"]) ?>
                     </option>
                 <?php
@@ -40,8 +41,7 @@ $issuers = $magewire->getIssuers();
                     <label
                     for="bk_credicard_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
                     class="flex flex-row grow gap-x-2 items-center">
-                        <img 
-                        src="<?= $escaper->escapeUrl($issuer["img"]) ?>"
+                        <img src="<?= $escaper->escapeUrl($issuer["img"]) ?>"
                         alt="<?= $issuer["name"] ?>"
                         style="max-height:25px;"
                         />
@@ -53,4 +53,4 @@ $issuers = $magewire->getIssuers();
             ?>
         <?php } ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/creditcards.phtml b/view/frontend/templates/component/payment/method/creditcards.phtml
index fc621cd..189cc89 100644
--- a/view/frontend/templates/component/payment/method/creditcards.phtml
+++ b/view/frontend/templates/component/payment/method/creditcards.phtml
@@ -54,7 +54,10 @@ use Magento\Framework\Escaper;
                             const isValid = await formValid();
                             if (this.cseHasLoaded && isValid) {
                                 const encryptedCardData = await this.saveEncryptedData();
-                                await this.$wire.updatedEncryptedData(encryptedCardData, this.determineIssuer(this.cardNumber));
+                                await this.$wire.updatedEncryptedData(
+                                    encryptedCardData,
+                                    this.determineIssuer(this.cardNumber)
+                                );
                             }
                         };
                         window.dispatchEvent(new CustomEvent('buckaroo-add-task', {
@@ -117,7 +120,12 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Name on card:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="text" x-model="cardHolder" data-validate='{"bk-validateCardHolderName": true}' @change="onChange" id="buckaroo_creditcards_card_holder" name="buckaroo_creditcards_card_holder" placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>" />
+            <input type="text"
+            x-model="cardHolder"
+            data-validate='{"bk-validateCardHolderName": true}'
+            @change="onChange" id="buckaroo_creditcards_card_holder"
+            name="buckaroo_creditcards_card_holder"
+            placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>" />
         </div>
 
         <div class="flex flex-col gap-y-2 field field-reserved">
@@ -126,9 +134,18 @@ use Magento\Framework\Escaper;
                 <span class="text-red">*</span>
             </label>
             <div class="relative w-full">
-                <input type="text" class="w-full" maxlength="23" x-model="cardNumber" data-validate='{"bk-validateCardNumber": true}' @change="onChange" id="buckaroo_creditcards_card_number" name="buckaroo_creditcards_card_number" placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>" />
+                <input
+                    type="text"
+                    class="w-full"
+                    maxlength="23"
+                    x-model="cardNumber"
+                    data-validate='{"bk-validateCardNumber": true}'
+                    @change="onChange" id="buckaroo_creditcards_card_number"
+                    name="buckaroo_creditcards_card_number"
+                    placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>"
+                />
                 <div class="absolute inset-y-0 right-3 flex items-center pr-3">
-                    <img :src="getIssuerImage()" style="height: 100%;padding: 10px 0;">
+                    <img :src="getIssuerImage()" :alt="cardNumber" style="height: 100%;padding: 10px 0;">
                 </div>
 
             </div>
@@ -140,7 +157,14 @@ use Magento\Framework\Escaper;
                         <?= $escaper->escapeHtml(__('Expiration:')); ?>
                         <span class="text-red">*</span>
                     </label>
-                    <input type="text" maxlength="5" x-model="cardExpiration" data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}' @change="onChange" id="buckaroo_creditcards_card_expiration" name="buckaroo_creditcards_card_expiration" placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>" />
+                    <input type="text"
+                        maxlength="5"
+                        x-model="cardExpiration"
+                        data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}'
+                        @change="onChange" id="buckaroo_creditcards_card_expiration"
+                        name="buckaroo_creditcards_card_expiration"
+                        placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>"
+                    />
                 </div>
 
                 <div class="flex flex-col w-5/12">
@@ -148,7 +172,15 @@ use Magento\Framework\Escaper;
                         <?= $escaper->escapeHtml(__('CVC / CVV:')); ?>
                         <span class="text-red">*</span>
                     </label>
-                    <input type="text" x-model="cardCvc" maxlength="4" data-validate='{"bk-validateCardCvc": true}' @change="onChange" id="buckaroo_creditcards_card_cvc" name="buckaroo_creditcards_card_cvc" placeholder="<?= $escaper->escapeHtml(__('123')); ?>" />
+                    <input
+                        type="text"
+                        x-model="cardCvc"
+                        maxlength="4"
+                        data-validate='{"bk-validateCardCvc": true}'
+                        @change="onChange" id="buckaroo_creditcards_card_cvc"
+                        name="buckaroo_creditcards_card_cvc"
+                        placeholder="<?= $escaper->escapeHtml(__('123')); ?>"
+                    />
                 </div>
             </div>
         </div>
diff --git a/view/frontend/templates/component/payment/method/giftcards.phtml b/view/frontend/templates/component/payment/method/giftcards.phtml
index 986dcfa..2a14a0c 100644
--- a/view/frontend/templates/component/payment/method/giftcards.phtml
+++ b/view/frontend/templates/component/payment/method/giftcards.phtml
@@ -66,7 +66,7 @@ if (!$magewire->isRedirect()) {
                     this.displaySuccess(response);
                 }
             })
-        },   
+        },
         register() {
             this.listenToSubmit();
             const v = async () => {
@@ -85,8 +85,16 @@ if (!$magewire->isRedirect()) {
     })" x-init="register()" novalidate>
 
             <div class="flex flex-col gap-y-2 field field-reserved">
-                <label for="buckaroo_giftcard_issuer"><?= $escaper->escapeHtml(__('Select giftcard issuer:')); ?></label>
-                <select name="issuer" id="buckaroo_giftcard_issuer" x-model="card" data-validate='{"required": true}'  class="form-select">
+                <label for="buckaroo_giftcard_issuer">
+                    <?= $escaper->escapeHtml(__('Select giftcard issuer:')); ?>
+                </label>
+                <select
+                    name="issuer"
+                    id="buckaroo_giftcard_issuer"
+                    x-model="card"
+                    data-validate='{"required": true}'
+                    class="form-select"
+                >
                     <option value=""><?= $escaper->escapeHtml(__('Please select issuer')); ?></option>
                     <?php
                     foreach ($magewire->getGiftcardIssuers() as $issuer) {
@@ -106,16 +114,32 @@ if (!$magewire->isRedirect()) {
                     <?= $escaper->escapeHtml(__('Card number:')); ?>
                     <span class="text-red">*</span>
                 </label>
-                <input type="text" x-model="cardNumber" data-validate='{"required": true}' @change="onChange" id="buckaroo_giftcard_card_number" name="buckaroo_giftcard_number" />
+                <input
+                    type="text"
+                    x-model="cardNumber"
+                    data-validate='{"required": true}'
+                    @change="onChange"
+                    id="buckaroo_giftcard_card_number"
+                    name="buckaroo_giftcard_number"
+                />
             </div>
             <div class="flex flex-col gap-y-2 field field-reserved">
                 <label for="buckaroo_giftcard_pin">
                     <?= $escaper->escapeHtml(__('PIN / Security code:')); ?>
                     <span class="text-red">*</span>
                 </label>
-                <input type="text" x-model="pin" data-validate='{"required": true}' @change="onChange" id="buckaroo_giftcard_pin" name="buckaroo_giftcard_pin" />
+                <input
+                    type="text"
+                    x-model="pin"
+                    data-validate='{"required": true}'
+                    @change="onChange"
+                    id="buckaroo_giftcard_pin"
+                    name="buckaroo_giftcard_pin"
+                />
             </div>
-            <button type="button" @click="submit" class="btn btn-primary"><?= $escaper->escapeHtml(__('Apply Gift Card')); ?></button>
+            <button type="button" @click="submit" class="btn btn-primary">
+            <?= $escaper->escapeHtml(__('Apply Gift Card')); ?>
+        </button>
         </form>
     </div>
 <?php
diff --git a/view/frontend/templates/component/payment/method/giropay.phtml b/view/frontend/templates/component/payment/method/giropay.phtml
index 238a042..9018652 100644
--- a/view/frontend/templates/component/payment/method/giropay.phtml
+++ b/view/frontend/templates/component/payment/method/giropay.phtml
@@ -15,9 +15,14 @@ $genders = $magewire->getGenderList();
             <?= $escaper->escapeHtml(__('BIC Number')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="bic" id="buckaroo_giropay_bic" placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="bic"
+            id="buckaroo_giropay_bic"
+            placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>"
+        >
         <?php if ($magewire->hasError('bic')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('bic')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/ideal.phtml b/view/frontend/templates/component/payment/method/ideal.phtml
index 8a0a398..2fff4b8 100644
--- a/view/frontend/templates/component/payment/method/ideal.phtml
+++ b/view/frontend/templates/component/payment/method/ideal.phtml
@@ -16,8 +16,7 @@ $issuers = $magewire->getIssuers();
                 <?php
                 foreach ($issuers as $issuer) {
                 ?>
-                    <option 
-                    value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
+                    <option value="<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>">
                         <?= $escaper->escapeHtml($issuer["name"]) ?>
                     </option>
                 <?php
@@ -40,7 +39,7 @@ $issuers = $magewire->getIssuers();
                     <label
                     for="bk_ideal_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
                     class="flex flex-row grow gap-x-2 items-center">
-                        <img 
+                        <img
                         src="<?= $escaper->escapeUrl($magewire->getImageUrl($issuer["imgName"])) ?>"
                         alt="<?= $issuer["name"] ?>"
                         style="max-height:25px;"
@@ -53,4 +52,4 @@ $issuers = $magewire->getIssuers();
             ?>
         <?php } ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/in3.phtml b/view/frontend/templates/component/payment/method/in3.phtml
index 394d764..81951c2 100644
--- a/view/frontend/templates/component/payment/method/in3.phtml
+++ b/view/frontend/templates/component/payment/method/in3.phtml
@@ -11,7 +11,13 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_capayablein3_tos_fullname">
             <?= $escaper->escapeHtml(__('Billing Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="fullName" disabled id="buckaroo_capayablein3_tos_fullname" class="bg-gray-200">
+        <input
+            type="text"
+            wire:model.lazy="fullName"
+            disabled
+            id="buckaroo_capayablein3_tos_fullname"
+            class="bg-gray-200"
+        >
     </div>
 
     <div class="flex flex-col gap-y-2 field field-reserved">
@@ -19,7 +25,13 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_capayablein3_dob">
+        <input
+            type="date"
+            x-data
+            value="<?= $magewire->dateOfBirth ?>"
+            @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+            id="buckaroo_capayablein3_dob"
+        >
         <?php if ($magewire->hasError('dateOfBirth')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
         <?php endif; ?>
@@ -40,4 +52,4 @@ use Magento\Framework\Escaper;
         </div>
     <?php
     } ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/klarna.phtml b/view/frontend/templates/component/payment/method/klarna.phtml
index e761de9..e64236b 100644
--- a/view/frontend/templates/component/payment/method/klarna.phtml
+++ b/view/frontend/templates/component/payment/method/klarna.phtml
@@ -25,4 +25,4 @@ $genders = $magewire->getGenderList();
             ?>
         </select>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/mrcash.phtml b/view/frontend/templates/component/payment/method/mrcash.phtml
index 1979877..3ce041c 100644
--- a/view/frontend/templates/component/payment/method/mrcash.phtml
+++ b/view/frontend/templates/component/payment/method/mrcash.phtml
@@ -68,7 +68,15 @@ use Magento\Framework\Escaper;
                     <?= $escaper->escapeHtml(__('Name on card:')); ?>
                     <span class="text-red">*</span>
                 </label>
-                <input type="text" x-model="cardHolder" data-validate='{"bk-validateCardHolderName": true}' @change="onChange" id="buckaroo_mrcash_card_holder" name="buckaroo_mrcash_card_holder" placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>" />
+                <input
+                    type="text"
+                    x-model="cardHolder"
+                    data-validate='{"bk-validateCardHolderName": true}'
+                    @change="onChange"
+                    id="buckaroo_mrcash_card_holder"
+                    name="buckaroo_mrcash_card_holder"
+                    placeholder="<?= $escaper->escapeHtml(__('John Doe')); ?>"
+                />
             </div>
 
             <div class="field field-reserved">
@@ -78,7 +86,15 @@ use Magento\Framework\Escaper;
                             <?= $escaper->escapeHtml(__('Card number:')); ?>
                             <span class="text-red">*</span>
                         </label>
-                        <input type="text" x-model="cardNumber" data-validate='{"bk-validateCardNumber": true}' @change="onChange" id="buckaroo_mrcash_card_number" name="buckaroo_mrcash_card_number" placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>" />
+                        <input
+                            type="text"
+                            x-model="cardNumber"
+                            data-validate='{"bk-validateCardNumber": true}'
+                            @change="onChange"
+                            id="buckaroo_mrcash_card_number"
+                            name="buckaroo_mrcash_card_number"
+                            placeholder="<?= $escaper->escapeHtml(__('0000 0000 0000 0000')); ?>"
+                        />
                     </div>
 
                     <div class="flex flex-col gap-y-2  w-4/12">
@@ -86,11 +102,20 @@ use Magento\Framework\Escaper;
                             <?= $escaper->escapeHtml(__('Expiration:')); ?>
                             <span class="text-red">*</span>
                         </label>
-                        <input type="text" maxlength="5" x-model="cardExpiration" data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}' @change="onChange" id="buckaroo_mrcash_card_expiration" name="buckaroo_mrcash_card_expiration" placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>" />
+                        <input
+                            type="text"
+                            maxlength="5"
+                            x-model="cardExpiration"
+                            data-validate='{"bk-ValidateYear": true, "bk-ValidateMonth": true}'
+                            @change="onChange"
+                            id="buckaroo_mrcash_card_expiration"
+                            name="buckaroo_mrcash_card_expiration"
+                            placeholder="<?= $escaper->escapeHtml(__('MM/YY')); ?>"
+                        />
                     </div>
                 </div>
             </div>
         </form>
     <?php
     } ?>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/payperemail.phtml b/view/frontend/templates/component/payment/method/payperemail.phtml
index a5807ac..d105b2d 100644
--- a/view/frontend/templates/component/payment/method/payperemail.phtml
+++ b/view/frontend/templates/component/payment/method/payperemail.phtml
@@ -32,7 +32,12 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Billing First Name:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="firstName" id="buckaroo_paypermail_first_name" placeholder="<?= $escaper->escapeHtml(__('John')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="firstName"
+            id="buckaroo_paypermail_first_name"
+            placeholder="<?= $escaper->escapeHtml(__('John')); ?>"
+        >
         <?php if ($magewire->hasError('firstName')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('firstName')) ?></div>
         <?php endif; ?>
@@ -42,7 +47,12 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_paypermail_middle_name">
             <?= $escaper->escapeHtml(__('Billing Middle Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="middleName" id="buckaroo_paypermail_middle_name" placeholder="<?= $escaper->escapeHtml(__('S')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="middleName"
+            id="buckaroo_paypermail_middle_name"
+            placeholder="<?= $escaper->escapeHtml(__('S')); ?>"
+        >
     </div>
 
     <div class="flex flex-col gap-y-2 field field-reserved">
@@ -50,7 +60,12 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Billing Last Name:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="lastName" id="buckaroo_paypermail_last_name" placeholder="<?= $escaper->escapeHtml(__('Doe')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="lastName"
+            id="buckaroo_paypermail_last_name"
+            placeholder="<?= $escaper->escapeHtml(__('Doe')); ?>"
+        >
         <?php if ($magewire->hasError('lastName')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('lastName')) ?></div>
         <?php endif; ?>
@@ -61,9 +76,14 @@ use Magento\Framework\Escaper;
             <?= $escaper->escapeHtml(__('Email:')); ?>
             <span class="text-red">*</span>
         </label>
-        <input type="text" wire:model.lazy="email" id="buckaroo_paypermail_email" placeholder="<?= $escaper->escapeHtml(__('email@example.com')); ?>">
+        <input
+            type="text"
+            wire:model.lazy="email"
+            id="buckaroo_paypermail_email"
+            placeholder="<?= $escaper->escapeHtml(__('email@example.com')); ?>"
+        >
         <?php if ($magewire->hasError('email')) : ?>
             <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('email')) ?></div>
         <?php endif; ?>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/sepaDirect.phtml b/view/frontend/templates/component/payment/method/sepaDirect.phtml
index 08b8a89..c795244 100644
--- a/view/frontend/templates/component/payment/method/sepaDirect.phtml
+++ b/view/frontend/templates/component/payment/method/sepaDirect.phtml
@@ -37,7 +37,12 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('BIC Number')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="text" wire:model.lazy="bic" id="buckaroo_sepa_direct_bic" placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>">
+            <input
+                type="text"
+                wire:model.lazy="bic"
+                id="buckaroo_sepa_direct_bic"
+                placeholder="<?= $escaper->escapeHtml(__('AAAABBCCDDD')); ?>"
+            >
             <?php if ($magewire->hasError('bic')) : ?>
                 <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('bic')) ?></div>
             <?php endif; ?>
@@ -46,4 +51,4 @@ use Magento\Framework\Escaper;
     }
     ?>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/tinka.phtml b/view/frontend/templates/component/payment/method/tinka.phtml
index f1362d2..17bb733 100644
--- a/view/frontend/templates/component/payment/method/tinka.phtml
+++ b/view/frontend/templates/component/payment/method/tinka.phtml
@@ -11,7 +11,13 @@ use Magento\Framework\Escaper;
         <label for="buckaroo_afterpay20_tos_fullname">
             <?= $escaper->escapeHtml(__('Billing Name:')); ?>
         </label>
-        <input type="text" wire:model.lazy="fullName" disabled id="buckaroo_afterpay20_tos_fullname" class="bg-gray-200">
+        <input
+            type="text"
+            wire:model.lazy="fullName"
+            disabled
+            id="buckaroo_afterpay20_tos_fullname"
+            class="bg-gray-200"
+        >
     </div>
 
     <?php if ($magewire->showBirth()) {
@@ -21,7 +27,13 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="date" x-data value="<?= $magewire->dateOfBirth ?>" @blur="$wire.call('updatedDateOfBirth', $event.target.value)" id="buckaroo_afterpay20_dob">
+            <input
+                type="date"
+                x-data
+                value="<?= $magewire->dateOfBirth ?>"
+                @blur="$wire.call('updatedDateOfBirth', $event.target.value)"
+                id="buckaroo_afterpay20_dob"
+            >
             <?php if ($magewire->hasError('dateOfBirth')) : ?>
                 <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
@@ -45,4 +57,4 @@ use Magento\Framework\Escaper;
     } ?>
 
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/component/payment/method/voucher.phtml b/view/frontend/templates/component/payment/method/voucher.phtml
index 47b7d40..421b69c 100644
--- a/view/frontend/templates/component/payment/method/voucher.phtml
+++ b/view/frontend/templates/component/payment/method/voucher.phtml
@@ -91,10 +91,20 @@ use Magento\Framework\Escaper;
                 <?= $escaper->escapeHtml(__('Voucher code:')); ?>
                 <span class="text-red">*</span>
             </label>
-            <input type="text" x-model="code" data-validate='{"required": true}' @change="onChange" id="buckaroo_voucher_code" name="buckaroo_voucher_code" placeholder="<?= $escaper->escapeHtml(__('1A2B-3C4D-6E7F-8G9H-1I2J')); ?>" />
+            <input
+                type="text"
+                x-model="code"
+                data-validate='{"required": true}'
+                @change="onChange"
+                id="buckaroo_voucher_code"
+                name="buckaroo_voucher_code"
+                placeholder="<?= $escaper->escapeHtml(__('1A2B-3C4D-6E7F-8G9H-1I2J')); ?>"
+            />
         </div>
-        <button type="button" @click="submit" class="btn btn-primary"><?= $escaper->escapeHtml(__('Apply Voucher')); ?></button>
+        <button type="button" @click="submit" class="btn btn-primary">
+            <?= $escaper->escapeHtml(__('Apply Voucher')); ?>
+        </button>
     </form>
 
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/frontend/templates/total-segments/empty.phtml b/view/frontend/templates/total-segments/empty.phtml
index 784da93..a766f11 100644
--- a/view/frontend/templates/total-segments/empty.phtml
+++ b/view/frontend/templates/total-segments/empty.phtml
@@ -1,4 +1,2 @@
 <?php
 declare(strict_types=1);
-
-?>
\ No newline at end of file