From 5f6a4940efdd73d1cb2149314aee00c347b9b5eb Mon Sep 17 00:00:00 2001
From: Bruce Atkinson <bruce@appinlet.com>
Date: Thu, 13 May 2021 23:01:53 +0200
Subject: [PATCH] = 1.4.3 - May 13, 2021

* Tested on WooCommerce 5.3 and Wordpress 5.7.
* Add SnapScan payment type.
* Remove legacy reference to 'paypopup'.
* Fix error messaging on cancelled and declined transactions.
* Use pending status for checksum failures.
* Add cron job for query function on orders older than 60 minutes.
* Fixed incorrect order note on transaction declined for Notify method.
---
 README.md                              |   4 +-
 assets/css/paygate_checkout.css        |   2 +-
 assets/images/snapscan.svg             |   1 +
 assets/js/maps/paygate_checkout.js.map |   2 +-
 assets/js/paygate_checkout.js          |   2 +-
 changelog.txt                          |   9 ++
 classes/WC_Gateway_PayGate.php         | 144 +++++++++++++++----------
 classes/WC_Gateway_PayGate_Cron.php    |  42 +++++++-
 classes/WC_Gateway_PayGate_Portal.php  |  22 ++--
 gateway-paygate.php                    |  14 ++-
 10 files changed, 161 insertions(+), 81 deletions(-)
 create mode 100644 assets/images/snapscan.svg

diff --git a/README.md b/README.md
index 9ed261c..6d65547 100755
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # PayWeb_WooCommerce
-## PayGate WooCommerce plugin v1.4.2 for WooCommerce v4.9.0
+## PayGate WooCommerce plugin v1.4.3 for WooCommerce v5.3.0
 
 This is the PayGate PayWeb3 plugin for WooCommerce. 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 WooCommerce](https://www.appinlet.com/wp-content/uploads/2018/09/WooCommerce-Integration.jpg)](https://www.youtube.com/watch?v=MMcEG7FmoEM "How To Setup PayGate PayWeb for WooCommerce")
 
-Please navigate to the [releases page](https://github.com/PayGate/PayWeb_WooCommerce/releases), download the latest release (v1.4.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_WooCommerce/releases), download the latest release (v1.4.3) and unzip. You will them be able to follow the integration guide PDF which is included in the zip.
 
 ## Collaboration
 
diff --git a/assets/css/paygate_checkout.css b/assets/css/paygate_checkout.css
index fae9406..9716679 100755
--- a/assets/css/paygate_checkout.css
+++ b/assets/css/paygate_checkout.css
@@ -1 +1 @@
-#payPopup{display:block;position:fixed;z-index:9999999999;left:0;top:0;width:100%;height:100%;overflow:auto;-webkit-overflow-scrolling:touch;overflow-y:scroll;background-color:#000;background-color:rgba(0,0,0,.6)}#payPopupContent{width:94%;background-color:#fefefe;margin:3% auto 0 auto;padding:0;border:0;border-radius:3px;height:90%;overflow:auto;-webkit-overflow-scrolling:touch;overflow-y:scroll}#payPopupFrame{margin:0 0 -7px 0;padding:0;border:none;width:100%;height:100%}#paygate_checkout{display:none}#payPopupClose{color:#aaa;float:right;font-size:28px;font-weight:700;margin:0;padding:0;font-family:Times New Roman,sans-serif;line-height:15px;height:15px}#payPopupClose:focus,#payPopupClose:hover{color:#000;text-decoration:none;cursor:pointer}img.pay_method_image{width:35px;margin-top:15px}td.pay_method_image{padding:0;vertical-align:middle}#payment .payment_methods li td.pay_method_image img{width:130px;height:auto;border:none;max-height:none;padding:10px 5px;float:right}.start_hidden{display:none}thead td{padding:0}#payment .payment_method_paygate tr td{border:none}#payment .payment_method_paygate thead{display:none}#payment .payment_method_paygate table{margin:none}
\ No newline at end of file
+#paygate_checkout{display:none}img.pay_method_image{width:35px;margin-top:15px}td.pay_method_image{padding:0;vertical-align:middle}#payment .payment_methods li td.pay_method_image img{width:130px;height:auto;border:none;max-height:none;padding:10px 5px;float:right}.start_hidden{display:none}thead td{padding:0}#payment .payment_method_paygate tr td{border:none}#payment .payment_method_paygate thead{display:none}#payment .payment_method_paygate table{margin:none}
\ No newline at end of file
diff --git a/assets/images/snapscan.svg b/assets/images/snapscan.svg
new file mode 100644
index 0000000..6c72916
--- /dev/null
+++ b/assets/images/snapscan.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 624.85 130"><defs><style>.cls-1{fill:#3a77bb;}</style></defs><path class="cls-1" d="M169.76,87.35,176.55,78a29.45,29.45,0,0,0,21.71,9.57c9.86,0,13.68-4.83,13.68-9.46,0-14.41-39.91-5.46-39.91-30.66,0-11.42,9.87-20.16,25-20.16,10.59,0,19.34,3.5,25.61,9.67l-6.78,9a28,28,0,0,0-20-7.92c-7,0-11.51,3.49-11.51,8.53,0,12.87,39.91,4.93,39.91,30.42,0,11.41-8.13,21.29-26.54,21.29-12.65,0-21.81-4.53-27.95-10.9"/><path class="cls-1" d="M268.64,97V66c0-7.82-4-10.29-10.08-10.29-5.45,0-10.19,3.29-12.75,6.58V97H235V47.32h10.8V54A23.65,23.65,0,0,1,263.4,46.1c10.68,0,16,5.75,16,15.93V97Z"/><path class="cls-1" d="M323.89,85.69V78.1c-2.58-3.39-7.2-5.14-11.83-5.14-6.07,0-10.69,3.6-10.69,9s4.62,9,10.69,9c4.63,0,9.25-1.76,11.83-5.15m0,11.32V91.57c-3.69,4.33-9.56,6.69-16.15,6.69-8,0-17.17-5.55-17.17-16.44,0-11.51,9-16.24,17.17-16.24,6.79,0,12.46,2.15,16.15,6.36v-7.4c0-5.76-4.84-9.25-11.63-9.25a20,20,0,0,0-14.71,6.36L293,54.15c5.76-5.55,13-8,20.88-8,11.1,0,20.78,4.63,20.78,17.89V97Z"/><path class="cls-1" d="M386.34,72.12c0-9.66-5.56-16.44-14.09-16.44a16.23,16.23,0,0,0-12.76,6.57V81.9a16.24,16.24,0,0,0,12.76,6.79c8.53,0,14.09-6.89,14.09-16.56m-26.85,18v25.78h-10.8V47.33h10.8v6.78a19.84,19.84,0,0,1,15.95-8c12.85,0,22,9.66,22,26s-9.15,26.13-22,26.13a19.92,19.92,0,0,1-15.95-8.13"/><path class="cls-1" d="M404.15,87.35,410.94,78a29.41,29.41,0,0,0,21.7,9.57c9.87,0,13.68-4.83,13.68-9.46,0-14.41-39.91-5.46-39.91-30.66,0-11.42,9.87-20.16,25-20.16,10.59,0,19.33,3.5,25.61,9.67l-6.79,9a28,28,0,0,0-20-7.92c-7,0-11.51,3.49-11.51,8.53,0,12.87,39.91,4.93,39.91,30.42,0,11.41-8.12,21.29-26.54,21.29-12.65,0-21.8-4.53-27.95-10.9"/><path class="cls-1" d="M466.39,72.12c0-15,10.6-26,25.62-26,9.76,0,15.53,4.11,19,8.85l-7.1,6.47a13.13,13.13,0,0,0-11.41-5.75c-9,0-15,6.78-15,16.44s6.06,16.57,15,16.57a13.37,13.37,0,0,0,11.41-6l7.1,6.69c-3.49,4.63-9.26,8.85-19,8.85-15,0-25.62-11.11-25.62-26.13"/><path class="cls-1" d="M551.05,85.69V78.1c-2.57-3.39-7.2-5.14-11.83-5.14-6.07,0-10.69,3.6-10.69,9s4.63,9,10.69,9c4.63,0,9.26-1.76,11.83-5.15m0,11.32V91.57c-3.7,4.33-9.57,6.69-16.15,6.69-8,0-17.18-5.55-17.18-16.44,0-11.51,9-16.24,17.18-16.24,6.8,0,12.45,2.15,16.15,6.36v-7.4c0-5.76-4.83-9.25-11.62-9.25a19.86,19.86,0,0,0-14.7,6.36l-4.53-7.5c5.75-5.55,12.95-8,20.88-8,11.11,0,20.77,4.63,20.77,17.89V97Z"/><path class="cls-1" d="M609.49,97V66c0-7.82-4-10.29-10.08-10.29-5.45,0-10.19,3.29-12.76,6.58V97H575.9V47.32h10.79V54a23.7,23.7,0,0,1,17.59-7.92c10.69,0,16.05,5.75,16.05,15.93V97Z"/><path class="cls-1" d="M63.88,124.6A59.6,59.6,0,1,1,123.48,65h0a59.6,59.6,0,0,1-59.6,59.6m0-123.48A63.88,63.88,0,1,0,127.76,65h0A63.88,63.88,0,0,0,63.88,1.12"/><path class="cls-1" d="M55.4,37.43H40.52a4.24,4.24,0,0,0-4.24,4.23V56.52a4.23,4.23,0,0,0,4.22,4.24H55.4a4.25,4.25,0,0,0,4.24-4.24V41.68a4.26,4.26,0,0,0-4.24-4.25"/><path class="cls-1" d="M87.24,37.43H72.37a4.23,4.23,0,0,0-4.24,4.23V56.52a4.23,4.23,0,0,0,4.22,4.24H87.24a4.25,4.25,0,0,0,4.25-4.23h0V41.68a4.25,4.25,0,0,0-4.25-4.25h0"/><path class="cls-1" d="M55.4,69.24H40.52a4.24,4.24,0,0,0-4.24,4.23h0V88.33a4.24,4.24,0,0,0,4.23,4.24H55.4a4.25,4.25,0,0,0,4.24-4.24V73.48a4.26,4.26,0,0,0-4.24-4.24"/></svg>
\ No newline at end of file
diff --git a/assets/js/maps/paygate_checkout.js.map b/assets/js/maps/paygate_checkout.js.map
index eabc85b..7c0b853 100644
--- a/assets/js/maps/paygate_checkout.js.map
+++ b/assets/js/maps/paygate_checkout.js.map
@@ -1 +1 @@
-{"version":3,"file":"../paygate_checkout.js","sources":["paygate_checkout.js"],"sourcesContent":["jQuery(function() {\n    jQuery.ajaxSetup({\n        complete: function(xhr, textStatus) {\n            var result = JSON.parse(xhr.responseText);\n            if (result.paygate_override) {\n                jQuery('.woocommerce-error').remove();\n                initPayPopup(result);\n                return false;\n            }\n            return;\n        }\n    });\n    jQuery(document).ajaxComplete(function() {\n        if (jQuery('body').hasClass('woocommerce-checkout') || jQuery('body').hasClass('woocommerce-cart')) {\n            jQuery('html, body').stop();\n        }\n    });\n});\n\nfunction initPayPopup(result) {\n    jQuery(\"body\").append(\"<div id='payPopup'></div>\");\n    jQuery(\"#payPopup\").append(\"<div id='payPopupContent'></div>\");\n    jQuery(\"#payPopupContent\").append(\"<form name='paygate_checkout' id='paygate_checkout' action='https://secure.paygate.co.za/payweb3/process.trans' method='post'><input type='hidden' name='PAY_REQUEST_ID' value='\" + result.PAY_REQUEST_ID + \"' size='200'><input type='hidden' name='CHECKSUM' value='\" + result.CHECKSUM + \"' size='200'></form><iframe id='payPopupFrame' name='myIframe'></iframe><script type='text/javascript'>document.getElementById('paygate_checkout').submit();</script>\");\n}\njQuery(document).on('submit', 'form#order_review', function(e) {\n    jQuery(\"#place_order\").attr(\"disabled\", \"disabled\");\n    var contine = true;\n    if (jQuery('#terms').length) {\n        if (!jQuery(\"#terms\").is(\":checked\") == true) {\n            contine = false;\n        }\n    }\n    if (contine && jQuery('#payment_method_paygate').length && jQuery(\"#payment_method_paygate\").is(\":checked\") == true) {\n        if (paygate_checkout_js.is_order_pay) {\n            e.preventDefault();\n            var result = JSON.parse(paygate_checkout_js.pay_now_form_data);\n            initPayPopup(result);\n        } else {\n            e.preventDefault();\n            jQuery.ajax({\n                'url': wc_add_to_cart_params.ajax_url,\n                'type': 'POST',\n                'dataType': 'json',\n                'data': {\n                    'action': 'order_pay_payment',\n                    'order_id': paygate_checkout_js.order_id\n                },\n                'async': false\n            }).complete(function(response) {\n                var ajaxResult = JSON.parse(response);\n                initPayPopup(ajaxResult);\n            });\n        }\n    }\n});\n"],"names":["initPayPopup","result","jQuery","append","PAY_REQUEST_ID","CHECKSUM","ajaxSetup","complete","xhr","textStatus","JSON","parse","responseText","paygate_override","remove","document","ajaxComplete","hasClass","stop","on","e","attr","contine","length","is","paygate_checkout_js","is_order_pay","preventDefault","pay_now_form_data","ajax","url","wc_add_to_cart_params","ajax_url","type","dataType","data","action","order_id","async","response"],"mappings":"AAmBA,SAASA,aAAaC,GAClBC,OAAO,QAAQC,OAAO,6BACtBD,OAAO,aAAaC,OAAO,oCAC3BD,OAAO,oBAAoBC,OAAO,mLAAqLF,EAAOG,eAAiB,4DAA8DH,EAAOI,SAAW,0KAtBnUH,OAAO,WACHA,OAAOI,UAAU,CACbC,SAAU,SAASC,EAAKC,GACpB,IAAIR,EAASS,KAAKC,MAAMH,EAAII,cAC5B,GAAIX,EAAOY,iBAGP,OAFAX,OAAO,sBAAsBY,SAC7Bd,aAAaC,IACN,KAKnBC,OAAOa,UAAUC,aAAa,YACtBd,OAAO,QAAQe,SAAS,yBAA2Bf,OAAO,QAAQe,SAAS,sBAC3Ef,OAAO,cAAcgB,WAUjChB,OAAOa,UAAUI,GAAG,SAAU,oBAAqB,SAASC,GACxDlB,OAAO,gBAAgBmB,KAAK,WAAY,YACxC,IAAIC,GAAU,EACVpB,OAAO,UAAUqB,QACuB,IAAnCrB,OAAO,UAAUsB,GAAG,cACrBF,GAAU,GAGdA,GAAWpB,OAAO,2BAA2BqB,QAA8D,GAApDrB,OAAO,2BAA2BsB,GAAG,cACxFC,oBAAoBC,cACpBN,EAAEO,iBAEF3B,aADaU,KAAKC,MAAMc,oBAAoBG,sBAG5CR,EAAEO,iBACFzB,OAAO2B,KAAK,CACRC,IAAOC,sBAAsBC,SAC7BC,KAAQ,OACRC,SAAY,OACZC,KAAQ,CACJC,OAAU,oBACVC,SAAYZ,oBAAoBY,UAEpCC,OAAS,IACV/B,SAAS,SAASgC,GAEjBvC,aADiBU,KAAKC,MAAM4B"}
\ No newline at end of file
+{"version":3,"file":"../paygate_checkout.js","sources":["paygate_checkout.js"],"sourcesContent":["jQuery(function() {\n    jQuery(document).ajaxComplete(function() {\n        if (jQuery('body').hasClass('woocommerce-checkout') || jQuery('body').hasClass('woocommerce-cart')) {\n            jQuery('html, body').stop();\n        }\n    });\n});\n\njQuery(document).on('submit', 'form#order_review', function(e) {\n    jQuery(\"#place_order\").attr(\"disabled\", \"disabled\");\n});\n"],"names":["jQuery","document","ajaxComplete","hasClass","stop","on","e","attr"],"mappings":"AAAAA,OAAO,WACHA,OAAOC,UAAUC,aAAa,YACtBF,OAAO,QAAQG,SAAS,yBAA2BH,OAAO,QAAQG,SAAS,sBAC3EH,OAAO,cAAcI,WAKjCJ,OAAOC,UAAUI,GAAG,SAAU,oBAAqB,SAASC,GACxDN,OAAO,gBAAgBO,KAAK,WAAY"}
\ No newline at end of file
diff --git a/assets/js/paygate_checkout.js b/assets/js/paygate_checkout.js
index 2b2c9ce..8e6c5d8 100755
--- a/assets/js/paygate_checkout.js
+++ b/assets/js/paygate_checkout.js
@@ -1,2 +1,2 @@
-function initPayPopup(e){jQuery("body").append("<div id='payPopup'></div>"),jQuery("#payPopup").append("<div id='payPopupContent'></div>"),jQuery("#payPopupContent").append("<form name='paygate_checkout' id='paygate_checkout' action='https://secure.paygate.co.za/payweb3/process.trans' method='post'><input type='hidden' name='PAY_REQUEST_ID' value='"+e.PAY_REQUEST_ID+"' size='200'><input type='hidden' name='CHECKSUM' value='"+e.CHECKSUM+"' size='200'></form><iframe id='payPopupFrame' name='myIframe'></iframe><script type='text/javascript'>document.getElementById('paygate_checkout').submit();<\/script>")}jQuery(function(){jQuery.ajaxSetup({complete:function(e,a){var t=JSON.parse(e.responseText);if(t.paygate_override)return jQuery(".woocommerce-error").remove(),initPayPopup(t),!1}}),jQuery(document).ajaxComplete(function(){(jQuery("body").hasClass("woocommerce-checkout")||jQuery("body").hasClass("woocommerce-cart"))&&jQuery("html, body").stop()})}),jQuery(document).on("submit","form#order_review",function(e){jQuery("#place_order").attr("disabled","disabled");var a=!0;jQuery("#terms").length&&1==!jQuery("#terms").is(":checked")&&(a=!1),a&&jQuery("#payment_method_paygate").length&&1==jQuery("#payment_method_paygate").is(":checked")&&(paygate_checkout_js.is_order_pay?(e.preventDefault(),initPayPopup(JSON.parse(paygate_checkout_js.pay_now_form_data))):(e.preventDefault(),jQuery.ajax({url:wc_add_to_cart_params.ajax_url,type:"POST",dataType:"json",data:{action:"order_pay_payment",order_id:paygate_checkout_js.order_id},async:!1}).complete(function(e){initPayPopup(JSON.parse(e))})))});
+jQuery(function(){jQuery(document).ajaxComplete(function(){(jQuery("body").hasClass("woocommerce-checkout")||jQuery("body").hasClass("woocommerce-cart"))&&jQuery("html, body").stop()})}),jQuery(document).on("submit","form#order_review",function(e){jQuery("#place_order").attr("disabled","disabled")});
 //# sourceMappingURL=maps/paygate_checkout.js.map
diff --git a/changelog.txt b/changelog.txt
index 4b8afd4..fd2cd42 100755
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+= 1.4.3 - May 13, 2021
+* Tested on WooCommerce 5.3 and Wordpress 5.7.
+* Add SnapScan payment type.
+* Remove legacy reference to 'paypopup'.
+* Fix error messaging on cancelled and declined transactions.
+* Use pending status for checksum failures.
+* Add cron job for query function on orders older than 60 minutes.
+* Fixed incorrect order note on transaction declined for Notify method.
+
 = 1.4.2 - Jan 18, 2021
 * Tested on WooCommerce 4.9 and Wordpress 5.6.
 * Fix an issue where PayVault did not work while Payment Type selection was active.
diff --git a/classes/WC_Gateway_PayGate.php b/classes/WC_Gateway_PayGate.php
index 7bd2d79..cee4180 100644
--- a/classes/WC_Gateway_PayGate.php
+++ b/classes/WC_Gateway_PayGate.php
@@ -87,12 +87,14 @@ class WC_Gateway_PayGate extends WC_Payment_Gateway
     const CREDIT_CARD                         = 'pw3_credit_card';
     const BANK_TRANSFER                       = 'pw3_bank_transfer';
     const ZAPPER                              = 'pw3_e_zapper';
+    const SNAPSCAN                            = 'pw3_e_snapscan';
     const MOBICRED                            = 'pw3_e_mobicred';
     const MOMOPAY                             = 'pw3_e_momopay';
     const MASTERPASS                          = 'pw3_e_masterpass';
     const CREDIT_CARD_METHOD                  = 'CC';
     const BANK_TRANSFER_METHOD                = 'BT';
     const ZAPPER_METHOD                       = 'EW-ZAPPER';
+    const SNAPSCAN_METHOD                     = 'EW-SNAPSCAN';
     const MOBICRED_METHOD                     = 'EW-MOBICRED';
     const MOMOPAY_METHOD                      = 'EW-MOMOPAY';
     const MASTERPASS_METHOD                   = 'EW-MASTERPASS';
@@ -100,6 +102,7 @@ class WC_Gateway_PayGate extends WC_Payment_Gateway
     const BANK_TRANSFER_DESCRIPTION           = 'SiD Secure EFT';
     const BANK_TRANSFER_METHOD_DETAIL         = 'SID';
     const ZAPPER_DESCRIPTION                  = 'Zapper';
+    const SNAPSCAN_DESCRIPTION                = 'SnapScan';
     const MOBICRED_DESCRIPTION                = 'Mobicred';
     const MOMOPAY_DESCRIPTION                 = 'MoMoPay';
     const MOMOPAY_METHOD_DETAIL               = 'Momopay';
@@ -112,7 +115,7 @@ class WC_Gateway_PayGate extends WC_Payment_Gateway
     const ORDER_META_REFERENCE                = 'order_meta_reference';
     const ORDER_META_REFERENCE_DESCRIPTION    = 'Order Meta Reference';
     const ORDER_META_REFERENCE_PLACEHOLDER    = 'Add order meta to the payment reference using a meta key (e.g. _billing_first_name)';
-    const LOGGING = 'logging';
+    const LOGGING                             = 'logging';
 
     public $version = '4.0.0';
 
@@ -151,6 +154,7 @@ class WC_Gateway_PayGate extends WC_Payment_Gateway
         self::CREDIT_CARD_METHOD   => self::CREDIT_CARD_DESCRIPTION,
         self::BANK_TRANSFER_METHOD => self::BANK_TRANSFER_METHOD_DETAIL,
         self::ZAPPER_METHOD        => self::ZAPPER_DESCRIPTION,
+        self::SNAPSCAN_METHOD      => self::SNAPSCAN_DESCRIPTION,
         self::MOBICRED_METHOD      => self::MOBICRED_DESCRIPTION,
         self::MOMOPAY_METHOD       => self::MOMOPAY_METHOD_DETAIL,
         self::MASTERPASS_METHOD    => self::MASTERPASS_DESCRIPTION,
@@ -188,11 +192,11 @@ public function __construct()
 
         $wcsession = WC()->session;
 
-        if(self::$wc_logger === null){
+        if (self::$wc_logger === null) {
             self::$wc_logger = wc_get_logger();
         }
 
-        if(isset($this->settings[self::LOGGING]) && $this->settings[self::LOGGING] === 'yes') {
+        if (isset($this->settings[self::LOGGING]) && $this->settings[self::LOGGING] === 'yes') {
             $this->logging = true;
         }
 
@@ -212,10 +216,10 @@ public function __construct()
                     $wcsession->set(
                         self::PAYGATE_PAYMENT_TOKEN,
                         filter_var(
-                    $_POST[self::PAYGATE_PAYMENT_TOKEN],
-                    FILTER_SANITIZE_STRING
+                            $_POST[self::PAYGATE_PAYMENT_TOKEN],
+                            FILTER_SANITIZE_STRING
                         )
-                );
+                    );
                 }
             } else {
                 if ($wcsession) {
@@ -228,10 +232,10 @@ public function __construct()
                     $wcsession->set(
                         self::SUB_PAYMENT_METHOD,
                         filter_var(
-                    $_POST[self::SUB_PAYMENT_METHOD],
-                    FILTER_SANITIZE_STRING
+                            $_POST[self::SUB_PAYMENT_METHOD],
+                            FILTER_SANITIZE_STRING
                         )
-                );
+                    );
                 }
             } else {
                 if ($wcsession) {
@@ -246,11 +250,11 @@ public function __construct()
             self::ID
         );
         $this->icon               = $this->get_plugin_url() . '/assets/images/PayGate_logo.svg';
-        if(isset($this->settings['paygateplus']) && $this->settings['paygateplus'] === 'yes') {
-            $this->icon               = $this->get_plugin_url() . '/assets/images/PayGate_Plus_logo.svg';
+        if (isset($this->settings['paygateplus']) && $this->settings['paygateplus'] === 'yes') {
+            $this->icon = $this->get_plugin_url() . '/assets/images/PayGate_Plus_logo.svg';
         }
-        $this->has_fields         = true;
-        $this->supports           = array(
+        $this->has_fields = true;
+        $this->supports   = array(
             'products',
         );
 
@@ -279,46 +283,63 @@ public function __construct()
         $this->setCardMethods();
     }
 
+    public static function show_cart_messages($messages)
+    {
+        if (isset($_GET['order_id'])) {
+            $order_id      = filter_var($_GET['order_id'], FILTER_SANITIZE_NUMBER_INT);
+            $orderMessages = get_post_meta($order_id, 'paygate_error');
+            $orderMessage  = $orderMessages[count($orderMessages) - 1];
+
+            echo '<h3 style="color: red;">' . $orderMessage . '</h3>';
+        }
+    }
+
     /**
      * Custom function added to overcome notice failures in recent versions
      *
      * @param false $return
+     *
      * @return string|void
      */
     protected function custom_print_notices($return = false)
     {
-        if ( ! did_action( 'woocommerce_init' ) ) {
-            wc_doing_it_wrong( __FUNCTION__, __( 'This function should not be called before woocommerce_init.', 'woocommerce' ), '2.3' );
+        if ( ! did_action('woocommerce_init')) {
+            wc_doing_it_wrong(
+                __FUNCTION__,
+                __('This function should not be called before woocommerce_init.', 'woocommerce'),
+                '2.3'
+            );
+
             return;
         }
 
-        $all_notices  = WC()->session->get( 'wc_notices', array() );
-        $notice_types = apply_filters( 'woocommerce_notice_types', array( 'error', 'success', 'notice' ) );
+        $all_notices  = WC()->session->get('wc_notices', array());
+        $notice_types = apply_filters('woocommerce_notice_types', array('error', 'success', 'notice'));
 
         // Buffer output.
         ob_start();
 
-        foreach ( $notice_types as $notice_type ) {
-            if ( wc_notice_count( $notice_type ) > 0 ) {
+        foreach ($notice_types as $notice_type) {
+            if (wc_notice_count($notice_type) > 0) {
                 $messages = array();
 
-                foreach ( $all_notices[ $notice_type ] as $notice ) {
-                    $messages[] = isset( $notice['notice'] ) ? $notice['notice'] : $notice;
+                foreach ($all_notices[$notice_type] as $notice) {
+                    $messages[] = isset($notice['notice']) ? $notice['notice'] : $notice;
                 }
 
                 wc_get_template(
                     "notices/{$notice_type}.php",
                     array(
-                        'messages' => array_filter( $messages ), // @deprecated 3.9.0
-                        'notices'  => array_filter( $all_notices[ $notice_type ] ),
+                        'messages' => array_filter($messages), // @deprecated 3.9.0
+                        'notices'  => array_filter($all_notices[$notice_type]),
                     )
                 );
             }
         }
 
-        $notices = wc_kses_notice( ob_get_clean() );
+        $notices = wc_kses_notice(ob_get_clean());
 
-        if ( $return ) {
+        if ($return) {
             return $notices;
         }
 
@@ -412,7 +433,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'yes',
             ),
-            self::LOGGING              => array(
+            self::LOGGING               => array(
                 self::TITLE         => __('Enable Logging', self::ID),
                 self::TYPE          => self::CHECKBOX,
                 self::DESCRIPTION   => __('Enable WooCommerce Logging', self::ID),
@@ -462,7 +483,7 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
-            'paygateplus'                  => array(
+            'paygateplus'               => array(
                 self::TITLE         => __('Use PayGate Plus logo', self::ID),
                 self::TYPE          => self::CHECKBOX,
                 self::LABEL         => 'Enable the PayGate Plus logo',
@@ -497,6 +518,14 @@ public function init_form_fields()
                 self::DESC_TIP      => true,
                 self::DEFAULT_CONST => 'no',
             ),
+            self::SNAPSCAN              => array(
+                self::TITLE         => __(self::ENABLE . self::SNAPSCAN_DESCRIPTION . self::ON_CHECKOUT, self::ID),
+                self::LABEL         => self::SNAPSCAN_DESCRIPTION . self::MUST_BE_ENABLED,
+                self::TYPE          => self::CHECKBOX,
+                self::DESCRIPTION   => __(self::CHECKOUT_PAYMENT_METHOD_DESCRIPTION),
+                self::DESC_TIP      => true,
+                self::DEFAULT_CONST => 'no',
+            ),
             self::MOBICRED              => array(
                 self::TITLE         => __(self::ENABLE . self::MOBICRED_DESCRIPTION . self::ON_CHECKOUT, self::ID),
                 self::LABEL         => self::MOBICRED_DESCRIPTION . self::MUST_BE_ENABLED,
@@ -563,7 +592,7 @@ public function admin_options()
                 '</a>'
             ); ?></p>
 
-        <table class="form-table">
+        <table class="form-table" aria-describedby="paygate">
             <th scope="col">PayGate Settings</th>
             <?php
             $this->generate_settings_html(); // Generate the HTML For the settings form.
@@ -655,9 +684,11 @@ public function process_review_payment()
      */
     public function get_icon()
     {
-        $icon = '<img src="' . esc_url( WC_HTTPS::force_https_url( $this->icon ) ) . '" alt="' . esc_attr( $this->get_title() ) . '" style="width: auto !important; height: 25px !important; max-width: 100px; border: none !important;">';
+        $icon = '<img src="' . esc_url(WC_HTTPS::force_https_url($this->icon)) . '" alt="' . esc_attr(
+                $this->get_title()
+            ) . '" style="width: auto !important; height: 25px !important; max-width: 100px; border: none !important;">';
 
-        return apply_filters( 'woocommerce_gateway_icon', $icon, $this->id );
+        return apply_filters('woocommerce_gateway_icon', $icon, $this->id);
     }
 
     /**
@@ -671,13 +702,13 @@ public function get_icon()
      */
     public function process_payment($order_id)
     {
-            $order = new WC_Order($order_id);
+        $order = new WC_Order($order_id);
 
-            return [
-                'result'       => 'success',
-                self::REDIRECT => $order->get_checkout_payment_url(true),
-            ];
-        }
+        return [
+            'result'       => 'success',
+            self::REDIRECT => $order->get_checkout_payment_url(true),
+        ];
+    }
 
     /**
      * Process the payment and return the result.
@@ -782,9 +813,9 @@ public function get_order_id_order_pay()
     public function receipt_page($order_id)
     {
         $receipt = new WC_Gateway_PayGate_Portal();
-            // Do redirect
-            echo $receipt->generate_paygate_form($order_id);
-        }
+        // Do redirect
+        echo $receipt->generate_paygate_form($order_id);
+    }
 
     /**
      * Add WooCommerce notice
@@ -794,17 +825,25 @@ public function receipt_page($order_id)
      *
      * @since 1.0.0
      */
-    public function add_notice($message, $notice_type = 'success')
+    public function add_notice($message, $notice_type = 'success', $order_id = '')
     {
         global $woocommerce;
 
-        if($wc_session = WC()->session) {
+        if ($order_id != '') {
+            add_post_meta($order_id, 'paygate_error', $message);
+        }
+
+        self::$wc_logger->add('paygatepayweb', 'In add notice: ' . json_encode($message));
+
+        if ($wc_session = WC()->session) {
+            $wc_session->set('payweb3_error_message', $message);
             $notices = $wc_session->get('wc_notices');
-            if(self::$wc_logger) {
+            if (self::$wc_logger) {
                 self::$wc_logger->add('paygatepayweb', 'Session notices: ' . json_encode($notices));
+                self::$wc_logger->add('paygatepayweb', 'Session : ' . json_encode($wc_session));
             }
         } else {
-            if(self::$wc_logger) {
+            if (self::$wc_logger) {
                 self::$wc_logger->add('paygatepayweb', 'Session not set ');
             }
         }
@@ -817,17 +856,6 @@ public function add_notice($message, $notice_type = 'success')
             // Use the old version
             $woocommerce->add_error($message);
         }
-
-        if($wc_session = WC()->session) {
-            $notices = $wc_session->get('wc_notices');
-            if(self::$wc_logger) {
-                self::$wc_logger->add('paygatepayweb', 'Session notices after: ' . json_encode($notices));
-            }
-        } else {
-            if(self::$wc_logger) {
-                self::$wc_logger->add('paygatepayweb', 'Session not set ');
-            }
-        }
     }
 
     /**
@@ -851,6 +879,11 @@ protected function setCardMethods()
                 'value'       => $this->settings[self::ZAPPER] == 'yes' ? self::ZAPPER_METHOD : '',
                 'image'       => $this->get_plugin_url() . '/assets/images/zapper.svg',
             );
+            $this->pw3_card_methods['snapscan']      = array(
+                'description' => self::SNAPSCAN_DESCRIPTION,
+                'value'       => $this->settings[self::SNAPSCAN] == 'yes' ? self::SNAPSCAN_METHOD : '',
+                'image'       => $this->get_plugin_url() . '/assets/images/snapscan.svg',
+            );
             $this->pw3_card_methods['mobicred']      = array(
                 'description' => self::MOBICRED_DESCRIPTION,
                 'value'       => $this->settings[self::MOBICRED] == 'yes' ? self::MOBICRED_METHOD : '',
@@ -935,7 +968,7 @@ protected function addActions()
      *
      * @return array|object|null
      */
-    protected function getOrderNotes($order_id)
+    protected static function getOrderNotes($order_id)
     {
         global $wpdb;
 
@@ -990,5 +1023,4 @@ protected function showTokens($defaultToken, $tokens)
                 </select>
 HTML;
     }
-
 }
diff --git a/classes/WC_Gateway_PayGate_Cron.php b/classes/WC_Gateway_PayGate_Cron.php
index e86b6c9..41fee19 100644
--- a/classes/WC_Gateway_PayGate_Cron.php
+++ b/classes/WC_Gateway_PayGate_Cron.php
@@ -9,6 +9,8 @@
 
 class WC_Gateway_PayGate_Cron extends WC_Gateway_PayGate
 {
+    const LOGGING = 'logging';
+
     /**
      *
      */
@@ -16,25 +18,51 @@ public static function paygate_order_query_cron()
     {
         $gwp = new WC_Gateway_PayGate_Portal();
 
+        // Load the settings
+        $settings = get_option('woocommerce_paygate_settings', false);
+
+        $logging = false;
+
+        if (isset($settings[self::LOGGING]) && $settings[self::LOGGING] === 'yes') {
+            $logging = true;
+        }
+
+        $logger = wc_get_logger();
+        $logging ? $logger->add('payweb_cron', 'Starting cron job') : '';
+
         $orders = self::paygate_order_query_cron_query();
+        $logging ? $logger->add('payweb_cron', 'Orders: ' . serialize($orders)) : '';
+
         foreach ($orders as $order_id) {
-            $order = new WC_Order($order_id->ID);
-            $notes = $gwp->getOrderNotes($order_id->ID);
+            $order   = null;
+            $orderId = $order_id->ID;
+            $logging ? $logger->add('payweb_cron', 'Order ID: ' . $orderId) : '';
+            try {
+                $order = new WC_Order($orderId);
+                $logging ? $logger->add('payweb_cron', 'Order: ' . serialize($order)) : '';
+            } catch (Exception $e) {
+                $logging ? $logger->add('payweb_cron', 'Fatal error: ' . $e->getMessage()) : '';
+            }
+
+            $notes = self::getOrderNotes($orderId);
 
-            $payRequestId = self::getPayRequestIdNotes($notes);
+            $payRequestId = WC_Gateway_PayGate_Portal::getPayRequestIdNotes($notes);
+            $logging ? $logger->add('payweb_cron', 'PayRequestId: ' . $payRequestId) : '';
 
             if ($payRequestId == '') {
-                return;
+                break;
             }
 
             $response          = $gwp->paywebQuery($payRequestId, $order);
             $transactionStatus = $gwp->paywebQueryStatus($response);
             $responseText      = $gwp->paywebQueryText($response, $payRequestId);
 
+            $logging ? $logger->add('payweb_cron', 'Response Text: ' . $responseText) : '';
+
             if ((int)$transactionStatus === 1) {
                 if ( ! $order->has_status(self::PROCESSING) && ! $order->has_status(self::COMPLETED)) {
                     $order->payment_complete();
-                    $responseText .= "<br>Order set to \"Processing\"";
+                    $responseText .= "<br>Order set to \"Processing\" by PayWeb Cron";
                 }
             } else {
                 if ( ! $order->has_status(self::FAILED)) {
@@ -49,12 +77,16 @@ protected static function paygate_order_query_cron_query()
     {
         global $wpdb;
 
+        // Orders from the last 60 minutes
+        $ordersModifiedInLastHour = " " . date('Y-m-d H:i:s', strtotime('-60 minutes')) . "";
+
         $query = <<<QUERY
 SELECT ID FROM `{$wpdb->prefix}posts`
 INNER JOIN `{$wpdb->prefix}postmeta` ON {$wpdb->prefix}posts.ID = {$wpdb->prefix}postmeta.post_id
 WHERE meta_key = '_payment_method'
 AND meta_value = 'paygate'
 AND post_status = 'wc-pending'
+AND post_date_gmt < '$ordersModifiedInLastHour'
 QUERY;
 
         return $wpdb->get_results($query);
diff --git a/classes/WC_Gateway_PayGate_Portal.php b/classes/WC_Gateway_PayGate_Portal.php
index 935b242..08977ba 100644
--- a/classes/WC_Gateway_PayGate_Portal.php
+++ b/classes/WC_Gateway_PayGate_Portal.php
@@ -11,7 +11,7 @@ class WC_Gateway_PayGate_Portal extends WC_Gateway_PayGate
 {
     protected $error_desc = 'Checksum validation error.';
 
-    protected static function getPayRequestIdNotes($notes)
+    public static function getPayRequestIdNotes($notes)
     {
         $payRequestId = '';
         foreach ($notes as $note) {
@@ -248,6 +248,7 @@ public function generate_paygate_form($order_id)
      */
     public function check_paygate_response()
     {
+        $this->logging ? self::$wc_logger->add('paygatepayweb', 'Redirect POST: ' . json_encode($_POST)) : '';
         // Sanitise GET and POST arrays
         $post = $this->sanitizeFields($_POST);
         $get  = $this->sanitizeFields($_GET);
@@ -273,6 +274,7 @@ public function check_paygate_response()
         $reference      = $this->getOrderReference($order);
 
         if ( ! $this->validateChecksum($post, $reference)) {
+            $order->update_status(self::PENDING, __('Checksum failed'));
             exit();
         }
 
@@ -356,7 +358,7 @@ public function check_paygate_notify_response()
             }
             if ( ! $order->has_status(self::FAILED)) {
                 $order->add_order_note('Failed Response via Notify, ' . $this->error_desc . self::BR);
-                $order->update_status(self::FAILED);
+                $order->update_status(self::PENDING, __('Checksum failed in notify'));
             }
             exit();
         } else {
@@ -385,12 +387,12 @@ public function check_paygate_notify_response()
                 exit;
                 break;
             case 2:
-                $this->add_notice('The transaction failed', self::ERROR);
+                $this->add_notice('The transaction was declined', self::ERROR, $order_id);
                 $this->processOrderFinalFail($order, $transaction_id, $pay_request_id, $result_desc, 'ipn');
                 exit;
                 break;
             case 4:
-                $this->add_notice('The transaction was cancelled', self::ERROR);
+                $this->add_notice('The transaction was cancelled', self::ERROR, $order_id);
                 $this->processOrderFinalCancel($order, $transaction_id, $pay_request_id, 'ipn');
                 exit;
                 break;
@@ -547,12 +549,12 @@ protected function processOrderFinal($status, $order, $transaction_id, $result_d
                 exit();
                 break;
             case 2:
-                $this->add_notice('The transaction failed', self::ERROR);
+                $this->add_notice('The transaction was declined', self::ERROR, $order->get_id());
                 $this->processOrderFinalFail($order, $transaction_id, $pay_request_id, $result_desc);
                 exit;
                 break;
             case 4:
-                $this->add_notice('The transaction was cancelled', self::ERROR);
+                $this->add_notice('The transaction was cancelled', self::ERROR, $order->get_id());
                 $this->processOrderFinalCancel($order, $transaction_id, $pay_request_id);
                 exit;
                 break;
@@ -635,14 +637,14 @@ protected function processOrderFinalCancel($order, $transaction_id, $pay_request
         if ($this->settings[self::DISABLENOTIFY] == 'yes') {
             if ( ! $order->has_status(self::FAILED)) {
                 $order->add_order_note(
-                    'Response via Redirect: User cancelled transaction<br/>PayGate Trans Id: ' . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
+                    'Response via Redirect: User cancelled transaction<br/>'  . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
                 $order->update_status(self::FAILED);
             }
         } else {
             if ( ! $order->has_status(self::FAILED)) {
                 $order->add_order_note(
-                    'Response via Notify, User cancelled transaction<br/>PayGate Trans Id: ' . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
+                    'Response via Notify, User cancelled transaction<br/>' . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
                 $order->update_status(self::FAILED);
             }
@@ -663,14 +665,14 @@ protected function processOrderFinalFail($order, $transaction_id, $pay_request_i
         if ($this->settings[self::DISABLENOTIFY] == 'yes') {
             if ( ! $order->has_status(self::FAILED)) {
                 $order->add_order_note(
-                    'Response via Redirect, RESULT_DESC: ' . $result_desc . self::PAYGATE_TRANS_ID . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
+                    'Response via Redirect, RESULT_DESC: ' . $result_desc . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
                 $order->update_status(self::FAILED);
             }
         } else {
             if ( ! $order->has_status(self::FAILED)) {
                 $order->add_order_note(
-                    'Response via Notify, RESULT_DESC: ' . $result_desc . self::PAYGATE_TRANS_ID . $transaction_id . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
+                    'Response via Notify, RESULT_DESC: ' . $result_desc . self::PAY_REQUEST_ID_TEXT . $pay_request_id . self::BR
                 );
                 $order->update_status(self::FAILED);
             }
diff --git a/gateway-paygate.php b/gateway-paygate.php
index 27cd27c..14300e9 100755
--- a/gateway-paygate.php
+++ b/gateway-paygate.php
@@ -3,15 +3,15 @@
  * Plugin Name: PayGate PayWeb3 plugin for WooCommerce
  * Plugin URI: https://github.com/PayGate/PayWeb_WooCommerce
  * Description: Accept payments for WooCommerce using PayGate's PayWeb3 service
- * Version: 1.4.2
- * Tested: 5.6.0
+ * Version: 1.4.3
+ * Tested: 5.7.2
  * Author: PayGate (Pty) Ltd
  * Author URI: https://www.paygate.co.za/
  * Developer: App Inlet (Pty) Ltd
  * Developer URI: https://www.appinlet.com/
  *
  * WC requires at least: 3.0
- * WC tested up to: 4.9
+ * WC tested up to: 5.3
  *
  * Copyright: © 2021 PayGate (Pty) Ltd.
  * License: GNU General Public License v3.0
@@ -53,13 +53,16 @@ function woocommerce_paygate_init()
         'woocommerce_order_action_wc_custom_order_action',
         array(WC_Gateway_PayGate_Portal::class, 'paygate_order_query_cron')
     );
-    add_action('paygate_query_cron_hook', array(WC_Gateway_PayGate::class, 'paygate_order_query_cron'));
+    add_action('paygate_query_cron_hook', array(WC_Gateway_PayGate_Cron::class, 'paygate_order_query_cron'));
 
     $nxt = wp_next_scheduled('paygate_query_cron_hook');
     if ( ! wp_next_scheduled('paygate_query_cron_hook')) {
-        wp_schedule_event(time(), 'daily', 'paygate_query_cron_hook');
+        wp_schedule_event(time(), 'hourly', 'paygate_query_cron_hook');
     }
 
+    add_action('woocommerce_before_cart', array(WC_Gateway_PayGate::class, 'show_cart_messages'), 10, 1);
+
+
     require_once 'classes/updater.class.php';
 
     if (is_admin()) {
@@ -83,6 +86,7 @@ function woocommerce_paygate_init()
         $wpGitHubUpdater = new WP_GitHub_Updater_PW3($config);
 
         $wpGitHubUpdater->add_filters();
+
     }
 } // End woocommerce_paygate_init()