fixed sentry errors && added education seeder

This commit is contained in:
vedatakd 2021-02-23 11:54:50 +03:00
parent 8eab51e20e
commit e1d993c0b9
5 changed files with 62 additions and 18 deletions

View File

@ -71,7 +71,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function userAdv($nullable_ad = false, $checkRole = true) public function userAdv($nullable_ad = false, $checkRole = true)
{ {
if (Auth::user()->hasRole('admin') && $checkRole) { if ($user = Auth::user() and $user->hasRole('admin') && $checkRole) {
return $this->getAdv(null, $nullable_ad); return $this->getAdv(null, $nullable_ad);
} else { } else {
return $this->getAdv(null, $nullable_ad) return $this->getAdv(null, $nullable_ad)

View File

@ -50,7 +50,7 @@ return [
'name' => 'Numero di telefono di terra' 'name' => 'Numero di telefono di terra'
], ],
'office_phone' => [ 'office_phone' => [
'name' => 'Numero di telefono dell\\'ufficio' 'name' => 'Numero di telefono dell\'ufficio'
], ],
'register_type' => [ 'register_type' => [
'name' => 'Tipo di registro' 'name' => 'Tipo di registro'
@ -158,7 +158,7 @@ return [
'name' => 'In attesa di approvazione' 'name' => 'In attesa di approvazione'
], ],
'menu_delete_account' => [ 'menu_delete_account' => [
'name' => 'Chiudere l\\'account' 'name' => 'Chiudere l\'account'
], ],
'menu_my_ads' => [ 'menu_my_ads' => [
'name' => 'I miei annunci' 'name' => 'I miei annunci'
@ -170,7 +170,7 @@ return [
'name' => 'Ciao' 'name' => 'Ciao'
], ],
'menu_last_msg' => [ 'menu_last_msg' => [
'name' => 'Hai effettuato l\\'ultimo accesso alle' 'name' => 'Hai effettuato l\'ultimo accesso alle'
], ],
'menu_packages' => [ 'menu_packages' => [
'name' => 'I miei pacchetti' 'name' => 'I miei pacchetti'
@ -270,7 +270,7 @@ return [
'name' => 'Totale', 'name' => 'Totale',
], ],
'order_date' => [ 'order_date' => [
'name' => 'Data dell\\'ordine', 'name' => 'Data dell\'ordine',
], ],
'order_no' => [ 'order_no' => [
'name' => 'ID ordine', 'name' => 'ID ordine',

View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\ProfileModule\Education; <?php namespace Visiosoft\ProfileModule\Education;
use Anomaly\Streams\Platform\Database\Seeder\Seeder; use Anomaly\Streams\Platform\Database\Seeder\Seeder;
use Visiosoft\ProfileModule\Education\Contract\EducationRepositoryInterface;
class EducationSeeder extends Seeder class EducationSeeder extends Seeder
{ {
@ -10,6 +11,45 @@ class EducationSeeder extends Seeder
*/ */
public function run() public function run()
{ {
// $repository = app(EducationRepositoryInterface::class);
$educations = [
[
'en' => [
'name' => 'Primary School',
],
'tr' => [
'name' => 'İlk Okul',
],
],
[
'en' => [
'name' => 'Middle School',
],
'tr' => [
'name' => 'Orta Okul',
],
],
[
'en' => [
'name' => 'High School',
],
'tr' => [
'name' => 'Lise',
],
],
[
'en' => [
'name' => 'University',
],
'tr' => [
'name' => 'Üniversite',
],
],
];
foreach ($educations as $education) {
$repository->create($education);
}
} }
} }

View File

@ -3,6 +3,7 @@
use Anomaly\FilesModule\Disk\Contract\DiskRepositoryInterface; use Anomaly\FilesModule\Disk\Contract\DiskRepositoryInterface;
use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface; use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface;
use Anomaly\Streams\Platform\Database\Seeder\Seeder; use Anomaly\Streams\Platform\Database\Seeder\Seeder;
use Visiosoft\ProfileModule\Education\EducationSeeder;
use Visiosoft\ProfileModule\Seed\UsersFieldsSeeder; use Visiosoft\ProfileModule\Seed\UsersFieldsSeeder;
class ProfileModuleSeeder extends Seeder class ProfileModuleSeeder extends Seeder
@ -25,14 +26,14 @@ class ProfileModuleSeeder extends Seeder
/** /**
* Create a new FolderSeeder instance. * Create a new FolderSeeder instance.
* *
* @param DiskRepositoryInterface $disks * @param DiskRepositoryInterface $disks
* @param FolderRepositoryInterface $folders * @param FolderRepositoryInterface $folders
*/ */
public function __construct(DiskRepositoryInterface $disks, FolderRepositoryInterface $folders) public function __construct(DiskRepositoryInterface $disks, FolderRepositoryInterface $folders)
{ {
parent::__construct(); parent::__construct();
$this->disks = $disks; $this->disks = $disks;
$this->folders = $folders; $this->folders = $folders;
} }
@ -43,5 +44,8 @@ class ProfileModuleSeeder extends Seeder
{ {
// Users Fields Seeder // Users Fields Seeder
$this->call(UsersFieldsSeeder::class); $this->call(UsersFieldsSeeder::class);
//Educations Seeder
$this->call(EducationSeeder::class);
} }
} }

View File

@ -14,16 +14,16 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
view()->composer('*', function ($view) { view()->composer('*', function ($view) {
//Hidden menu items in sidebar on dashboard //Hidden menu items in sidebar on dashboard
if (auth()->check() and template()->get('cp')){ if (auth()->check() and template()->get('cp')) {
template()->get('cp')->getNavigation()->get('anomaly.module.variables')->setClass('hidden'); $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false;
template()->get('cp')->getNavigation()->get('anomaly.module.system')->setClass('hidden'); $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false;
template()->get('cp')->getNavigation()->get('anomaly.module.redirects')->setClass('hidden'); $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false;
template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')->setClass('hidden'); $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false;
} }
//Auto Language Switcher //Auto Language Switcher
if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
$lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);//Get Browser Language
$acceptLang = config('streams::locales.enabled'); //Supported Language $acceptLang = config('streams::locales.enabled'); //Supported Language
$lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en'); $lang = in_array($lang, $acceptLang) ? $lang : config('streams::locales.default', 'en');