diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..78c7b31 Binary files /dev/null and b/.DS_Store differ diff --git a/upload/.DS_Store b/upload/.DS_Store new file mode 100644 index 0000000..2aba6a4 Binary files /dev/null and b/upload/.DS_Store differ diff --git a/upload/admin/.DS_Store b/upload/admin/.DS_Store new file mode 100644 index 0000000..c945417 Binary files /dev/null and b/upload/admin/.DS_Store differ diff --git a/upload/admin/controller/.DS_Store b/upload/admin/controller/.DS_Store new file mode 100644 index 0000000..8ad4d49 Binary files /dev/null and b/upload/admin/controller/.DS_Store differ diff --git a/upload/admin/controller/extension/.DS_Store b/upload/admin/controller/extension/.DS_Store new file mode 100644 index 0000000..53b57b6 Binary files /dev/null and b/upload/admin/controller/extension/.DS_Store differ diff --git a/upload/admin/controller/extension/payment/.DS_Store b/upload/admin/controller/extension/payment/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/upload/admin/controller/extension/payment/.DS_Store differ diff --git a/upload/admin/controller/extension/payment/paywithiyzico.php b/upload/admin/controller/extension/payment/paywithiyzico.php index 742f6d0..cfa8ef8 100644 --- a/upload/admin/controller/extension/payment/paywithiyzico.php +++ b/upload/admin/controller/extension/payment/paywithiyzico.php @@ -2,8 +2,8 @@ class ControllerExtensionPaymentPaywithiyzico extends Controller { - private $module_version = '1.3'; - private $module_product_name = 'eleven-1.3'; + private $module_version = '1.5'; + private $module_product_name = 'eleven-1.5'; private $error = array(); diff --git a/upload/admin/model/.DS_Store b/upload/admin/model/.DS_Store new file mode 100644 index 0000000..8ad4d49 Binary files /dev/null and b/upload/admin/model/.DS_Store differ diff --git a/upload/admin/model/extension/.DS_Store b/upload/admin/model/extension/.DS_Store new file mode 100644 index 0000000..53b57b6 Binary files /dev/null and b/upload/admin/model/extension/.DS_Store differ diff --git a/upload/admin/model/extension/payment/.DS_Store b/upload/admin/model/extension/payment/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/upload/admin/model/extension/payment/.DS_Store differ diff --git a/upload/admin/model/extension/payment/paywithiyzico.php b/upload/admin/model/extension/payment/paywithiyzico.php index 413d07c..8965cac 100644 --- a/upload/admin/model/extension/payment/paywithiyzico.php +++ b/upload/admin/model/extension/payment/paywithiyzico.php @@ -1,7 +1,7 @@ locale = $this->language->get('code'); + + $language = $this->config->get('payment_iyzico_language'); + $str_language = mb_strtolower($language); + + if(empty($str_language) or $str_language == 'null') + { + $paywithiyzico->locale = $this->language->get('code'); + }else { + $paywithiyzico->locale = $str_language; + } + $paywithiyzico->conversationId = $order_id; $paywithiyzico->price = $this->priceParser($this->itemPriceSubTotal($products) * $order_info['currency_value']); $paywithiyzico->paidPrice = $this->priceParser($order_info['total'] * $order_info['currency_value']); @@ -417,6 +427,16 @@ public function successPage() { $this->document->addStyle('catalog/view/javascript/paywithiyzico/paywithiyzico_success.css'); $data['continue'] = $this->url->link('account/order', '', true); + $language = $this->config->get('payment_iyzico_language'); + $str_language = mb_strtolower($language); + + if(empty($str_language) or $str_language == 'null') + { + $locale = $this->language->get('code'); + }else { + $locale = $str_language; + } + $data['locale'] = $locale; $data['column_left'] = $this->load->controller('common/column_left'); $data['column_right'] = $this->load->controller('common/column_right'); @@ -532,4 +552,4 @@ public function injectPwiLogoCss($route, &$data = false, &$output) { $output = str_replace($hook,$js,$output); } -} \ No newline at end of file +} diff --git a/upload/catalog/model/.DS_Store b/upload/catalog/model/.DS_Store new file mode 100644 index 0000000..8ad4d49 Binary files /dev/null and b/upload/catalog/model/.DS_Store differ diff --git a/upload/catalog/model/extension/.DS_Store b/upload/catalog/model/extension/.DS_Store new file mode 100644 index 0000000..53b57b6 Binary files /dev/null and b/upload/catalog/model/extension/.DS_Store differ diff --git a/upload/catalog/model/extension/payment/.DS_Store b/upload/catalog/model/extension/payment/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/upload/catalog/model/extension/payment/.DS_Store differ diff --git a/upload/catalog/model/extension/payment/paywithiyzico.php b/upload/catalog/model/extension/payment/paywithiyzico.php index dbba926..3ec988a 100644 --- a/upload/catalog/model/extension/payment/paywithiyzico.php +++ b/upload/catalog/model/extension/payment/paywithiyzico.php @@ -3,44 +3,79 @@ class ModelExtensionPaymentPaywithiyzico extends Model { public function getMethod($address, $total) { + $currency_code = $this->session->data['currency']; + if(!empty($currency_code) and $currency_code == 'TRY' or $currency_code == 'try') + { + $payment_paywithiyzico_geo_zone_id = $this->config->get('payment_paywithiyzico_geo_zone_id'); + $payment_paywithiyzico_geo_zone_id = $this->db->escape($payment_paywithiyzico_geo_zone_id); + $address_country_id = $this->db->escape($address['country_id']); + $address_zone_id = $this->db->escape($address['zone_id']); - $payment_paywithiyzico_geo_zone_id = $this->config->get('payment_paywithiyzico_geo_zone_id'); - $payment_paywithiyzico_geo_zone_id = $this->db->escape($payment_paywithiyzico_geo_zone_id); - $address_country_id = $this->db->escape($address['country_id']); - $address_zone_id = $this->db->escape($address['zone_id']); + $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone_to_geo_zone` WHERE `geo_zone_id` = '" . $payment_paywithiyzico_geo_zone_id . "' AND `country_id` = '" . $address_country_id . "' AND (`zone_id` = '" . $address_zone_id . "' OR `zone_id` = '0')"); - $query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone_to_geo_zone` WHERE `geo_zone_id` = '" . $payment_paywithiyzico_geo_zone_id . "' AND `country_id` = '" . $address_country_id . "' AND (`zone_id` = '" . $address_zone_id . "' OR `zone_id` = '0')"); + if ($this->config->get('payment_paywithiyzico_total') > $total) { + $status = false; + } elseif (!$this->config->get('payment_paywithiyzico_geo_zone_id')) { + $status = true; + } elseif ($query->num_rows) { + $status = true; + } else { + $status = false; + } - if ($this->config->get('payment_paywithiyzico_total') > $total) { - $status = false; - } elseif (!$this->config->get('payment_paywithiyzico_geo_zone_id')) { - $status = true; - } elseif ($query->num_rows) { - $status = true; - } else { - $status = false; - } + $language = $this->config->get('payment_iyzico_language'); + $str_language = mb_strtolower($language); + $this->load->language('extension/payment/paywithiyzico'); - $method_data = array(); - $this->load->language('extension/payment/paywithiyzico'); + if(empty($str_language) or $str_language == 'null') + { + $title_language = $this->language->get('pwi_img_title'). " " .$this->language->get('pwi_title'); + + }elseif ($str_language == 'tr') { + + $title_language = ''.''.'iyzico ile Öde'; + }else { + + $title_language = ''.''.'Pay with iyzico'; + } + + $method_data = array(); + + + + if ($status) { + $method_data = array( + 'code' => 'paywithiyzico', + 'title' => $title_language, + 'terms' => '', + 'sort_order' => $this->config->get('payment_paywithiyzico_sort_order') + ); + } + + return $method_data; + + } - if ($status) { - $method_data = array( - 'code' => 'paywithiyzico', - 'title' => $this->language->get('pwi_img_title'). " " .$this->language->get('pwi_title'), - 'terms' => '', - 'sort_order' => $this->config->get('payment_paywithiyzico_sort_order') - ); - } - return $method_data; } private function paywithiyzicoMultipLangTitle($title) { $this->load->language('extension/payment/paywithiyzico'); + $this->load->language('extension/payment/iyzico'); + $language = $this->config->get('payment_iyzico_language'); + $str_language = mb_strtolower($language); + + if(empty($str_language) or $str_language == 'null') + { + $title_language = $this->language->get('code'); + }else { + $title_language = $str_language; + } + + if($title) { $parser = explode('|',$title); @@ -50,7 +85,7 @@ private function paywithiyzicoMultipLangTitle($title) { foreach ($parser as $key => $parse) { $result = explode('=',$parse); - if($this->language->get('code') == $result[0]) { + if($title_language == $result[0]) { $new_title = $result[1]; break; } @@ -245,7 +280,7 @@ public function curlPost($json,$authorization_data,$url) { public function insertCardUserKey($customer_id,$card_user_key,$api_key) { - $insertCard = $this->db->query("INSERT INTO `" . DB_PREFIX . "paywithiyzico_card` SET + $insertCard = $this->db->query("INSERT INTO `" . DB_PREFIX . "paywithiyzico_card` SET `customer_id` = '" . $this->db->escape($customer_id) . "', `card_user_key` = '" . $this->db->escape($card_user_key) . "', `api_key` = '" . $this->db->escape($api_key) . "'"); @@ -270,9 +305,9 @@ public function findUserCardKey($customer_id,$api_key) { public function insertIyzicoOrder($order) { - $insertOrder = $this->db->query("INSERT INTO `" . DB_PREFIX . "paywithiyzico_order` SET + $insertOrder = $this->db->query("INSERT INTO `" . DB_PREFIX . "paywithiyzico_order` SET `payment_id` = '" . $this->db->escape($order->payment_id) . "', - `order_id` = '" . $this->db->escape($order->order_id) . "', + `order_id` = '" . $this->db->escape($order->order_id) . "', `total_amount` = '" . $this->db->escape($order->total_amount) . "', `status` = '" . $this->db->escape($order->status) . "'"); @@ -361,4 +396,4 @@ public function getUserCreateDate($user_id) { -} \ No newline at end of file +} diff --git a/upload/catalog/view/.DS_Store b/upload/catalog/view/.DS_Store new file mode 100644 index 0000000..7b2ed7f Binary files /dev/null and b/upload/catalog/view/.DS_Store differ diff --git a/upload/catalog/view/theme/.DS_Store b/upload/catalog/view/theme/.DS_Store new file mode 100644 index 0000000..0f32880 Binary files /dev/null and b/upload/catalog/view/theme/.DS_Store differ diff --git a/upload/catalog/view/theme/default/.DS_Store b/upload/catalog/view/theme/default/.DS_Store new file mode 100644 index 0000000..7e319d2 Binary files /dev/null and b/upload/catalog/view/theme/default/.DS_Store differ diff --git a/upload/catalog/view/theme/default/template/.DS_Store b/upload/catalog/view/theme/default/template/.DS_Store new file mode 100644 index 0000000..8ad4d49 Binary files /dev/null and b/upload/catalog/view/theme/default/template/.DS_Store differ diff --git a/upload/catalog/view/theme/default/template/extension/.DS_Store b/upload/catalog/view/theme/default/template/extension/.DS_Store new file mode 100644 index 0000000..ac7dff7 Binary files /dev/null and b/upload/catalog/view/theme/default/template/extension/.DS_Store differ diff --git a/upload/catalog/view/theme/default/template/extension/payment/.DS_Store b/upload/catalog/view/theme/default/template/extension/payment/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/upload/catalog/view/theme/default/template/extension/payment/.DS_Store differ diff --git a/upload/catalog/view/theme/default/template/extension/payment/paywithiyzico_success.twig b/upload/catalog/view/theme/default/template/extension/payment/paywithiyzico_success.twig index 957e142..546b07b 100644 --- a/upload/catalog/view/theme/default/template/extension/payment/paywithiyzico_success.twig +++ b/upload/catalog/view/theme/default/template/extension/payment/paywithiyzico_success.twig @@ -1,6 +1,6 @@ {{ header }}