Merge pull request #7 from appinlet/release/3.0.7

2021-09-29: v3.0.7
Paygate · Sep 29, 2021 · 98e815c · 98e815c
2 parents 96b461e + 965e3e4
commit 98e815c
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # PayWeb_OpenCart
-## PayGate OpenCart plugin v3.0.6 for OpenCart v3.0.3.7
+## PayGate OpenCart plugin v3.0.7 for OpenCart v3.0.3.7
 
 This is the PayGate PayWeb3 plugin for OpenCart. Please feel free to contact the PayGate support team at support@paygate.co.za should you require any assistance.
 
 ## Installation
 [![How To Setup PayGate PayWeb for OpenCart](https://appinlet.com/wp-content/uploads/2021/01/How-To-Setup-PayGate-PayWeb-for-OpenCart.jpg)](https://www.youtube.com/watch?v=vP457DVuhGc "How To Setup PayGate PayWeb for OpenCart")
 
-Please navigate to the [releases page](https://github.com/PayGate/PayWeb_OpenCart/releases), download the latest release (v3.0.6) and unzip. You will them 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_OpenCart/releases), download the latest release (v3.0.7) and unzip. You will them be able to follow the integration guide PDF which is included in the zip.
 
 ## Collaboration
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,8 @@
 =====================================
 Date	  : Version: Description
 =====================================
+2021-09-29: v3.0.7 : Add PayPal to payment types.
+
 2021-07-20: v3.0.6 : Bug fixes and code quality improvements.
                      Fix logo issue on email and admin order detail page.
                      Improve display of payment redirect page.

diff --git a/upload/admin/controller/extension/payment/paygate.php b/upload/admin/controller/extension/payment/paygate.php
@@ -1,7 +1,6 @@
 <?php
-
 /*
- * Copyright (c) 2020 PayGate (Pty) Ltd
+ * Copyright (c) 2021 PayGate (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -110,6 +109,7 @@ public function index()
 		$data['payment_paygate_banktransfermethod'] = $this->checkPostValue("payment_paygate_banktransfermethod");
 		$data['payment_paygate_zappermethod'] = $this->checkPostValue("payment_paygate_zappermethod");
 		$data['payment_paygate_snapscanmethod'] = $this->checkPostValue("payment_paygate_snapscanmethod");
+        $data['payment_paygate_paypalmethod'] = $this->checkPostValue("payment_paygate_paypalmethod");
 		$data['payment_paygate_mobicredmethod'] = $this->checkPostValue("payment_paygate_mobicredmethod");
 		$data['payment_paygate_momopaymethod'] = $this->checkPostValue("payment_paygate_momopaymethod");
 		$data['payment_paygate_geo_zone_id'] = $this->checkPostValue("payment_paygate_geo_zone_id");

diff --git a/upload/admin/language/en-gb/extension/payment/paygate.php b/upload/admin/language/en-gb/extension/payment/paygate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020 PayGate (Pty) Ltd
+ * Copyright (c) 2021 PayGate (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -39,7 +39,8 @@
 $_['entry_creditcardmethod']   = 'Enable Card on Checkout';
 $_['entry_banktransfermethod'] = 'Enable SiD Secure EFT on Checkout';
 $_['entry_zappermethod']       = 'Enable Zapper on Checkout';
-$_['entry_snapscanmethod']       = 'Enable SnapScan on Checkout';
+$_['entry_snapscanmethod']     = 'Enable SnapScan on Checkout';
+$_['entry_paypalmethod']       = 'Enable PayPal on Checkout';
 $_['entry_mobicredmethod']     = 'Enable Mobicred on Checkout';
 $_['entry_momopaymethod']      = 'Enable MoMoPay on Checkout';
 $_['entry_masterpassmethod']   = 'Enable MasterPass on Checkout';

diff --git a/upload/admin/view/template/extension/payment/paygate.twig b/upload/admin/view/template/extension/payment/paygate.twig
@@ -1,5 +1,5 @@
 {#
- # Copyright (c) 2020 PayGate (Pty) Ltd
+ # Copyright (c) 2021 PayGate (Pty) Ltd
  #
  # Author: App Inlet (Pty) Ltd
  #
@@ -263,6 +263,20 @@
                                     </select>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label" for="input-paypalmethod">{{ entry_paypalmethod }}</label>
+                                <div class="col-sm-8">
+                                    <select name="payment_paygate_paypalmethod" id="input-paypalmethod" class="form-control">
+                                        {% if payment_paygate_paypalmethod == 'yes' %}
+                                            <option value="yes" selected="selected">{{ text_methodyes }}</option>
+                                            <option value="no">{{ text_methodno }}</option>
+                                        {% else %}
+                                            <option value="yes">{{ text_methodyes }}</option>
+                                            <option value="no" selected="selected">{{ text_methodno }}</option>
+                                        {% endif %}
+                                    </select>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label class="col-sm-4 control-label" for="input-mobicredmethod">{{ entry_mobicredmethod }}</label>
                                 <div class="col-sm-8">

diff --git a/upload/catalog/controller/extension/payment/paygate.php b/upload/catalog/controller/extension/payment/paygate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020 PayGate (Pty) Ltd
+ * Copyright (c) 2021 PayGate (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -35,6 +35,10 @@ public function getPaymentMethods(){
 				'title' => 'SnapScan',
 				'img'   => $imgs . 'snapscan.svg',
 			],
+            'paypalmethod'       => [
+                'title' => 'PayPal',
+                'img'   => $imgs . 'paypal.svg',
+            ],
 			'mobicredmethod'     => [
 				'title' => 'Mobicred',
 				'img'   => $imgs . 'mobicred.svg',
@@ -77,6 +81,9 @@ public function getPayMethodDetails(){
 			case 'snapscanmethod':
 				$PAY_METHOD_DETAIL = 'SnapScan';
 				break;
+            case 'paypalmethod':
+                $PAY_METHOD_DETAIL = 'PayPal';
+                break;
 			case 'mobicredmethod':
 				$PAY_METHOD_DETAIL = 'Mobicred';
 				break;
@@ -154,7 +161,7 @@ public function initiate_data($order_info,$pay_method_data){
 		$notifyUrl = $this->getNotifyUrl();
 		$userField1      = $order_info['order_id'];
 		$userField2      = $order_info['payment_firstname'] . ' ' . $order_info['payment_lastname'];
-		$userField3      = 'opencart-v3.0.4';
+		$userField3      = 'opencart-v3.0.7';
 
 		/* getting order info ********/
 

diff --git a/upload/catalog/language/en-gb/checkout/paygate.php b/upload/catalog/language/en-gb/checkout/paygate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020 PayGate (Pty) Ltd
+ * Copyright (c) 2021 PayGate (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *

diff --git a/upload/catalog/language/en-gb/extension/payment/paygate.php b/upload/catalog/language/en-gb/extension/payment/paygate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020 PayGate (Pty) Ltd
+ * Copyright (c) 2021 PayGate (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *

diff --git a/upload/catalog/model/extension/payment/paygate.php b/upload/catalog/model/extension/payment/paygate.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2020 PayGate (Pty) Ltd
+ * Copyright (c) 2021 PayGate (Pty) Ltd
  *
  * Author: App Inlet (Pty) Ltd
  *
@@ -42,7 +42,8 @@ public function getMethod( $address, $total )
             'creditcardmethod'   => 'Card',
             'banktransfermethod' => 'SiD Secure EFT',
             'zappermethod'       => 'Zapper',
-            'snapscanmethod'       => 'SnapScan',
+            'snapscanmethod'     => 'SnapScan',
+            'paypalmethod'       => 'PayPal',
             'mobicredmethod'     => 'Mobicred',
             'momopaymethod'      => 'MoMoPay',
             'masterpassmethod'   => 'MasterPass',

diff --git a/upload/catalog/view/theme/default/image/paypal.svg b/upload/catalog/view/theme/default/image/paypal.svg