diff --git a/addons/default/visiosoft/advs-module/resources/views/list/table.twig b/addons/default/visiosoft/advs-module/resources/views/list/table.twig
index ae5eefb98..d969f529c 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig
@@ -20,8 +20,9 @@
+ {{ addBlock('ad-list/partials/table',{'featured_advs':featured_advs})|raw }}
{% for adv in advs %}
-
+
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index 8569b780f..f3ef4674e 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -199,8 +199,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
$join->on('advs_advs.id', '=', 'dopings_dopings.adv_name_id');
$join->where('dopings_dopings.doping_type_id', '=', 4);
});
-
- $query = $query->select('advs_advs.*', 'dopings_dopings.id as doping');
}
if (!empty($param['sort_by'])) {
switch ($param['sort_by']) {
@@ -216,7 +214,13 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
}
} else {
$query = $query->orderBy('advs_advs.created_at', 'desc');
- $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name', 'advs_advs_translations.advs_desc as advs_desc');
+ if ($isActiveDopings) {
+ $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name',
+ 'advs_advs_translations.advs_desc as advs_desc', 'dopings_dopings.id as doping');
+ } else {
+ $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name',
+ 'advs_advs_translations.advs_desc as advs_desc');
+ }
}
if ($type == "list") {
diff --git a/addons/default/visiosoft/cats-module/resources/lang/en/field.php b/addons/default/visiosoft/cats-module/resources/lang/en/field.php
index ab6a13cfe..b97a49e4b 100644
--- a/addons/default/visiosoft/cats-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/cats-module/resources/lang/en/field.php
@@ -21,7 +21,8 @@ return [
],
'icon' => [
'name' => 'Icon'
-],
+ ],
'please_wait' => 'Please wait.Deleting Sub Categories',
+ 'category_selection' => 'Category Selection',
];
diff --git a/addons/default/visiosoft/cats-module/resources/lang/tr/field.php b/addons/default/visiosoft/cats-module/resources/lang/tr/field.php
index 465c5b222..12aa56caf 100644
--- a/addons/default/visiosoft/cats-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/cats-module/resources/lang/tr/field.php
@@ -21,7 +21,8 @@ return [
],
'icon' => [
'name' => 'Icon'
-],
-
+ ],
'please_wait' => 'Lütfen bekleyin. Alt Kategoriler Siliniyor',
+ 'category_selection' => 'Kategori Seçimi',
+
];
diff --git a/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php b/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php
index 33bb4e4f5..ec59c9816 100644
--- a/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php
+++ b/addons/default/visiosoft/profile-module/migrations/2018_11_15_125011_visiosoft.module.profile__create_profile_fields.php
@@ -14,7 +14,7 @@ class VisiosoftModuleProfileCreateProfileFields extends Migration
*/
protected $fields = [
'name' => 'anomaly.field_type.text',
- 'user_no' => [
+ 'user' => [
'type' => 'anomaly.field_type.relationship',
'config' => [
'related' => UserModel::class,
diff --git a/addons/default/visiosoft/profile-module/migrations/2018_11_15_131718_visiosoft.module.profile__create_profile_stream.php b/addons/default/visiosoft/profile-module/migrations/2018_11_15_131718_visiosoft.module.profile__create_profile_stream.php
index 4804ff5b3..8c407acb0 100644
--- a/addons/default/visiosoft/profile-module/migrations/2018_11_15_131718_visiosoft.module.profile__create_profile_stream.php
+++ b/addons/default/visiosoft/profile-module/migrations/2018_11_15_131718_visiosoft.module.profile__create_profile_stream.php
@@ -25,7 +25,7 @@ class VisiosoftModuleProfileCreateProfileStream extends Migration
* @var array
*/
protected $assignments = [
- 'user_no',
+ 'user',
'file',
'email' => [
'required' => true
diff --git a/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php b/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
index 6f6c41639..dc2ae55da 100644
--- a/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
+++ b/addons/default/visiosoft/profile-module/migrations/2018_11_17_112645_visiosoft.module.profile__create_adress_stream.php
@@ -25,7 +25,7 @@ class VisiosoftModuleProfileCreateAdressStream extends Migration
* @var array
*/
protected $assignments = [
- 'user_no',
+ 'user',
'adress_name' => [
'required' => true,
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/ar/field.php b/addons/default/visiosoft/profile-module/resources/lang/ar/field.php
index 48111a7fe..ddcfa8fcb 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/ar/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/ar/field.php
@@ -100,7 +100,7 @@ return [
'messages' => [
'name' => 'رسائل'
],
- 'user_no' => [
+ 'user' => [
'name' => 'المستعمل'
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/de/field.php b/addons/default/visiosoft/profile-module/resources/lang/de/field.php
index 81e8174c9..cb39493f4 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/de/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/de/field.php
@@ -133,7 +133,7 @@
"name" =>"Mitteilungen",
],
- "user_no" => [
+ "user" => [
"name" =>"Nutzer",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/el/field.php b/addons/default/visiosoft/profile-module/resources/lang/el/field.php
index d17e0330d..c02c18f6b 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/el/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/el/field.php
@@ -133,7 +133,7 @@
"name" =>"Μηνύματα",
],
- "user_no" => [
+ "user" => [
"name" =>"Χρήστης",
],
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 654410428..15bca0078 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php
@@ -100,7 +100,7 @@ return [
'messages' => [
'name' => 'Messages'
],
- 'user_no' => [
+ 'user' => [
'name' => 'User'
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/es/field.php b/addons/default/visiosoft/profile-module/resources/lang/es/field.php
index b83d58a38..729c3fd3f 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/es/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/es/field.php
@@ -133,7 +133,7 @@
"name" =>"Mensajes",
],
- "user_no" => [
+ "user" => [
"name" =>"Usuario",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/fa/field.php b/addons/default/visiosoft/profile-module/resources/lang/fa/field.php
index 5aeed7db3..9ad15c594 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/fa/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/fa/field.php
@@ -133,7 +133,7 @@
"name" =>"پیام ها",
],
- "user_no" => [
+ "user" => [
"name" =>"کاربر",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/fr/field.php b/addons/default/visiosoft/profile-module/resources/lang/fr/field.php
index e38c5be62..1f8b91c70 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/fr/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/fr/field.php
@@ -133,7 +133,7 @@
"name" =>"messages",
],
- "user_no" => [
+ "user" => [
"name" =>"Utilisateur",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/it/field.php b/addons/default/visiosoft/profile-module/resources/lang/it/field.php
index 8ab698174..05757e357 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/it/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/it/field.php
@@ -133,7 +133,7 @@
"name" =>"messaggi",
],
- "user_no" => [
+ "user" => [
"name" =>"Utente",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php
index 4a2b0fcc4..bcfaa7810 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php
@@ -133,7 +133,7 @@
"name" =>"berichten",
],
- "user_no" => [
+ "user" => [
"name" =>"Gebruiker",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/pt/field.php b/addons/default/visiosoft/profile-module/resources/lang/pt/field.php
index 0961a956c..8e00fe3b5 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/pt/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/pt/field.php
@@ -133,7 +133,7 @@
"name" =>"Mensagens",
],
- "user_no" => [
+ "user" => [
"name" =>"Do utilizador",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/ru/field.php b/addons/default/visiosoft/profile-module/resources/lang/ru/field.php
index 462a5a285..b11e2581f 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/ru/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/ru/field.php
@@ -133,7 +133,7 @@
"name" =>"Сообщения",
],
- "user_no" => [
+ "user" => [
"name" =>"пользователь",
],
diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/field.php b/addons/default/visiosoft/profile-module/resources/lang/tr/field.php
index ab353402d..2b410b6f3 100644
--- a/addons/default/visiosoft/profile-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/profile-module/resources/lang/tr/field.php
@@ -100,7 +100,7 @@ return [
'messages' => [
'name' => 'Mesajlar'
],
- 'user_no' => [
+ 'user' => [
'name' => 'Kullanıcı'
],
diff --git a/addons/default/visiosoft/profile-module/src/Adress/AdressModel.php b/addons/default/visiosoft/profile-module/src/Adress/AdressModel.php
index 053316c3a..eabb1cc8d 100644
--- a/addons/default/visiosoft/profile-module/src/Adress/AdressModel.php
+++ b/addons/default/visiosoft/profile-module/src/Adress/AdressModel.php
@@ -22,9 +22,9 @@ class AdressModel extends ProfileAdressEntryModel implements AdressInterface
{
if($id != null)
{
- return $this->query()->where('user_no_id',$id)->get();
+ return $this->query()->where('user_id',$id)->get();
}
- return $this->query()->where('user_no_id',Auth::id())->get();
+ return $this->query()->where('user_id',Auth::id())->get();
}
diff --git a/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php b/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php
index 3defbd223..f3fcd2b66 100644
--- a/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php
+++ b/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php
@@ -23,7 +23,7 @@ class AdressTableBuilder extends TableBuilder
'search' => [
'filter' => 'search',
'fields' => [
- 'user_no',
+ 'user',
],
],
];
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php
index 4d2c3c9c4..eaa4a7e89 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/AdressController.php
@@ -52,7 +52,7 @@ class AdressController extends AdminController
public function adresList(AdressTableBuilder $table, $id)
{
- $table->setColumns(['adress_name','user_no']);
+ $table->setColumns(['adress_name','user']);
$table->setButtons(['edit' => [
'href' => '/admin/profile/adress/editAdress/{entry.id}',
],]);
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php
index 015d8bd21..6d01f1d63 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/ProfileController.php
@@ -35,14 +35,14 @@ class ProfileController extends AdminController
public function edit(ProfileFormBuilder $form,$id)
{
$users = UsersUsersEntryModel::find($id);
- $profiles = ProfileModel::query()->where('user_no_id',$id)->orderBy("id")->first();
+ $profiles = ProfileModel::query()->where('user_id',$id)->orderBy("id")->first();
if($profiles == null)
{
$newProfile = [];
- $newProfile ['user_no_id'] = $id;
+ $newProfile ['user_id'] = $id;
$newProfile ['country_id'] = null;
ProfileModel::query()->create($newProfile);
- $profiles = ProfileModel::query()->where('user_no_id',$id)->orderBy("id")->first();
+ $profiles = ProfileModel::query()->where('user_id',$id)->orderBy("id")->first();
}
$country = CountryModel::all();
return $this->view->make('visiosoft.module.profile::admin.profile.edit',compact('users','profiles','country','form'));
@@ -81,7 +81,7 @@ class ProfileController extends AdminController
$all['file_id'] = $all['file'];
unset($all['file']);
unset($all['_token'],$all['action']);
- ProfileModel::query()->where('user_no_id',$id)->update($all);
+ ProfileModel::query()->where('user_id',$id)->update($all);
$message = [];
$message[] = trans('visiosoft.module.profile::message.success_update');
return redirect('admin/profile')->with('success', $message);
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 7b31c6af7..bdb1f577e 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -75,7 +75,7 @@ class MyProfileController extends PublicController
if ($profiles == null) {
$newProfile = [];
- $newProfile ['user_no_id'] = Auth::id();
+ $newProfile ['user_id'] = Auth::id();
$profileModel->getProfile()->create($newProfile);
@@ -163,7 +163,7 @@ class MyProfileController extends PublicController
{
$adressModel = new AdressModel();
$adress = $adressModel->getAdressFirst($id);
- if ($adress->getAttribute('user_no_id') == Auth::id()) {
+ if ($adress->getAttribute('user_id') == Auth::id()) {
$country = CountryModel::all();
return $this->view->make('visiosoft.module.profile::address/edit', compact('adress', 'country'));
}
@@ -179,7 +179,7 @@ class MyProfileController extends PublicController
$adressModel = new AdressModel();
$adress = $adressModel->getAdressFirst($id);
- if ($adress->getAttribute('user_no_id') == Auth::id()) {
+ if ($adress->getAttribute('user_id') == Auth::id()) {
$New_value = $request->all();
$New_value['country_id'] = $New_value['country'];
@@ -201,7 +201,7 @@ class MyProfileController extends PublicController
}
$new_adress = $request->request->all();
unset($new_adress['action'], $new_adress['_to*ken']);
- $new_adress['user_no_id'] = Auth::id();
+ $new_adress['user_id'] = Auth::id();
$adressModel = new AdressModel();
$adressModel->getAdress()->create($new_adress);
@@ -226,7 +226,7 @@ class MyProfileController extends PublicController
}
$new_adress = $request->request->all();
unset($new_adress['action'], $new_adress['_token']);
- $new_adress['user_no_id'] = Auth::id();
+ $new_adress['user_id'] = Auth::id();
$adressModel = new AdressModel();
$address = $adressModel->getAdress()->create($new_adress);
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php
index 7a3dd10f0..3771b1730 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php
@@ -96,7 +96,7 @@ class UserAuthenticator
if (isset($credentials['username'])) {
$profile = $profileRepository->findProfileForLogin('gsm_phone', $credentials['username']);
if ($profile != null) {
- $find_user = $profileRepository->findUserForLogin('id', $profile->user_no_id);
+ $find_user = $profileRepository->findUserForLogin('id', $profile->user_id);
$credentials['username'] = $find_user->username;
}
}
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 025c2281e..a7a6f9b95 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php
@@ -29,7 +29,7 @@ class ProfileFormHandler
$parameters['file_id'] = $builder->getPostValue('file');
- $profileModel->where('user_no_id', Auth::id())
+ $profileModel->where('user_id', Auth::id())
->update($parameters);
$messages->success(trans('visiosoft.module.profile::message.success_update'));
diff --git a/addons/default/visiosoft/profile-module/src/Profile/ProfileModel.php b/addons/default/visiosoft/profile-module/src/Profile/ProfileModel.php
index 9dc3ab64e..fd6ad8370 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/ProfileModel.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/ProfileModel.php
@@ -10,7 +10,7 @@ class ProfileModel extends ProfileProfileEntryModel implements ProfileInterface
{
if($id != null)
{
- return $this->query()->where('user_no_id',$id);
+ return $this->query()->where('user_id',$id);
}
return $this->query();
}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php b/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
index 655aa75e2..0236ad60a 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/ProfileRepository.php
@@ -41,7 +41,7 @@ class ProfileRepository extends EntryRepository implements ProfileRepositoryInte
public function getProfile($id)
{
- return ProfileModel::query()->where('user_no_id', $id)->first();
+ return ProfileModel::query()->where('user_id', $id)->first();
}
public function findUserForLogin($field, $val)
@@ -50,7 +50,7 @@ class ProfileRepository extends EntryRepository implements ProfileRepositoryInte
if ($user == null) {
$profile = $this->findProfileForLogin('gsm_phone', $val);
if ($profile != null) {
- $user = UserModel::query()->find($profile->user_no_id);
+ $user = UserModel::query()->find($profile->user_id);
}
}
return $user;
@@ -127,14 +127,14 @@ class ProfileRepository extends EntryRepository implements ProfileRepositoryInte
public function findByUserID($id)
{
- return $this->model->where('user_no_id', $id)->first();
+ return $this->model->where('user_id', $id)->first();
}
public function CheckPhoneNumber($phoneNumber)
{
return $this->model
->where('gsm_phone', $phoneNumber)
- ->where('user_no_id','!=', Auth::id())
+ ->where('user_id','!=', Auth::id())
->first();
}
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
index f77e6ca83..a8fae7993 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -54,7 +54,7 @@ class Register2FormHandler
/* @var UserInterface $user */
$user = $builder->getFormEntry();
- $profile_parameters['user_no_id'] = $user->getId();
+ $profile_parameters['user_id'] = $user->getId();
ProfileModel::query()->create($profile_parameters);
$activator->start($user);
diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php
index d5ea0a30c..f25fb4630 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php
@@ -39,7 +39,7 @@ class ValidateCredentials
//Is email or phone number
if (!filter_var($credentials['email'], FILTER_VALIDATE_EMAIL)) {
if ($profile = $this->profile->findPhoneNumber($credentials['email'])) {
- if ($user = $this->repository->find($profile->user_no_id)) {
+ if ($user = $this->repository->find($profile->user_id)) {
$credentials['email'] = $user->email;
}
}
|