ERP-282 Нужно сделать интерфейс настройки магазина

diff --git a/erp24/views/city-store-params/index.php b/erp24/views/city-store-params/index.php
index 28f06598d1b0eb0dac4a539dab4d29814b74d6fc..9aaff3820dacf93cfeaae1ace861bc39824ea089 100644 (file)
--- a/erp24/views/city-store-params/index.php
+++ b/erp24/views/city-store-params/index.php
@@ -152,13 +152,13 @@ $this->registerJsFile('/js/city-store-params/city-store-params.js', ['position'
             <?php endif; ?>
         </div>
         <div class="col-md-2 d-flex justify-content-center align-items-center">
-            <div class="card bg-light shadow-sm w-100">
-                <?= Html::button('СбÑ\80оÑ\81иÑ\82Ñ\8c Ñ\84илÑ\8cÑ\82Ñ\80Ñ\8b', ['class' => 'btn btn-secondary w-100', 'id' => 'reset-button']); ?>
+            <div class="card p-45 bg-light shadow-sm w-100">
+                <?= Html::button('Ð\9fÑ\80имениÑ\82Ñ\8c', ['class' => 'btn btn-primary w-100', 'id' => 'apply-button']); ?>
             </div>
         </div>
         <div class="col-md-2 d-flex justify-content-center align-items-center">
-            <div class="card p-45 bg-light shadow-sm w-100">
-                <?= Html::button('Ð\9fÑ\80имениÑ\82Ñ\8c', ['class' => 'btn btn-primary w-100', 'id' => 'apply-button']); ?>
+            <div class="card bg-light shadow-sm w-100">
+                <?= Html::button('СбÑ\80оÑ\81иÑ\82Ñ\8c Ñ\84илÑ\8cÑ\82Ñ\80Ñ\8b', ['class' => 'btn btn-secondary w-100', 'id' => 'reset-button']); ?>
             </div>
         </div>
     </div>

diff --git a/erp24/web/js/city-store-params/city-store-params.js b/erp24/web/js/city-store-params/city-store-params.js
index a2dedb4d850263bb602a15bc6853d03acb05766f..ed9a0f1b2fa449e0495fc9474efa340e7382a5d3 100644 (file)
--- a/erp24/web/js/city-store-params/city-store-params.js
+++ b/erp24/web/js/city-store-params/city-store-params.js
@@ -135,12 +135,11 @@ $(document).ready(function () {
         $('#edit-button').click();
     }
 
-    if ($('.flash-message').hasClass('alert-info') || $('.flash-message').hasClass('alert-success')) {
-        setTimeout(function () {
-            $('.flash-message').fadeOut(2000, function() {
-                $(this).remove();
-            });
-        }, 15000);
+    const flashMessage = $('.flash-message');
+    
+    if (flashMessage.length) {
+        const delayTime = flashMessage.hasClass('alert-success') ? 5000 : 15000;
+        setTimeout(() => flashMessage.fadeOut(2000, () => flashMessage.remove()), delayTime);
     }
 });
 
@@ -151,4 +150,5 @@ $('#reset-button').on('click', function() {
     $('#store_type').val(null).trigger('change');
     $('#territorial_manager').val(null).trigger('change');
     $('#bush_chef_florist').val(null).trigger('change');
+    $('#apply-button').click()
 });
\ No newline at end of file