Merge pull request #11 from appinlet/release/1.8.3

2024-01-04: v1.8.3
Paygate · Jan 4, 2024 · 2968372 · 2968372
2 parents ba1713c + e2d75dc
commit 2968372
Show file tree

Hide file tree

Showing 18 changed files with 696 additions and 93 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # PayWeb_PrestaShop
-## Paygate PrestaShop plugin v1.8.2 for PrestaShop v8.1.2
+## Paygate PrestaShop plugin v1.8.3 for PrestaShop v8.1.3
 
 This is the Paygate PayWeb3 plugin for PrestaShop. Please feel free to contact the Payfast support team at support@payfast.help should you require any assistance.
 
 ## Installation
-Please navigate to the [releases page](https://github.com/PayGate/PayWeb_PrestaShop/releases), download the latest release (v1.8.2) and unzip. You will then be able to follow the integration guide PDF which is included in the zip.
+Please navigate to the [releases page](https://github.com/PayGate/PayWeb_PrestaShop/releases), download the latest release (v1.8.3) and unzip. You will then be able to follow the integration guide PDF which is included in the zip.
 
 ## Collaboration
 

diff --git a/paygate/assets/images/apple-pay.svg b/paygate/assets/images/apple-pay.svg
diff --git a/paygate/assets/images/rcs.svg b/paygate/assets/images/rcs.svg
diff --git a/paygate/assets/images/samsung-pay.svg b/paygate/assets/images/samsung-pay.svg
diff --git a/paygate/changelog.txt b/paygate/changelog.txt
@@ -2,6 +2,10 @@
 Date	  : Version: Description
 =====================================
 
+2024-01-04: v1.8.3 : Update for PHP 8.1 and Prestashop 8.1.3.
+                     Add PayVault feature.
+                     Add Apple Pay, Samsung Pay and RCS payment types.
+
 2023-11-15: v1.8.2 : Update for PHP 8.0.
                      Test on Prestashop 8.1.2.
 

diff --git a/paygate/classes/PayVault.php b/paygate/classes/PayVault.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ * Copyright (c) 2024 Payfast (Pty) Ltd
+ *
+ * Author: App Inlet (Pty) Ltd
+ *
+ * Released under the GNU General Public License
+ */
+
+class PayVault
+{
+    /**
+     * @param int $customerId
+     * @param array $result
+     *
+     * @return void
+     * @throws \PrestaShopDatabaseException
+     */
+    public static function storeVault(int $customerId, array $result): void
+    {
+        PrestaShopLogger::addLog('In storeVault: ' . $customerId);
+        if ((int)Configuration::get('PAYGATE_PAY_VAULT') === 1 && !empty($result['VAULT_ID'])) {
+            $dbPrefix = _DB_PREFIX_;
+            $existing = Db::getInstance()->getValue(
+                "SELECT id_vault FROM `{$dbPrefix}paygate_vaults` WHERE vault_id='{$result['VAULT_ID']}'"
+            );
+
+            $firstSix = substr($result['PAYVAULT_DATA_1'], 0, 6);
+            $lastFour = substr($result['PAYVAULT_DATA_1'], -4, 4);
+
+            if (!$existing) {
+                Db::getInstance()->insert(
+                    'paygate_vaults',
+                    [
+                        'id_customer' => $customerId,
+                        'vault_id'    => $result['VAULT_ID'],
+                        'first_six'   => $firstSix,
+                        'last_four'   => $lastFour,
+                        'expiry'      => $result['PAYVAULT_DATA_2'],
+                    ]
+                );
+            } else {
+                Db::getInstance()->update(
+                    'paygate_vaults',
+                    [
+                        'id_customer' => $customerId,
+                        'first_six'   => $firstSix,
+                        'last_four'   => $lastFour,
+                        'expiry'      => $result['PAYVAULT_DATA_2'],
+                    ],
+                    "vault_id = '$result[VAULT_ID]'"
+                );
+            }
+        }
+    }
+
+    /**
+     * @param int $customerId
+     *
+     * @return array
+     * @throws \PrestaShopDatabaseException
+     */
+    public static function customerVaults(int $customerId): array
+    {
+        $dbPrefix = _DB_PREFIX_;
+        $db       = Db::getInstance();
+        $query    = $db->query(
+            "SELECT * FROM `{$dbPrefix}paygate_vaults` WHERE id_customer='$customerId'"
+        );
+        $vaults   = [];
+        while ($row = $db->nextRow($query)) {
+            $vaults[] = $row;
+        }
+
+        return $vaults;
+    }
+
+    /**
+     * @param int $customerId
+     * @param string $idVault
+     *
+     * @return bool|string
+     */
+    public static function customerVault(int $customerId, string $idVault): bool|string
+    {
+        $dbPrefix = _DB_PREFIX_;
+        $db       = Db::getInstance();
+        $vault    = $db->getValue(
+            "select vault_id from `{$dbPrefix}paygate_vaults` where id_vault='$idVault' 
+      and id_customer='$customerId'"
+        ) ?? '';
+
+        return $vault;
+    }
+}
diff --git a/paygate/classes/countries.php b/paygate/classes/countries.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *

diff --git a/paygate/classes/methods.php b/paygate/classes/methods.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -19,7 +19,7 @@ public function getPaygateMethodsList()
                 'label'       => 'Card',
                 'img'         => '../modules/paygate/assets/images/mastercard-visa.svg',
                 'ptype'       => 'CC',
-                'ptypedetail' => 'Card',
+                'ptypedetail' => 'Credit Card',
                 'type'        => 'radio',
                 'value'       => 'creditcard',
                 'title'       => 'Card',
@@ -81,6 +81,30 @@ public function getPaygateMethodsList()
                 'ptypedetail' => 'MasterPass',
                 'type'        => 'radio',
             ],
+            'applepay'   => [
+                'name'        => 'paygate-paymethod',
+                'label'       => 'ApplePay',
+                'img'         => '../modules/paygate/assets/images/apple-pay.svg',
+                'ptype'       => 'CC',
+                'ptypedetail' => 'Applepay',
+                'type'        => 'radio',
+            ],
+            'rcs'   => [
+                'name'        => 'paygate-paymethod',
+                'label'       => 'RCS',
+                'img'         => '../modules/paygate/assets/images/rcs.svg',
+                'ptype'       => 'EW',
+                'ptypedetail' => 'RCS',
+                'type'        => 'radio',
+            ],
+            'samsungpay'   => [
+                'name'        => 'paygate-paymethod',
+                'label'       => 'SamsungPay',
+                'img'         => '../modules/paygate/assets/images/samsung-pay.svg',
+                'ptype'       => 'EW',
+                'ptypedetail' => 'Samsungpay',
+                'type'        => 'radio',
+            ],
         ];
     }
 

diff --git a/paygate/config.xml b/paygate/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 /*
- * Copyright (c) 2023 Payfast (Pty) Ltd
+ * Copyright (c) 2024 Payfast (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -11,7 +11,7 @@
 <module>
     <name>paygate</name>
     <displayName><![CDATA[Paygate]]></displayName>
-    <version><![CDATA[1.8.2]]></version>
+    <version><![CDATA[1.8.3]]></version>
     <description><![CDATA[Accept payments via Paygate.]]></description>
     <author><![CDATA[Paygate]]></author>
     <tab><![CDATA[payments_gateways]]></tab>