From c1f59ead7f235fe4b07970d407e893fd60790bb7 Mon Sep 17 00:00:00 2001
From: Xyslik <137037990+Xyslik@users.noreply.github.com>
Date: Mon, 22 Apr 2024 09:24:27 +0300
Subject: [PATCH] =?UTF-8?q?#95443=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D1=8F=D0=B5=D0=BC=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83?=
 =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20"=D0=92=D1=8B=D0=B3?=
 =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D1=81=D0=BB=D1=83=D0=B6=D0=B1?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D1=81=D1=82=D0=B0=D0=B2=D0=BE=D0=BA"=20(#344)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         |  3 ++
 intaro.retailcrm/description.ru      |  2 +-
 intaro.retailcrm/install/version.php |  4 +--
 intaro.retailcrm/options.php         | 51 ++++++++++++++--------------
 4 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c8359c..be938883 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2024-04-18 v.6.5.14
+- Исправление работы кнопки "Выгрузка служб доставок"
+
 ## 2024-04-03 v.6.5.13
 - Исправление присваивания номера заказа к платежу при синхронизации с CRM
 
diff --git a/intaro.retailcrm/description.ru b/intaro.retailcrm/description.ru
index 532fc4c2..5400e042 100644
--- a/intaro.retailcrm/description.ru
+++ b/intaro.retailcrm/description.ru
@@ -1 +1 @@
-- Исправление присваивания номера заказа к платежу при синхронизации с CRM
+- Исправление работы кнопки "Выгрузка служб доставок"
\ No newline at end of file
diff --git a/intaro.retailcrm/install/version.php b/intaro.retailcrm/install/version.php
index d716fcc7..48c0da66 100644
--- a/intaro.retailcrm/install/version.php
+++ b/intaro.retailcrm/install/version.php
@@ -1,6 +1,6 @@
 <?php
 
 $arModuleVersion = [
-    'VERSION'      => '6.5.13',
-    'VERSION_DATE' => '2024-04-03 10:30:00'
+    'VERSION'      => '6.5.14',
+    'VERSION_DATE' => '2024-04-18 11:15:00'
 ];
diff --git a/intaro.retailcrm/options.php b/intaro.retailcrm/options.php
index 569ad4e2..8bd8d3c2 100644
--- a/intaro.retailcrm/options.php
+++ b/intaro.retailcrm/options.php
@@ -1779,38 +1779,37 @@ if (isset($_POST['Update']) && ($_POST['Update'] === 'Y')) {
                 return true;
             });
 
-        });
+            $('input[name="update-delivery-services"]').on('click', function() {
+                BX.showWait();
+                var updButton = this;
+                // hide next step button
+                $(updButton).css('opacity', '0.5').attr('disabled', 'disabled');
 
-        $('input[name="update-delivery-services"]').on('click', function() {
-            BX.showWait();
-            var updButton = this;
-            // hide next step button
-            $(updButton).css('opacity', '0.5').attr('disabled', 'disabled');
+                var handlerUrl = $(this).parents('form').attr('action');
+                var data = 'ajax=1';
 
-            var handlerUrl = $(this).parents('form').attr('action');
-            var data = 'ajax=1';
+                $.ajax({
+                    type: 'POST',
+                    url: handlerUrl,
+                    data: data,
+                    dataType: 'json',
+                    success: function(response) {
+                        BX.closeWait();
+                        $(updButton).css('opacity', '1').removeAttr('disabled');
 
-            $.ajax({
-                type: 'POST',
-                url: handlerUrl,
-                data: data,
-                dataType: 'json',
-                success: function(response) {
-                    BX.closeWait();
-                    $(updButton).css('opacity', '1').removeAttr('disabled');
+                        if (!response.success)
+                            alert('<?php echo GetMessage('MESS_1'); ?>');
+                    },
+                    error: function () {
+                        BX.closeWait();
+                        $(updButton).css('opacity', '1').removeAttr('disabled');
 
-                    if (!response.success)
-                        alert('<?php echo GetMessage('MESS_1'); ?>');
-                },
-                error: function () {
-                    BX.closeWait();
-                    $(updButton).css('opacity', '1').removeAttr('disabled');
+                        alert('<?php echo GetMessage('MESS_2'); ?>');
+                    }
+                });
 
-                    alert('<?php echo GetMessage('MESS_2'); ?>');
-                }
+                return false;
             });
-
-            return false;
         });
     </script>
     <style type="text/css">