From 4a424ea7bd3f067e5fc430a23ac29960d0ddfdb7 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 16 Oct 2020 12:42:55 +0300 Subject: [PATCH 1/9] #2329 Duplicate pages without canonical --- addons/default/visiosoft/advs-module/resources/css/list.css | 4 ++++ .../advs-module/src/Http/Controller/advsController.php | 6 ++++++ .../base-theme/resources/views/partials/metatags.twig | 3 +++ 3 files changed, 13 insertions(+) diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index cc6bb4d82..cc9d284f0 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -200,6 +200,10 @@ a.sort-by-open-dropdown:hover { color: #8598AA; } +.list-view-type button { + background-color: unset; +} + .list-view-type button:focus { outline: none; } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index bea56a763..012671856 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -398,6 +398,12 @@ class AdvsController extends PublicController $this->template->set('meta_title', $user->name() . ' ' . trans('visiosoft.module.advs::field.ads')); } + // Set rel="canonical" + $canonParam = $param; + unset($canonParam['sort_by'], $canonParam['doping']); + $canonUrl = fullLink($canonParam, \request()->url()); + $this->template->set('additional_meta', ""); + $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'param', 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', 'seenList', 'radio', 'categoryId', 'cityId', 'allCats', 'catText', 'cFArray'); 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 e7ab06471..017843463 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -9,6 +9,9 @@ {{ setting_value('visiosoft.module.advs::google_statistic_code')|raw }} +{% set additionalMeta = template.get('additional_meta') %} +{{ additionalMeta ? additionalMeta|raw }} + {% set title = trans(template.meta_title) %} {% set showTitle = template.showTitle is same as(false) ? false : true %} From 86261755ec69a2d46691849b9625b0fc6f9c71e0 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 16 Oct 2020 16:46:19 +0300 Subject: [PATCH 2/9] #2365 ad share not showing image and title --- .../advs-module/src/Http/Controller/advsController.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 012671856..a79574eee 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -506,7 +506,14 @@ class AdvsController extends PublicController $coverPhoto = \Illuminate\Support\Facades\Request::root() . '/' . $adv->cover_photo; } } - $this->template->set('meta_image', $coverPhoto); + $coverPhotoInfo = pathinfo($coverPhoto); + if (substr($coverPhotoInfo['basename'], 0, 3) === "tn-") { + $ogImage = substr(basename($coverPhotoInfo['basename']), 3); + $ogImage = $coverPhotoInfo['dirname'] . "/$ogImage"; + } else { + $ogImage = $coverPhoto; + } + $this->template->set('meta_image', $ogImage); if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") { return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints', From 65f7c7a78c2b11d299b4bd7fabec1cc037130147 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 16 Oct 2020 16:57:44 +0300 Subject: [PATCH 3/9] #2364 ad watermark doesnt show on default --- .../advs-module/resources/js/settings.js | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/settings.js b/addons/default/visiosoft/advs-module/resources/js/settings.js index 119d656dd..14817b7b4 100644 --- a/addons/default/visiosoft/advs-module/resources/js/settings.js +++ b/addons/default/visiosoft/advs-module/resources/js/settings.js @@ -1,13 +1,21 @@ // Hide watermark_image by default -$(".watermark_image").hide(); +const watermarkType = $("select[name='watermark_type']") +const watermarkText = $(".watermark_text") +const watermarkImage = $(".watermark_image") -$("select[name='watermark_type']").change((event) => { - let watermarkType = event.target.value; - if (watermarkType === 'text') { - $(".watermark_image").hide(); - $(".watermark_text").show() +if (watermarkType.val() === 'text') { + watermarkImage.hide(); +} else { + watermarkText.hide(); +} + +$(watermarkType).change((event) => { + const watermarkTypeValue = event.target.value; + if (watermarkTypeValue === 'text') { + watermarkImage.hide(); + watermarkText.show() } else if (event.target.value === 'image') { - $(".watermark_image").show(); - $(".watermark_text").hide() + watermarkImage.show(); + watermarkText.hide() } }); \ No newline at end of file From 96d9176e0fc731348ec355a274d7dbf0cacac4c9 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Mon, 19 Oct 2020 15:07:51 +0300 Subject: [PATCH 4/9] #2399 e-madencilik ads bug --- .../advs-module/resources/views/ad-detail/partials/detail.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig index efd963ad9..80f58bf24 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/detail.twig @@ -1,7 +1,7 @@ <div class="slider-text"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row"> {% set standardPrice = adv.standard_price.value %} - {% if standardPrice %} + {% if standardPrice and standardPrice > 0 %} <div class="d-flex flex-wrap align-items-center"> <h3 class="ad-price-standard mr-3 text-truncate"> <b>{{ adv.standard_price.currency(null,'currency') }}</b> From 314b29cc996fc0f74c529c93d560525fb70ca780 Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Tue, 20 Oct 2020 10:50:32 +0300 Subject: [PATCH 5/9] abv added to countries table --- .../location-module/src/countries.sql | 37 ++----------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/addons/default/visiosoft/location-module/src/countries.sql b/addons/default/visiosoft/location-module/src/countries.sql index 6dfdd2c75..4553ac505 100644 --- a/addons/default/visiosoft/location-module/src/countries.sql +++ b/addons/default/visiosoft/location-module/src/countries.sql @@ -1,31 +1,9 @@ --- 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` --- - +TRUNCATE `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), @@ -260,10 +238,7 @@ INSERT INTO `default_location_countries` (`id`, `sort_order`, `created_at`, `cre (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` --- - +TRUNCATE `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'), @@ -496,9 +471,5 @@ INSERT INTO `default_location_countries_translations` (`id`, `entry_id`, `create (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 */; +(232, 232, '2019-01-31 10:27:55', NULL, '2019-01-31 10:27:55', NULL, 'en', 'KKTC', 'KKTC'); +COMMIT; \ No newline at end of file From f1b8b2fb5af1682858001a82328efaea7395a0fb Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Tue, 20 Oct 2020 11:04:45 +0300 Subject: [PATCH 6/9] register, country error on phone fields --- .../resources/config/settings/settings.php | 16 - .../users-module/partials/register-form.twig | 2 +- .../resources/config/settings/sections.php | 2 +- .../resources/config/settings/settings.php | 13 + .../resources/lang/en/setting.php | 3 + .../src/LocationModuleSeeder.php | 8 +- .../location-module/src/countries.sql | 475 ------------------ 7 files changed, 22 insertions(+), 497 deletions(-) delete mode 100644 addons/default/visiosoft/location-module/src/countries.sql 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 c67ca3596..813cf0050 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -71,20 +71,4 @@ return [ 'style' => [ 'type' => 'anomaly.field_type.editor', ], - - 'default_country' => [ - '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 = CountryModel::query()->get()->pluck('name', 'abv')->toArray(); - return $array; - }, - ], - ], ]; \ No newline at end of file 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 ab4c2dbea..24946f203 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 @@ <div class="input-wrapper validate-phone"> {{ form.fields.phone.setValue(form.fields.phone.value).input|raw }} - <div id="country" class="hidden">{{ setting_value('visiosoft.theme.base::default_country') }}</div> + <div id="country" class="hidden">{{ setting_value('visiosoft.module.location::country_for_phone_field') }}</div> </div> </div> </div> diff --git a/addons/default/visiosoft/location-module/resources/config/settings/sections.php b/addons/default/visiosoft/location-module/resources/config/settings/sections.php index dc87cbf02..01994dcc0 100644 --- a/addons/default/visiosoft/location-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/location-module/resources/config/settings/sections.php @@ -7,7 +7,7 @@ return [ 'general' => [ 'title' => 'visiosoft.module.location::section.general', 'fields' => [ - 'home_page_location', 'list_page_location', 'detail_page_location', 'create_ad_page_location', + 'home_page_location', 'list_page_location', 'detail_page_location', 'create_ad_page_location', 'country_for_phone_field' ], ], 'map' => [ diff --git a/addons/default/visiosoft/location-module/resources/config/settings/settings.php b/addons/default/visiosoft/location-module/resources/config/settings/settings.php index 5a75e3123..3d9a797a6 100644 --- a/addons/default/visiosoft/location-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/location-module/resources/config/settings/settings.php @@ -33,6 +33,19 @@ return [ 'default_value' => 212, ] ], + 'country_for_phone_field' => [ + '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()->pluck('name', 'abv')->toArray(); + return $array; + }, + ], + ], 'default_city' => [ 'type' => 'anomaly.field_type.select', ], diff --git a/addons/default/visiosoft/location-module/resources/lang/en/setting.php b/addons/default/visiosoft/location-module/resources/lang/en/setting.php index 05cfd8e38..459166207 100644 --- a/addons/default/visiosoft/location-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/en/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Hide Location Filter', ], + 'country_for_phone_field' => [ + 'name' => 'Default Country For Register Phone Field' + ] ]; diff --git a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php index 7d7b8973d..c4c638003 100644 --- a/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php +++ b/addons/default/visiosoft/location-module/src/LocationModuleSeeder.php @@ -20,13 +20,13 @@ class LocationModuleSeeder extends Seeder { //Download demo SQL $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; - file_put_contents(__DIR__ . "/countries.sql", fopen($repository . "countries.sql", 'r')); - file_put_contents(__DIR__ . "/cities.sql", fopen($repository . "cities.sql", 'r')); + file_put_contents(storage_path('countries.sql'), fopen($repository . "countries.sql", 'r')); + file_put_contents(storage_path('cities.sql'), fopen($repository . "cities.sql", 'r')); /* Demo Start */ Model::unguard(); - DB::unprepared(file_get_contents(__DIR__ . '/countries.sql')); - DB::unprepared(file_get_contents(__DIR__ . '/cities.sql')); + DB::unprepared(file_get_contents(storage_path('countries.sql'))); + DB::unprepared(file_get_contents(storage_path('cities.sql'))); Model::reguard(); /* Demo Stop*/ } diff --git a/addons/default/visiosoft/location-module/src/countries.sql b/addons/default/visiosoft/location-module/src/countries.sql deleted file mode 100644 index 4553ac505..000000000 --- a/addons/default/visiosoft/location-module/src/countries.sql +++ /dev/null @@ -1,475 +0,0 @@ -SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; -SET AUTOCOMMIT = 0; -START TRANSACTION; -SET time_zone = "+00:00"; - -TRUNCATE `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); - -TRUNCATE `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', 'KKTC'); -COMMIT; \ No newline at end of file From 22d9267588000bbd4454dedc9a443664665411a2 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Tue, 20 Oct 2020 12:05:40 +0300 Subject: [PATCH 7/9] #2340 Packages module changes - ad post (e-madencilik) --- .../advs-module/src/Adv/AdvRepository.php | 12 ++++++++++++ .../src/Adv/Contract/AdvRepositoryInterface.php | 2 ++ .../src/Http/Controller/advsController.php | 15 ++++++++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index e39e5580a..a843841bd 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -447,4 +447,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ->orderBy('count_show_ad', 'desc') ->paginate(setting_value('visiosoft.module.advs::popular_ads_limit', setting_value('streams::per_page'))); } + + public function approveAds($adsIDs) + { + $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time'); + $ads = $this->newQuery()->where('advs_advs.id', $adsIDs)->update([ + 'status' => 'approved', + 'finish_at' => date('Y-m-d H:i:s', strtotime(date('Y-m-d H:i:s') . ' + ' . $defaultAdPublishTime . ' day')), + 'publish_at' => date('Y-m-d H:i:s') + ]); + + return $ads; + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php index 4118d90a4..eb59f6eb2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php @@ -44,4 +44,6 @@ interface AdvRepositoryInterface extends EntryRepositoryInterface public function getByUsersIDs($usersIDs); public function getPopular(); + + public function approveAds($adsIDs); } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index a79574eee..67c5961f3 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -672,10 +672,15 @@ class AdvsController extends PublicController /* Update Adv */ $adv = AdvsAdvsEntryModel::find($request->update_id); + $allowPendingAdCreation = false; if ($advModel->is_enabled('packages') and $adv->slug == "") { $cat = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForNewAd($request); if (!is_null($cat)) { - return redirect('/'); + if (is_array($cat) && array_key_exists('allowPendingAds', $cat)) { + $allowPendingAdCreation = $cat['allowPendingAds']; + } else { + return redirect('/'); + } } } @@ -730,7 +735,7 @@ class AdvsController extends PublicController } // Auto approve - if (setting_value('visiosoft.module.advs::auto_approve')) { + if (setting_value('visiosoft.module.advs::auto_approve') && !$allowPendingAdCreation) { $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time'); $adv->update([ 'status' => 'approved', @@ -775,7 +780,11 @@ class AdvsController extends PublicController return redirect('/advs/edit_advs/' . $request->update_id)->with('cats_d', $cats_d)->with('request', $request); } event(new CreatedAd($adv)); - return redirect(route('advs_preview', [$request->update_id])); + if ($allowPendingAdCreation) { + return redirect(route("visiosoft.module.packages::buy_package") . '?ad_id=' . $adv->id); + } else { + return redirect(route('advs_preview', [$request->update_id])); + } } /* New Create Adv */ From e3bfd83615bec138fc2d75b0d54161da090a9b7a Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Tue, 20 Oct 2020 12:10:18 +0300 Subject: [PATCH 8/9] #2329 Duplicate pages without canonical #723 --- .../advs-module/src/Http/Controller/advsController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 67c5961f3..969f80a16 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -399,10 +399,12 @@ class AdvsController extends PublicController } // Set rel="canonical" - $canonParam = $param; - unset($canonParam['sort_by'], $canonParam['doping']); - $canonUrl = fullLink($canonParam, \request()->url()); - $this->template->set('additional_meta', "<link rel='canonical' href='$canonUrl'/>"); + if (array_key_exists('sort_by', $param) || array_key_exists('doping', $param)) { + $canonParam = $param; + unset($canonParam['sort_by'], $canonParam['doping']); + $canonUrl = fullLink($canonParam, \request()->url()); + $this->template->set('additional_meta', "<link rel='canonical' href='$canonUrl'/>"); + } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'param', 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', From ea5d738ed1c06ac849f4e3d6416ce5073be8e3e1 Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Tue, 20 Oct 2020 16:40:52 +0300 Subject: [PATCH 9/9] phonefield.js console error fixed --- addons/default/visiosoft/base-theme/resources/js/phonefield.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index 155532c75..ef6dc6dde 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -1,5 +1,6 @@ function phoneMask(fields) { - var country = document.getElementById('country').innerText; + var country = document.getElementById('country') + ? document.getElementById('country').innerText : null; var inputQueries = document.querySelectorAll(fields); inputQueries.forEach(function (inputQuery, key) { var iti = intlTelInput(inputQuery, {