diff --git a/iyzipay/LICENSE b/iyzipay/LICENSE old mode 100644 new mode 100755 index d305f1f..0efa8b7 --- a/iyzipay/LICENSE +++ b/iyzipay/LICENSE @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. +SOFTWARE. \ No newline at end of file diff --git a/iyzipay/classes/IyzipayCheckoutFormObject.php b/iyzipay/classes/IyzipayCheckoutFormObject.php old mode 100644 new mode 100755 index 61f5c30..808e0e3 --- a/iyzipay/classes/IyzipayCheckoutFormObject.php +++ b/iyzipay/classes/IyzipayCheckoutFormObject.php @@ -58,7 +58,7 @@ public static function option($params, $currency, $context, $apiKey) $iyzico->forceThreeDS = '0'; $iyzico->callbackUrl = $httpProtocol.htmlspecialchars($_SERVER['HTTP_HOST'], ENT_COMPAT, 'UTF-8').__PS_BASE_URI__.'index.php?module_action=init&fc=module&module=iyzipay&controller=callback'; $iyzico->cardUserKey = IyzipayModel::findUserCardKey($params['cookie']->id_customer, $apiKey); - $iyzico->paymentSource = _PS_VERSION_.'|PIE|1.0'; + $iyzico->paymentSource = _PS_VERSION_.'|PRESTASHOP|PIE|1.0.1'; return $iyzico; } @@ -235,4 +235,4 @@ public static function cancelObject($locale, $paymentId, $ip) return $responseObject; } -} +} \ No newline at end of file diff --git a/iyzipay/classes/IyzipayHelper.php b/iyzipay/classes/IyzipayHelper.php old mode 100644 new mode 100755 index 0c68d93..7bb4c0e --- a/iyzipay/classes/IyzipayHelper.php +++ b/iyzipay/classes/IyzipayHelper.php @@ -76,4 +76,4 @@ public static function priceParser($price) return strrev(substr($priceReversed, $subStrIndex)); } -} +} \ No newline at end of file diff --git a/iyzipay/classes/IyzipayModel.php b/iyzipay/classes/IyzipayModel.php old mode 100644 new mode 100755 index 3231e9e..c1867fd --- a/iyzipay/classes/IyzipayModel.php +++ b/iyzipay/classes/IyzipayModel.php @@ -122,4 +122,4 @@ public static function updateOrderPayment($price, $reference) return Db::getInstance()->execute($sql); } -} +} \ No newline at end of file diff --git a/iyzipay/classes/IyzipayOverlayScript.php b/iyzipay/classes/IyzipayOverlayScript.php old mode 100644 new mode 100755 index 3344786..9867725 --- a/iyzipay/classes/IyzipayOverlayScript.php +++ b/iyzipay/classes/IyzipayOverlayScript.php @@ -41,4 +41,4 @@ public static function generateOverlayScriptObject($isoCode, $randNumer) return $overlayObject; } -} +} \ No newline at end of file diff --git a/iyzipay/classes/IyzipayPkiStringBuilder.php b/iyzipay/classes/IyzipayPkiStringBuilder.php old mode 100644 new mode 100755 index 0852c43..6bcaaa9 --- a/iyzipay/classes/IyzipayPkiStringBuilder.php +++ b/iyzipay/classes/IyzipayPkiStringBuilder.php @@ -117,4 +117,4 @@ public static function authorization($pkiString, $apiKey, $secretKey, $rand) return $authorization; } -} +} \ No newline at end of file diff --git a/iyzipay/classes/IyzipayRequest.php b/iyzipay/classes/IyzipayRequest.php old mode 100644 new mode 100755 index 96fa305..13936c6 --- a/iyzipay/classes/IyzipayRequest.php +++ b/iyzipay/classes/IyzipayRequest.php @@ -104,4 +104,4 @@ public static function curlPost($json, $authorization, $endpoint) return $result; } -} +} \ No newline at end of file diff --git a/iyzipay/classes/index.php b/iyzipay/classes/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/classes/index.php +++ b/iyzipay/classes/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/config.xml b/iyzipay/config.xml old mode 100644 new mode 100755 diff --git a/iyzipay/config_tr.xml b/iyzipay/config_tr.xml index 5dc9b31..be6e8d5 100644 --- a/iyzipay/config_tr.xml +++ b/iyzipay/config_tr.xml @@ -2,7 +2,7 @@ iyzipay - + diff --git a/iyzipay/controllers/front/callback.php b/iyzipay/controllers/front/callback.php old mode 100644 new mode 100755 index 17a2980..601fcc0 --- a/iyzipay/controllers/front/callback.php +++ b/iyzipay/controllers/front/callback.php @@ -240,4 +240,4 @@ private function cancelPayment($locale, $paymentId, $remoteIpAddr, $apiKey, $sec $errorMessage = $this->l('uniqError'); throw new \Exception($errorMessage); } -} +} \ No newline at end of file diff --git a/iyzipay/controllers/front/index.php b/iyzipay/controllers/front/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/controllers/front/index.php +++ b/iyzipay/controllers/front/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/controllers/index.php b/iyzipay/controllers/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/controllers/index.php +++ b/iyzipay/controllers/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/index.php b/iyzipay/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/index.php +++ b/iyzipay/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/iyzipay.php b/iyzipay/iyzipay.php old mode 100644 new mode 100755 index b38d82b..fabcddd --- a/iyzipay/iyzipay.php +++ b/iyzipay/iyzipay.php @@ -44,7 +44,7 @@ public function __construct() { $this->name = 'iyzipay'; $this->tab = 'payments_gateways'; - $this->version = '1.0.0'; + $this->version = '1.0.1'; $this->author = 'iyzico'; $this->need_instance = 1; @@ -373,6 +373,10 @@ public function hookFooter($params) public function hookPaymentOptions($params) { + + if(!$params['cart']->id_carrier) + return $this->paymentOptionResult(); + $iyzicoCheckoutFormResponse = $this->checkoutFormGenerate($params); $phpCheckVersion = $this->versionCheck(); @@ -570,4 +574,4 @@ private function iyziMultipLangTitle($title, $isoCode) return $title; } -} +} \ No newline at end of file diff --git a/iyzipay/logo.png b/iyzipay/logo.png index 1712f17..a4fd8fb 100644 Binary files a/iyzipay/logo.png and b/iyzipay/logo.png differ diff --git a/iyzipay/sql/index.php b/iyzipay/sql/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/sql/index.php +++ b/iyzipay/sql/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/sql/install.php b/iyzipay/sql/install.php old mode 100644 new mode 100755 index 5d5b1a5..a584e52 --- a/iyzipay/sql/install.php +++ b/iyzipay/sql/install.php @@ -50,4 +50,4 @@ if (Db::getInstance()->execute($query) == false) { return false; } -} +} \ No newline at end of file diff --git a/iyzipay/sql/uninstall.php b/iyzipay/sql/uninstall.php old mode 100644 new mode 100755 index 041f00d..2a5a510 --- a/iyzipay/sql/uninstall.php +++ b/iyzipay/sql/uninstall.php @@ -38,4 +38,4 @@ if (Db::getInstance()->execute($query) == false) { return false; } -} +} \ No newline at end of file diff --git a/iyzipay/translations/en.php b/iyzipay/translations/en.php old mode 100644 new mode 100755 index 94d4bd9..2f80659 --- a/iyzipay/translations/en.php +++ b/iyzipay/translations/en.php @@ -53,4 +53,4 @@ $_MODULE['<{iyzipay}prestashop>confirmation_cd430c2eb4b87fb3b49320bd21af074e'] = 'expert customer support team.'; $_MODULE['<{iyzipay}prestashop>confirmation_7569ab9b5973795ce8c9fc870d38d8e1'] = 'Your order on %s has not been accepted.'; $_MODULE['<{iyzipay}prestashop>confirmation_caa4088f1d295cf8ce8e358eb975ab32'] = 'Please, try to order again.'; -$_MODULE['<{iyzipay}prestashop>error_a25c753ee3e4be15ec0daa5a40deb7b8'] = 'An error occurred'; +$_MODULE['<{iyzipay}prestashop>error_a25c753ee3e4be15ec0daa5a40deb7b8'] = 'An error occurred'; \ No newline at end of file diff --git a/iyzipay/translations/index.php b/iyzipay/translations/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/translations/index.php +++ b/iyzipay/translations/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/translations/tr.php b/iyzipay/translations/tr.php old mode 100644 new mode 100755 index cee63f4..7aa1fb8 --- a/iyzipay/translations/tr.php +++ b/iyzipay/translations/tr.php @@ -53,4 +53,4 @@ $_MODULE['<{iyzipay}prestashop>confirmation_cd430c2eb4b87fb3b49320bd21af074e'] = 'uzman müşteri destek ekibi.'; $_MODULE['<{iyzipay}prestashop>confirmation_7569ab9b5973795ce8c9fc870d38d8e1'] = '%s üzerindeki siparişiniz kabul edilmedi. '; $_MODULE['<{iyzipay}prestashop>confirmation_caa4088f1d295cf8ce8e358eb975ab32'] = 'Lütfen, tekrar deneyiniz.'; -$_MODULE['<{iyzipay}prestashop>error_a25c753ee3e4be15ec0daa5a40deb7b8'] = 'Bir hata oluştu'; +$_MODULE['<{iyzipay}prestashop>error_a25c753ee3e4be15ec0daa5a40deb7b8'] = 'Bir hata oluştu'; \ No newline at end of file diff --git a/iyzipay/views/css/back.css b/iyzipay/views/css/back.css old mode 100644 new mode 100755 index 75d13e9..e0e6bd5 --- a/iyzipay/views/css/back.css +++ b/iyzipay/views/css/back.css @@ -24,4 +24,4 @@ * * Don't forget to prefix your containers with your own identifier * to avoid any conflicts with others containers. -*/ +*/ \ No newline at end of file diff --git a/iyzipay/views/css/front.css b/iyzipay/views/css/front.css old mode 100644 new mode 100755 index 75d13e9..e0e6bd5 --- a/iyzipay/views/css/front.css +++ b/iyzipay/views/css/front.css @@ -24,4 +24,4 @@ * * Don't forget to prefix your containers with your own identifier * to avoid any conflicts with others containers. -*/ +*/ \ No newline at end of file diff --git a/iyzipay/views/css/index.php b/iyzipay/views/css/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/css/index.php +++ b/iyzipay/views/css/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/img/cards.png b/iyzipay/views/img/cards.png index a2bc305..255c12f 100644 Binary files a/iyzipay/views/img/cards.png and b/iyzipay/views/img/cards.png differ diff --git a/iyzipay/views/img/index.php b/iyzipay/views/img/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/img/index.php +++ b/iyzipay/views/img/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/img/template_1_cards.png b/iyzipay/views/img/template_1_cards.png deleted file mode 100644 index 0720b3f..0000000 Binary files a/iyzipay/views/img/template_1_cards.png and /dev/null differ diff --git a/iyzipay/views/img/template_1_logo.png b/iyzipay/views/img/template_1_logo.png deleted file mode 100644 index 880ce7e..0000000 Binary files a/iyzipay/views/img/template_1_logo.png and /dev/null differ diff --git a/iyzipay/views/img/template_2_cards.png b/iyzipay/views/img/template_2_cards.png deleted file mode 100644 index 0720b3f..0000000 Binary files a/iyzipay/views/img/template_2_cards.png and /dev/null differ diff --git a/iyzipay/views/img/template_2_logo.png b/iyzipay/views/img/template_2_logo.png deleted file mode 100644 index ba4d56f..0000000 Binary files a/iyzipay/views/img/template_2_logo.png and /dev/null differ diff --git a/iyzipay/views/index.php b/iyzipay/views/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/index.php +++ b/iyzipay/views/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/js/back.js b/iyzipay/views/js/back.js old mode 100644 new mode 100755 diff --git a/iyzipay/views/js/front.js b/iyzipay/views/js/front.js old mode 100644 new mode 100755 index cfd9da4..e0e6bd5 --- a/iyzipay/views/js/front.js +++ b/iyzipay/views/js/front.js @@ -24,5 +24,4 @@ * * Don't forget to prefix your containers with your own identifier * to avoid any conflicts with others containers. -*/ - +*/ \ No newline at end of file diff --git a/iyzipay/views/js/index.php b/iyzipay/views/js/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/js/index.php +++ b/iyzipay/views/js/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/templates/admin/configure.tpl b/iyzipay/views/templates/admin/configure.tpl old mode 100644 new mode 100755 index 32f6346..d0c89e3 --- a/iyzipay/views/templates/admin/configure.tpl +++ b/iyzipay/views/templates/admin/configure.tpl @@ -34,4 +34,4 @@
{include file='./template_1.tpl'}
{include file='./template_2.tpl'}
{include file='./template_3.tpl'}
- + \ No newline at end of file diff --git a/iyzipay/views/templates/admin/index.php b/iyzipay/views/templates/admin/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/templates/admin/index.php +++ b/iyzipay/views/templates/admin/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/templates/admin/template_1.tpl b/iyzipay/views/templates/admin/template_1.tpl old mode 100644 new mode 100755 index b1cc187..999f849 --- a/iyzipay/views/templates/admin/template_1.tpl +++ b/iyzipay/views/templates/admin/template_1.tpl @@ -25,13 +25,400 @@
-
- +
+ + + + iyzico + + + + + + + + + +

V: 1.0.1

Hemen Başla !

-

https://merchant.iyzipay.com veya https://sandbox-merchant.iyzipay.com adresi üzerinden müşteri bilgileriniz ile giriş yapınız. Panele eriştiğiniz sırada sağ üst köşede profil bilgilerinizi göreceksiniz. Profil bilgilerinizin üzerine tıkladıktan sonra “Ayarlar” menüsüne tıklayınız. “API Anahtları" alanından “API Anahtarı ve Güvenlik Anahtarı" bilgilerinizi kopyalayıp PrestaShop iyzico panelinde bulunan “API Anahtarı” ve “Güvenlik Anahtarı” alanlarına yapıştırınız..

-
+
\ No newline at end of file diff --git a/iyzipay/views/templates/admin/template_2.tpl b/iyzipay/views/templates/admin/template_2.tpl old mode 100644 new mode 100755 diff --git a/iyzipay/views/templates/admin/template_3.tpl b/iyzipay/views/templates/admin/template_3.tpl old mode 100644 new mode 100755 diff --git a/iyzipay/views/templates/front/confirmation.tpl b/iyzipay/views/templates/front/confirmation.tpl old mode 100644 new mode 100755 diff --git a/iyzipay/views/templates/front/error.tpl b/iyzipay/views/templates/front/error.tpl old mode 100644 new mode 100755 diff --git a/iyzipay/views/templates/front/index.php b/iyzipay/views/templates/front/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/templates/front/index.php +++ b/iyzipay/views/templates/front/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/templates/front/iyzi_error.tpl b/iyzipay/views/templates/front/iyzi_error.tpl old mode 100644 new mode 100755 diff --git a/iyzipay/views/templates/front/iyzico.tpl b/iyzipay/views/templates/front/iyzico.tpl old mode 100644 new mode 100755 index 0e2905c..be2894b --- a/iyzipay/views/templates/front/iyzico.tpl +++ b/iyzipay/views/templates/front/iyzico.tpl @@ -31,13 +31,13 @@ {/if}
-
+

iyzico

@@ -78,8 +78,8 @@ $( document ).ready(function() { if(contractCheck.length == 1) { - $("input[name='payment-option']").click(function () { - $("button[class='btn btn-primary center-block']").show(); + $("input[name='payment-option']").click(function () { + $("button[class='btn btn-primary center-block']").show(); if ($("input[id='conditions_to_approve[terms-and-conditions]']").is(':checked')) { @@ -95,9 +95,9 @@ $( document ).ready(function() { } - }); + }); - $("input[data-module-name='iyzipay']").click(function () { + $("input[data-module-name='iyzipay']").click(function () { $("button[class='btn btn-primary center-block']").hide(); @@ -122,9 +122,19 @@ $( document ).ready(function() { }); } else { - $("#loadingContainer").hide(); - $("#iyzipay-checkout-form").show(); - $('#iyziCards').hide(); + $("input[name='payment-option']").click(function () { + $("button[class='btn btn-primary center-block']").show(); + }); + + $("input[data-module-name='iyzipay']").click(function () { + + $("button[class='btn btn-primary center-block']").hide(); + + $("#loadingContainer").hide(); + $('#iyziCards').hide(); + $("#iyzipay-checkout-form").show(); + + }); } $(".material-icons").click(function(){ @@ -153,4 +163,4 @@ $( document ).ready(function() { -{/literal} +{/literal} \ No newline at end of file diff --git a/iyzipay/views/templates/hook/footer.tpl b/iyzipay/views/templates/hook/footer.tpl old mode 100644 new mode 100755 diff --git a/iyzipay/views/templates/hook/index.php b/iyzipay/views/templates/hook/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/templates/hook/index.php +++ b/iyzipay/views/templates/hook/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file diff --git a/iyzipay/views/templates/index.php b/iyzipay/views/templates/index.php old mode 100644 new mode 100755 index 7f0deb7..f1a0df9 --- a/iyzipay/views/templates/index.php +++ b/iyzipay/views/templates/index.php @@ -32,4 +32,4 @@ header('Pragma: no-cache'); header('Location: ../'); -exit; +exit; \ No newline at end of file