Merge pull request #105 from yoomoney/release/v2.0.9

Release/2.0.9

CHANGELOG.md

@@ -1,3 +1,6 @@
+### v2.0.9 от 15.04.2021
+* Проверка на наличие jQuery.fn.button
+
 ### v2.0.8 от 23.03.2021
 * Проверка суммы платежа через кошелек
 

src/install.xml

@@ -2,7 +2,7 @@
 <modification>
     <name>YooMoney for Opencart 3.x</name>
     <code>YooMoney</code>
-    <version>2.0.8</version>
+    <version>2.0.9</version>
     <author>YooMoney</author>
     <link>https://github.com/yoomoney/cms-opencart3</link>
     <!-- Вставка кнопки в историю заказов-->

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.8';
+    const MODULE_VERSION = '2.0.9';
 
     const WIDGET_INSTALL_STATUS_SUCCESS = true;
     const WIDGET_INSTALL_STATUS_FAIL    = false;

src/upload/admin/model/extension/payment/yoomoney.php

@@ -5,7 +5,7 @@ class ModelExtensionPaymentYoomoney extends Model
     /**
      * string
      */
-    const MODULE_VERSION = '2.0.8';
+    const MODULE_VERSION = '2.0.9';
     const YOOMONEY_EVENT_SECOND_RECEIPT_CODE = 'yoomoney_second_receipt_trigger';
 
     private $kassaModel;

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.8';
+    const MODULE_VERSION = '2.0.9';
 
     /**
      * @var ModelExtensionPaymentYoomoney

src/upload/catalog/model/extension/payment/yoomoney.php

@@ -20,7 +20,7 @@
  */
 class ModelExtensionPaymentYoomoney extends Model
 {
-    const MODULE_VERSION = '2.0.8';
+    const MODULE_VERSION = '2.0.9';
 
     private $kassaModel;
     private $walletModel;

src/upload/catalog/view/theme/default/template/extension/payment/yoomoney/kassa_form.twig

@@ -111,13 +111,20 @@
             jQuery(id).css('display', 'block');
         });
 
-        var continueButton = jQuery('#continue-button');
-        continueButton.off('click').on('click', function (event) {
-            event.preventDefault();
-            createPayment();
+        var continueButton = '#continue-button';
+        jQuery(document).off('click.default', continueButton).on('click.default', continueButton, function (e) {
+            e.preventDefault();
+            createPayment(jQuery(this));
         });
 
-        function createPayment() {
+        function buttonAction(button, action) {
+            if (jQuery.fn.button && button) {
+                button.button(action);
+            }
+        }
+
+        function createPayment(button) {
+            button = button || null;
             var form = jQuery("#yoomoney-payment-form")[0];
             jQuery('#payment-form').hide();
             jQuery.ajax({
@@ -130,7 +137,7 @@
                     alphaLogin: (form.alfaLogin ? form.alfaLogin.value : '')
                 },
                 beforeSend: function() {
-                    continueButton.button('loading');
+                    buttonAction(button, 'loading');
                 },
                 success: function (data) {
                     if (data.success) {
@@ -141,12 +148,12 @@
                         }
                     } else {
                         onValidateError(data.error);
-                        continueButton.button('reset');
+                        buttonAction(button, 'reset');
                     }
                 },
                 failure: function () {
                     onValidateError('Failed to create payment');
-                    continueButton.button('reset');
+                    buttonAction(button, 'reset');
                 }
             });
         }