Use of order-confirmation page trackers compliance

khipu · May 11, 2020 · 0016403 · 0016403
1 parent 0069226
commit 0016403
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 24 deletions.
diff --git a/KhipuPostBack.php b/KhipuPostBack.php
@@ -18,7 +18,7 @@
 class KhipuPostback
 {
 
-    const PLUGIN_VERSION = '4.0.9';
+    const PLUGIN_VERSION = '4.0.10';
 
     public function init()
     {

diff --git a/config.xml b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>khipupayment</name>
     <displayName><![CDATA[khipu]]></displayName>
-    <version><![CDATA[4.0.9]]></version>
+    <version><![CDATA[4.0.10]]></version>
     <description><![CDATA[Pago usando khipu]]></description>
     <author><![CDATA[khipu]]></author>
     <tab><![CDATA[payments_gateways]]></tab>

diff --git a/config_es.xml b/config_es.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>khipupayment</name>
 	<displayName><![CDATA[khipu]]></displayName>
-	<version><![CDATA[4.0.9]]></version>
+	<version><![CDATA[4.0.10]]></version>
 	<description><![CDATA[Recibe pagos con khipu]]></description>
 	<author><![CDATA[khipu]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>

diff --git a/controllers/front/manual.php b/controllers/front/manual.php
@@ -71,7 +71,7 @@ public function initContent()
         $opts = array(
             'transaction_id' => $order->reference
         ,
-            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference))
+            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference, "cartId"=>$cart->id))
         ,
             'cancel_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"cancel", "reference"=>$order->reference))
         ,

diff --git a/controllers/front/payme.php b/controllers/front/payme.php
@@ -70,7 +70,7 @@ public function initContent()
         $opts = array(
             'transaction_id' => $order->reference
         ,
-            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference))
+            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference, "cartId"=>$cart->id))
         ,
             'cancel_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"cancel", "reference"=>$order->reference))
         ,

diff --git a/controllers/front/simplified.php b/controllers/front/simplified.php
@@ -71,7 +71,7 @@ public function initContent()
         $opts = array(
             'transaction_id' => $order->reference
         ,
-            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference))
+            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference, "cartId"=>$cart->id))
         ,
             'cancel_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"cancel", "reference"=>$order->reference))
         ,

diff --git a/controllers/front/validate.php b/controllers/front/validate.php
@@ -32,6 +32,7 @@ public function initContent()
 
     private function handleGET()
     {
+        $cart_id = Tools::getValue('cartId');
         $reference = Tools::getValue('reference');
         $orders = Order::getByReference($reference);
         if (count($orders) == 0) {
@@ -43,8 +44,10 @@ private function handleGET()
             );
         }
 
+
         $customer = $orders[0]->getCustomer();
 
+
         if (Tools::getValue('return') == 'cancel') {
             foreach ($orders as $order) {
                 if ($order->current_state == (int)Configuration::get('PS_OS_KHIPU_OPEN')) {
@@ -60,21 +63,15 @@ private function handleGET()
 
         } else {
             if (Tools::getValue('return') == 'ok') {
-                if ($this->context->customer->isLogged()) {
-                    Tools::redirect(
-                        Context::getContext()->link->getPageLink(
-                            'order-detail', true, null,
-                            array("id_order" => $orders[0]->id)
-                        )
-                    );
-                } else {
-                    Tools::redirect(
-                        Context::getContext()->link->getPageLink(
-                            'guest-tracking', true, null,
-                            array("order_reference" => $orders[0]->reference, "email" => $customer->email)
-                        )
-                    );
-                }
+                Tools::redirect(
+                    Context::getContext()->link->getPageLink(
+                        'order-confirmation', true, null,
+                        array("id_cart" => $cart_id
+                        , "id_module" => Module::getInstanceByName($orders[0]->module)->id
+                        , "id_order" => $orders[0]->id
+                        , "key" => $customer->secure_key)
+                    )
+                );
             }
         }
     }

diff --git a/controllers/front/webpay.php b/controllers/front/webpay.php
@@ -71,7 +71,7 @@ public function initContent()
         $opts = array(
             'transaction_id' => $order->reference
         ,
-            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference))
+            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference, "cartId"=>$cart->id))
         ,
             'cancel_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"cancel", "reference"=>$order->reference))
         ,

diff --git a/controllers/front/webpaypsp.php b/controllers/front/webpaypsp.php
@@ -71,7 +71,7 @@ public function initContent()
         $opts = array(
             'transaction_id' => $order->reference
         ,
-            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference))
+            'return_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"ok", "reference"=>$order->reference, "cartId"=>$cart->id))
         ,
             'cancel_url' => Context::getContext()->link->getModuleLink($this->module->name, 'validate', array("return"=>"cancel", "reference"=>$order->reference))
         ,

diff --git a/khipupayment.php b/khipupayment.php
@@ -36,7 +36,7 @@ public function __construct()
     {
         $this->name = 'khipupayment';
         $this->tab = 'payments_gateways';
-        $this->version = '4.0.9';
+        $this->version = '4.0.10';
         $this->apiVersion = '2.0';
         $this->ps_versions_compliancy = array('min' => '1.7', 'max' => _PS_VERSION_);
         $this->author = 'Khipu SpA';