From 965e3e46a8183d9c10b225e8b0140e18cdcdd577 Mon Sep 17 00:00:00 2001
From: Bruce Atkinson <bruce@appinlet.com>
Date: Wed, 29 Sep 2021 10:06:08 +0200
Subject: [PATCH] 2021-09-29: v3.0.7

Add PayPal to payment types.
---
 README.md                                        |  4 ++--
 changelog.txt                                    |  2 ++
 .../controller/extension/payment/paygate.php     |  4 ++--
 .../language/en-gb/extension/payment/paygate.php |  5 +++--
 .../view/template/extension/payment/paygate.twig | 16 +++++++++++++++-
 .../controller/extension/payment/paygate.php     | 11 +++++++++--
 .../catalog/language/en-gb/checkout/paygate.php  |  2 +-
 .../language/en-gb/extension/payment/paygate.php |  2 +-
 .../catalog/model/extension/payment/paygate.php  |  5 +++--
 .../catalog/view/theme/default/image/paypal.svg  |  1 +
 10 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 upload/catalog/view/theme/default/image/paypal.svg

diff --git a/README.md b/README.md
index 9cf733d..725eea6 100644
--- 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
index dbc7b46..c1a2f62 100755
--- 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
index 70257bc..76912f1 100755
--- 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
index aa60b2e..f21c27e 100755
--- 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
index 699ec6f..15af8ba 100755
--- 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
index 790ae25..f822210 100755
--- 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
index c663e29..ca8fc78 100755
--- 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
index d267d90..e27e106 100755
--- 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
index 7a4369b..6aa75ef 100755
--- 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
new file mode 100644
index 0000000..7a21ba8
--- /dev/null
+++ b/upload/catalog/view/theme/default/image/paypal.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 368.5 141.73"><defs><style>.cls-1{fill:#263c7f;}.cls-2{fill:#179bd7;}.cls-3{fill:#253064;}</style></defs><path class="cls-1" d="M143,48.79h-18.1a2.52,2.52,0,0,0-2.49,2.12L115.1,97.33a1.5,1.5,0,0,0,1.49,1.74h8.64A2.52,2.52,0,0,0,127.72,97l2-12.52a2.52,2.52,0,0,1,2.49-2.13h5.73c11.92,0,18.8-5.77,20.6-17.2.81-5,0-8.93-2.31-11.69C153.63,50.39,149.07,48.79,143,48.79Zm2.09,16.95c-1,6.5-6,6.5-10.76,6.5h-2.73l1.92-12.13A1.51,1.51,0,0,1,135,58.84h1.25c3.27,0,6.35,0,7.95,1.86C145.17,61.81,145.46,63.46,145.1,65.74Z"/><path class="cls-1" d="M197.12,65.54h-8.67A1.51,1.51,0,0,0,187,66.81l-.38,2.42-.61-.88c-1.88-2.72-6.06-3.63-10.24-3.63-9.58,0-17.76,7.26-19.35,17.43a16.37,16.37,0,0,0,3.23,13.32c2.64,3.11,6.42,4.41,10.91,4.41a16.59,16.59,0,0,0,12-5l-.38,2.4a1.5,1.5,0,0,0,1.48,1.75h7.81A2.52,2.52,0,0,0,193.92,97l4.68-29.67A1.5,1.5,0,0,0,197.12,65.54ZM185,82.41a9.66,9.66,0,0,1-9.79,8.27,7.33,7.33,0,0,1-5.82-2.33,7.41,7.41,0,0,1-1.36-6.09,9.71,9.71,0,0,1,9.72-8.35,7.33,7.33,0,0,1,5.78,2.36A7.55,7.55,0,0,1,185,82.41Z"/><path class="cls-1" d="M243.29,65.54h-8.72a2.52,2.52,0,0,0-2.08,1.1l-12,17.7-5.1-17A2.52,2.52,0,0,0,213,65.54h-8.56a1.5,1.5,0,0,0-1.43,2l9.59,28.16-9,12.73a1.51,1.51,0,0,0,1.23,2.39h8.7a2.53,2.53,0,0,0,2.07-1.08l29-41.83A1.5,1.5,0,0,0,243.29,65.54Z"/><path class="cls-2" d="M272.13,48.79H254a2.51,2.51,0,0,0-2.48,2.12l-7.32,46.42a1.5,1.5,0,0,0,1.48,1.74H255a1.75,1.75,0,0,0,1.73-1.48l2.08-13.16a2.51,2.51,0,0,1,2.48-2.13H267c11.93,0,18.81-5.77,20.61-17.2.81-5,0-8.93-2.31-11.69C282.75,50.39,278.18,48.79,272.13,48.79Zm2.08,16.95c-1,6.5-5.95,6.5-10.75,6.5h-2.73l1.92-12.13a1.51,1.51,0,0,1,1.49-1.27h1.25c3.27,0,6.35,0,7.95,1.86C274.29,61.81,274.58,63.46,274.21,65.74Z"/><path class="cls-2" d="M326.23,65.54h-8.66a1.51,1.51,0,0,0-1.49,1.27l-.38,2.42-.61-.88c-1.88-2.72-6.06-3.63-10.24-3.63-9.57,0-17.75,7.26-19.35,17.43a16.4,16.4,0,0,0,3.23,13.32c2.65,3.11,6.42,4.41,10.92,4.41a16.59,16.59,0,0,0,12-5l-.39,2.4a1.5,1.5,0,0,0,1.49,1.75h7.81A2.51,2.51,0,0,0,323,97l4.69-29.67A1.51,1.51,0,0,0,326.23,65.54ZM314.15,82.41a9.65,9.65,0,0,1-9.78,8.27,7.31,7.31,0,0,1-5.82-2.33,7.41,7.41,0,0,1-1.36-6.09,9.72,9.72,0,0,1,9.71-8.35,7.31,7.31,0,0,1,5.78,2.36A7.48,7.48,0,0,1,314.15,82.41Z"/><path class="cls-2" d="M336.45,50.06,329,97.33a1.51,1.51,0,0,0,1.49,1.74H338A2.52,2.52,0,0,0,340.47,97l7.32-46.42a1.5,1.5,0,0,0-1.49-1.74h-8.36A1.51,1.51,0,0,0,336.45,50.06Z"/><path class="cls-1" d="M39.92,108.09l1.39-8.79-3.08-.07H23.5L33.73,34.35a.91.91,0,0,1,.29-.51.82.82,0,0,1,.54-.2H59.39c8.25,0,13.93,1.71,16.9,5.1A11.6,11.6,0,0,1,79,43.81a18.31,18.31,0,0,1,0,7l0,.2V52.8l1.39.79a9.94,9.94,0,0,1,2.82,2.15,10.09,10.09,0,0,1,2.29,5.13,21.85,21.85,0,0,1-.33,7.44,26.17,26.17,0,0,1-3,8.43A17.18,17.18,0,0,1,77.28,82,19.6,19.6,0,0,1,70.77,85a32.6,32.6,0,0,1-8.13.94H60.71A5.82,5.82,0,0,0,55,90.81l-.14.79-2.45,15.5-.11.57a.51.51,0,0,1-.15.33.39.39,0,0,1-.26.09Z"/><path class="cls-2" d="M81.7,51.22h0c-.08.47-.16,1-.26,1.46C78.17,69.49,67,75.29,52.66,75.29H45.38a3.54,3.54,0,0,0-3.5,3h0l-3.73,23.65-1,6.71a1.85,1.85,0,0,0,1.83,2.15H51.85a3.11,3.11,0,0,0,3.07-2.62l.13-.65,2.43-15.44.16-.85a3.11,3.11,0,0,1,3.07-2.62h1.93c12.52,0,22.32-5.09,25.18-19.79C89,62.68,88.4,57.55,85.23,54A12.25,12.25,0,0,0,81.7,51.22Z"/><path class="cls-3" d="M78.27,49.86c-.5-.15-1-.28-1.54-.4s-1.08-.22-1.64-.31a40.25,40.25,0,0,0-6.42-.47H49.21a3.09,3.09,0,0,0-3.07,2.63L42,77.53l-.12.76a3.54,3.54,0,0,1,3.5-3h7.28c14.31,0,25.51-5.81,28.78-22.61.1-.5.18-1,.26-1.46A17.65,17.65,0,0,0,79,50.09Z"/><path class="cls-1" d="M46.14,51.31A3.09,3.09,0,0,1,47.87,49a3,3,0,0,1,1.34-.31H68.67a40.25,40.25,0,0,1,6.42.47c.56.09,1.11.19,1.64.31s1,.25,1.54.4l.74.23a17.65,17.65,0,0,1,2.69,1.13c1-6.21,0-10.44-3.37-14.27-3.7-4.22-10.38-6-18.93-6H34.57a3.55,3.55,0,0,0-3.51,3L20.72,99.48a2.13,2.13,0,0,0,2.1,2.46H38.15L42,77.53Z"/></svg>
\ No newline at end of file