2022-06-30: v2.5.0

- Remove layout="1column" from frontend.
- BREAKING CHANGE: Add the ability to set Successful Order State in addition to Successful Order Status. Please ensure this config option is set after updating.

Author: bruce-atkinson

README.md

@@ -1,12 +1,12 @@
 # PayWeb_Magento_2
-## PayGate Magento plugin v2.4.9 for Magento v2.4.3
+## PayGate Magento plugin v2.5.0 for Magento v2.4.4
 
 This is the PayGate PayWeb3 plugin for Magento 2. 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 Magento 2](https://appinlet.com/wp-content/uploads/2021/01/How-To-Setup-PayGate-PayWeb-for-Magento-2.jpg)](https://www.youtube.com/watch?v=JtDTm49cWmU "How To Setup PayGate PayWeb for Magento 2")
 
-Please navigate to the [releases page](https://github.com/PayGate/PayWeb_Magento_2/releases), download the latest release (v2.4.9) 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_Magento_2/releases), download the latest release (v2.5.0) and unzip. You will then be able to follow the integration guide PDF which is included in the zip.
 
 ## Collaboration
 

paygate/paygate-payweb-gateway/Controller/Notify/Indexm220.php

@@ -179,10 +179,16 @@ public function execute()
                         $orderState = $order->getState();
                         if ($orderState != Order::STATE_COMPLETE && $orderState != Order::STATE_PROCESSING) {
                             $status = Order::STATE_PROCESSING;
+                            $state  = Order::STATE_PROCESSING;
+
                             if ($this->getConfigData('Successful_Order_status') != "") {
                                 $status = $this->getConfigData('Successful_Order_status');
                             }
 
+                            if ($this->getConfigData('Successful_Order_state') != '') {
+                                $state = $this->getConfigData('Successful_Order_state');
+                            }
+
                             $model                  = $this->_paymentMethod;
                             $order_successful_email = $model->getConfigData('order_email');
 
@@ -216,7 +222,7 @@ public function execute()
 
                             // Save Transaction Response
                             $this->createTransaction($order, $paygate_data);
-                            $order->setState($status)->setStatus($status)->save();
+                            $order->setState($state)->setStatus($status)->save();
                         }
 
                         exit;

paygate/paygate-payweb-gateway/Controller/Redirect/Success.php

@@ -175,10 +175,15 @@ public function execute()
                         if ($canProcessThisOrder) {
                             $order->setPaywebPaymentProcessed(1)->save();
                             $status = Order::STATE_PROCESSING;
+                            $state  = Order::STATE_PROCESSING;
                             if ($this->getConfigData('Successful_Order_status') != "") {
                                 $status = $this->getConfigData('Successful_Order_status');
                             }
 
+                            if ($this->getConfigData('Successful_Order_state') != "") {
+                                $state = $this->getConfigData('Successful_Order_state');
+                            }
+
                             $model                  = $this->_paymentMethod;
                             $order_successful_email = $model->getConfigData('order_email');
 
@@ -212,7 +217,7 @@ public function execute()
 
                             // Save Transaction Response
                             $this->createTransaction($order, $data);
-                            $order->setState($status)->setStatus($status)->save();
+                            $order->setState($state)->setStatus($status)->save();
                         }
 
                         // Invoice capture code completed

paygate/paygate-payweb-gateway/Model/PayGate.php

@@ -516,7 +516,7 @@ public function prepareFields($order, $api = null)
                 'paygate/notify',
                 array('_secure' => true)
             ) . '?eid=' . $entityOrderId;
-        $fields['USER3']      = 'magento2-v2.4.9';
+        $fields['USER3']      = 'magento2-v2.5.0';
 
         return $fields;
     }

paygate/paygate-payweb-gateway/changelog.txt

@@ -2,6 +2,11 @@
 Date                Version     Description
 =========================================================================
 
+2022-06-30: v2.5.0 : Remove layout="1column" from frontend.
+                     BREAKING CHANGE: Add the ability to set Successful Order State
+                     in addition to Successful Order Status. Please ensure this config
+                     option is set after updating.
+
 2022-01-05: v2.4.9 : Improve store scope handling.
                      Update Masterpass to Scan to Pay. 
 

paygate/paygate-payweb-gateway/etc/adminhtml/system.xml

@@ -109,6 +109,11 @@
                     <label>Successful Order Status</label>
                     <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
                 </field>
+                <field id="Successful_Order_state" translate="label" type="select" sortOrder="17" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
+                    <label>Successful Order State</label>
+                    <source_model>Magento\Sales\Model\Config\Source\Order\Status</source_model>
+                </field>
             </group>
         </section>
     </system>

paygate/paygate-payweb-gateway/etc/module.xml

@@ -10,7 +10,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="PayGate_PayWeb" setup_version="2.4.9">
+    <module name="PayGate_PayWeb" setup_version="2.5.0">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Sales"/>

paygate/paygate-payweb-gateway/view/frontend/layout/checkout_index_index.xml

@@ -8,7 +8,7 @@
  * Released under the GNU General Public License
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <css src="PayGate_PayWeb::css/paygate_checkout.css"/>

paygate/paygate-payweb-gateway/view/frontend/layout/default.xml

@@ -8,7 +8,7 @@
  * Released under the GNU General Public License
  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column"
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <css src="PayGate_PayWeb::css/paygate_checkout.css"/>