Merge pull request #2 from wirecard/updateToOpenCart2.3.0.2

Update to OpenCart2.3.0.2 compatibility
qenta-cee · Nov 8, 2016 · 1850f5e · 1850f5e
2 parents 22e31a4 + 1dd7702
commit 1850f5e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 62 deletions.
diff --git a/catalog/controller/extension/payment/wirecard.php b/catalog/controller/extension/payment/wirecard.php
@@ -107,28 +107,25 @@ public function index()
      */
     public function init()
     {
-        /*if (!isset($_POST['wirecard_checkout_page_window_name']) || !isset($_SESSION['order_id'])) {
-            $this->response->redirect($this->url->link('checkout/checkout', '', true));
-        }*/
         if (isset($_POST['wirecard_checkout_page_window_name'])) {
             $data['window_name'] = $_POST['wirecard_checkout_page_window_name'];
         }
 
         if (($this->payment_type == WirecardCEE_QPay_PaymentType::INSTALLMENT || $this->payment_type == WirecardCEE_QPay_PaymentType::INVOICE) && !isset($_POST['birthday'])) {
-            $this->response->redirect($this->url->link('checkout/checkout', '', true));
+            $this->checkout();
         }
 
         $birthday = null;
         if ($this->payment_type == WirecardCEE_QPay_PaymentType::INSTALLMENT || $this->payment_type == WirecardCEE_QPay_PaymentType::INVOICE) {
             $birthday = date_create($_POST['birthday']);
             if (!$birthday) {
-                $this->response->redirect($this->url->link('checkout/checkout', '', true));
+                $this->checkout();
             }
 
             $diff = $birthday->diff(new DateTime());
             $customerAge = $diff->format('%y');
             if ($customerAge < self::INVOICE_INSTALLMENT_MIN_AGE) {
-                $this->response->redirect($this->url->link('checkout/checkout', '', true));
+                $this->checkout();
             }
         }
 
@@ -176,7 +173,7 @@ public function init()
             }
         } else {
             $this->session->data['error'] = $this->language->get('error_init');
-            $this->response->redirect($this->url->link('checkout/checkout', '', true));
+            $this->checkout();
         }
 
         // Template Output
@@ -282,20 +279,12 @@ public function callback()
                     /**
                      * @var $return WirecardCEE_QPay_Return_Cancel
                      */
-                    // $this->model_checkout_order->addOrderHistory($order_id, $cancelStatus);
-                    // $this->model_checkout_order->update($order_id, $cancelStatus, $comment,
-                    // false);
                     break;
 
                 case WirecardCEE_QPay_ReturnFactory::STATE_FAILURE:
                     /**
                      * @var $return WirecardCEE_QPay_Return_Failure
                      */
-                    // $this->model_checkout_order->addOrderHistory($order_id, $failureStatus, '',
-                    // false);
-                    //$this->model_checkout_order->update($order_id, $failureStatus, $return->getErrors()->getConsumerMessage(), false);
-                    //$this->model_extension_payment_wirecard->write_log($e->getMessage());
-                    $this->session->data['error'] = $return->getError()->getMessage();
                     break;
 
                 default:
@@ -313,22 +302,25 @@ public function callback()
      */
     public function success()
     {
-        $this->response->redirect($this->url->link('checkout/success', '', true));
+        echo '<script type="text/javascript"> parent.location ="' . $this->url->link('checkout/success') . '"</script>';
+        echo '<noscript>Javascript muss aktiviert sein</noscript>';
     }
 
     /**
      * redirection of canceled or not finished payment
      */
     public function checkout()
     {
-        $this->response->redirect($this->url->link('checkout/checkout', '', true));
+        echo '<script type="text/javascript"> parent.location ="' . $this->url->link('checkout/checkout') . '"</script>';
+        echo '<noscript>Javascript muss aktiviert sein</noscript>';
     }
 
     /**
      * redirection of failed payment
      */
     public function failure()
     {
-        $this->response->redirect($this->url->link('checkout/failure', '', true));
+        echo '<script type="text/javascript"> parent.location ="' . $this->url->link('checkout/failure') . '"</script>';
+        echo '<noscript>Javascript muss aktiviert sein</noscript>';
     }
 }
diff --git a/catalog/view/theme/default/template/extension/payment/wirecard_error.tpl b/catalog/view/theme/default/template/extension/payment/wirecard_error.tpl