Merge pull request #3 from crypto-com/v1_0_1

Update to v1.0.1
crypto-com · Apr 12, 2021 · 17ee0d1 · 17ee0d1
2 parents 3b0df31 + 4a7f535
commit 17ee0d1
Show file tree

Hide file tree

Showing 34 changed files with 83 additions and 85 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 
-  Copyright 2018 - 2020, Foris Limited ("Crypto.com"). 
+  Copyright 2018 - 2021, Foris Limited ("Crypto.com"). 
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/classes/cryptopayhelper.php b/classes/cryptopayhelper.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/classes/cryptopaytransaction.php b/classes/cryptopaytransaction.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/classes/index.php b/classes/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/admin/AdminCryptoPayLogController.php b/controllers/admin/AdminCryptoPayLogController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/admin/AdminCryptoPayPaymentController.php b/controllers/admin/AdminCryptoPayPaymentController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/admin/AdminCryptoPaySettingController.php b/controllers/admin/AdminCryptoPaySettingController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/admin/index.php b/controllers/admin/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/front/index.php b/controllers/front/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/front/validation.php b/controllers/front/validation.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 
@@ -251,16 +251,21 @@ public function displayAjaxGetPayment()
                     $payment['id_crypto_pay'] = (int)$payment['id_crypto_pay'];
                     $cryptopaytransactions = new CryptoPayTransactions();
                     $cryptopaytransactions->updateTransaction($payment);
-                    $url = Context::getContext()->shop->getBaseURL(true) .
-                        '/index.php?controller=order-confirmation&id_cart=' .
-                        $this->context->cart->id . '&id_module=' . $this->module->id .
-                        '&id_order=' . $this->module->currentOrder . '&key=' . $customer->secure_key;
-
-                    if (Configuration::get('PS_REWRITING_SETTINGS')) {
-                        $url = (new Link())->getPageLink("order-confirmation", $this->ssl, $this->context->language->id);
-                        $url .= '?id_cart=' . $this->context->cart->id . '&id_module=' . $this->module->id .
-                            '&id_order=' . $this->module->currentOrder . '&key=' . $customer->secure_key;
-                    }
+
+                    $url = Context::getContext()->link->getPageLink('order-confirmation');
+
+                    $query = parse_url($url, PHP_URL_QUERY);
+
+                    if ($query) {
+                        $url .= '&id_cart=' .
+                                    $this->context->cart->id . '&id_module=' . $this->module->id .
+                                    '&id_order=' . $this->module->currentOrder . '&key=' . $customer->secure_key;
+                    } else {
+                        $url .= '?id_cart=' .
+                                    $this->context->cart->id . '&id_module=' . $this->module->id .
+                                    '&id_order=' . $this->module->currentOrder . '&key=' . $customer->secure_key;
+                    }    
+
                     die(
                         Tools::jsonEncode(
                             array(

diff --git a/controllers/front/webhook.php b/controllers/front/webhook.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/controllers/index.php b/controllers/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/cryptopay.php b/cryptopay.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 
@@ -43,15 +43,14 @@ public function __construct()
     {
         $this->name = 'cryptopay';
         $this->tab = 'payments_gateways';
-        $this->version = '1.0.0';
+        $this->version = '1.0.1';
         $this->ps_versions_compliancy = array('min' => '1.7', 'max' => _PS_VERSION_);
         $this->author = 'Crypto.com';
         $this->controllers = array('validation');
         $this->is_eu_compatible = 1;
         $this->currencies = true;
         $this->module_key = '7a10b1c0440ed9b43192fd15f8188f31';
         $this->currencies_mode = 'checkbox';
-        $this->limited_currencies = array('USD', 'EUR');
         $this->bootstrap = true;
         parent::__construct();
         $this->displayName = $this->l('Crypto.com Pay');
@@ -102,12 +101,6 @@ public function install()
         ) {
             return false;
         }
-        if (!Currency::exists('USD', 0) &&
-            !Currency::exists('EUR', 0)) {
-            $this->_errors[] = $this->l('Crypto.com Payment Method is only available 
-            when one of this (USD, EUR) currency is activated.');
-            return false;
-        }
         return true;
     }
 

diff --git a/index.php b/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/sql/index.php b/sql/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/sql/install.php b/sql/install.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/views/img/index.php b/views/img/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/views/index.php b/views/index.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -17,7 +17,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 */
 

diff --git a/views/templates/admin/admin-order.tpl b/views/templates/admin/admin-order.tpl
@@ -1,5 +1,5 @@
 {*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 *}
 

diff --git a/views/templates/admin/cancel_order.tpl b/views/templates/admin/cancel_order.tpl
@@ -1,5 +1,5 @@
 {*
-* 2018-2020 Foris Limited ("Crypto.com")
+* 2018-2021 Foris Limited ("Crypto.com")
 *
 * NOTICE OF LICENSE
 *
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 *  @author     Crypto.com <pay@crypto.com>
-*  @copyright  2018-2020 Foris Limited ("Crypto.com")
+*  @copyright  2018-2021 Foris Limited ("Crypto.com")
 *  @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License, Version 2.0
 *}
 {$status|escape:'htmlall':'UTF-8'}