From d8f27dc45f73f50b652ef0c8f5aab21bc7524476 Mon Sep 17 00:00:00 2001 From: "ikit.by" Date: Thu, 28 Mar 2019 12:50:40 +0300 Subject: [PATCH 1/3] Update assign_items.php --- .../framework/views/jbimport/assign_items.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php b/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php index e88e90475..b30699659 100644 --- a/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php +++ b/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php @@ -122,23 +122,24 @@ function showSelects(val) { } if (prev.typeid) { - var typeid = prev.typeid; - $('#fields-assign select.type-select-' + prev.typeid).each(function (n, obj) { - $(obj).val(prevParams[typeid][n]); - }); + putValues(prev.typeid) } } - function checkKey(value) { - - var result = false; - var selects = $('#fields-assign select.type-select:visible'); + function putValues(val) { + var typeid = val; + $('#fields-assign select.type-select-' + val).each(function (n, obj) { + $(obj).val(prevParams[typeid][n]); + }); + } + function checkKey(value) { selects.each(function () { if ($(this).val() == value) { result = true; return false; + } else if (value == 'jbprice' && $(this).val().indexOf(value) != -1 || value == 'jbprice' && $(this).val().indexOf('price_sku') != -1) { result = true; From 95a9222ab5e458e98b8e97036eda254a3cefb0e0 Mon Sep 17 00:00:00 2001 From: "ikit.by" Date: Thu, 28 Mar 2019 12:55:07 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Автозаполнение полей из сохраненных неастроек последнего импорта в зависимости от типа --- .../jbuniversal/framework/views/jbimport/assign_items.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php b/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php index b30699659..109b50e15 100644 --- a/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php +++ b/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php @@ -128,13 +128,16 @@ function showSelects(val) { } function putValues(val) { + var typeid = val; $('#fields-assign select.type-select-' + val).each(function (n, obj) { $(obj).val(prevParams[typeid][n]); }); + } function checkKey(value) { + selects.each(function () { if ($(this).val() == value) { result = true; @@ -145,6 +148,7 @@ function checkKey(value) { result = true; return false; } + }); return result; } From c51f45962967758311e2ee3897942e234fa0f387 Mon Sep 17 00:00:00 2001 From: "ikit.by" Date: Thu, 28 Mar 2019 13:03:24 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=90=D0=B2=D1=82=D0=BE=D0=B7=D0=B0=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=D0=B7=20=D0=B1=D0=B0=D0=B7=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Автозаполнение полей из уже импортированных типов сохраненных в базу при выборе соотетствующего типа --- .../jbuniversal/framework/views/jbimport/assign_items.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php b/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php index 109b50e15..f5aeeb259 100644 --- a/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php +++ b/packages/jbuniversal/jbuniversal/framework/views/jbimport/assign_items.php @@ -137,7 +137,6 @@ function putValues(val) { } function checkKey(value) { - selects.each(function () { if ($(this).val() == value) { result = true; @@ -148,7 +147,6 @@ function checkKey(value) { result = true; return false; } - }); return result; }