hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Muammer Top 2020-10-14 19:05:14 +03:00
commit 8caff286d3
11 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
}
}

5
addons/default/visiosoft/profile-module/composer.json
View File

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

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

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

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

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

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

@ -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>

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

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

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

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

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

@ -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'),
];

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

@ -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) {

12
addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php Normal file
View File

@ -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();
}
}

10
addons/default/visiosoft/profile-module/src/Support/_helpers.php Normal file
View File

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