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

addons/default/visiosoft/advs-module/src/Support/_helpers.php

@@ -25,3 +25,10 @@ if (!function_exists('get_buyables'))
 		return dispatch_now(new GetBuyables());
 	}
 }
+
+if (!function_exists('auth_id_if_null'))
+{
+	function auth_id_if_null($userId) {
+		return $userId ?: auth()->id();
+	}
+}

addons/default/visiosoft/profile-module/composer.json

@@ -4,7 +4,10 @@
   "autoload": {
     "psr-4": {
       "Visiosoft\\ProfileModule\\": "src/"
-    }
+    },
+    "files": [
+      "src/Support/_helpers.php"
+    ]
   },
   "require": {
     "maatwebsite/excel": "*"

addons/default/visiosoft/profile-module/resources/assets/css/profile.scss

@@ -114,4 +114,10 @@
 			}
 		}
 	}
+
+	#nav-details {
+		.birthday-field .input-group-addon {
+			display: none;
+		}
+	}
 }

addons/default/visiosoft/profile-module/resources/lang/en/field.php

@@ -55,6 +55,9 @@ return [
     'register_type' => [
         'name' => 'Register Type'
     ],
+    'birthday' => [
+        'name' => 'Birthday'
+    ],
     'identification_number' => [
         'name' => 'Identification Number'
     ],

addons/default/visiosoft/profile-module/resources/views/profile/detail.twig

@@ -96,6 +96,7 @@
                                         </div>
                                     </div>
                                 </div>
+                                {{ userForm.close()|raw }}
                             </div>
                         </div>
                         <div class="tab-pane fade" id="nav-details" role="tabpanel"
@@ -140,15 +141,25 @@
                                         {{ profileForm.fields.land_phone.input|raw }}
                                     </div>
                                 </div>
+                                <div class="col-md-12">
+                                    <div class="form-group birthday-field">
+                                        <label class="control-label font-weight-bold">
+                                            {{ trans("visiosoft.module.profile::field.birthday.name") }}
+                                        </label>
+                                        {{ profileForm.fields.birthday.input|raw }}
+                                    </div>
+                                </div>
                                 <div class="col-md-12">
                                     <div class="form-group">
-                                        <label class="control-label font-weight-bold">{{ trans("visiosoft.module.profile::field.register_type.name") }}</label>
+                                        <label class="control-label font-weight-bold">
+                                            {{ trans("visiosoft.module.profile::field.register_type.name") }}
+                                        </label>
                                         {{ profileForm.fields.register_type.input|raw }}
                                     </div>
                                 </div>
                                 <div class="col-md-12 text-right">
                                     <div class="form-group d-flex align-items-center justify-content-end">
-                                        {{ addBlock('profile/detail/profile-detail-form/actions', {'user': user})|raw }}
+                                        {{ addBlock('profile/detail/profile-detail-form/actions')|raw }}
 
                                         {{ profileForm.actions|raw }}
                                     </div>

addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php

@@ -14,4 +14,9 @@ class UserActivatedByMail
     {
         $this->user = $user;
     }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
 }

addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php

@@ -13,6 +13,7 @@ class ProfileFormBuilder extends FormBuilder
         'office_phone',
         'land_phone',
         'identification_number',
+        'birthday',
         'register_type'
     ];
 

addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php

@@ -21,6 +21,7 @@ class ProfileFormHandler
             'office_phone' => $builder->getPostValue('office_phone'),
             'land_phone' => $builder->getPostValue('land_phone'),
             'identification_number' => $builder->getPostValue('identification_number'),
+            'birthday' => $builder->getPostValue('birthday'),
             'register_type' => $builder->getPostValue('register_type'),
         ];
 

addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php

@@ -3,11 +3,9 @@
 use Anomaly\Streams\Platform\Assignment\AssignmentModelTranslation;
 use Anomaly\Streams\Platform\Assignment\Contract\AssignmentRepositoryInterface;
 use Anomaly\Streams\Platform\Database\Seeder\Seeder;
-use Anomaly\Streams\Platform\Entry\EntryTranslationsModel;
 use Anomaly\Streams\Platform\Field\Contract\FieldRepositoryInterface;
 use Anomaly\Streams\Platform\Field\FieldModelTranslation;
 use Anomaly\Streams\Platform\Stream\Contract\StreamRepositoryInterface;
-use Anomaly\Streams\Platform\Stream\StreamModelTranslation;
 use Visiosoft\LocationModule\Country\CountryModel;
 
 class UsersFieldsSeeder extends Seeder
@@ -144,6 +142,15 @@ class UsersFieldsSeeder extends Seeder
                     'separator' => ':',
                 ]
             ],
+            14 => [
+                'name' => trans('visiosoft.module.profile::field.birthday.name'),
+                'slug' => 'birthday',
+                'type' => 'anomaly.field_type.datetime',
+                'config' => [
+                    "mode" => "date",
+                    "picker" => true,
+                ]
+            ],
         ];
 
         foreach ($customFields as $customField) {

addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php

@@ -0,0 +1,12 @@
+<?php namespace Visiosoft\ProfileModule\Support\Command;
+
+use Anomaly\UsersModule\Role\Contract\RoleRepositoryInterface;
+
+class getAdmins
+{
+    public function handle()
+    {
+        $adminRole = app(RoleRepositoryInterface::class)->findBySlug('admin');
+        return $adminRole->getUsers();
+    }
+}

addons/default/visiosoft/profile-module/src/Support/_helpers.php

@@ -0,0 +1,10 @@
+<?php
+
+use Visiosoft\ProfileModule\Support\Command\getAdmins;
+
+if (!function_exists('get_admins'))
+{
+	function getAdmins() {
+		return dispatch_now(new getAdmins());
+	}
+}