From f5c8034a5c3fae47e4a71bbd2ff0ae847a43ff60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Mon, 1 Feb 2021 18:57:06 +0300 Subject: [PATCH 1/7] Create Event Fields 2 --- .../Adv/Event/ReadySimpleAdvFormColumns.php | 19 ++++++++++ .../src/Adv/Form/SimpleAdvFormBuilder.php | 20 ---------- .../src/Adv/Form/SimpleAdvFormFields.php | 38 +++++++++++++++++++ 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php new file mode 100644 index 000000000..ed34bcf4b --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php @@ -0,0 +1,19 @@ +fields = $fields; + } + + public function getFields() + { + return $this->fields; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php index 0664685b5..3ab942d97 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php @@ -7,26 +7,6 @@ class SimpleAdvFormBuilder extends FormBuilder { protected $model = AdvModel::class; - protected $fields = [ - 'name', - 'price', - 'currency', - 'advs_desc', - 'cat1', - 'cat2', - 'cat3', - 'cat4', - 'cat5', - 'cat6', - 'cat7', - 'cat8', - 'cat9', - 'cat10', - 'is_get_adv', - 'stock', - 'files', - ]; - protected $assets = [ 'scripts.js' => [ 'visiosoft.module.advs::js/simple.js' diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php new file mode 100644 index 000000000..dbcf49bfe --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php @@ -0,0 +1,38 @@ +setFields($form_fields); + + } +} From 611860f0db1a65c77f7c5cdb6e7526d6672e5e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Mon, 1 Feb 2021 18:59:45 +0300 Subject: [PATCH 2/7] Revert "Create Event Fields 2" This reverts commit f5c8034a5c3fae47e4a71bbd2ff0ae847a43ff60. --- .../Adv/Event/ReadySimpleAdvFormColumns.php | 19 ---------- .../src/Adv/Form/SimpleAdvFormBuilder.php | 20 ++++++++++ .../src/Adv/Form/SimpleAdvFormFields.php | 38 ------------------- 3 files changed, 20 insertions(+), 57 deletions(-) delete mode 100644 addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php delete mode 100644 addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php deleted file mode 100644 index ed34bcf4b..000000000 --- a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php +++ /dev/null @@ -1,19 +0,0 @@ -fields = $fields; - } - - public function getFields() - { - return $this->fields; - } -} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php index 3ab942d97..0664685b5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php @@ -7,6 +7,26 @@ class SimpleAdvFormBuilder extends FormBuilder { protected $model = AdvModel::class; + protected $fields = [ + 'name', + 'price', + 'currency', + 'advs_desc', + 'cat1', + 'cat2', + 'cat3', + 'cat4', + 'cat5', + 'cat6', + 'cat7', + 'cat8', + 'cat9', + 'cat10', + 'is_get_adv', + 'stock', + 'files', + ]; + protected $assets = [ 'scripts.js' => [ 'visiosoft.module.advs::js/simple.js' diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php deleted file mode 100644 index dbcf49bfe..000000000 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php +++ /dev/null @@ -1,38 +0,0 @@ -setFields($form_fields); - - } -} From 31b9e837056d3492485906fd7c0a71b5eb676449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Mon, 1 Feb 2021 19:05:21 +0300 Subject: [PATCH 3/7] Revert "Revert "Create Event Fields 2"" This reverts commit 611860f0db1a65c77f7c5cdb6e7526d6672e5e8b. --- .../Adv/Event/ReadySimpleAdvFormColumns.php | 19 ++++++++++ .../src/Adv/Form/SimpleAdvFormBuilder.php | 20 ---------- .../src/Adv/Form/SimpleAdvFormFields.php | 38 +++++++++++++++++++ 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php new file mode 100644 index 000000000..ed34bcf4b --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php @@ -0,0 +1,19 @@ +fields = $fields; + } + + public function getFields() + { + return $this->fields; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php index 0664685b5..3ab942d97 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php @@ -7,26 +7,6 @@ class SimpleAdvFormBuilder extends FormBuilder { protected $model = AdvModel::class; - protected $fields = [ - 'name', - 'price', - 'currency', - 'advs_desc', - 'cat1', - 'cat2', - 'cat3', - 'cat4', - 'cat5', - 'cat6', - 'cat7', - 'cat8', - 'cat9', - 'cat10', - 'is_get_adv', - 'stock', - 'files', - ]; - protected $assets = [ 'scripts.js' => [ 'visiosoft.module.advs::js/simple.js' diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php new file mode 100644 index 000000000..dbcf49bfe --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php @@ -0,0 +1,38 @@ +setFields($form_fields); + + } +} From 0d56448acccf44d8e6ea1e0879873bb3524c2392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Mon, 1 Feb 2021 19:05:30 +0300 Subject: [PATCH 4/7] Revert "Revert "Revert "Create Event Fields 2""" This reverts commit 31b9e837056d3492485906fd7c0a71b5eb676449. --- .../Adv/Event/ReadySimpleAdvFormColumns.php | 19 ---------- .../src/Adv/Form/SimpleAdvFormBuilder.php | 20 ++++++++++ .../src/Adv/Form/SimpleAdvFormFields.php | 38 ------------------- 3 files changed, 20 insertions(+), 57 deletions(-) delete mode 100644 addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php delete mode 100644 addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php deleted file mode 100644 index ed34bcf4b..000000000 --- a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php +++ /dev/null @@ -1,19 +0,0 @@ -fields = $fields; - } - - public function getFields() - { - return $this->fields; - } -} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php index 3ab942d97..0664685b5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php @@ -7,6 +7,26 @@ class SimpleAdvFormBuilder extends FormBuilder { protected $model = AdvModel::class; + protected $fields = [ + 'name', + 'price', + 'currency', + 'advs_desc', + 'cat1', + 'cat2', + 'cat3', + 'cat4', + 'cat5', + 'cat6', + 'cat7', + 'cat8', + 'cat9', + 'cat10', + 'is_get_adv', + 'stock', + 'files', + ]; + protected $assets = [ 'scripts.js' => [ 'visiosoft.module.advs::js/simple.js' diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php deleted file mode 100644 index dbcf49bfe..000000000 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php +++ /dev/null @@ -1,38 +0,0 @@ -setFields($form_fields); - - } -} From 8cd1f3bf8e242a884cc8ff7d3da18725b67a628a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Mon, 1 Feb 2021 19:13:48 +0300 Subject: [PATCH 5/7] Create Event Fields 2 --- .../Adv/Event/ReadySimpleAdvFormColumns.php | 19 ++++++++++ .../src/Adv/Form/SimpleAdvFormBuilder.php | 20 ---------- .../src/Adv/Form/SimpleAdvFormFields.php | 38 +++++++++++++++++++ 3 files changed, 57 insertions(+), 20 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php new file mode 100644 index 000000000..ed34bcf4b --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php @@ -0,0 +1,19 @@ +fields = $fields; + } + + public function getFields() + { + return $this->fields; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php index 0664685b5..3ab942d97 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormBuilder.php @@ -7,26 +7,6 @@ class SimpleAdvFormBuilder extends FormBuilder { protected $model = AdvModel::class; - protected $fields = [ - 'name', - 'price', - 'currency', - 'advs_desc', - 'cat1', - 'cat2', - 'cat3', - 'cat4', - 'cat5', - 'cat6', - 'cat7', - 'cat8', - 'cat9', - 'cat10', - 'is_get_adv', - 'stock', - 'files', - ]; - protected $assets = [ 'scripts.js' => [ 'visiosoft.module.advs::js/simple.js' diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php new file mode 100644 index 000000000..dbcf49bfe --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php @@ -0,0 +1,38 @@ +setFields($form_fields); + + } +} From 02b8219b41450a69590505c4cc0ee008cf279d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Wed, 3 Feb 2021 15:33:53 +0300 Subject: [PATCH 6/7] fixed conflict --- .../advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php index ed34bcf4b..9a00879b9 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php @@ -5,7 +5,6 @@ use Illuminate\Database\Eloquent\Builder; class ReadySimpleAdvFormColumns { - protected $fields; public function __construct($fields) { From 2acf7b62ad9899bbedfb0e86a2607dedbbd67813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kerim=20K=C4=B1l=C4=B1=C3=A7?= Date: Sat, 6 Feb 2021 22:29:47 +0300 Subject: [PATCH 7/7] ReadySimpleAdvFormColumns.php to ReadySimpleAdvFormFields.php --- ...ySimpleAdvFormColumns.php => ReadySimpleAdvFormFields.php} | 2 +- .../advs-module/src/Adv/Form/SimpleAdvFormFields.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename addons/default/visiosoft/advs-module/src/Adv/Event/{ReadySimpleAdvFormColumns.php => ReadySimpleAdvFormFields.php} (91%) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormFields.php similarity index 91% rename from addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php rename to addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormFields.php index 9a00879b9..527533f0a 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Event/ReadySimpleAdvFormFields.php @@ -3,7 +3,7 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder; use Illuminate\Database\Eloquent\Builder; -class ReadySimpleAdvFormColumns +class ReadySimpleAdvFormFields { protected $fields; public function __construct($fields) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php index dbcf49bfe..2b519de33 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormFields.php @@ -1,6 +1,6 @@