From 6dc8903460771df09c13583086b765475be430dc Mon Sep 17 00:00:00 2001
From: Harry <harry.pujianto@veritrans.co.id>
Date: Fri, 1 Jul 2016 12:23:09 +0700
Subject: [PATCH] fix loading problem with OC 2.2

---
 catalog/controller/payment/veritrans.php        | 10 ++++++----
 catalog/controller/payment/veritransbca.php     |  8 +++++++-
 catalog/controller/payment/veritransbcains.php  |  6 +++++-
 catalog/controller/payment/veritransbni.php     |  6 +++++-
 catalog/controller/payment/veritransmandiri.php |  6 +++++-
 5 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/catalog/controller/payment/veritrans.php b/catalog/controller/payment/veritrans.php
index f34b8fa..b02ddf0 100755
--- a/catalog/controller/payment/veritrans.php
+++ b/catalog/controller/payment/veritrans.php
@@ -11,15 +11,17 @@ public function index() {
 
   	$data['pay_type'] = $this->config->get('veritrans_payment_type');
     $data['text_loading'] = $this->language->get('text_loading');
-
   	$data['process_order'] = $this->url->link('payment/veritrans/process_order');
 
-    if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/veritrans.tpl')) {
+    if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/veritrans.tpl')) {    
         return $this->load->view($this->config->get('config_template') . '/template/payment/veritrans.tpl',$data);
   	} else {
-  	  return $this->load->view('default/template/payment/veritrans.tpl', $data);
+      if (VERSION > 2.1 ) {
+        return $this->load->view('payment/veritrans', $data);
+      } else {
+        return $this->load->view('default/template/payment/veritrans.tpl', $data);
+      }
   	}
-
   }
 
   /**
diff --git a/catalog/controller/payment/veritransbca.php b/catalog/controller/payment/veritransbca.php
index 199d1f6..cee5551 100755
--- a/catalog/controller/payment/veritransbca.php
+++ b/catalog/controller/payment/veritransbca.php
@@ -17,7 +17,13 @@ public function index() {
     if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/veritransbca.tpl')) {
         return $this->load->view($this->config->get('config_template') . '/template/payment/veritransbca.tpl',$data);
     } else {
-      return $this->load->view('default/template/payment/veritransbca.tpl', $data);
+
+      if (VERSION > 2.1 ) {
+        return $this->load->view('payment/veritransbca', $data);
+      } else {
+        return $this->load->view('default/template/payment/veritransbca.tpl', $data);
+      }
+
     }
 
   }
diff --git a/catalog/controller/payment/veritransbcains.php b/catalog/controller/payment/veritransbcains.php
index 2941c9b..5dd66b2 100755
--- a/catalog/controller/payment/veritransbcains.php
+++ b/catalog/controller/payment/veritransbcains.php
@@ -17,7 +17,11 @@ public function index() {
     if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/veritransbcains.tpl')) {
         return $this->load->view($this->config->get('config_template') . '/template/payment/veritransbcains.tpl',$data);
     } else {
-      return $this->load->view('default/template/payment/veritransbcains.tpl', $data);
+      if (VERSION > 2.1 ) {
+        return $this->load->view('payment/veritransbcains', $data);
+      } else {
+        return $this->load->view('default/template/payment/veritransbcains.tpl', $data);
+      }
     }
 
   }
diff --git a/catalog/controller/payment/veritransbni.php b/catalog/controller/payment/veritransbni.php
index 5ff7735..815018a 100755
--- a/catalog/controller/payment/veritransbni.php
+++ b/catalog/controller/payment/veritransbni.php
@@ -17,7 +17,11 @@ public function index() {
     if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/veritransbni.tpl')) {
         return $this->load->view($this->config->get('config_template') . '/template/payment/veritransbni.tpl',$data);
   	} else {
-  	  return $this->load->view('default/template/payment/veritransbni.tpl', $data);
+      if (VERSION > 2.1 ) {
+        return $this->load->view('payment/veritransbni', $data);
+      } else {
+        return $this->load->view('default/template/payment/veritransbni.tpl', $data);
+      }
   	}
 
   }
diff --git a/catalog/controller/payment/veritransmandiri.php b/catalog/controller/payment/veritransmandiri.php
index ef1403a..d377082 100755
--- a/catalog/controller/payment/veritransmandiri.php
+++ b/catalog/controller/payment/veritransmandiri.php
@@ -17,7 +17,11 @@ public function index() {
     if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/payment/veritransmandiri.tpl')) {
         return $this->load->view($this->config->get('config_template') . '/template/payment/veritransmandiri.tpl',$data);
     } else {
-      return $this->load->view('default/template/payment/veritransmandiri.tpl', $data);
+      if (VERSION > 2.1 ) {
+        return $this->load->view('payment/veritransmandiri', $data);
+      } else {
+        return $this->load->view('default/template/payment/veritransmandiri.tpl', $data);
+      }
     }
 
   }