From 977ec223099fe0b21d2201662892d5e693716483 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 29 Jan 2020 12:19:11 +0300 Subject: [PATCH 1/4] #701 Follow-up from "#672 [store] show form errors and fixes" --- .../views/list/partials/user-section.twig | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig index 7ee42f61d..3330ae7f8 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig @@ -1,30 +1,29 @@ -{% if app.request.get('user') != null or app.request.get('user') != "" %} - {% set store = entries('store','store').where('user_id', user.id).first() %} - {% if store is null %} - {% set user = entries('store','user').where('user_id', user.id).first() %} - {% set store = user.store %} +{% if store %} + {% if store.store_banner is null %} + {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %} + {% else %} + {% set background_image = store.store_banner.url %} {% endif %} - {% if store is not null %} - {% if store.store_banner is null %} - {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %} - {% else %} - {% set background_image = store.store_banner.url %} - {% endif %} -
-
-
-
- {% if store.file is null %} - - {% else %} - - {% endif %} -
-
{{ store.name }}
-
+
+
+
+
+ {% if store.file is null %} + + {% else %} + + {% endif %} +
+
{{ store.name }}
+
+ {% if store.user_id == auth_user().id %} +
+ Edit + Add Users +
{% endif %} {% endif %} \ No newline at end of file From 7a6b9d008510096c5b4b91dbf60712fda6c914c9 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 29 Jan 2020 18:11:53 +0300 Subject: [PATCH 2/4] #751 [Favs-module] Block position --- .../visiosoft/advs-module/resources/views/list/list.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 7739126be..4bf5abd23 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -11,7 +11,7 @@ {% include "visiosoft.module.advs::list/partials/user-section" %} -
+
{% include "visiosoft.module.advs::list/partials/list-filter" %}
@@ -25,7 +25,6 @@
{% include "visiosoft.module.advs::list/partials/display-mode" %} -
{{ addBlock('ads-list/row',{'topfields':topfields})|raw }} @@ -36,6 +35,8 @@
{% include "visiosoft.module.advs::list/partials/pagination" %} + {{ addBlock('ads-list/row-bottom')|raw }} + {#
#}
From c6430328059eeac3909866989fdb14ebf07885f2 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 30 Jan 2020 16:23:38 +0300 Subject: [PATCH 3/4] #694 [Store] Create form design --- .../visiosoft/advs-module/src/Http/Controller/advsController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index fd3af9783..1a261f474 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -51,7 +51,6 @@ use Anomaly\Streams\Platform\Model\Customfields\CustomfieldsCustomFieldAdvsEntry use Illuminate\Contracts\Events\Dispatcher; use Visiosoft\QrcontactModule\Qr\QrModel; use Visiosoft\StoreModule\Ad\AdModel; -use Visiosoft\StoreModule\User\UserModel; class AdvsController extends PublicController From 1264d21bc500466ef7d50ce06b49a6d89a31645f Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 30 Jan 2020 17:02:37 +0300 Subject: [PATCH 4/4] fixed register --- .../views/addons/anomaly/users-module/register.twig | 3 +++ .../src/Profile/Register2/Register2FormBuilder.php | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig index 10e57e3fc..d1e88c05c 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig @@ -19,6 +19,9 @@
{{ form.fields.first_name.input|raw }} + {{ form.fields.username.setValue(random()).setAttributes({ + 'class' :'hidden', + }).input|raw }}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php index 2d2bfc072..fe4a8c513 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php @@ -38,6 +38,7 @@ class Register2FormBuilder extends FormBuilder * @var array */ protected $fields = [ + 'username', 'first_name' => [ 'instructions' => false, 'required' => true, @@ -49,10 +50,10 @@ class Register2FormBuilder extends FormBuilder 'email' => [ 'type' => 'anomaly.field_type.text', 'instructions' => false, - 'rules' => [ + 'rules' => [ 'valid_register', ], - 'validators' => [ + 'validators' => [ 'valid_register' => [ 'message' => false, 'handler' => ValidateRegister::class,