Merge pull request #3 from mehmetselim/master

Plug-In Update

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.

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;
     }
-}
+}

iyzipay/classes/IyzipayHelper.php

@@ -76,4 +76,4 @@ public static function priceParser($price)
 
         return strrev(substr($priceReversed, $subStrIndex));
     }
-}
+}

iyzipay/classes/IyzipayModel.php

@@ -122,4 +122,4 @@ public static function updateOrderPayment($price, $reference)
 
         return Db::getInstance()->execute($sql);
     }
-}
+}

iyzipay/classes/IyzipayOverlayScript.php

@@ -41,4 +41,4 @@ public static function generateOverlayScriptObject($isoCode, $randNumer)
 
         return $overlayObject;
     }
-}
+}

iyzipay/classes/IyzipayPkiStringBuilder.php

@@ -117,4 +117,4 @@ public static function authorization($pkiString, $apiKey, $secretKey, $rand)
 
         return $authorization;
     }
-}
+}

iyzipay/classes/IyzipayRequest.php

@@ -104,4 +104,4 @@ public static function curlPost($json, $authorization, $endpoint)
 
         return $result;
     }
-}
+}

iyzipay/classes/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/config_tr.xml

@@ -2,7 +2,7 @@
 <module>
     <name>iyzipay</name>
     <displayName><![CDATA[iyzico &Ouml;deme Mod&uuml;l&uuml;]]></displayName>
-    <version><![CDATA[1.0.0]]></version>
+    <version><![CDATA[1.0.1]]></version>
     <description><![CDATA[PrestaShop i&ccedil;in iyzico &Ouml;deme Ge&ccedil;idi]]></description>
     <author><![CDATA[iyzico]]></author>
     <tab><![CDATA[payments_gateways]]></tab>

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);
     }
-}
+}

iyzipay/controllers/front/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/controllers/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

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;
     }
-}
+}

iyzipay/sql/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/sql/install.php

@@ -50,4 +50,4 @@
     if (Db::getInstance()->execute($query) == false) {
         return false;
     }
-}
+}

iyzipay/sql/uninstall.php

@@ -38,4 +38,4 @@
     if (Db::getInstance()->execute($query) == false) {
         return false;
     }
-}
+}

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';

iyzipay/translations/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

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';

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.
-*/
+*/

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.
-*/
+*/

iyzipay/views/css/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/views/img/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/views/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

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.
-*/
-
+*/

iyzipay/views/js/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;

iyzipay/views/templates/admin/configure.tpl

@@ -34,4 +34,4 @@
 	<div class="tab-pane active" id="template_1">{include file='./template_1.tpl'}</div>
 	<div class="tab-pane" id="template_2">{include file='./template_2.tpl'}</div>
 	<div class="tab-pane" id="template_3">{include file='./template_3.tpl'}</div>
-</div>
+</div>

iyzipay/views/templates/admin/index.php

@@ -32,4 +32,4 @@
 header('Pragma: no-cache');
 
 header('Location: ../');
-exit;
+exit;