Merge pull request #93 from yoomoney/release/v2.0.1

Release/2.0.1
yoomoney · Dec 15, 2020 · b3d1f06 · b3d1f06
2 parents a62feea + 62898f2
commit b3d1f06
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
+### v2.0.1 от 15.12.2020
+* Новый виджет кредитования
+
 ### v2.0.0 от 10.12.2020
 * Ребрендинг модуля
-
-###
diff --git a/src/install.xml b/src/install.xml
@@ -2,7 +2,7 @@
 <modification>
     <name>YooMoney for Opencart 3.x</name>
     <code>YooMoney</code>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <author>YooMoney</author>
     <!-- Вставка кнопки в историю заказов-->
     <file path="catalog/controller/account/order.php">
@@ -245,7 +245,7 @@
             <search><![CDATA[</head>]]></search>
             <add position="before"><![CDATA[
                 {% if config is defined and config.get('yoomoney_kassa_enabled') and (config.get('yoomoney_kassa_use_installments_button') or config.get('yoomoney_kassa_add_installments_block')) %}
-                <script src="https://static.yandex.net/kassa/pay-in-parts/ui/v1/"></script>
+                <script src="https://static.yoomoney.ru/checkout-credit-ui/v1/index.js"></script>
                 {% endif %}
             ]]></add>
         </operation>
@@ -292,8 +292,8 @@
             <add position="before"><![CDATA[
                 <script>
                     {% if yoomoney_showInstallmentsBlock %}
-                        if (typeof YandexCheckoutCreditUI !== "undefined") {
-                            const yamoneyCheckoutCreditUI = YandexCheckoutCreditUI({
+                        if (typeof CheckoutCreditUI !== "undefined") {
+                            const yamoneyCheckoutCreditUI = CheckoutCreditUI({
                                 shopId: '{{ yoomoney_shop_id }}',
                                 sum: parseFloat('{{ cost }}'),
                                 language: '{{ yoomoney_language_code }}'

diff --git a/src/upload/admin/controller/extension/payment/yoomoney.php b/src/upload/admin/controller/extension/payment/yoomoney.php
@@ -12,7 +12,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.0.0';
+    const MODULE_VERSION = '2.0.1';
 
     const WIDGET_INSTALL_STATUS_SUCCESS = true;
     const WIDGET_INSTALL_STATUS_FAIL    = false;

diff --git a/src/upload/admin/model/extension/payment/yoomoney.php b/src/upload/admin/model/extension/payment/yoomoney.php
@@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
     /**
      * string
      */
-    const MODULE_VERSION = '2.0.0';
+    const MODULE_VERSION = '2.0.1';
     const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
 
     private $kassaModel;

diff --git a/src/upload/catalog/controller/extension/payment/yoomoney.php b/src/upload/catalog/controller/extension/payment/yoomoney.php
@@ -19,7 +19,7 @@
 class ControllerExtensionPaymentYoomoney extends Controller
 {
     const MODULE_NAME = 'yoomoney';
-    const MODULE_VERSION = '2.0.0';
+    const MODULE_VERSION = '2.0.1';
 
     /**
      * @var ModelExtensionPaymentYoomoney

diff --git a/src/upload/catalog/model/extension/payment/yoomoney.php b/src/upload/catalog/model/extension/payment/yoomoney.php
@@ -20,7 +20,7 @@
  */
 class ModelExtensionPaymentYoomoney extends Model
 {
-    const MODULE_VERSION = '2.0.0';
+    const MODULE_VERSION = '2.0.1';
 
     private $kassaModel;
     private $walletModel;

diff --git a/src/upload/catalog/view/theme/default/template/extension/payment/yoomoney/kassa_form.twig b/src/upload/catalog/view/theme/default/template/extension/payment/yoomoney/kassa_form.twig
@@ -181,16 +181,16 @@
 
             {% if kassa.isInstallmentsOn() %}
                 function createCheckoutCreditUI() {
-                    if (typeof YandexCheckoutCreditUI === "undefined") {
+                    if (typeof CheckoutCreditUI === "undefined") {
                         setTimeout(createCheckoutCreditUI, 200);
                         return;
                     }
-                    const checkoutCreditUI = YandexCheckoutCreditUI({
+                    const yoomoneyCheckoutCreditUI = CheckoutCreditUI({
                         shopId: {{ kassa.getShopId() }},
                         sum: {{ amount }},
                         language: "{{ language.get('code') }}"
                     });
-                    const checkoutCreditButton = checkoutCreditUI({
+                    const checkoutCreditButton = yoomoneyCheckoutCreditUI({
                         type: 'button',
                         tag: 'button',
                         domSelector: '.yoomoney_kassa_installments_button_container'

diff --git a/src/upload/catalog/view/theme/journal3/template/extension/payment/yoomoney/kassa_form.twig b/src/upload/catalog/view/theme/journal3/template/extension/payment/yoomoney/kassa_form.twig
@@ -190,16 +190,16 @@
 
             {% if kassa.isInstallmentsOn() %}
                 function createCheckoutCreditUI() {
-                    if (typeof YandexCheckoutCreditUI === "undefined") {
+                    if (typeof CheckoutCreditUI === "undefined") {
                         setTimeout(createCheckoutCreditUI, 200);
                         return;
                     }
-                    const checkoutCreditUI = YandexCheckoutCreditUI({
+                    const yoomoneyCheckoutCreditUI = CheckoutCreditUI({
                         shopId: {{ kassa.getShopId() }},
                         sum: {{ amount }},
                         language: "{{ language.get('code') }}"
                     });
-                    const checkoutCreditButton = checkoutCreditUI({
+                    const checkoutCreditButton = yoomoneyCheckoutCreditUI({
                         type: 'button',
                         tag: 'button',
                         domSelector: '.yoomoney_kassa_installments_button_container'

diff --git a/yoomoney.oc3x.ocmod.zip b/yoomoney.oc3x.ocmod.zip