V1.1.0 (#10)

* Update README on develop (#7) * Hyva checkout README.md update * BP-3191 Module loads too fast (Unexpected identifier) (#9) * move js to the after component * fix css --------- Co-authored-by: Ivascu Madalin <[email protected]> * update the readme * Update README.md * update composer version --------- Co-authored-by: Rene <[email protected]> Co-authored-by: Ivascu Madalin <[email protected]>
buckaroo-it · Nov 28, 2023 · 86f3f2d · 86f3f2d
1 parent c391bfb
commit 86f3f2d
Show file tree

Hide file tree

Showing 18 changed files with 565 additions and 543 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Buckaroo has developed a cutting-edge Hyvä Checkout module as an extension for
 
 ## Requirements
 * [Buckaroo Magento 2 plugin](https://github.com/buckaroo-it/Magento2/releases) version 1.46 or higher
-* Hyvä Checkout version 1.1.3 or higher
+* Hyvä Checkout version 1.1.8 or higher
 <br>
 
 ## Installation
@@ -35,7 +35,7 @@ git clone https://github.com/buckaroo-it/Magento2_Hyva_Checkout.git
 ```
 4. Swich to the latest version:
 ```
-git checkout 1.0.0
+git checkout 1.1.0
 ```
 5. Rename resulting directory:
 ```

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "docs": "https://support.buckaroo.nl"
     },
     "homepage": "https://www.buckaroo.nl",
-    "version" : "v1.0.0-RC1",
+    "version" : "v1.1.0",
     "minimum-stability": "stable",
     "autoload": {
         "files": [

diff --git a/view/frontend/templates/component/payment/after.phtml b/view/frontend/templates/component/payment/after.phtml
diff --git a/view/frontend/templates/component/payment/method/afterpay.phtml b/view/frontend/templates/component/payment/method/afterpay.phtml
@@ -19,7 +19,7 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay_dob">
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input
                 type="date"
@@ -29,7 +29,7 @@ use Magento\Framework\Escaper;
                 id="buckaroo_afterpay_dob"
             >
             <?php if ($magewire->hasError('dateOfBirth')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -40,11 +40,11 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay_phone">
                 <?= $escaper->escapeHtml(__('Telephone:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="phone" id="buckaroo_afterpay_phone">
             <?php if ($magewire->hasError('phone')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('phone')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('phone')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -73,11 +73,11 @@ 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:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="iban" id="buckaroo_afterpay_iban">
             <?php if ($magewire->hasError('iban')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('iban')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('iban')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -87,22 +87,22 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay_coc">
                 <?= $escaper->escapeHtml(__('COC Number:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="coc" id="buckaroo_afterpay_coc">
             <?php if ($magewire->hasError('coc')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('coc')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('coc')) ?></div>
             <?php endif; ?>
         </div>
 
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay_company_name">
                 <?= $escaper->escapeHtml(__('Company Name:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="companyName" id="buckaroo_afterpay_company_name">
             <?php if ($magewire->hasError('companyName')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('companyName')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('companyName')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -119,7 +119,7 @@ use Magento\Framework\Escaper;
             </a>
         </div>
         <?php if ($magewire->hasError('tos')) : ?>
-            <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
+            <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
 </div>
diff --git a/view/frontend/templates/component/payment/method/afterpay20.phtml b/view/frontend/templates/component/payment/method/afterpay20.phtml
@@ -24,7 +24,7 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay20_dob">
                 <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="date"
                 x-data
@@ -33,7 +33,7 @@ use Magento\Framework\Escaper;
                 id="buckaroo_afterpay20_dob"
             >
             <?php if ($magewire->hasError('dateOfBirth')): ?>
-               <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
+               <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -44,11 +44,11 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay20_identification">
                 <?= $escaper->escapeHtml(__('Identification number:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="identificationNumber" id="buckaroo_afterpay20_identification">
             <?php if ($magewire->hasError('identificationNumber')): ?>
-               <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('identificationNumber')) ?></div>
+               <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('identificationNumber')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -59,11 +59,11 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay20_phone">
                 <?= $escaper->escapeHtml(__('Telephone:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="phone" id="buckaroo_afterpay20_phone">
             <?php if ($magewire->hasError('phone')): ?>
-               <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('phone')) ?></div>
+               <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('phone')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -74,11 +74,11 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_afterpay20_coc">
                 <?= $escaper->escapeHtml(__('COC Number:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="coc" id="buckaroo_afterpay20_coc">
             <?php if ($magewire->hasError('coc')): ?>
-               <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('coc')) ?></div>
+               <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('coc')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -97,7 +97,7 @@ use Magento\Framework\Escaper;
             </a>
         </div>
         <?php if ($magewire->hasError('tos')): ?>
-            <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
+            <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
 </div>
diff --git a/view/frontend/templates/component/payment/method/applepay.phtml b/view/frontend/templates/component/payment/method/applepay.phtml
@@ -6,93 +6,7 @@ declare(strict_types=1);
 
 use Magento\Framework\Escaper;
 ?>
-<form x-data="{
-    config: {},
-    canDisplay: false,
-    loadSdk() {
-            return new Promise(resolve => {
-                const script = document.createElement('script');
-                script.type = 'text/javascript';
-                script.src = '<?= $magewire->getJsSdkUrl() ?>';
-                script.async = true;
-                script.onload = resolve;
-                document.head.appendChild(script);
-            })
-    },
-
-    formatTransactionResponse(response) {
-        if (response === null || response === 'undefined') {
-            return null;
-        }
-
-            const paymentData = response.token.paymentData;
-
-            return JSON.stringify({
-                paymentData: {
-                version: paymentData.version,
-                data: paymentData.data,
-                signature: paymentData.signature,
-                header: {
-                    ephemeralPublicKey: paymentData.header.ephemeralPublicKey,
-                    publicKeyHash: paymentData.header.publicKeyHash,
-                    transactionId: paymentData.header.transactionId,
-                },
-                },
-            });
-    },
-
-    async captureFunds(payment) {
-        const billingContact = payment && payment.billingContact ? JSON.stringify(payment.billingContact) : ''
-        await this.$wire.updateData(this.formatTransactionResponse(payment),billingContact);
-        this.resolve();
-        return {
-            status: window.ApplePaySession.STATUS_SUCCESS,
-            errors: [],
-        };
-    },
-
-    async beginPayment() {
-        const promise = new Promise((resolve) => {
-            this.resolve = resolve;
-
-            const config = new BuckarooApplePay.PayOptions(
-                this.config.storeName,
-                this.config.country,
-                this.config.currency,
-                this.config.cultureCode,
-                this.config.guid,
-                this.$wire.get('totals'),
-                this.$wire.get('grandTotal'),
-                'shipping',
-                [],
-                (payment) => this.captureFunds(payment),
-                null,
-                null,
-                ['email', 'postalAddress'],
-                ['email']
-            );
-            new BuckarooApplePay.PayPayment(config).beginPayment()
-        })
-        await promise;
-    },
-
-    async submit() {
-        await hyvaCheckout.order.place();
-    },
-    getButtonClass() {
-        return `pay-with-apple ${BuckarooApplePay.getButtonClass(this.config.buttonStyle, 'buy')}`;
-    },
-    async register() {
-        this.config = this.$wire.get('config');
-        this.loadSdk().then(async () => {
-            this.canDisplay = await BuckarooApplePay.checkPaySupport();
-            window.buckarooTask = async () => {
-                if(this.canDisplay)
-                    await this.beginPayment();
-            };
-        });
-    }
-}" x-init="register()" novalidate>
+<form x-data="buckaroo.applePay('<?= $magewire->getJsSdkUrl() ?>')" x-init="register()" novalidate>
     <template x-if="canDisplay">
         <button type="button" :class="getButtonClass()" @click="submit()">
             <?= $escaper->escapeHtml(__('Place Order')) ?>

diff --git a/view/frontend/templates/component/payment/method/billink.phtml b/view/frontend/templates/component/payment/method/billink.phtml
@@ -29,14 +29,14 @@ use Magento\Framework\Escaper;
             ?>
         </select>
         <?php if ($magewire->hasError('gender')) : ?>
-            <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('gender')) ?></div>
+            <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('gender')) ?></div>
         <?php endif; ?>
     </div>
 
     <div class="flex flex-col gap-y-2 field field-reserved">
         <label for="buckaroo_billink_dob">
             <?= $escaper->escapeHtml(__('Date of Birth:')); ?>
-            <span class="text-red">*</span>
+            <span class="text-red-600">*</span>
         </label>
         <input
             type="date"
@@ -45,7 +45,7 @@ use Magento\Framework\Escaper;
             id="buckaroo_billink_dob"
         >
         <?php if ($magewire->hasError('dateOfBirth')) : ?>
-            <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
+            <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('dateOfBirth')) ?></div>
         <?php endif; ?>
     </div>
 
@@ -55,11 +55,11 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_billink_phone">
                 <?= $escaper->escapeHtml(__('Telephone:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="phone" id="buckaroo_billink_phone">
             <?php if ($magewire->hasError('phone')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('phone')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('phone')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -70,11 +70,11 @@ use Magento\Framework\Escaper;
         <div class="flex flex-col gap-y-2 field field-reserved">
             <label for="buckaroo_billink_coc">
                 <?= $escaper->escapeHtml(__('COC Number:')); ?>
-                <span class="text-red">*</span>
+                <span class="text-red-600">*</span>
             </label>
             <input type="text" wire:model.lazy="coc" id="buckaroo_billink_coc">
             <?php if ($magewire->hasError('coc')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('coc')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('coc')) ?></div>
             <?php endif; ?>
         </div>
 
@@ -84,7 +84,7 @@ use Magento\Framework\Escaper;
             </label>
             <input type="text" wire:model.lazy="vatNumber" id="buckaroo_billink_vat_number">
             <?php if ($magewire->hasError('vatNumber')) : ?>
-                <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('vatNumber')) ?></div>
+                <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('vatNumber')) ?></div>
             <?php endif; ?>
         </div>
     <?php
@@ -102,7 +102,7 @@ use Magento\Framework\Escaper;
             </a>
         </div>
         <?php if ($magewire->hasError('tos')) : ?>
-            <div class="text-red"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
+            <div class="text-red-600"><?= $escaper->escapeHtmlAttr($magewire->getError('tos')) ?></div>
         <?php endif; ?>
     </div>
 </div>
diff --git a/view/frontend/templates/component/payment/method/creditcard.phtml b/view/frontend/templates/component/payment/method/creditcard.phtml
@@ -30,7 +30,7 @@ $issuers = $magewire->getIssuers();
             <?php
             foreach ($issuers as $issuer) {
             ?>
-                <div class="flex flex-row grow gap-x-2 items-center">
+                <div class="flex flex-row flex-grow gap-x-2 items-center">
                     <input
                     type="radio"
                     name="issuer"
@@ -40,7 +40,7 @@ $issuers = $magewire->getIssuers();
                     />
                     <label
                     for="bk_credicard_issuer_<?= $escaper->escapeHtmlAttr($issuer["code"]) ?>"
-                    class="flex flex-row grow gap-x-2 items-center">
+                    class="flex flex-row flex-grow gap-x-2 items-center">
                         <img src="<?= $escaper->escapeUrl($issuer["img"]) ?>"
                         alt="<?= $issuer["name"] ?>"
                         style="max-height:25px;"