diff --git a/addons/default/visiosoft/advs-module/src/Support/_helpers.php b/addons/default/visiosoft/advs-module/src/Support/_helpers.php index 114eccbf0..45c94b635 100644 --- a/addons/default/visiosoft/advs-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/advs-module/src/Support/_helpers.php @@ -24,4 +24,11 @@ if (!function_exists('get_buyables')) function get_buyables() { return dispatch_now(new GetBuyables()); } +} + +if (!function_exists('auth_id_if_null')) +{ + function auth_id_if_null($userId) { + return $userId ?: auth()->id(); + } } \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/composer.json b/addons/default/visiosoft/profile-module/composer.json index 9e60e3695..04878d89c 100644 --- a/addons/default/visiosoft/profile-module/composer.json +++ b/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": "*" diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss index ea9072a56..73cf95b77 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss +++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss @@ -114,4 +114,10 @@ } } } + + #nav-details { + .birthday-field .input-group-addon { + display: none; + } + } } \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php index df06bb419..452193750 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php +++ b/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' ], diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig index e7fa7eabe..98720ce82 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -96,6 +96,7 @@ + {{ userForm.close()|raw }} +
+
+ + {{ profileForm.fields.birthday.input|raw }} +
+
- + {{ profileForm.fields.register_type.input|raw }}
- {{ addBlock('profile/detail/profile-detail-form/actions', {'user': user})|raw }} + {{ addBlock('profile/detail/profile-detail-form/actions')|raw }} {{ profileForm.actions|raw }}
diff --git a/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php b/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php index ecfe8b278..6e19425a7 100644 --- a/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php +++ b/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php @@ -14,4 +14,9 @@ class UserActivatedByMail { $this->user = $user; } + + public function getUser() + { + return $this->user; + } } \ No newline at end of file diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php index 44b7e584a..a64e538b5 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormBuilder.php +++ b/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' ]; diff --git a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php index f1f0d45b7..3a5b2a9bf 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php +++ b/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'), ]; diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index ede3c3c13..7b2f4c51a 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/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) { diff --git a/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php b/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php new file mode 100644 index 000000000..9c01b9c29 --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php @@ -0,0 +1,12 @@ +findBySlug('admin'); + return $adminRole->getUsers(); + } +} diff --git a/addons/default/visiosoft/profile-module/src/Support/_helpers.php b/addons/default/visiosoft/profile-module/src/Support/_helpers.php new file mode 100644 index 000000000..276134d40 --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Support/_helpers.php @@ -0,0 +1,10 @@ +