From bc832d1cbc857060cb7c786aa300282e4bbbb8ca Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 8 Oct 2020 11:31:47 +0300 Subject: [PATCH 01/28] #2300 Mobile App Fixes --- .../visiosoft/base-theme/resources/views/partials/metatags.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig index 47b13d70b..e7ab06471 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -2,7 +2,7 @@ - + From e80f9b9cb0cb90e2bf1ac493a92b38f7b29f91d3 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 8 Oct 2020 13:56:38 +0300 Subject: [PATCH 02/28] #2245 Add points-module as payment method --- .../Support/Command/CheckModuleInstalled.php | 23 +++++++++++++++++++ .../advs-module/src/Support/_helpers.php | 11 ++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php diff --git a/addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php b/addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php new file mode 100644 index 000000000..d3b82188e --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Support/Command/CheckModuleInstalled.php @@ -0,0 +1,23 @@ +moduleNamespace = $moduleNamespace; + $this->checkEnabled = $checkEnabled; + } + + public function handle(ModuleRepositoryInterface $moduleRepository) + { + if ($module = $moduleRepository->findBy('namespace', $this->moduleNamespace)) { + return $this->checkEnabled ? $module->installed && $module->enabled : boolval($module->installed); + } + return false; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Support/_helpers.php b/addons/default/visiosoft/advs-module/src/Support/_helpers.php index 834968bdb..f9f24f480 100644 --- a/addons/default/visiosoft/advs-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/advs-module/src/Support/_helpers.php @@ -2,9 +2,18 @@ use Illuminate\Contracts\Bus\Dispatcher; use Visiosoft\AdvsModule\Adv\Command\appendRequestURL; +use Visiosoft\AdvsModule\Support\Command\CheckModuleInstalled; -if (!function_exists('fullLink')) { +if (!function_exists('fullLink')) +{ function fullLink($request, $url, $newParameters = array()) { return app(Dispatcher::class)->dispatch(new appendRequestURL($request, $url, $newParameters)); } +} + +if (!function_exists('is_module_installed')) +{ + function is_module_installed($moduleNamespace, $checkEnabled = true) { + return dispatch_now(new CheckModuleInstalled($moduleNamespace, $checkEnabled)); + } } \ No newline at end of file From 4a8c1b6010775c74b20626776487b87dfd5d0908 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 8 Oct 2020 14:07:15 +0300 Subject: [PATCH 03/28] #2245 Add points-module as payment method --- .../advs-module/resources/lang/en/field.php | 6 ++++ .../src/Support/Command/GetBuyables.php | 34 +++++++++++++++++++ .../advs-module/src/Support/_helpers.php | 8 +++++ 3 files changed, 48 insertions(+) create mode 100644 addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index fc6f0d4dc..1dd8b7abc 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -306,4 +306,10 @@ return [ 'and_above' => 'and above', 'and_below' => 'and below', 'clear_all' => 'Clear All', + 'balances' => 'Balances', + 'packages' => 'Packages', + 'dopings' => 'Dopings', + 'advs' => 'Advs', + 'site' => 'Site', + 'subscription' => 'Subscription', ]; diff --git a/addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php b/addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php new file mode 100644 index 000000000..05d5fb29c --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Support/Command/GetBuyables.php @@ -0,0 +1,34 @@ + [ + 'name' => trans('visiosoft.module.advs::field.balances'), + 'entry_type' => 'Visiosoft\BalancesModule\Balance\BalanceModel' + ], + 'packages' => [ + 'name' => trans('visiosoft.module.advs::field.packages'), + 'entry_type' => 'Visiosoft\PackagesModule\Package\PackageModel' + ], + 'dopings' => [ + 'name' => trans('visiosoft.module.advs::field.dopings'), + 'entry_type' => 'Anomaly\Streams\Platform\Model\Dopings\DopingsDopingsEntryModel' + ], + 'advs' => [ + 'name' => trans('visiosoft.module.advs::field.advs'), + 'entry_type' => 'Visiosoft\AdvsModule\Adv\AdvModel' + ], + 'site' => [ + 'name' => trans('visiosoft.module.advs::field.site'), + 'entry_type' => 'Visiosoft\SiteModule\Addon\AddonModel' + ], + 'subscriptions' => [ + 'name' => trans('visiosoft.module.advs::field.subscriptions'), + 'entry_type' => 'Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel' + ], + ]; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Support/_helpers.php b/addons/default/visiosoft/advs-module/src/Support/_helpers.php index f9f24f480..114eccbf0 100644 --- a/addons/default/visiosoft/advs-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/advs-module/src/Support/_helpers.php @@ -3,6 +3,7 @@ use Illuminate\Contracts\Bus\Dispatcher; use Visiosoft\AdvsModule\Adv\Command\appendRequestURL; use Visiosoft\AdvsModule\Support\Command\CheckModuleInstalled; +use Visiosoft\AdvsModule\Support\Command\GetBuyables; if (!function_exists('fullLink')) { @@ -16,4 +17,11 @@ if (!function_exists('is_module_installed')) function is_module_installed($moduleNamespace, $checkEnabled = true) { return dispatch_now(new CheckModuleInstalled($moduleNamespace, $checkEnabled)); } +} + +if (!function_exists('get_buyables')) +{ + function get_buyables() { + return dispatch_now(new GetBuyables()); + } } \ No newline at end of file From aac63400251ef3883fa4775ebf2994f7d7e382b3 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 8 Oct 2020 18:11:02 +0300 Subject: [PATCH 04/28] #2220 points module --- .../profile-module/resources/views/profile/detail.twig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 7d53dee4d..e7fa7eabe 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -147,13 +147,14 @@
-
+
+ {{ addBlock('profile/detail/profile-detail-form/actions', {'user': user})|raw }} + {{ profileForm.actions|raw }}
-
- {{ profileForm.close()|raw }} + {{ profileForm.close()|raw }}
- {{ addBlock('profile/detail/profile-detail-form/actions', {'user': user})|raw }} + {{ addBlock('profile/detail/profile-detail-form/actions')|raw }} {{ profileForm.actions|raw }}
From 6c77ce41097eb0b53b54e08a930d685f388d07a5 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 9 Oct 2020 12:44:07 +0300 Subject: [PATCH 06/28] #2312 [profile-module] Can't update profile detail --- .../profile-module/resources/views/profile/detail.twig | 9 +++++++++ 1 file changed, 9 insertions(+) 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 b870a59a0..64ab4f27d 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 }} +
+
From 15ffa5646b205a439e6027800c10111af2ff54c4 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 9 Oct 2020 16:34:40 +0300 Subject: [PATCH 07/28] #2220 points module --- .../resources/assets/css/profile.scss | 6 + .../resources/lang/en/field.php | 3 + .../resources/views/profile/detail.twig | 4 +- .../Profile/Profile/ProfileFormBuilder.php | 1 + .../Profile/Profile/ProfileFormHandler.php | 1 + .../src/Seed/UsersFieldsSeeder.php | 323 +++++++++--------- 6 files changed, 180 insertions(+), 158 deletions(-) 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 64ab4f27d..98720ce82 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -151,7 +151,9 @@
- + {{ profileForm.fields.register_type.input|raw }}
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..d4315d3ac 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 @@ -28,166 +26,177 @@ class UsersFieldsSeeder extends Seeder AssignmentModelTranslation $assignmentModelTranslation ) { - $namespace = 'users'; - $locked = 0; - $stream = $streamRepository->findBySlugAndNamespace('users', 'users'); + if ($this->command->confirm('This command will remove the old custom fields from the users table! Are you sure you want to continue?')) { + $namespace = 'users'; + $locked = 0; + $stream = $streamRepository->findBySlugAndNamespace('users', 'users'); - $customFields = [ - 0 => [ - 'name' => 'File', - 'slug' => 'file', - 'type' => 'visiosoft.field_type.singlefile', - 'config' => [ - 'folders' => ["images"], - 'mode' => 'upload', - ] - ], - 1 => [ - 'name' => 'Country', - 'slug' => 'country', - 'type' => 'anomaly.field_type.relationship', - 'config' => [ - 'related' => CountryModel::class, - "default_value" => 0, + $customFields = [ + 0 => [ + 'name' => 'File', + 'slug' => 'file', + 'type' => 'visiosoft.field_type.singlefile', + 'config' => [ + 'folders' => ["images"], + 'mode' => 'upload', + ] ], - ], - 2 => [ - 'name' => 'City', - 'slug' => 'city', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 3 => [ - 'name' => 'District', - 'slug' => 'district', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 4 => [ - 'name' => 'Neighborhood', - 'slug' => 'neighborhood', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 5 => [ - 'name' => 'Village', - 'slug' => 'village', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 6 => [ - 'name' => 'Gsm Phone', - 'slug' => 'gsm_phone', - 'type' => 'anomaly.field_type.text', - ], - 7 => [ - 'name' => 'Land Phone', - 'slug' => 'land_phone', - 'type' => 'anomaly.field_type.text', - ], - 8 => [ - 'name' => 'Office Phone', - 'slug' => 'office_phone', - 'type' => 'anomaly.field_type.text', - ], - 9 => [ - 'name' => 'Register Type', - 'slug' => 'register_type', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [ - '1' => trans('visiosoft.module.profile::field.individual.name'), - '2' => trans('visiosoft.module.profile::field.corporate.name') + 1 => [ + 'name' => 'Country', + 'slug' => 'country', + 'type' => 'anomaly.field_type.relationship', + 'config' => [ + 'related' => CountryModel::class, + "default_value" => 0, ], - ] - ], - 10 => [ - 'name' => 'Identification Number', - 'slug' => 'identification_number', - 'type' => 'anomaly.field_type.text', - ], - 11 => [ - 'name' => 'Notified New Updates', - 'slug' => 'notified_new_updates', - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'default_value' => 1, - 'options' => [0 => 'Active', 1 => 'Passive'], - 'separator' => ':', - ] - ], - 12 => [ - 'name' => 'Notified About Ads', - 'slug' => 'notified_about_ads', - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'default_value' => 1, - 'options' => [0 => 'Active', 1 => 'Passive'], - 'separator' => ':', - ] - ], - 13 => [ - 'name' => 'Receive Messages Email', - 'slug' => 'receive_messages_email', - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'default_value' => 1, - 'options' => [0 => 'Active', 1 => 'Passive'], - 'separator' => ':', - ] - ], - ]; - - foreach ($customFields as $customField) { - $fields = $fieldRepository - ->newQuery() - ->where('slug', $customField['slug']) - ->where('namespace', $namespace) - ->get(); - - if ($fields) { - foreach ($fields as $field) { - $fieldModelTranslation->newQuery()->where('field_id', $field->id)->delete(); - - $assignment = $assignmentRepository - ->newQuery() - ->where('stream_id', $stream->id) - ->where('field_id', $field->id) - ->first(); - if ($assignment) { - $assignmentModelTranslation->newQuery()->where('assignment_id', $assignment->id)->delete(); - $assignment->delete(); - } - - $field->delete(); - } - } - - $data = [ - 'name' => $customField['name'], - 'namespace' => $namespace, - 'slug' => $customField['slug'], - 'type' => $customField['type'], - 'locked' => $locked + ], + 2 => [ + 'name' => 'City', + 'slug' => 'city', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 3 => [ + 'name' => 'District', + 'slug' => 'district', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 4 => [ + 'name' => 'Neighborhood', + 'slug' => 'neighborhood', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 5 => [ + 'name' => 'Village', + 'slug' => 'village', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 6 => [ + 'name' => 'Gsm Phone', + 'slug' => 'gsm_phone', + 'type' => 'anomaly.field_type.text', + ], + 7 => [ + 'name' => 'Land Phone', + 'slug' => 'land_phone', + 'type' => 'anomaly.field_type.text', + ], + 8 => [ + 'name' => 'Office Phone', + 'slug' => 'office_phone', + 'type' => 'anomaly.field_type.text', + ], + 9 => [ + 'name' => 'Register Type', + 'slug' => 'register_type', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [ + '1' => trans('visiosoft.module.profile::field.individual.name'), + '2' => trans('visiosoft.module.profile::field.corporate.name') + ], + ] + ], + 10 => [ + 'name' => 'Identification Number', + 'slug' => 'identification_number', + 'type' => 'anomaly.field_type.text', + ], + 11 => [ + 'name' => 'Notified New Updates', + 'slug' => 'notified_new_updates', + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'default_value' => 1, + 'options' => [0 => 'Active', 1 => 'Passive'], + 'separator' => ':', + ] + ], + 12 => [ + 'name' => 'Notified About Ads', + 'slug' => 'notified_about_ads', + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'default_value' => 1, + 'options' => [0 => 'Active', 1 => 'Passive'], + 'separator' => ':', + ] + ], + 13 => [ + 'name' => 'Receive Messages Email', + 'slug' => 'receive_messages_email', + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'default_value' => 1, + 'options' => [0 => 'Active', 1 => 'Passive'], + 'separator' => ':', + ] + ], + 14 => [ + 'name' => 'Birthday', + 'slug' => 'birthday', + 'type' => 'anomaly.field_type.datetime', + 'config' => [ + "mode" => "date", + "picker" => true, + ] + ], ]; - if (isset($customField['config'])) { - $data['config'] = $customField['config']; + + foreach ($customFields as $customField) { + $fields = $fieldRepository + ->newQuery() + ->where('slug', $customField['slug']) + ->where('namespace', $namespace) + ->get(); + + if ($fields) { + foreach ($fields as $field) { + $fieldModelTranslation->newQuery()->where('field_id', $field->id)->delete(); + + $assignment = $assignmentRepository + ->newQuery() + ->where('stream_id', $stream->id) + ->where('field_id', $field->id) + ->first(); + if ($assignment) { + $assignmentModelTranslation->newQuery()->where('assignment_id', $assignment->id)->delete(); + $assignment->delete(); + } + + $field->delete(); + } + } + + $data = [ + 'name' => $customField['name'], + 'namespace' => $namespace, + 'slug' => $customField['slug'], + 'type' => $customField['type'], + 'locked' => $locked + ]; + if (isset($customField['config'])) { + $data['config'] = $customField['config']; + } + + $field = $fieldRepository->create($data); + + $assignmentRepository->create([ + 'stream_id' => $stream->id, + 'field_id' => $field->id + ]); } - - $field = $fieldRepository->create($data); - - $assignmentRepository->create([ - 'stream_id' => $stream->id, - 'field_id' => $field->id - ]); } } } From a16e6c63a58feb8c25e7d2985d8b7190c0f25a58 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 9 Oct 2020 16:55:18 +0300 Subject: [PATCH 08/28] #2220 points module (rewrite the sms verification module) !4 --- .../default/visiosoft/advs-module/src/Support/_helpers.php | 7 +++++++ 1 file changed, 7 insertions(+) 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 From 42bce4bc7da57899118605313018f71435455b3a Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 12 Oct 2020 16:35:48 +0300 Subject: [PATCH 09/28] #2253 Do not show GET if it's off --- .../resources/views/new-ad/new-create.twig | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 29416109b..062321ad7 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -58,28 +58,31 @@ {{ form.fields.slug|raw }}
+ {% if setting_value('visiosoft.module.advs::market_place') %} + {{ addBlock('new-ad/fields', {'adv': adv})|raw }} - {{ addBlock('new-ad/fields', {'adv': adv})|raw }} +
+ +
+ {{ form.fields.standard_price.setAttributes({ + 'required' :true, + }).input|raw }} +
+ {% set standardPriceValue = form.fields.standard_price.value|split('.') %} +
+ +
+
+ +
+
+ {% endif %} -
- -
- {{ form.fields.standard_price.setAttributes({ - 'required' :true - }).input|raw }} -
- {% set standardPriceValue = form.fields.standard_price.value|split('.') %} -
- -
-
- -
-
+
+ {{ form.fields.standard_price.setAttributes({ + 'required' :true, + }).input|raw }} +
{% if setting_value('visiosoft.module.advs::market_place') %} {{ addBlock('new-ad/fields', {'adv': adv})|raw }} @@ -66,14 +71,11 @@ {{ form.fields.standard_price.label|raw }} * -
- {{ form.fields.standard_price.setAttributes({ - 'required' :true, - }).input|raw }} -
+ {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
- +
Date: Tue, 13 Oct 2020 09:16:55 +0300 Subject: [PATCH 11/28] remove command prompt --- .../src/Seed/UsersFieldsSeeder.php | 322 +++++++++--------- 1 file changed, 160 insertions(+), 162 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index e0973abc6..7b2f4c51a 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php @@ -26,177 +26,175 @@ class UsersFieldsSeeder extends Seeder AssignmentModelTranslation $assignmentModelTranslation ) { - if ($this->command->confirm('This command will remove the old custom fields from the users table! Are you sure you want to continue?')) { - $namespace = 'users'; - $locked = 0; - $stream = $streamRepository->findBySlugAndNamespace('users', 'users'); + $namespace = 'users'; + $locked = 0; + $stream = $streamRepository->findBySlugAndNamespace('users', 'users'); - $customFields = [ - 0 => [ - 'name' => 'File', - 'slug' => 'file', - 'type' => 'visiosoft.field_type.singlefile', - 'config' => [ - 'folders' => ["images"], - 'mode' => 'upload', - ] + $customFields = [ + 0 => [ + 'name' => 'File', + 'slug' => 'file', + 'type' => 'visiosoft.field_type.singlefile', + 'config' => [ + 'folders' => ["images"], + 'mode' => 'upload', + ] + ], + 1 => [ + 'name' => 'Country', + 'slug' => 'country', + 'type' => 'anomaly.field_type.relationship', + 'config' => [ + 'related' => CountryModel::class, + "default_value" => 0, ], - 1 => [ - 'name' => 'Country', - 'slug' => 'country', - 'type' => 'anomaly.field_type.relationship', - 'config' => [ - 'related' => CountryModel::class, - "default_value" => 0, + ], + 2 => [ + 'name' => 'City', + 'slug' => 'city', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 3 => [ + 'name' => 'District', + 'slug' => 'district', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 4 => [ + 'name' => 'Neighborhood', + 'slug' => 'neighborhood', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 5 => [ + 'name' => 'Village', + 'slug' => 'village', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [], + ] + ], + 6 => [ + 'name' => 'Gsm Phone', + 'slug' => 'gsm_phone', + 'type' => 'anomaly.field_type.text', + ], + 7 => [ + 'name' => 'Land Phone', + 'slug' => 'land_phone', + 'type' => 'anomaly.field_type.text', + ], + 8 => [ + 'name' => 'Office Phone', + 'slug' => 'office_phone', + 'type' => 'anomaly.field_type.text', + ], + 9 => [ + 'name' => 'Register Type', + 'slug' => 'register_type', + 'type' => 'anomaly.field_type.select', + "config" => [ + "options" => [ + '1' => trans('visiosoft.module.profile::field.individual.name'), + '2' => trans('visiosoft.module.profile::field.corporate.name') ], - ], - 2 => [ - 'name' => 'City', - 'slug' => 'city', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 3 => [ - 'name' => 'District', - 'slug' => 'district', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 4 => [ - 'name' => 'Neighborhood', - 'slug' => 'neighborhood', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 5 => [ - 'name' => 'Village', - 'slug' => 'village', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [], - ] - ], - 6 => [ - 'name' => 'Gsm Phone', - 'slug' => 'gsm_phone', - 'type' => 'anomaly.field_type.text', - ], - 7 => [ - 'name' => 'Land Phone', - 'slug' => 'land_phone', - 'type' => 'anomaly.field_type.text', - ], - 8 => [ - 'name' => 'Office Phone', - 'slug' => 'office_phone', - 'type' => 'anomaly.field_type.text', - ], - 9 => [ - 'name' => 'Register Type', - 'slug' => 'register_type', - 'type' => 'anomaly.field_type.select', - "config" => [ - "options" => [ - '1' => trans('visiosoft.module.profile::field.individual.name'), - '2' => trans('visiosoft.module.profile::field.corporate.name') - ], - ] - ], - 10 => [ - 'name' => 'Identification Number', - 'slug' => 'identification_number', - 'type' => 'anomaly.field_type.text', - ], - 11 => [ - 'name' => 'Notified New Updates', - 'slug' => 'notified_new_updates', - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'default_value' => 1, - 'options' => [0 => 'Active', 1 => 'Passive'], - 'separator' => ':', - ] - ], - 12 => [ - 'name' => 'Notified About Ads', - 'slug' => 'notified_about_ads', - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'default_value' => 1, - 'options' => [0 => 'Active', 1 => 'Passive'], - 'separator' => ':', - ] - ], - 13 => [ - 'name' => 'Receive Messages Email', - 'slug' => 'receive_messages_email', - 'type' => 'anomaly.field_type.select', - 'config' => [ - 'default_value' => 1, - 'options' => [0 => 'Active', 1 => 'Passive'], - 'separator' => ':', - ] - ], - 14 => [ - 'name' => trans('visiosoft.module.profile::field.birthday.name'), - 'slug' => 'birthday', - 'type' => 'anomaly.field_type.datetime', - 'config' => [ - "mode" => "date", - "picker" => true, - ] - ], - ]; + ] + ], + 10 => [ + 'name' => 'Identification Number', + 'slug' => 'identification_number', + 'type' => 'anomaly.field_type.text', + ], + 11 => [ + 'name' => 'Notified New Updates', + 'slug' => 'notified_new_updates', + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'default_value' => 1, + 'options' => [0 => 'Active', 1 => 'Passive'], + 'separator' => ':', + ] + ], + 12 => [ + 'name' => 'Notified About Ads', + 'slug' => 'notified_about_ads', + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'default_value' => 1, + 'options' => [0 => 'Active', 1 => 'Passive'], + 'separator' => ':', + ] + ], + 13 => [ + 'name' => 'Receive Messages Email', + 'slug' => 'receive_messages_email', + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'default_value' => 1, + 'options' => [0 => 'Active', 1 => 'Passive'], + '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) { - $fields = $fieldRepository - ->newQuery() - ->where('slug', $customField['slug']) - ->where('namespace', $namespace) - ->get(); + foreach ($customFields as $customField) { + $fields = $fieldRepository + ->newQuery() + ->where('slug', $customField['slug']) + ->where('namespace', $namespace) + ->get(); - if ($fields) { - foreach ($fields as $field) { - $fieldModelTranslation->newQuery()->where('field_id', $field->id)->delete(); + if ($fields) { + foreach ($fields as $field) { + $fieldModelTranslation->newQuery()->where('field_id', $field->id)->delete(); - $assignment = $assignmentRepository - ->newQuery() - ->where('stream_id', $stream->id) - ->where('field_id', $field->id) - ->first(); - if ($assignment) { - $assignmentModelTranslation->newQuery()->where('assignment_id', $assignment->id)->delete(); - $assignment->delete(); - } - - $field->delete(); + $assignment = $assignmentRepository + ->newQuery() + ->where('stream_id', $stream->id) + ->where('field_id', $field->id) + ->first(); + if ($assignment) { + $assignmentModelTranslation->newQuery()->where('assignment_id', $assignment->id)->delete(); + $assignment->delete(); } + + $field->delete(); } - - $data = [ - 'name' => $customField['name'], - 'namespace' => $namespace, - 'slug' => $customField['slug'], - 'type' => $customField['type'], - 'locked' => $locked - ]; - if (isset($customField['config'])) { - $data['config'] = $customField['config']; - } - - $field = $fieldRepository->create($data); - - $assignmentRepository->create([ - 'stream_id' => $stream->id, - 'field_id' => $field->id - ]); } + + $data = [ + 'name' => $customField['name'], + 'namespace' => $namespace, + 'slug' => $customField['slug'], + 'type' => $customField['type'], + 'locked' => $locked + ]; + if (isset($customField['config'])) { + $data['config'] = $customField['config']; + } + + $field = $fieldRepository->create($data); + + $assignmentRepository->create([ + 'stream_id' => $stream->id, + 'field_id' => $field->id + ]); } } } From e5f5ea0b627e5f159de611db7d5aeb357f61df28 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 13 Oct 2020 17:41:27 +0300 Subject: [PATCH 12/28] sign up country selection settings added --- .../resources/config/settings/sections.php | 2 +- .../resources/config/settings/settings.php | 22 ++++++++++++++++++- .../base-theme/resources/js/phonefield.js | 3 ++- .../users-module/partials/register-form.twig | 1 + 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php index 950b34146..e356e2b94 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php @@ -9,7 +9,7 @@ return [ 'fields' => [ 'home_page_sub_categories_limit', 'navigation_title', 'navigation_action', 'date_fields', 'price_fields', 'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn', - 'register_page_instruction_logo', 'register_page_alert_link' + 'register_page_instruction_logo', 'register_page_alert_link', 'enabled_countries' ], ], 'template' => [ diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index 791e3a74b..eb501c7ab 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -1,5 +1,5 @@ [ 'type' => 'anomaly.field_type.boolean', @@ -71,4 +71,24 @@ return [ 'style' => [ 'type' => 'anomaly.field_type.editor', ], + + 'enabled_countries' => [ + 'bind' => 'visiosoft.theme.base::countries.enabled', + 'env' => 'ADV_ENABLED_COUNTRIES', + 'type' => 'anomaly.field_type.select', + 'required' => false, + 'config' => [ + 'default_value' => function () { + return [config('visiosoft.theme.base::countries.default')]; + }, + 'options' => function () { + $array = \Visiosoft\LocationModule\Country\CountryModel::query()->get(); + $cur = array(); + foreach ($array as $key => $value) { + $cur[$value['abv']] = $value['name']; + } + return $cur; + }, + ], + ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index 66535c2a8..155532c75 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -1,4 +1,5 @@ function phoneMask(fields) { + var country = document.getElementById('country').innerText; var inputQueries = document.querySelectorAll(fields); inputQueries.forEach(function (inputQuery, key) { var iti = intlTelInput(inputQuery, { @@ -8,7 +9,7 @@ function phoneMask(fields) { geoIpLookup: function (success, failure) { $.get("https://ipinfo.io", function () { }, "jsonp").always(function (resp) { - var countryCode = (resp && resp.country) ? resp.country : ""; + var countryCode = country ? country : (resp && resp.country) ? resp.country : ""; success(countryCode); }) } diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig index c63a55cb9..df0c260db 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig @@ -56,6 +56,7 @@
{{ form.fields.phone.setValue(form.fields.phone.value).input|raw }} +
From 8ff6179572c02e3a95df0dac8a5f1d63fccc2400 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 13 Oct 2020 17:41:34 +0300 Subject: [PATCH 13/28] sign up country selection settings added --- ....module.location__add_abv_to_countries.php | 32 ++ .../location-module/src/countries.sql | 504 ++++++++++++++++++ 2 files changed, 536 insertions(+) create mode 100644 addons/default/visiosoft/location-module/migrations/2020_10_13_133916_visiosoft.module.location__add_abv_to_countries.php create mode 100644 addons/default/visiosoft/location-module/src/countries.sql diff --git a/addons/default/visiosoft/location-module/migrations/2020_10_13_133916_visiosoft.module.location__add_abv_to_countries.php b/addons/default/visiosoft/location-module/migrations/2020_10_13_133916_visiosoft.module.location__add_abv_to_countries.php new file mode 100644 index 000000000..3447542c6 --- /dev/null +++ b/addons/default/visiosoft/location-module/migrations/2020_10_13_133916_visiosoft.module.location__add_abv_to_countries.php @@ -0,0 +1,32 @@ +string('abv'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('location_countries_translations', function (Blueprint $table) { + $table->string('abv'); + }); + } +} diff --git a/addons/default/visiosoft/location-module/src/countries.sql b/addons/default/visiosoft/location-module/src/countries.sql new file mode 100644 index 000000000..6dfdd2c75 --- /dev/null +++ b/addons/default/visiosoft/location-module/src/countries.sql @@ -0,0 +1,504 @@ +-- phpMyAdmin SQL Dump +-- version 4.8.4 +-- https://www.phpmyadmin.net/ +-- +-- Host: localhost +-- Generation Time: Jan 31, 2019 at 12:17 PM +-- Server version: 10.3.11-MariaDB +-- PHP Version: 7.2.13 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +SET AUTOCOMMIT = 0; +START TRANSACTION; +SET time_zone = "+00:00"; + + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8mb4 */; + +-- +-- Database: `celep` +-- + +-- +-- Dumping data for table `default_location_countries` +-- + +INSERT INTO `default_location_countries` (`id`, `sort_order`, `created_at`, `created_by_id`, `updated_at`, `updated_by_id`, `slug`, `order`) VALUES +(1, 1, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'afghanistan', NULL), +(2, 2, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'albania', NULL), +(3, 3, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'algeria', NULL), +(4, 4, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'american_samoa', NULL), +(5, 5, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'andorra', NULL), +(6, 6, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'angola', NULL), +(7, 7, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'anguilla', NULL), +(8, 8, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'antarctica', NULL), +(9, 9, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'antigua_and_barbuda', NULL), +(10, 10, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'argentina', NULL), +(11, 11, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'armenia', NULL), +(12, 12, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'aruba', NULL), +(13, 13, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'australia', NULL), +(14, 14, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'austria', NULL), +(15, 15, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'azerbaijan', NULL), +(16, 16, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bahamas', NULL), +(17, 17, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bahrain', NULL), +(18, 18, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bangladesh', NULL), +(19, 19, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'barbados', NULL), +(20, 20, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'belarus', NULL), +(21, 21, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'belgium', NULL), +(22, 22, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'belize', NULL), +(23, 23, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'benin', NULL), +(24, 24, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bermuda', NULL), +(25, 25, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bhutan', NULL), +(26, 26, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bolivia', NULL), +(27, 27, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bosnia_and_herzegovina', NULL), +(28, 28, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'botswana', NULL), +(29, 29, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'brazil', NULL), +(30, 30, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'british_virgin_islands', NULL), +(31, 31, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'brunei', NULL), +(32, 32, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'bulgaria', NULL), +(33, 33, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'burkina_faso', NULL), +(34, 34, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'burundi', NULL), +(35, 35, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cambodia', NULL), +(36, 36, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cameroon', NULL), +(37, 37, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'canada', NULL), +(38, 38, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cape_verde', NULL), +(39, 39, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cayman_islands', NULL), +(40, 40, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'central_african_republic', NULL), +(41, 41, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'chad', NULL), +(42, 42, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'chile', NULL), +(43, 43, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'china', NULL), +(44, 44, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'christmas_island', NULL), +(45, 45, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cocos_keeling_islands', NULL), +(46, 46, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'colombia', NULL), +(47, 47, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'comoros', NULL), +(48, 48, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'congo_drc', NULL), +(49, 49, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'congo_republic', NULL), +(50, 50, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cook_islands', NULL), +(51, 51, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'costa_rica', NULL), +(52, 52, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'croatia', NULL), +(53, 53, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cuba', NULL), +(54, 54, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'cyprus', NULL), +(55, 55, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'czech_republic', NULL), +(56, 56, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'denmark', NULL), +(57, 57, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'djibouti', NULL), +(58, 58, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'dominica', NULL), +(59, 59, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'dominican_republic', NULL), +(60, 60, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'east_timor', NULL), +(61, 61, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'ecuador', NULL), +(62, 62, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'egypt', NULL), +(63, 63, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'el_salvador', NULL), +(64, 64, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'equatorial_guinea', NULL), +(65, 65, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'eritrea', NULL), +(66, 66, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'estonia', NULL), +(67, 67, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'ethiopia', NULL), +(68, 68, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'falkland_islands', NULL), +(69, 69, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'faroe_islands', NULL), +(70, 70, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'fiji', NULL), +(71, 71, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'finland', NULL), +(72, 72, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'france', NULL), +(73, 73, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'french_guiana', NULL), +(74, 74, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'french_polynesia', NULL), +(75, 75, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'french_southern_territories', NULL), +(76, 76, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'gabon', NULL), +(77, 77, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'gambia', NULL), +(78, 78, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'georgia', NULL), +(79, 79, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'germany', NULL), +(80, 80, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'ghana', NULL), +(81, 81, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'gibraltar', NULL), +(82, 82, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'greece', NULL), +(83, 83, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'greenland', NULL), +(84, 84, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'grenada', NULL), +(85, 85, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'guadeloupe', NULL), +(86, 86, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'guam', NULL), +(87, 87, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'guatemala', NULL), +(88, 88, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'guinea', NULL), +(89, 89, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'guinea_bissau', NULL), +(90, 90, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'guyana', NULL), +(91, 91, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'haiti', NULL), +(92, 92, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'honduras', NULL), +(93, 93, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'hong_kong', NULL), +(94, 94, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'hungary', NULL), +(95, 95, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'iceland', NULL), +(96, 96, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'india', NULL), +(97, 97, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'indonesia', NULL), +(98, 98, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'iran', NULL), +(99, 99, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'iraq', NULL), +(100, 100, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'ireland', NULL), +(101, 101, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'isle_of_man', NULL), +(102, 102, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'israel', NULL), +(103, 103, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'italy', NULL), +(104, 104, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'ivory_coast', NULL), +(105, 105, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'jamaica', NULL), +(106, 106, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'japan', NULL), +(107, 107, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'jordan', NULL), +(108, 108, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'kazakhstan', NULL), +(109, 109, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'kenya', NULL), +(110, 110, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'kiribati', NULL), +(111, 111, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'kosovo', NULL), +(112, 112, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'kuwait', NULL), +(113, 113, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'kyrgyzstan', NULL), +(114, 114, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'laos', NULL), +(115, 115, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'latvia', NULL), +(116, 116, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'lebanon', NULL), +(117, 117, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'lesotho', NULL), +(118, 118, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'liberia', NULL), +(119, 119, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'libya', NULL), +(120, 120, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'liechtenstein', NULL), +(121, 121, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'lithuania', NULL), +(122, 122, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'luxembourg', NULL), +(123, 123, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'macau', NULL), +(124, 124, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'macedonia', NULL), +(125, 125, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'madagascar', NULL), +(126, 126, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'malawi', NULL), +(127, 127, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'malaysia', NULL), +(128, 128, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'maldives', NULL), +(129, 129, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mali', NULL), +(130, 130, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'malta', NULL), +(131, 131, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'marshall_islands', NULL), +(132, 132, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'martinique', NULL), +(133, 133, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mauritania', NULL), +(134, 134, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mauritius', NULL), +(135, 135, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mayotte', NULL), +(136, 136, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mexico', NULL), +(137, 137, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'micronesia', NULL), +(138, 138, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'moldova', NULL), +(139, 139, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'monaco', NULL), +(140, 140, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mongolia', NULL), +(141, 141, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'montserrat', NULL), +(142, 142, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'morocco', NULL), +(143, 143, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'mozambique', NULL), +(144, 144, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'myanmar_burma', NULL), +(145, 145, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'namibia', NULL), +(146, 146, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'nauru', NULL), +(147, 147, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'nepal', NULL), +(148, 148, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'netherlands', NULL), +(149, 149, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'netherlands_antilles', NULL), +(150, 150, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'new_caledonia', NULL), +(151, 151, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'new_zealand', NULL), +(152, 152, '2019-01-31 10:27:51', NULL, '2019-01-31 10:27:51', NULL, 'nicaragua', NULL), +(153, 153, '2019-01-31 10:27:51', NULL, '2019-01-31 10:27:51', NULL, 'niger', NULL), +(154, 154, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'nigeria', NULL), +(155, 155, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'niue', NULL), +(156, 156, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'norfolk_island', NULL), +(157, 157, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'north_korea', NULL), +(158, 158, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'norway', NULL), +(159, 159, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'oman', NULL), +(160, 160, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'pakistan', NULL), +(161, 161, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'palau', NULL), +(162, 162, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'panama', NULL), +(163, 163, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'papua_new_guinea', NULL), +(164, 164, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'paraguay', NULL), +(165, 165, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'peru', NULL), +(166, 166, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'philippines', NULL), +(167, 167, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'pitcairn_islands', NULL), +(168, 168, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'poland', NULL), +(169, 169, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'portugal', NULL), +(170, 170, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'puerto_rico', NULL), +(171, 171, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'qatar', NULL), +(172, 172, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'r', NULL), +(173, 173, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'romania', NULL), +(174, 174, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'russia', NULL), +(175, 175, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'rwanda', NULL), +(176, 176, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'saint_helena', NULL), +(177, 177, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'saint_kitts_and_nevis', NULL), +(178, 178, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'saint_lucia', NULL), +(179, 179, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'saint_pierre_and_miquelon', NULL), +(180, 180, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'saint_vincent_and_the_grenadines', NULL), +(181, 181, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'san_marino', NULL), +(182, 182, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'sao_tome_and_principe', NULL), +(183, 183, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'saudi_arabia', NULL), +(184, 184, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'senegal', NULL), +(185, 185, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'serbia', NULL), +(186, 186, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'seychelles', NULL), +(187, 187, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'sierra_leone', NULL), +(188, 188, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'singapore', NULL), +(189, 189, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'slovakia', NULL), +(190, 190, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'slovenia', NULL), +(191, 191, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'solomon_islands', NULL), +(192, 192, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'somalia', NULL), +(193, 193, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'south_africa', NULL), +(194, 194, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'south_korea', NULL), +(195, 195, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'spain', NULL), +(196, 196, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'sri_lanka', NULL), +(197, 197, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'sudan', NULL), +(198, 198, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'suriname', NULL), +(199, 199, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'swaziland', NULL), +(200, 200, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'sweden', NULL), +(201, 201, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'switzerland', NULL), +(202, 202, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'syria', NULL), +(203, 203, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'taiwan', NULL), +(204, 204, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'tajikistan', NULL), +(205, 205, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'tanzania', NULL), +(206, 206, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'thailand', NULL), +(207, 207, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'togo', NULL), +(208, 208, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'tokelau', NULL), +(209, 209, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'tonga', NULL), +(210, 210, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'trinidad_and_tobago', NULL), +(211, 211, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'tunisia', NULL), +(212, 212, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'turkey', NULL), +(213, 213, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'turkmenistan', NULL), +(214, 214, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'turks_and_caicos_islands', NULL), +(215, 215, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'tuvalu', NULL), +(216, 216, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'us_virgin_islands', NULL), +(217, 217, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'uganda', NULL), +(218, 218, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'ukraine', NULL), +(219, 219, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'united_arab_emirates', NULL), +(220, 220, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'united_kingdom', NULL), +(221, 221, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'united_states', NULL), +(222, 222, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'uruguay', NULL), +(223, 223, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'uzbekistan', NULL), +(224, 224, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'vanuatu', NULL), +(225, 225, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'vatican_city', NULL), +(226, 226, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'venezuela', NULL), +(227, 227, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'vietnam', NULL), +(228, 228, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'wallis_and_futuna', NULL), +(229, 229, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'yemen', NULL), +(230, 230, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'zambia', NULL), +(231, 231, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'zimbabwe', NULL), +(232, 232, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'kktc', NULL); + +-- +-- Dumping data for table `default_location_countries_translations` +-- + +INSERT INTO `default_location_countries_translations` (`id`, `entry_id`, `created_at`, `created_by_id`, `updated_at`, `updated_by_id`, `locale`, `name`, `abv`) VALUES +(1, 1, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Afghanistan', 'AF'), +(2, 2, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Albania', 'AL'), +(3, 3, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Algeria', 'DZ'), +(4, 4, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'American Samoa', 'AS'), +(5, 5, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Andorra', 'AD'), +(6, 6, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Angola', 'AO'), +(7, 7, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Anguilla', 'AI'), +(8, 8, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Antarctica', 'ZW'), +(9, 9, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Antigua and Barbuda', 'AG'), +(10, 10, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Argentina', 'AR'), +(11, 11, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Armenia', 'AM'), +(12, 12, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Aruba', 'AW'), +(13, 13, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Australia', 'AU'), +(14, 14, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Austria', 'AT'), +(15, 15, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Azerbaijan', 'AZ'), +(16, 16, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bahamas', 'BS'), +(17, 17, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bahrain', 'BH'), +(18, 18, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bangladesh', 'BD'), +(19, 19, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Barbados', 'BB'), +(20, 20, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Belarus', 'BY'), +(21, 21, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Belgium', 'BE'), +(22, 22, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Belize', 'BZ'), +(23, 23, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Benin', 'BJ'), +(24, 24, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bermuda', 'BM'), +(25, 25, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bhutan', 'BT'), +(26, 26, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bolivia', 'BO'), +(27, 27, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bosnia and Herzegovina', 'BA'), +(28, 28, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Botswana', 'BW'), +(29, 29, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Brazil', 'BR'), +(30, 30, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'British Virgin Islands', 'VG'), +(31, 31, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Brunei', 'ZW'), +(32, 32, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Bulgaria', 'BG'), +(33, 33, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Burkina Faso', 'BF'), +(34, 34, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Burundi', 'BI'), +(35, 35, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cambodia', 'KH'), +(36, 36, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cameroon', 'CM'), +(37, 37, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Canada', 'CA'), +(38, 38, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cape Verde', 'CV'), +(39, 39, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cayman Islands', 'KY'), +(40, 40, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Central African Republic', 'CF'), +(41, 41, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Chad', 'TD'), +(42, 42, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Chile', 'CL'), +(43, 43, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'China', 'CN'), +(44, 44, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Christmas Island', 'ZW'), +(45, 45, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cocos [Keeling] Islands', 'ZW'), +(46, 46, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Colombia', 'CO'), +(47, 47, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Comoros', 'KM'), +(48, 48, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Congo [DRC]', 'ZW'), +(49, 49, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Congo [Republic]', 'ZW'), +(50, 50, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cook Islands', 'CK'), +(51, 51, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Costa Rica', 'CR'), +(52, 52, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Croatia', 'HR'), +(53, 53, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cuba', 'CU'), +(54, 54, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Cyprus', 'CY'), +(55, 55, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Czech Republic', 'CZ'), +(56, 56, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Denmark', 'DK'), +(57, 57, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Djibouti', 'DJ'), +(58, 58, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Dominica', 'DM'), +(59, 59, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Dominican Republic', 'DO'), +(60, 60, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'East Timor', 'ZW'), +(61, 61, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Ecuador', 'EC'), +(62, 62, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Egypt', 'EG'), +(63, 63, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'El Salvador', 'SV'), +(64, 64, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Equatorial Guinea', 'GQ'), +(65, 65, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Eritrea', 'ER'), +(66, 66, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Estonia', 'EE'), +(67, 67, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Ethiopia', 'ET'), +(68, 68, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Falkland Islands', 'FK'), +(69, 69, '2019-01-31 10:27:49', NULL, '2019-01-31 10:27:49', NULL, 'en', 'Faroe Islands', 'ZW'), +(70, 70, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Fiji', 'FJ'), +(71, 71, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Finland', 'FI'), +(72, 72, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'France', 'FR'), +(73, 73, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'French Guiana', 'GF'), +(74, 74, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'French Polynesia', 'PF'), +(75, 75, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'French Southern Territories', 'ZW'), +(76, 76, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Gabon', 'GA'), +(77, 77, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Gambia', 'GM'), +(78, 78, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Georgia', 'GE'), +(79, 79, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Germany', 'DE'), +(80, 80, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Ghana', 'GH'), +(81, 81, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Gibraltar', 'GI'), +(82, 82, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Greece', 'GR'), +(83, 83, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Greenland', 'GL'), +(84, 84, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Grenada', 'GD'), +(85, 85, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Guadeloupe', 'GP'), +(86, 86, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Guam', 'GU'), +(87, 87, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Guatemala', 'GT'), +(88, 88, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Guinea', 'GN'), +(89, 89, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Guinea-Bissau', 'GW'), +(90, 90, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Guyana', 'GY'), +(91, 91, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Haiti', 'HT'), +(92, 92, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Honduras', 'HN'), +(93, 93, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Hong Kong', 'HK'), +(94, 94, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Hungary', 'HU'), +(95, 95, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Iceland', 'IS'), +(96, 96, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'India', 'IN'), +(97, 97, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Indonesia', 'ID'), +(98, 98, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Iran', 'IR'), +(99, 99, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Iraq', 'IQ'), +(100, 100, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Ireland', 'IE'), +(101, 101, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Isle of Man', 'IM'), +(102, 102, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Israel', 'IL'), +(103, 103, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Italy', 'IT'), +(104, 104, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Ivory Coast', 'ZW'), +(105, 105, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Jamaica', 'JM'), +(106, 106, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Japan', 'JP'), +(107, 107, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Jordan', 'JO'), +(108, 108, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Kazakhstan', 'KZ'), +(109, 109, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Kenya', 'KE'), +(110, 110, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Kiribati', 'KI'), +(111, 111, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Kosovo', 'ZW'), +(112, 112, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Kuwait', 'KW'), +(113, 113, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Kyrgyzstan', 'KG'), +(114, 114, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Laos', 'LA'), +(115, 115, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Latvia', 'LV'), +(116, 116, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Lebanon', 'LB'), +(117, 117, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Lesotho', 'LS'), +(118, 118, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Liberia', 'LR'), +(119, 119, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Libya', 'ZW'), +(120, 120, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Liechtenstein', 'LI'), +(121, 121, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Lithuania', 'LT'), +(122, 122, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Luxembourg', 'LU'), +(123, 123, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Macau', 'ZW'), +(124, 124, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Macedonia', 'MK'), +(125, 125, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Madagascar', 'MG'), +(126, 126, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Malawi', 'MW'), +(127, 127, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Malaysia', 'MY'), +(128, 128, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Maldives', 'MV'), +(129, 129, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mali', 'ML'), +(130, 130, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Malta', 'MT'), +(131, 131, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Marshall Islands', 'MH'), +(132, 132, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Martinique', 'MQ'), +(133, 133, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mauritania', 'MR'), +(134, 134, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mauritius', 'MU'), +(135, 135, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mayotte', 'YT'), +(136, 136, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mexico', 'MX'), +(137, 137, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Micronesia', 'FM'), +(138, 138, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Moldova', 'MD'), +(139, 139, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Monaco', 'MC'), +(140, 140, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mongolia', 'MN'), +(141, 141, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Montserrat', 'MS'), +(142, 142, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Morocco', 'MA'), +(143, 143, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Mozambique', 'MZ'), +(144, 144, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Myanmar [Burma]', 'ZW'), +(145, 145, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Namibia', 'NA'), +(146, 146, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Nauru', 'NR'), +(147, 147, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Nepal', 'NP'), +(148, 148, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Netherlands', 'NL'), +(149, 149, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'Netherlands Antilles', 'AN'), +(150, 150, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'New Caledonia', 'NC'), +(151, 151, '2019-01-31 10:27:50', NULL, '2019-01-31 10:27:50', NULL, 'en', 'New Zealand', 'NZ'), +(152, 152, '2019-01-31 10:27:51', NULL, '2019-01-31 10:27:51', NULL, 'en', 'Nicaragua', 'NI'), +(153, 153, '2019-01-31 10:27:51', NULL, '2019-01-31 10:27:51', NULL, 'en', 'Niger', 'NE'), +(154, 154, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Nigeria', 'NG'), +(155, 155, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Niue', 'NU'), +(156, 156, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Norfolk Island', 'NF'), +(157, 157, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'North Korea', 'KP'), +(158, 158, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Norway', 'NO'), +(159, 159, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Oman', 'OM'), +(160, 160, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Pakistan', 'PK'), +(161, 161, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Palau', 'PW'), +(162, 162, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Panama', 'PA'), +(163, 163, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Papua New Guinea', 'PG'), +(164, 164, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Paraguay', 'PY'), +(165, 165, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Peru', 'PE'), +(166, 166, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Philippines', 'PH'), +(167, 167, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Pitcairn Islands', 'ZW'), +(168, 168, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Poland', 'PL'), +(169, 169, '2019-01-31 10:27:52', NULL, '2019-01-31 10:27:52', NULL, 'en', 'Portugal', 'PT'), +(170, 170, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Puerto Rico', 'PR'), +(171, 171, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Qatar', 'QA'), +(172, 172, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'R', 'ZW'), +(173, 173, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Romania', 'RO'), +(174, 174, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Russia', 'ZW'), +(175, 175, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Rwanda', 'RW'), +(176, 176, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Saint Helena', 'SH'), +(177, 177, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Saint Kitts and Nevis', 'KN'), +(178, 178, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Saint Lucia', 'LC'), +(179, 179, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Saint Pierre and Miquelon', 'PM'), +(180, 180, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Saint Vincent and the Grenadines', 'VC'), +(181, 181, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'San Marino', 'SM'), +(182, 182, '2019-01-31 10:27:53', NULL, '2019-01-31 10:27:53', NULL, 'en', 'Sao Tome and Principe', 'ST'), +(183, 183, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Saudi Arabia', 'SA'), +(184, 184, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Senegal', 'SN'), +(185, 185, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Serbia', 'RS'), +(186, 186, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Seychelles', 'SC'), +(187, 187, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Sierra Leone', 'SL'), +(188, 188, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Singapore', 'SG'), +(189, 189, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Slovakia', 'SK'), +(190, 190, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Slovenia', 'SI'), +(191, 191, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Solomon Islands', 'SB'), +(192, 192, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Somalia', 'SO'), +(193, 193, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'South Africa', 'ZA'), +(194, 194, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'South Korea', 'KR'), +(195, 195, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Spain', 'ES'), +(196, 196, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Sri Lanka', 'LK'), +(197, 197, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Sudan', 'SD'), +(198, 198, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Suriname', 'SR'), +(199, 199, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Swaziland', 'SZ'), +(200, 200, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Sweden', 'SE'), +(201, 201, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Switzerland', 'CH'), +(202, 202, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Syria', 'ZW'), +(203, 203, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Taiwan', 'ZW'), +(204, 204, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Tajikistan', 'TJ'), +(205, 205, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Tanzania', 'TZ'), +(206, 206, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Thailand', 'TH'), +(207, 207, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Togo', 'TG'), +(208, 208, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Tokelau', 'TK'), +(209, 209, '2019-01-31 10:27:54', NULL, '2019-01-31 10:27:54', NULL, 'en', 'Tonga', 'TO'), +(210, 210, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Trinidad and Tobago', 'TT'), +(211, 211, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Tunisia', 'TN'), +(212, 212, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Turkey', 'TR'), +(213, 213, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Turkmenistan', 'TM'), +(214, 214, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Turks and Caicos Islands', 'TC'), +(215, 215, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Tuvalu', 'TV'), +(216, 216, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'U.S. Virgin Islands', 'VI'), +(217, 217, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Uganda', 'UG'), +(218, 218, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Ukraine', 'UA'), +(219, 219, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'United Arab Emirates', 'AE'), +(220, 220, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'United Kingdom', 'UK'), +(221, 221, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'United States', 'US'), +(222, 222, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Uruguay', 'UY'), +(223, 223, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Uzbekistan', 'UZ'), +(224, 224, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Vanuatu', 'VU'), +(225, 225, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Vatican City', 'ZW'), +(226, 226, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Venezuela', 'VE'), +(227, 227, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Vietnam', 'ZW'), +(228, 228, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Wallis and Futuna', 'ZW'), +(229, 229, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Yemen', 'YE'), +(230, 230, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Zambia', 'ZM'), +(231, 231, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'Zimbabwe', 'ZW'), +(232, 232, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'KKTC', 'ZW'); +COMMIT; + +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; From 779c4e5bd2602a970342974ceded025bd8b199b2 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 13 Oct 2020 17:43:10 +0300 Subject: [PATCH 14/28] sign up country selection settings added --- .../base-theme/resources/config/settings/settings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index eb501c7ab..b95d6bf4e 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -1,5 +1,5 @@ [ 'type' => 'anomaly.field_type.boolean', @@ -82,7 +82,7 @@ return [ return [config('visiosoft.theme.base::countries.default')]; }, 'options' => function () { - $array = \Visiosoft\LocationModule\Country\CountryModel::query()->get(); + $array = CountryModel::query()->get(); $cur = array(); foreach ($array as $key => $value) { $cur[$value['abv']] = $value['name']; From 5a01f77dd5e247a7b4d96671a4a9919a23216271 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 14 Oct 2020 09:20:13 +0300 Subject: [PATCH 15/28] setting title added --- .../default/visiosoft/base-theme/resources/lang/en/setting.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php index f927a8a08..c8b391250 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Homepage Sub Categories Limit', ], + 'enabled_countries' => [ + 'name' => 'Enabled Country', + ] ]; \ No newline at end of file From bd153541f906be1f2ca99f2bc06675828c464928 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 14 Oct 2020 11:50:20 +0300 Subject: [PATCH 16/28] field names edited --- .../base-theme/resources/config/settings/sections.php | 2 +- .../visiosoft/base-theme/resources/lang/en/setting.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php index e356e2b94..7e08b05f8 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php @@ -9,7 +9,7 @@ return [ 'fields' => [ 'home_page_sub_categories_limit', 'navigation_title', 'navigation_action', 'date_fields', 'price_fields', 'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn', - 'register_page_instruction_logo', 'register_page_alert_link', 'enabled_countries' + 'register_page_instruction_logo', 'register_page_alert_link', 'default_country' ], ], 'template' => [ diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php index c8b391250..01ae47cf2 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php @@ -40,7 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Homepage Sub Categories Limit', ], - 'enabled_countries' => [ - 'name' => 'Enabled Country', + 'default_country' => [ + 'name' => 'Register page, default country for phone', ] ]; \ No newline at end of file From 803b3c3d808a754370ddd6f81adb486a522cef4e Mon Sep 17 00:00:00 2001 From: Dia Shalabi <45572261+diashalabi@users.noreply.github.com> Date: Wed, 14 Oct 2020 11:52:03 +0300 Subject: [PATCH 17/28] #2220 points module (rewrite the sms verification module) (#713) * #2300 Mobile App Fixes * #2245 Add points-module as payment method * #2245 Add points-module as payment method * #2220 points module * #2220 points module (rewrite the sms verification module) * #2312 [profile-module] Can't update profile detail * #2220 points module * #2220 points module (rewrite the sms verification module) !4 * remove command prompt --- .../advs-module/src/Support/_helpers.php | 7 +++++++ .../resources/assets/css/profile.scss | 6 ++++++ .../profile-module/resources/lang/en/field.php | 3 +++ .../resources/views/profile/detail.twig | 15 +++++++++++++-- .../src/Profile/Profile/ProfileFormBuilder.php | 1 + .../src/Profile/Profile/ProfileFormHandler.php | 1 + .../profile-module/src/Seed/UsersFieldsSeeder.php | 11 +++++++++-- 7 files changed, 40 insertions(+), 4 deletions(-) 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/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/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) { From c384d6c4c4f23ee9d08493190de335f213292f7e Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 14 Oct 2020 12:04:26 +0300 Subject: [PATCH 18/28] field names edited --- .../visiosoft/base-theme/resources/config/settings/settings.php | 2 +- .../addons/anomaly/users-module/partials/register-form.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index b95d6bf4e..b814051b2 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -72,7 +72,7 @@ return [ 'type' => 'anomaly.field_type.editor', ], - 'enabled_countries' => [ + 'default_country' => [ 'bind' => 'visiosoft.theme.base::countries.enabled', 'env' => 'ADV_ENABLED_COUNTRIES', 'type' => 'anomaly.field_type.select', diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig index df0c260db..ab4c2dbea 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/partials/register-form.twig @@ -56,7 +56,7 @@
{{ form.fields.phone.setValue(form.fields.phone.value).input|raw }} - +
From 7abf0084d7f4608dea50905dd8cc5ed4360bb9ac Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 14 Oct 2020 19:03:21 +0300 Subject: [PATCH 19/28] #1866 advs excel export --- .../advs-module/resources/lang/en/button.php | 1 + .../advs-module/src/Adv/AdvsExport.php | 81 +++++++++++++++++++ .../src/AdvsModuleServiceProvider.php | 16 +++- .../Http/Controller/Admin/AdvsController.php | 7 ++ 4 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php index c84a77408..ab988e7b0 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Update Category' ], 'new_option' => 'New Option', + 'export' => 'Export' ]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php new file mode 100644 index 000000000..96bcadd91 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -0,0 +1,81 @@ +newQuery() + ->leftJoin('cats_category', function ($q){ + $q->on('cats_category.id', 'advs_advs.cat1') + ->orOn('cats_category.id', 'advs_advs.cat2') + ->orOn('cats_category.id', 'advs_advs.cat3') + ->orOn('cats_category.id', 'advs_advs.cat4') + ->orOn('cats_category.id', 'advs_advs.cat5') + ->orOn('cats_category.id', 'advs_advs.cat6') + ->orOn('cats_category.id', 'advs_advs.cat7') + ->orOn('cats_category.id', 'advs_advs.cat8') + ->orOn('cats_category.id', 'advs_advs.cat9') + ->orOn('cats_category.id', 'advs_advs.cat10'); + }) + ->leftJoin('cats_category_translations', 'cats_category.id', 'cats_category_translations.entry_id') + ->leftJoin('location_countries_translations','advs_advs.country_id', 'location_countries_translations.entry_id') + + ->leftJoin('location_cities_translations','advs_advs.city', 'location_cities_translations.entry_id') + + ->leftJoin('location_districts_translations','advs_advs.district', 'location_districts_translations.entry_id') + ->where('cats_category_translations.locale',Request()->session()->get('_locale', setting_value('streams::default_locale', 'en'))) + ->where('advs_advs_translations.locale',Request()->session()->get('_locale', setting_value('streams::default_locale', 'en'))) + ->select(['advs_advs.*', 'location_countries_translations.name as country', 'location_cities_translations.name as city_name', 'location_districts_translations.name as district', DB::raw("group_concat(default_cats_category_translations.name SEPARATOR ', ') as categories")]) + ->groupBy('advs_advs.id') + ->get(); + + return $cats; + } + + public function map($adv): array + { + return [ + $adv->id, + $adv->name, + strip_tags($adv->advs_desc), + $adv->currency, + $adv->price, + $adv->standard_price, + $adv->created_by_id, + $adv->categories, + $adv->country, + $adv->city_name, + $adv->district, + ]; + } + + public function headings(): array + { + return [ + 'ID', + 'Name', + 'Description', + 'Currency', + 'Price', + 'Standard Price', + 'Created By Id', + 'Categories', + 'Country', + 'City', + 'District', + ]; + } +} diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 74041899a..ec32d05a9 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -75,6 +75,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider ], 'admin/advs-users/choose/{advId}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@choose', 'admin/class/actions/{id}/{type}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@actions', + 'admin/advs/export' => [ + 'as' => 'advs::exportAdvs', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@exportAdvs', + ], // advsController 'advs/list' => [ @@ -344,22 +348,30 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'general_settings' => [ 'title' => 'visiosoft.module.advs::button.general_settings', 'href' => '/admin/settings/modules/visiosoft.module.advs', + 'page' => 'anomaly.module.settings' ], 'theme_settings' => [ 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', 'href' => url('admin/settings/themes/' . setting_value('streams::standard_theme')), + 'page' => 'anomaly.module.settings' ], 'assets_clear' => [ 'title' => 'visiosoft.module.advs::section.assets_clear.name', 'href' => route('assets_clear'), + 'page' => 'anomaly.module.settings' ], + 'export' => [ + 'title' => 'visiosoft.module.advs::button.export', + 'href' => route('advs::exportAdvs'), + 'page' => 'visiosoft.module.advs' + ] ]; foreach ($settings_url as $key => $value) { - $addonCollection->get('anomaly.module.settings')->addSection($key, $value); + $addonCollection->get($value['page'])->addSection($key, $value); } - // Disable file versioning + // Disable file versioning $fileModel->disableVersioning(); } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index e0268b5d5..47032280d 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -25,6 +25,8 @@ use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface; use Visiosoft\CatsModule\Category\CategoryModel; use Visiosoft\LocationModule\City\CityModel; use Visiosoft\AlgoliaModule\Search\SearchModel; +use Maatwebsite\Excel\Facades\Excel; +use Visiosoft\AdvsModule\Adv\AdvsExport; class AdvsController extends AdminController { @@ -341,4 +343,9 @@ class AdvsController extends AdminController Return Back"; echo "
Return Admin Panel"; } + + + public function exportAdvs(){ + return Excel::download(new AdvsExport(), 'advs-' . time() . '.xlsx'); + } } From d3fd76e2f3217929984dea95e58f45af0e2aac01 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 14 Oct 2020 19:03:50 +0300 Subject: [PATCH 20/28] #1866 advs excel export --- addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php index 96bcadd91..e90120f00 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -32,9 +32,7 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings }) ->leftJoin('cats_category_translations', 'cats_category.id', 'cats_category_translations.entry_id') ->leftJoin('location_countries_translations','advs_advs.country_id', 'location_countries_translations.entry_id') - ->leftJoin('location_cities_translations','advs_advs.city', 'location_cities_translations.entry_id') - ->leftJoin('location_districts_translations','advs_advs.district', 'location_districts_translations.entry_id') ->where('cats_category_translations.locale',Request()->session()->get('_locale', setting_value('streams::default_locale', 'en'))) ->where('advs_advs_translations.locale',Request()->session()->get('_locale', setting_value('streams::default_locale', 'en'))) From ec473b51bc9bb8f5848d438e23351d822a096d4b Mon Sep 17 00:00:00 2001 From: spektra2147 <39536659+spektra2147@users.noreply.github.com> Date: Wed, 14 Oct 2020 19:54:34 +0300 Subject: [PATCH 21/28] change helper name (#719) Co-authored-by: vedatakd --- .../src/Support/Command/{getAdmins.php => getAdminUsers.php} | 2 +- .../default/visiosoft/profile-module/src/Support/_helpers.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename addons/default/visiosoft/profile-module/src/Support/Command/{getAdmins.php => getAdminUsers.php} (93%) diff --git a/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php b/addons/default/visiosoft/profile-module/src/Support/Command/getAdminUsers.php similarity index 93% rename from addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php rename to addons/default/visiosoft/profile-module/src/Support/Command/getAdminUsers.php index 9c01b9c29..5e5dd4079 100644 --- a/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php +++ b/addons/default/visiosoft/profile-module/src/Support/Command/getAdminUsers.php @@ -2,7 +2,7 @@ use Anomaly\UsersModule\Role\Contract\RoleRepositoryInterface; -class getAdmins +class getAdminUsers { public function handle() { diff --git a/addons/default/visiosoft/profile-module/src/Support/_helpers.php b/addons/default/visiosoft/profile-module/src/Support/_helpers.php index 276134d40..6991cd3b8 100644 --- a/addons/default/visiosoft/profile-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/profile-module/src/Support/_helpers.php @@ -1,10 +1,10 @@ Date: Thu, 15 Oct 2020 09:45:59 +0300 Subject: [PATCH 22/28] Excel headings make translatable --- .../advs-module/resources/lang/en/field.php | 1 + .../advs-module/src/Adv/AdvsExport.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index 1dd8b7abc..7ebc16101 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -312,4 +312,5 @@ return [ 'advs' => 'Advs', 'site' => 'Site', 'subscription' => 'Subscription', + 'created' => 'Created', ]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php index e90120f00..ef50835c4 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -64,16 +64,16 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings { return [ 'ID', - 'Name', - 'Description', - 'Currency', - 'Price', - 'Standard Price', - 'Created By Id', - 'Categories', - 'Country', - 'City', - 'District', + trans('module::field.name.name'), + trans('module::field.description'), + trans('module::field.currency.name'), + trans('module::field.price.name'), + trans('module::field.standard_price.name'), + trans('module::field.created'), + trans('module::field.categories'), + trans('module::field.country.name'), + trans('module::field.city.name'), + trans('module::field.district.name'), ]; } } From da4eda57664612cdcae29bca9d744e8747cdaee6 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 15 Oct 2020 12:20:43 +0300 Subject: [PATCH 23/28] #2331 oc.com bug - 'Call to a member function update() on null' --- addons/default/visiosoft/advs-module/resources/js/viewed.js | 3 +-- .../advs-module/resources/views/ad-detail/detail.twig | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/viewed.js b/addons/default/visiosoft/advs-module/resources/js/viewed.js index f507cfa28..fa69da85b 100644 --- a/addons/default/visiosoft/advs-module/resources/js/viewed.js +++ b/addons/default/visiosoft/advs-module/resources/js/viewed.js @@ -1,8 +1,7 @@ function viewed_ad() { - var id = $('#adv-id').val(); $.ajax({ type: 'get', - url: '/ajax/viewed/' + id, + url: '/ajax/viewed/' + advID, }); } diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index 761abb50b..186bfd58b 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -55,6 +55,9 @@ {% include "visiosoft.module.advs::ad-detail/partials/dropleft-edit" %} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/viewed.js") }} {% endblock %} \ No newline at end of file From 0f64617d50f0135f3dcb25f431c0d5983ef9165e Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 15 Oct 2020 12:26:19 +0300 Subject: [PATCH 24/28] #2331 oc.com bug - 'Call to a member function update() on null' --- .../advs-module/resources/views/ad-detail/detail.twig | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index 186bfd58b..761abb50b 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -55,9 +55,6 @@ {% include "visiosoft.module.advs::ad-detail/partials/dropleft-edit" %} - {{ asset_add("scripts.js", "visiosoft.module.advs::js/viewed.js") }} {% endblock %} \ No newline at end of file From 1f1b10434d90edff439c6bf5731a69bfeac2312d Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 15 Oct 2020 12:27:01 +0300 Subject: [PATCH 25/28] oc.com bug - 'Call to a member function update() on null' --- addons/default/visiosoft/advs-module/resources/js/viewed.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/viewed.js b/addons/default/visiosoft/advs-module/resources/js/viewed.js index fa69da85b..f507cfa28 100644 --- a/addons/default/visiosoft/advs-module/resources/js/viewed.js +++ b/addons/default/visiosoft/advs-module/resources/js/viewed.js @@ -1,7 +1,8 @@ function viewed_ad() { + var id = $('#adv-id').val(); $.ajax({ type: 'get', - url: '/ajax/viewed/' + advID, + url: '/ajax/viewed/' + id, }); } From 8b560865fac4eab2adecc274ff895cbe743814cc Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 15 Oct 2020 15:38:28 +0300 Subject: [PATCH 26/28] #2362 ad post now working [URGENT] --- ....module.profile__create_birthday_field.php | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 addons/default/visiosoft/profile-module/migrations/2020_10_15_122457_visiosoft.module.profile__create_birthday_field.php diff --git a/addons/default/visiosoft/profile-module/migrations/2020_10_15_122457_visiosoft.module.profile__create_birthday_field.php b/addons/default/visiosoft/profile-module/migrations/2020_10_15_122457_visiosoft.module.profile__create_birthday_field.php new file mode 100644 index 000000000..c4741b263 --- /dev/null +++ b/addons/default/visiosoft/profile-module/migrations/2020_10_15_122457_visiosoft.module.profile__create_birthday_field.php @@ -0,0 +1,56 @@ +streams()->findBySlugAndNamespace('users', 'users')) { + $field = $this->fields() + ->newQuery() + ->where('slug', 'birthday') + ->where('namespace', 'users') + ->first(); + + if (!$field) { + $field = $this->fields()->create([ + 'name' => trans('visiosoft.module.profile::field.birthday.name'), + 'namespace' => 'users', + 'slug' => 'birthday', + 'type' => 'anomaly.field_type.datetime', + 'locked' => 0, + 'config' => [ + "mode" => "date", + "picker" => true, + ] + ]); + + $this->assignments()->create([ + 'stream_id' => $stream->id, + 'field_id' => $field->id + ]); + } + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + /* + * I never go back on my word! + * That's my nindo: my ninja way! + * NARUTO + */ + } +} From 3220976fd2b79f320c2cf9ec5eab1bc6adc01ca6 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 16 Oct 2020 12:03:04 +0300 Subject: [PATCH 27/28] foreach change to pluck --- .../base-theme/resources/config/settings/settings.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index b814051b2..c94df6ea5 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -84,9 +84,7 @@ return [ 'options' => function () { $array = CountryModel::query()->get(); $cur = array(); - foreach ($array as $key => $value) { - $cur[$value['abv']] = $value['name']; - } + $cur[] = $array->pluck('name', 'abv'); return $cur; }, ], From 96561ecb31f649be64f43e17cace284bf934e4f5 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 16 Oct 2020 12:13:51 +0300 Subject: [PATCH 28/28] foreach change to pluck --- .../base-theme/resources/config/settings/settings.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php index c94df6ea5..268a0b6dd 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -82,10 +82,8 @@ return [ return [config('visiosoft.theme.base::countries.default')]; }, 'options' => function () { - $array = CountryModel::query()->get(); - $cur = array(); - $cur[] = $array->pluck('name', 'abv'); - return $cur; + $array = CountryModel::query()->get()->pluck('name', 'abv')->toArray(); + return $array; }, ], ],