Merge branch 'master' of https://github.com/openclassify/openclassify

addons/default/visiosoft/advs-module/resources/views/list/list.twig

@@ -11,7 +11,7 @@
 
             {% include "visiosoft.module.advs::list/partials/user-section" %}
 
-            <div class="row my-5">
+            <div class="row my-3">
                 <div class="col-md-3">
                     {% include "visiosoft.module.advs::list/partials/list-filter" %}
                 </div>
@@ -25,7 +25,6 @@
                             </div>
                             <div class="col-md-6 my-2">
                                 {% include "visiosoft.module.advs::list/partials/display-mode" %}
-
                             </div>
                         </div>
                         {{ addBlock('ads-list/row',{'topfields':topfields})|raw }}
@@ -36,6 +35,8 @@
                         </div>
                         {% include "visiosoft.module.advs::list/partials/pagination" %}
 
+                        {{ addBlock('ads-list/row-bottom')|raw }}
+
                         {#                        <div class="category-tabs"></div>#}
                     </div>
                 </div>

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') != "" %}
+{% if store %}
-    {% set store = entries('store','store').where('user_id', user.id).first() %}
+    {% if store.store_banner is null %}
-    {% if store is null %}
+        {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %}
-        {% set user = entries('store','user').where('user_id', user.id).first() %}
+    {% else %}
-        {% set store = user.store %}
+        {% set background_image = store.store_banner.url %}
     {% endif %}
-    {% if store is not null %}
+    <div class="upper-list-banner" style="background-image: url('{{ background_image }}');">
-        {% if store.store_banner is null %}
+        <div class="row">
-            {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %}
+            <div class="col-md-3 col-xs-3">
-        {% else %}
+                <div class="card m-4">
-            {% set background_image =  store.store_banner.url %}
+                    {% if store.file is null %}
-        {% endif %}
+                        <img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}" class="card-img-top">
-        <div class="col-md-12 upper-list-banner" style="background-image: url('{{ background_image }}');">
+                    {% else %}
-            <div class="row">
+                        <img src="{{ store.file.url }}" class="card-img-top">
-                <div class="col-md-3 col-xs-3">
+                    {% endif %}
-                    <div class="card m-4">
+                    <div class="card-body">
-                        {% if store.file is null %}
+                        <h5 class="card-title text-center mb-0">{{ store.name }}</h5>
-                            <img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}" class="card-img-top">
-                        {% else %}
-                            <img src="{{ store.file.url }}" class="card-img-top">
-                        {% endif %}
-                        <div class="card-body">
-                            <h5 class="card-title text-center mb-0">{{ store.name }}</h5>
-                        </div>
                     </div>
                 </div>
             </div>
         </div>
+    </div>
+    {% if store.user_id == auth_user().id %}
+        <div class="p-2 bg-secondary rounded my-2">
+            <a href="{{ url_route('store::edit', [store.slug, store.id]) }}" class="btn btn-primary text-light">Edit</a>
+            <a href="{{ url_route('store::add-user', [store.slug]) }}" class="btn btn-success text-light">Add Users</a>
+        </div>
     {% endif %}
 {% endif %}

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

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig

@@ -19,6 +19,9 @@
 
                     <div class="input-wrapper">
                         {{ form.fields.first_name.input|raw }}
+                        {{ form.fields.username.setValue(random()).setAttributes({
+                            'class' :'hidden',
+                        }).input|raw }}
                     </div>
                 </div>
             </div>

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,