Merge pull request #21 from sozgat/pwi

Opencart3.x PWI 1.3v

upload/admin/controller/extension/payment/paywithiyzico.php

@@ -2,8 +2,8 @@
 
 class ControllerExtensionPaymentPaywithiyzico extends Controller {
 
-    private $module_version      = '1.2';
-    private $module_product_name = 'eleven';
+    private $module_version      = '1.3';
+    private $module_product_name = 'eleven-1.3';
 
     private $error = array();
 
@@ -68,6 +68,7 @@ public function index() {
         $data['footer']         = $this->load->controller('common/footer');
         $data['locale']         = $this->language->get('code');
         $data['version']        = $this->module_version;
+        $data['pwi_module_logo']=$this->language->get('pwi_module_setting_logo');
 
 
         foreach ($this->fields as $key => $field) {

upload/admin/language/en-gb/extension/payment/paywithiyzico.php

@@ -2,7 +2,7 @@
 
 // Heading
 $_['heading_title']         			= 'Pay with iyzico';
-$_['text_paywithiyzico'] 				= '<a href="https://www.iyzico.com/isim-icin/iyzico-ile-ode" target="_blank"><img src="view/image/payment/paywithiyzico_logo.png" alt="paywithiyzico" title="paywithiyzico" /></a>';
+$_['text_paywithiyzico'] 				= '<a href="https://www.iyzico.com/isim-icin/iyzico-ile-ode" target="_blank"><img width="40%" src="view/image/payment/pay-with-iyzico.svg?v=1.0.0" alt="paywithiyzico" title="paywithiyzico" /></a>';
 $_['general_select']        			= 'Select';
 $_['live']                  			= 'Live';
 $_['sandbox']               			= 'Sandbox / Test';
@@ -52,6 +52,7 @@
 $_['current_version_name'] 				= 'Old Version:';
 $_['new_version_name'] 					= 'New Version:';
 $_['description_name'] 					= 'Description:';
+$_['pwi_module_setting_logo']           = '<img width="15%" src="view/image/payment/pay-with-iyzico.svg?v=1.0.0" alt="paywithiyzico" title="paywithiyzico"/>';
 
 
 

upload/admin/language/tr-tr/extension/payment/paywithiyzico.php

@@ -2,7 +2,7 @@
 
 // Heading
 $_['heading_title']         		= 'iyzico ile Öde';
-$_['text_paywithiyzico'] 			= '<a href="https://www.iyzico.com/isim-icin/iyzico-ile-ode" target="_blank"><img src="view/image/payment/paywithiyzico_logo.png" alt="paywithiyzico" title="paywithiyzico" /></a>';
+$_['text_paywithiyzico'] 			= '<a href="https://www.iyzico.com/isim-icin/iyzico-ile-ode" target="_blank"><img width="40%" src="view/image/payment/pay-with-iyzico-tr.svg?v=1.0.0" alt="paywithiyzico" title="paywithiyzico" /></a>';
 $_['general_select']        		= 'Seçiniz';
 $_['live']                  		= 'Live';
 $_['sandbox']               		= 'Sandbox / Test';
@@ -53,4 +53,5 @@
 $_['paywithiyzico_update_screen'] 			= 'İYZİCO GÜNCELLEME EKRANI';
 $_['current_version_name'] 			= 'Mevcur Sürümünüz:';
 $_['new_version_name'] 				= 'Yeni Sürümünüz:';
-$_['description_name'] 				= 'Açıklama:';
+$_['description_name'] 				= 'Açıklama:';
+$_['pwi_module_setting_logo']       = '<img width="15%" src="view/image/payment/pay-with-iyzico-tr.svg?v=1.0.0" alt="paywithiyzico" title="paywithiyzico"/>';

upload/admin/model/extension/payment/paywithiyzico.php

@@ -1,7 +1,7 @@
 <?php
 class ModelExtensionPaymentPaywithiyzico extends Model {
-    private $module_version 	 = '1.2';
-    private $module_product_name = 'eleven';
+    private $module_version 	 = VERSION;
+    private $module_product_name = 'eleven-1.3';
 
 
     public function install() {

upload/admin/view/template/extension/payment/paywithiyzico.twig

@@ -17,7 +17,7 @@
         <div class="form-group required">
             <div class="panel-body">
                 <div>
-                    <img style="width: 10%" src="view/image/payment/paywithiyzico_logo.png" alt="paywithiyzico" title="paywithiyzico"/>
+                    {{ pwi_module_logo }}
                     <span><strong>v:</strong>{{ version }}</span>
                 </div>
                 <form action="{{ action }}" method="post" enctype="multipart/form-data" id="form-payment" onsubmit="return getApiValid()" class="form-horizontal">

upload/catalog/controller/extension/payment/paywithiyzico.php

@@ -1,8 +1,8 @@
 <?php
 
 class ControllerExtensionPaymentPaywithiyzico extends Controller {
-    private $module_version      = '1.2';
-    private $module_product_name = 'eleven-1.2';
+    private $module_version      = VERSION;
+    private $module_product_name = 'eleven-1.3';
 
 
     private function setcookieSameSite($name, $value, $expire, $path, $domain, $secure, $httponly) {
@@ -61,7 +61,7 @@ public function index() {
 
         $api_key                               = $this->config->get('payment_iyzico_api_key');
         $secret_key                            = $this->config->get('payment_iyzico_secret_key');
-        $payment_source                        = "OPENCART-".$this->module_version."|".$this->module_product_name."|".$this->config->get('payment_paywithiyzico_design');
+        $payment_source                        = "OPENCART-".$this->module_version."|".$this->module_product_name."|PWI";
 
 
         $user_create_date                      = $this->model_extension_payment_paywithiyzico->getUserCreateDate($user_id);

upload/catalog/language/en-gb/extension/payment/paywithiyzico.php

@@ -1,7 +1,7 @@
 <?php
 // Text
 $_['pwi_title'] = 'Pay with iyzico';
-$_['pwi_img_title'] 			= '<img style="width: 30%" src="admin/view/image/payment/paywithiyzico_logo.png"/>';
+$_['pwi_img_title'] 			= '<img width="20%" src="admin/view/image/payment/pay-with-iyzico.svg"/>';
 $_['payment_failed'] 		 	= 'Payment Failed';
 $_['payment_field_desc'] 	 	= 'Payment ID: ';
 $_['installement_field_desc'] 	= ' Installement ';

upload/catalog/language/tr-tr/extension/payment/paywithiyzico.php

@@ -1,7 +1,7 @@
 <?php
 // Text
 $_['pwi_title'] = 'iyzico ile Öde';
-$_['pwi_img_title'] 			= '<img style="width: 30%" src="admin/view/image/payment/paywithiyzico_logo_tr.png"/>';
+$_['pwi_img_title'] 			= '<img width="20%" src="admin/view/image/payment/pay-with-iyzico-tr.svg"/>';
 $_['payment_failed'] 		  	= 'Ödeme Başarısız';
 $_['payment_field_desc'] 	 	= 'Ödeme Numarası: ';
 $_['installement_field_desc'] 	= ' Taksit ';