From bc832d1cbc857060cb7c786aa300282e4bbbb8ca Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 8 Oct 2020 11:31:47 +0300 Subject: [PATCH 01/72] #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/72] #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/72] #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 eb1de960aa3b17a7bc051d6179c13f3ab08b6b62 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 8 Oct 2020 17:05:38 +0300 Subject: [PATCH 04/72] filter-menu fixed --- .../advs-module/resources/views/list/partials/list-filter.twig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 0991832e0..d0e4b35e3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -40,8 +40,7 @@ 'villages':villages, 'param':param, 'categoryId':categoryId, - 'cityId':cityId, - '_ORDER_':['visiosoft.module.cats', 'visiosoft.module.location'] + 'cityId':cityId })|raw }} From 0bf73f302a6862155455d179b065560b405f9806 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 8 Oct 2020 17:14:16 +0300 Subject: [PATCH 05/72] =?UTF-8?q?[users]=20Admin=20listelemede=20m=C3=BC?= =?UTF-8?q?=C5=9Fteri=20ad=C4=B1=20yazm=C4=B1yor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../defaultadmin-theme/src/Listener/AddGsmFilter.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php index ffbb8ca40..bbec40070 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php @@ -51,6 +51,8 @@ class AddGsmFilter $builder->getTable()->addFilter($filter); $builder->setColumns([ + 'first_name', + 'last_name', 'email', 'gsm_phone', 'created_at' => [ @@ -68,6 +70,10 @@ class AddGsmFilter ]); $collection = new Collection(); + $header_firstname = new Header(); + $header_firstname = $header_firstname->setBuilder($builder)->setHeading('anomaly.module.users::field.first_name.name'); + $header_lastname = new Header(); + $header_lastname = $header_lastname->setBuilder($builder)->setHeading('anomaly.module.users::field.last_name.name'); $header_email = new Header(); $header_email = $header_email->setBuilder($builder)->setHeading('anomaly.module.users::field.email.name')->setSortable(true)->setSortColumn('email'); $header_phone = new Header(); @@ -77,6 +83,8 @@ class AddGsmFilter $header_status = new Header(); $header_status = $header_status->setBuilder($builder)->setHeading('anomaly.module.users::field.status.name'); + $collection = $collection->add($header_firstname); + $collection = $collection->add($header_lastname); $collection = $collection->add($header_email); $collection = $collection->add($header_gsm_phone); $collection = $collection->add($header_created_at); From df2afcd562157a229ab100bcb2ecb104e358bf92 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Thu, 8 Oct 2020 17:58:17 +0300 Subject: [PATCH 06/72] New Crowdin updates (#709) * New translations message.php (Japanese) * New translations section.php (Japanese) * New translations setting.php (Japanese) * New translations section.php (Korean) * New translations setting.php (Korean) * New translations section.php (Italian) * New translations setting.php (Italian) * New translations message.php (Hebrew) * New translations message.php (Italian) * New translations message.php (Korean) * New translations message.php (Polish) * New translations message.php (Portuguese) * New translations section.php (Portuguese) * New translations setting.php (Portuguese) * New translations section.php (Dutch) * New translations setting.php (Dutch) * New translations section.php (Polish) * New translations setting.php (Polish) * New translations message.php (Dutch) * New translations section.php (Spanish) * New translations setting.php (Spanish) * New translations section.php (Arabic) * New translations setting.php (Arabic) * New translations message.php (Spanish) * New translations message.php (French) * New translations message.php (Romanian) * New translations section.php (Romanian) * New translations setting.php (Romanian) * New translations section.php (French) * New translations setting.php (French) * New translations section.php (Greek) * New translations setting.php (Greek) * New translations message.php (Greek) * New translations section.php (Hebrew) * New translations setting.php (Hebrew) * New translations message.php (Arabic) * New translations message.php (German) * New translations section.php (German) * New translations setting.php (German) * New translations message.php (Swedish) * New translations section.php (Swedish) * New translations setting.php (Swedish) * New translations message.php (Turkish) * New translations section.php (Turkish) * New translations setting.php (Turkish) * New translations message.php (Russian) * New translations section.php (Russian) * New translations setting.php (Russian) * New translations message.php (Albanian) * New translations section.php (Albanian) * New translations setting.php (Albanian) * New translations message.php (Bengali) * New translations setting.php (Azerbaijani) * New translations section.php (Azerbaijani) * New translations message.php (Persian) * New translations setting.php (Bengali) * New translations section.php (Bengali) * New translations setting.php (Hindi) * New translations message.php (Hindi) * New translations section.php (Hindi) * New translations message.php (Azerbaijani) * New translations message.php (Ukrainian) * New translations setting.php (Urdu (Pakistan)) * New translations section.php (Urdu (Pakistan)) * New translations setting.php (Ukrainian) * New translations section.php (Ukrainian) * New translations message.php (Vietnamese) * New translations setting.php (Persian) * New translations section.php (Persian) * New translations message.php (Urdu (Pakistan)) * New translations setting.php (Vietnamese) * New translations section.php (Vietnamese) --- .../advs-module/resources/lang/ar/section.php | 3 +- .../advs-module/resources/lang/ar/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/az/section.php | 1 + .../advs-module/resources/lang/az/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/bn/section.php | 1 + .../advs-module/resources/lang/bn/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/de/section.php | 1 + .../advs-module/resources/lang/de/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/el/section.php | 1 + .../advs-module/resources/lang/el/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/es/section.php | 1 + .../advs-module/resources/lang/es/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/fa/section.php | 1 + .../advs-module/resources/lang/fa/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/fr/section.php | 1 + .../advs-module/resources/lang/fr/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/he/section.php | 1 + .../advs-module/resources/lang/he/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/hi/section.php | 1 + .../advs-module/resources/lang/hi/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/it/section.php | 1 + .../advs-module/resources/lang/it/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/ja/section.php | 1 + .../advs-module/resources/lang/ja/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/ko/section.php | 1 + .../advs-module/resources/lang/ko/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/nl/section.php | 1 + .../advs-module/resources/lang/nl/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/pl/section.php | 1 + .../advs-module/resources/lang/pl/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/pt/section.php | 1 + .../advs-module/resources/lang/pt/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/ro/section.php | 1 + .../advs-module/resources/lang/ro/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/ru/section.php | 1 + .../advs-module/resources/lang/ru/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/sq/section.php | 1 + .../advs-module/resources/lang/sq/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/sv/section.php | 1 + .../advs-module/resources/lang/sv/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/tr/section.php | 1 + .../advs-module/resources/lang/tr/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/uk/section.php | 1 + .../advs-module/resources/lang/uk/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/ur/section.php | 1 + .../advs-module/resources/lang/ur/setting.php | 72 ++++++++++++------- .../advs-module/resources/lang/vi/section.php | 1 + .../advs-module/resources/lang/vi/setting.php | 72 ++++++++++++------- .../resources/lang/ar/message.php | 15 ++-- .../resources/lang/az/message.php | 15 ++-- .../resources/lang/bn/message.php | 15 ++-- .../resources/lang/de/message.php | 15 ++-- .../resources/lang/el/message.php | 15 ++-- .../resources/lang/es/message.php | 15 ++-- .../resources/lang/fa/message.php | 15 ++-- .../resources/lang/fr/message.php | 15 ++-- .../resources/lang/he/message.php | 15 ++-- .../resources/lang/hi/message.php | 15 ++-- .../resources/lang/it/message.php | 15 ++-- .../resources/lang/ja/message.php | 15 ++-- .../resources/lang/ko/message.php | 15 ++-- .../resources/lang/nl/message.php | 15 ++-- .../resources/lang/pl/message.php | 15 ++-- .../resources/lang/pt/message.php | 15 ++-- .../resources/lang/ro/message.php | 15 ++-- .../resources/lang/ru/message.php | 15 ++-- .../resources/lang/sq/message.php | 15 ++-- .../resources/lang/sv/message.php | 15 ++-- .../resources/lang/tr/message.php | 15 ++-- .../resources/lang/uk/message.php | 15 ++-- .../resources/lang/ur/message.php | 15 ++-- .../resources/lang/vi/message.php | 15 ++-- 72 files changed, 1297 insertions(+), 817 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/section.php b/addons/default/visiosoft/advs-module/resources/lang/ar/section.php index de00453e2..ee6dd29b9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/section.php @@ -39,9 +39,10 @@ return [ ], 'general' => 'جنرال لواء', 'ads' => 'إعلانات', - 'user' => 'المستعمل', + 'user' => 'العضو', 'filter' => 'منقي', 'options' => [ 'title' => 'خيارات', ], + 'ads_image' => 'صورة الإعلانات', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php index 1155381e9..cee207ae4 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'الإعلان الافتراضي', ], - 'add_canvas' => [ - 'name' => 'أضف قماش', - ], - 'thumbnail_width' => [ - 'name' => 'عرض الصورة المصغرة', - ], - 'thumbnail_height' => [ - 'name' => 'ارتفاع الصورة المصغرة', - ], - 'picture_width' => [ - 'name' => 'عرض الصورة', - ], - 'picture_height' => [ - 'name' => 'ارتفاع الصورة', - ], 'twitter' => [ 'name' => 'تغريد', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'جوجل', ], - 'watermark_type' => [ - 'name' => 'نوع العلامة المائية', - ], - 'watermark_text' => [ - 'name' => 'نص العلامة المائية', - ], - 'watermark_image' => [ - 'name' => 'صورة العلامة المائية', - ], - 'watermark_position' => [ - 'name' => 'موقف العلامة المائية', - ], 'listing_page_image' => [ 'name' => 'سرد صورة الصفحة', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'حد الإعلانات الشعبية', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'تغيير حجم الصورة الخلفية', + ], + 'full_image_width' => [ + 'name' => 'Full Image Width', + ], + 'full_image_height' => [ + 'name' => 'ارتفاع الصورة الكاملة', + ], + 'medium_image_width' => [ + 'name' => 'Medium Image Width', + ], + 'medium_image_height' => [ + 'name' => 'متوسط ارتفاع الصورة', + ], + 'thumbnail_width' => [ + 'name' => 'عرض الصورة المصغرة', + ], + 'thumbnail_height' => [ + 'name' => 'ارتفاع الصورة المصغرة', + ], + 'add_canvas' => [ + 'name' => 'أضف قماش', + ], + 'image_canvas_width' => [ + 'name' => 'عرض قماش الصورة', + ], + 'image_canvas_height' => [ + 'name' => 'ارتفاع قماش الصورة', + ], + 'watermark_type' => [ + 'name' => 'نوع العلامة المائية', + ], + 'watermark_text' => [ + 'name' => 'نص العلامة المائية', + ], + 'watermark_image' => [ + 'name' => 'صورة العلامة المائية', + ], + 'watermark_position' => [ + 'name' => 'موقف العلامة المائية', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/section.php b/addons/default/visiosoft/advs-module/resources/lang/az/section.php index 7520a0921..1b9870d8d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/az/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/az/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Seçimlər', ], + 'ads_image' => 'Reklamlar şəkli', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/setting.php b/addons/default/visiosoft/advs-module/resources/lang/az/setting.php index 3d1b95d1e..6321f842a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/az/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/az/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Defolt Elan GET', ], - 'add_canvas' => [ - 'name' => 'Kətan əlavə edin', - ], - 'thumbnail_width' => [ - 'name' => 'Eskiz eni', - ], - 'thumbnail_height' => [ - 'name' => 'Eskiz hündürlüyü', - ], - 'picture_width' => [ - 'name' => 'Şəkil genişliyi', - ], - 'picture_height' => [ - 'name' => 'Şəkil Boyu', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Su nişanının növü', - ], - 'watermark_text' => [ - 'name' => 'Su nişanı Mətn', - ], - 'watermark_image' => [ - 'name' => 'Su nişanı şəkli', - ], - 'watermark_position' => [ - 'name' => 'Su nişanının mövqeyi', - ], 'listing_page_image' => [ 'name' => 'Səhifənin görüntüləməsi', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Populyar elanlar limiti', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Image Resize Backend', + ], + 'full_image_width' => [ + 'name' => 'Tam şəkil genişliyi', + ], + 'full_image_height' => [ + 'name' => 'Tam şəkil boyu', + ], + 'medium_image_width' => [ + 'name' => 'Orta şəkil genişliyi', + ], + 'medium_image_height' => [ + 'name' => 'Orta şəkil boyu', + ], + 'thumbnail_width' => [ + 'name' => 'Eskiz eni', + ], + 'thumbnail_height' => [ + 'name' => 'Eskiz hündürlüyü', + ], + 'add_canvas' => [ + 'name' => 'Kətan əlavə edin', + ], + 'image_canvas_width' => [ + 'name' => 'Şəkil kətan eni', + ], + 'image_canvas_height' => [ + 'name' => 'Şəkil kətan hündürlüyü', + ], + 'watermark_type' => [ + 'name' => 'Su nişanının növü', + ], + 'watermark_text' => [ + 'name' => 'Su nişanı Mətn', + ], + 'watermark_image' => [ + 'name' => 'Su nişanı şəkli', + ], + 'watermark_position' => [ + 'name' => 'Su nişanının mövqeyi', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/section.php b/addons/default/visiosoft/advs-module/resources/lang/bn/section.php index 140708046..610813794 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bn/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bn/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'বিকল্পগুলি', ], + 'ads_image' => 'বিজ্ঞাপন চিত্র', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php b/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php index 8c2d1e888..03ebdfa37 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'ডিফল্ট বিজ্ঞাপন জিইটি', ], - 'add_canvas' => [ - 'name' => 'ক্যানভাস যুক্ত করুন', - ], - 'thumbnail_width' => [ - 'name' => 'থাম্বনেইল প্রস্থ', - ], - 'thumbnail_height' => [ - 'name' => 'থাম্বনেইল উচ্চতা', - ], - 'picture_width' => [ - 'name' => 'চিত্র প্রস্থ', - ], - 'picture_height' => [ - 'name' => 'চিত্র উচ্চতা', - ], 'twitter' => [ 'name' => 'টুইটার', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'গুগল', ], - 'watermark_type' => [ - 'name' => 'ওয়াটারমার্ক টাইপ', - ], - 'watermark_text' => [ - 'name' => 'জলছবি পাঠ্য', - ], - 'watermark_image' => [ - 'name' => 'জলছবি ইমেজ', - ], - 'watermark_position' => [ - 'name' => 'জলছবি অবস্থান', - ], 'listing_page_image' => [ 'name' => 'পৃষ্ঠার চিত্র তালিকাভুক্ত', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'জনপ্রিয় বিজ্ঞাপন সীমাবদ্ধতা', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'চিত্র পুনরায় আকার ব্যাকএন্ড', + ], + 'full_image_width' => [ + 'name' => 'পূর্ণ চিত্র প্রস্থ', + ], + 'full_image_height' => [ + 'name' => 'পূর্ণ চিত্র উচ্চতা', + ], + 'medium_image_width' => [ + 'name' => 'মাঝারি চিত্র প্রস্থ', + ], + 'medium_image_height' => [ + 'name' => 'মাঝারি চিত্র উচ্চতা', + ], + 'thumbnail_width' => [ + 'name' => 'থাম্বনেইল প্রস্থ', + ], + 'thumbnail_height' => [ + 'name' => 'থাম্বনেইল উচ্চতা', + ], + 'add_canvas' => [ + 'name' => 'ক্যানভাস যুক্ত করুন', + ], + 'image_canvas_width' => [ + 'name' => 'চিত্র ক্যানভাস প্রস্থ', + ], + 'image_canvas_height' => [ + 'name' => 'চিত্র ক্যানভাস উচ্চতা', + ], + 'watermark_type' => [ + 'name' => 'ওয়াটারমার্ক টাইপ', + ], + 'watermark_text' => [ + 'name' => 'জলছবি পাঠ্য', + ], + 'watermark_image' => [ + 'name' => 'জলছবি ইমেজ', + ], + 'watermark_position' => [ + 'name' => 'জলছবি অবস্থান', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/section.php b/addons/default/visiosoft/advs-module/resources/lang/de/section.php index 088484cc8..9ace3ae91 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Optionen', ], + 'ads_image' => 'Anzeigenbild', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php index f5da68417..9d26feaab 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Standardanzeige GET', ], - 'add_canvas' => [ - 'name' => 'Leinwand hinzufügen', - ], - 'thumbnail_width' => [ - 'name' => 'Miniaturbildbreite', - ], - 'thumbnail_height' => [ - 'name' => 'Miniaturbildhöhe', - ], - 'picture_width' => [ - 'name' => 'Bildbreite', - ], - 'picture_height' => [ - 'name' => 'Bildhöhe', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Wasserzeichentyp', - ], - 'watermark_text' => [ - 'name' => 'Wasserzeichentext', - ], - 'watermark_image' => [ - 'name' => 'Wasserzeichen Bild', - ], - 'watermark_position' => [ - 'name' => 'Wasserzeichen Position', - ], 'listing_page_image' => [ 'name' => 'Listing Page Image', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Beliebtes Anzeigenlimit', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Bildgröße Backend ändern', + ], + 'full_image_width' => [ + 'name' => 'Volle Bildbreite', + ], + 'full_image_height' => [ + 'name' => 'Vollbildhöhe', + ], + 'medium_image_width' => [ + 'name' => 'Mittlere Bildbreite', + ], + 'medium_image_height' => [ + 'name' => 'Mittlere Bildhöhe', + ], + 'thumbnail_width' => [ + 'name' => 'Miniaturbildbreite', + ], + 'thumbnail_height' => [ + 'name' => 'Miniaturbildhöhe', + ], + 'add_canvas' => [ + 'name' => 'Leinwand hinzufügen', + ], + 'image_canvas_width' => [ + 'name' => 'Bild Leinwandbreite', + ], + 'image_canvas_height' => [ + 'name' => 'Bild Leinwand Höhe', + ], + 'watermark_type' => [ + 'name' => 'Wasserzeichentyp', + ], + 'watermark_text' => [ + 'name' => 'Wasserzeichentext', + ], + 'watermark_image' => [ + 'name' => 'Wasserzeichen Bild', + ], + 'watermark_position' => [ + 'name' => 'Wasserzeichen Position', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/section.php b/addons/default/visiosoft/advs-module/resources/lang/el/section.php index adbd65a96..a1121a250 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Επιλογές', ], + 'ads_image' => 'Εικόνα διαφημίσεων', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php index e257cf308..5d16cf2ca 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Προεπιλεγμένη διαφήμιση GET', ], - 'add_canvas' => [ - 'name' => 'Προσθήκη καμβά', - ], - 'thumbnail_width' => [ - 'name' => 'Πλάτος μικρογραφιών', - ], - 'thumbnail_height' => [ - 'name' => 'Ύψος μικρογραφιών', - ], - 'picture_width' => [ - 'name' => 'Πλάτος εικόνας', - ], - 'picture_height' => [ - 'name' => 'Ύψος εικόνας', - ], 'twitter' => [ 'name' => 'Κελάδημα', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Τύπος υδατογραφήματος', - ], - 'watermark_text' => [ - 'name' => 'Κείμενο υδατογράφημα', - ], - 'watermark_image' => [ - 'name' => 'Εικόνα υδατογράφημα', - ], - 'watermark_position' => [ - 'name' => 'Θέση υδατοσήματος', - ], 'listing_page_image' => [ 'name' => 'Λίστα εικόνων σελίδας', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Όριο δημοφιλών διαφημίσεων', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Μέγεθος εικόνας Backend', + ], + 'full_image_width' => [ + 'name' => 'Πλήρες πλάτος εικόνας', + ], + 'full_image_height' => [ + 'name' => 'Ύψος πλήρους εικόνας', + ], + 'medium_image_width' => [ + 'name' => 'Μεσαίο πλάτος εικόνας', + ], + 'medium_image_height' => [ + 'name' => 'Μεσαίο ύψος εικόνας', + ], + 'thumbnail_width' => [ + 'name' => 'Πλάτος μικρογραφιών', + ], + 'thumbnail_height' => [ + 'name' => 'Ύψος μικρογραφιών', + ], + 'add_canvas' => [ + 'name' => 'Προσθήκη καμβά', + ], + 'image_canvas_width' => [ + 'name' => 'Πλάτος καμβά εικόνας', + ], + 'image_canvas_height' => [ + 'name' => 'Ύψος καμβά εικόνας', + ], + 'watermark_type' => [ + 'name' => 'Τύπος υδατογραφήματος', + ], + 'watermark_text' => [ + 'name' => 'Κείμενο υδατογράφημα', + ], + 'watermark_image' => [ + 'name' => 'Εικόνα υδατογράφημα', + ], + 'watermark_position' => [ + 'name' => 'Θέση υδατοσήματος', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/section.php b/addons/default/visiosoft/advs-module/resources/lang/es/section.php index ed31f945e..575a42471 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/es/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/es/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opciones', ], + 'ads_image' => 'Imagen de anuncios', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/setting.php b/addons/default/visiosoft/advs-module/resources/lang/es/setting.php index 41adca202..3f22d1204 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/es/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/es/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Anuncio predeterminado GET', ], - 'add_canvas' => [ - 'name' => 'Agregar lienzo', - ], - 'thumbnail_width' => [ - 'name' => 'Ancho de miniaturas', - ], - 'thumbnail_height' => [ - 'name' => 'Altura de miniatura', - ], - 'picture_width' => [ - 'name' => 'Ancho de imagen', - ], - 'picture_height' => [ - 'name' => 'Altura de imagen', - ], 'twitter' => [ 'name' => 'Gorjeo', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Tipo de marca de agua', - ], - 'watermark_text' => [ - 'name' => 'Texto de marca de agua', - ], - 'watermark_image' => [ - 'name' => 'Imagen de marca de agua', - ], - 'watermark_position' => [ - 'name' => 'Posición de marca de agua', - ], 'listing_page_image' => [ 'name' => 'Imagen de la página de listado', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Límite de anuncios populares', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Backend de cambio de tamaño de imagen', + ], + 'full_image_width' => [ + 'name' => 'Ancho de imagen completo', + ], + 'full_image_height' => [ + 'name' => 'Altura de imagen completa', + ], + 'medium_image_width' => [ + 'name' => 'Ancho de imagen medio', + ], + 'medium_image_height' => [ + 'name' => 'Altura de imagen media', + ], + 'thumbnail_width' => [ + 'name' => 'Ancho de miniaturas', + ], + 'thumbnail_height' => [ + 'name' => 'Altura de miniatura', + ], + 'add_canvas' => [ + 'name' => 'Agregar lienzo', + ], + 'image_canvas_width' => [ + 'name' => 'Ancho del lienzo de la imagen', + ], + 'image_canvas_height' => [ + 'name' => 'Altura del lienzo de la imagen', + ], + 'watermark_type' => [ + 'name' => 'Tipo de marca de agua', + ], + 'watermark_text' => [ + 'name' => 'Texto de marca de agua', + ], + 'watermark_image' => [ + 'name' => 'Imagen de marca de agua', + ], + 'watermark_position' => [ + 'name' => 'Posición de marca de agua', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/section.php b/addons/default/visiosoft/advs-module/resources/lang/fa/section.php index d119b1281..5ee0f1832 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fa/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fa/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'گزینه ها', ], + 'ads_image' => 'تصویر تبلیغات', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php index 7ed03eaec..7a33afbfc 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php @@ -80,21 +80,6 @@ return [ 'default_GET' => [ 'name' => 'تبلیغات پیش فرض GET', ], - 'add_canvas' => [ - 'name' => 'بوم را اضافه کنید', - ], - 'thumbnail_width' => [ - 'name' => 'عرض تصویر', - ], - 'thumbnail_height' => [ - 'name' => 'ارتفاع تصویر بند انگشتی', - ], - 'picture_width' => [ - 'name' => 'عرض تصویر', - ], - 'picture_height' => [ - 'name' => 'ارتفاع تصویر', - ], 'twitter' => [ 'name' => 'توییتر', ], @@ -107,18 +92,6 @@ return [ 'google' => [ 'name' => 'گوگل', ], - 'watermark_type' => [ - 'name' => 'نوع علامت', - ], - 'watermark_text' => [ - 'name' => 'متن علامت', - ], - 'watermark_image' => [ - 'name' => 'تصویر علامت', - ], - 'watermark_position' => [ - 'name' => 'موقعیت علامت سفید', - ], 'listing_page_image' => [ 'name' => 'لیست صفحه تصویر', ], @@ -159,4 +132,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'محدودیت تبلیغات محبوب', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'تغییر اندازه تصویر Backend', + ], + 'full_image_width' => [ + 'name' => 'عرض تصویر کامل', + ], + 'full_image_height' => [ + 'name' => 'ارتفاع تصویر کامل', + ], + 'medium_image_width' => [ + 'name' => 'عرض تصویر متوسط', + ], + 'medium_image_height' => [ + 'name' => 'ارتفاع تصویر متوسط', + ], + 'thumbnail_width' => [ + 'name' => 'عرض تصویر', + ], + 'thumbnail_height' => [ + 'name' => 'ارتفاع تصویر بند انگشتی', + ], + 'add_canvas' => [ + 'name' => 'بوم را اضافه کنید', + ], + 'image_canvas_width' => [ + 'name' => 'عرض بوم تصویر', + ], + 'image_canvas_height' => [ + 'name' => 'ارتفاع بوم تصویر', + ], + 'watermark_type' => [ + 'name' => 'نوع علامت', + ], + 'watermark_text' => [ + 'name' => 'متن علامت', + ], + 'watermark_image' => [ + 'name' => 'تصویر علامت', + ], + 'watermark_position' => [ + 'name' => 'موقعیت علامت سفید', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/section.php b/addons/default/visiosoft/advs-module/resources/lang/fr/section.php index 3b5505c45..a88efc582 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fr/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fr/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Options', ], + 'ads_image' => 'Image d\'annonces', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php index 76e8447b8..349cb8ae3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Annonce par défaut GET', ], - 'add_canvas' => [ - 'name' => 'Ajouter une toile', - ], - 'thumbnail_width' => [ - 'name' => 'Largeur de vignette', - ], - 'thumbnail_height' => [ - 'name' => 'Hauteur de la vignette', - ], - 'picture_width' => [ - 'name' => 'Largeur de l\'image', - ], - 'picture_height' => [ - 'name' => 'Hauteur de l\'image', - ], 'twitter' => [ 'name' => 'Gazouillement', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Type defiligrane', - ], - 'watermark_text' => [ - 'name' => 'Texte en filigrane', - ], - 'watermark_image' => [ - 'name' => 'Image en filigrane', - ], - 'watermark_position' => [ - 'name' => 'Position du filigrane', - ], 'listing_page_image' => [ 'name' => 'Image de page de liste', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Limite des annonces populaires', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Backend de redimensionnement d\'image', + ], + 'full_image_width' => [ + 'name' => 'Largeur totale de l\'image', + ], + 'full_image_height' => [ + 'name' => 'Hauteur totale de l\'image', + ], + 'medium_image_width' => [ + 'name' => 'Largeur d\'image moyenne', + ], + 'medium_image_height' => [ + 'name' => 'Hauteur d\'image moyenne', + ], + 'thumbnail_width' => [ + 'name' => 'Largeur de vignette', + ], + 'thumbnail_height' => [ + 'name' => 'Hauteur de la vignette', + ], + 'add_canvas' => [ + 'name' => 'Ajouter une toile', + ], + 'image_canvas_width' => [ + 'name' => 'Largeur du canevas d\'image', + ], + 'image_canvas_height' => [ + 'name' => 'Hauteur du canevas d\'image', + ], + 'watermark_type' => [ + 'name' => 'Type defiligrane', + ], + 'watermark_text' => [ + 'name' => 'Texte en filigrane', + ], + 'watermark_image' => [ + 'name' => 'Image en filigrane', + ], + 'watermark_position' => [ + 'name' => 'Position du filigrane', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/section.php b/addons/default/visiosoft/advs-module/resources/lang/he/section.php index 882dfe5dd..3dea65a39 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/he/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/he/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'אפשרויות', ], + 'ads_image' => 'תמונת מודעות', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/setting.php b/addons/default/visiosoft/advs-module/resources/lang/he/setting.php index e94f25019..b71c1b1ed 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/he/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/he/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'ברירת מחדל של מודעות GET', ], - 'add_canvas' => [ - 'name' => 'הוסף בד', - ], - 'thumbnail_width' => [ - 'name' => 'רוחב תמונה ממוזערת', - ], - 'thumbnail_height' => [ - 'name' => 'גובה תמונה ממוזערת', - ], - 'picture_width' => [ - 'name' => 'רוחב תמונה', - ], - 'picture_height' => [ - 'name' => 'גובה תמונה', - ], 'twitter' => [ 'name' => 'טוויטר', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'גוגל', ], - 'watermark_type' => [ - 'name' => 'סוג סימן מים', - ], - 'watermark_text' => [ - 'name' => 'טקסט סימן מים', - ], - 'watermark_image' => [ - 'name' => 'תמונה של סימן מים', - ], - 'watermark_position' => [ - 'name' => 'מיקום סימן מים', - ], 'listing_page_image' => [ 'name' => 'תמונת עמוד רישום', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'מגבלת מודעות פופולריות', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'תמונה שינוי גודל backend', + ], + 'full_image_width' => [ + 'name' => 'רוחב תמונה מלא', + ], + 'full_image_height' => [ + 'name' => 'תמונה מלאה גובה', + ], + 'medium_image_width' => [ + 'name' => 'רוחב תמונה בינוני', + ], + 'medium_image_height' => [ + 'name' => 'גובה תמונה בינוני', + ], + 'thumbnail_width' => [ + 'name' => 'רוחב תמונה ממוזערת', + ], + 'thumbnail_height' => [ + 'name' => 'גובה תמונה ממוזערת', + ], + 'add_canvas' => [ + 'name' => 'הוסף בד', + ], + 'image_canvas_width' => [ + 'name' => 'רוחב בד תמונה', + ], + 'image_canvas_height' => [ + 'name' => 'תמונה גובה בד', + ], + 'watermark_type' => [ + 'name' => 'סוג סימן מים', + ], + 'watermark_text' => [ + 'name' => 'טקסט סימן מים', + ], + 'watermark_image' => [ + 'name' => 'תמונה של סימן מים', + ], + 'watermark_position' => [ + 'name' => 'מיקום סימן מים', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/section.php b/addons/default/visiosoft/advs-module/resources/lang/hi/section.php index 6fb43035a..3048cb03d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hi/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hi/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'विकल्प', ], + 'ads_image' => 'विज्ञापन छवि', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php index f896aef00..c9c14d7e9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'डिफ़ॉल्ट विज्ञापन GET', ], - 'add_canvas' => [ - 'name' => 'कैनवास जोड़ें', - ], - 'thumbnail_width' => [ - 'name' => 'थंबनेल की चौड़ाई', - ], - 'thumbnail_height' => [ - 'name' => 'थंबनेल की ऊँचाई', - ], - 'picture_width' => [ - 'name' => 'चित्र चौड़ाई', - ], - 'picture_height' => [ - 'name' => 'चित्र ऊंचाई', - ], 'twitter' => [ 'name' => 'ट्विटर', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'गूगल', ], - 'watermark_type' => [ - 'name' => 'वॉटरमार्क प्रकार', - ], - 'watermark_text' => [ - 'name' => 'वॉटरमार्क पाठ', - ], - 'watermark_image' => [ - 'name' => 'वॉटरमार्क छवि', - ], - 'watermark_position' => [ - 'name' => 'वॉटरमार्क स्थिति', - ], 'listing_page_image' => [ 'name' => 'लिस्टिंग पृष्ठ छवि', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'लोकप्रिय विज्ञापन सीमा', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'छवि बैकएंड का आकार बदलें', + ], + 'full_image_width' => [ + 'name' => 'पूर्ण छवि चौड़ाई', + ], + 'full_image_height' => [ + 'name' => 'पूर्ण छवि ऊँचाई', + ], + 'medium_image_width' => [ + 'name' => 'मध्यम छवि चौड़ाई', + ], + 'medium_image_height' => [ + 'name' => 'मध्यम छवि ऊँचाई', + ], + 'thumbnail_width' => [ + 'name' => 'थंबनेल की चौड़ाई', + ], + 'thumbnail_height' => [ + 'name' => 'थंबनेल की ऊँचाई', + ], + 'add_canvas' => [ + 'name' => 'कैनवास जोड़ें', + ], + 'image_canvas_width' => [ + 'name' => 'छवि कैनवास की चौड़ाई', + ], + 'image_canvas_height' => [ + 'name' => 'छवि कैनवास ऊंचाई', + ], + 'watermark_type' => [ + 'name' => 'वॉटरमार्क प्रकार', + ], + 'watermark_text' => [ + 'name' => 'वॉटरमार्क पाठ', + ], + 'watermark_image' => [ + 'name' => 'वॉटरमार्क छवि', + ], + 'watermark_position' => [ + 'name' => 'वॉटरमार्क स्थिति', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/section.php b/addons/default/visiosoft/advs-module/resources/lang/it/section.php index 20e113b56..25ed5f82e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/it/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/it/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opzioni', ], + 'ads_image' => 'Immagine degli annunci', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/setting.php b/addons/default/visiosoft/advs-module/resources/lang/it/setting.php index 9a0447a3b..b62373bef 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/it/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/it/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Annuncio predefinito GET', ], - 'add_canvas' => [ - 'name' => 'Aggiungi tela', - ], - 'thumbnail_width' => [ - 'name' => 'Larghezza Miniatura', - ], - 'thumbnail_height' => [ - 'name' => 'Altezza Miniatura', - ], - 'picture_width' => [ - 'name' => 'Larghezza immagine', - ], - 'picture_height' => [ - 'name' => 'Altezza dell\'immagine', - ], 'twitter' => [ 'name' => 'cinguettio', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Tipo di filigrana', - ], - 'watermark_text' => [ - 'name' => 'Testo filigrana', - ], - 'watermark_image' => [ - 'name' => 'Immagine filigrana', - ], - 'watermark_position' => [ - 'name' => 'Posizione della filigrana', - ], 'listing_page_image' => [ 'name' => 'Immagine della pagina di elenco', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Limite annunci popolari', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Backend ridimensionamento immagine', + ], + 'full_image_width' => [ + 'name' => 'Larghezza immagine completa', + ], + 'full_image_height' => [ + 'name' => 'Altezza completa dell\'immagine', + ], + 'medium_image_width' => [ + 'name' => 'Larghezza immagine media', + ], + 'medium_image_height' => [ + 'name' => 'Altezza media dell\'immagine', + ], + 'thumbnail_width' => [ + 'name' => 'Larghezza Miniatura', + ], + 'thumbnail_height' => [ + 'name' => 'Altezza Miniatura', + ], + 'add_canvas' => [ + 'name' => 'Aggiungi tela', + ], + 'image_canvas_width' => [ + 'name' => 'Larghezza tela immagine', + ], + 'image_canvas_height' => [ + 'name' => 'Altezza tela immagine', + ], + 'watermark_type' => [ + 'name' => 'Tipo di filigrana', + ], + 'watermark_text' => [ + 'name' => 'Testo filigrana', + ], + 'watermark_image' => [ + 'name' => 'Immagine filigrana', + ], + 'watermark_position' => [ + 'name' => 'Posizione della filigrana', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/section.php b/addons/default/visiosoft/advs-module/resources/lang/ja/section.php index e86265cdc..92dacd5ac 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ja/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ja/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'オプション', ], + 'ads_image' => '広告画像', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php index 212bb25c9..4e69fcdab 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'デフォルト広告GET', ], - 'add_canvas' => [ - 'name' => 'キャンバスを追加', - ], - 'thumbnail_width' => [ - 'name' => 'サムネイルの幅', - ], - 'thumbnail_height' => [ - 'name' => 'サムネイルの高さ', - ], - 'picture_width' => [ - 'name' => '画像の幅', - ], - 'picture_height' => [ - 'name' => '画像の高さ', - ], 'twitter' => [ 'name' => 'ツイッター', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'グーグル', ], - 'watermark_type' => [ - 'name' => '透かしタイプ', - ], - 'watermark_text' => [ - 'name' => '透かしテキスト', - ], - 'watermark_image' => [ - 'name' => '透かし画像', - ], - 'watermark_position' => [ - 'name' => '透かしの位置', - ], 'listing_page_image' => [ 'name' => 'リストページの画像', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => '人気の広告制限', ], + + //Image + + 'image_resize_backend' => [ + 'name' => '画像サイズ変更バックエンド', + ], + 'full_image_width' => [ + 'name' => '全画像幅', + ], + 'full_image_height' => [ + 'name' => '全画像の高さ', + ], + 'medium_image_width' => [ + 'name' => '中程度の画像幅', + ], + 'medium_image_height' => [ + 'name' => '中程度の画像の高さ', + ], + 'thumbnail_width' => [ + 'name' => 'サムネイルの幅', + ], + 'thumbnail_height' => [ + 'name' => 'サムネイルの高さ', + ], + 'add_canvas' => [ + 'name' => 'キャンバスを追加', + ], + 'image_canvas_width' => [ + 'name' => '画像のキャンバスの幅', + ], + 'image_canvas_height' => [ + 'name' => '画像キャンバスの高さ', + ], + 'watermark_type' => [ + 'name' => '透かしタイプ', + ], + 'watermark_text' => [ + 'name' => '透かしテキスト', + ], + 'watermark_image' => [ + 'name' => '透かし画像', + ], + 'watermark_position' => [ + 'name' => '透かしの位置', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/section.php b/addons/default/visiosoft/advs-module/resources/lang/ko/section.php index f86413da6..e93d90bbf 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ko/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ko/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => '옵션', ], + 'ads_image' => '광고 이미지', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php index 0be464f25..d98d9c54a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => '기본 광고 GET', ], - 'add_canvas' => [ - 'name' => '캔버스 추가', - ], - 'thumbnail_width' => [ - 'name' => '썸네일 폭', - ], - 'thumbnail_height' => [ - 'name' => '썸네일 높이', - ], - 'picture_width' => [ - 'name' => '사진 폭', - ], - 'picture_height' => [ - 'name' => '사진 높이', - ], 'twitter' => [ 'name' => '트위터', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => '구글', ], - 'watermark_type' => [ - 'name' => '워터 마크 유형', - ], - 'watermark_text' => [ - 'name' => '워터 마크 텍스트', - ], - 'watermark_image' => [ - 'name' => '워터 마크 이미지', - ], - 'watermark_position' => [ - 'name' => '워터 마크 위치', - ], 'listing_page_image' => [ 'name' => '리스팅 페이지 이미지', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => '인기 광고 제한', ], + + //Image + + 'image_resize_backend' => [ + 'name' => '이미지 크기 조정 백엔드', + ], + 'full_image_width' => [ + 'name' => '전체 이미지 너비', + ], + 'full_image_height' => [ + 'name' => '전체 이미지 높이', + ], + 'medium_image_width' => [ + 'name' => '중간 이미지 너비', + ], + 'medium_image_height' => [ + 'name' => '중간 이미지 높이', + ], + 'thumbnail_width' => [ + 'name' => '썸네일 폭', + ], + 'thumbnail_height' => [ + 'name' => '썸네일 높이', + ], + 'add_canvas' => [ + 'name' => '캔버스 추가', + ], + 'image_canvas_width' => [ + 'name' => '이미지 캔버스 너비', + ], + 'image_canvas_height' => [ + 'name' => '이미지 캔버스 높이', + ], + 'watermark_type' => [ + 'name' => '워터 마크 유형', + ], + 'watermark_text' => [ + 'name' => '워터 마크 텍스트', + ], + 'watermark_image' => [ + 'name' => '워터 마크 이미지', + ], + 'watermark_position' => [ + 'name' => '워터 마크 위치', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/section.php b/addons/default/visiosoft/advs-module/resources/lang/nl/section.php index 250209946..4f0fede9b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opties', ], + 'ads_image' => 'Advertenties afbeelding', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php index 630c9b4ab..d0a12341e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Standaardadvertentie GET', ], - 'add_canvas' => [ - 'name' => 'Canvas toevoegen', - ], - 'thumbnail_width' => [ - 'name' => 'Thumbnail breedte', - ], - 'thumbnail_height' => [ - 'name' => 'Hoogte miniatuur', - ], - 'picture_width' => [ - 'name' => 'Beeldbreedte', - ], - 'picture_height' => [ - 'name' => 'Beeldhoogte', - ], 'twitter' => [ 'name' => 'tjilpen', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Watermerk Type', - ], - 'watermark_text' => [ - 'name' => 'Watermerktekst', - ], - 'watermark_image' => [ - 'name' => 'Watermerk afbeelding', - ], - 'watermark_position' => [ - 'name' => 'Watermerkpositie', - ], 'listing_page_image' => [ 'name' => 'Lijstpagina-afbeelding', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Beperking van populaire advertenties', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Afbeelding formaat wijzigen backend', + ], + 'full_image_width' => [ + 'name' => 'Volledige afbeeldingsbreedte', + ], + 'full_image_height' => [ + 'name' => 'Volledige beeldhoogte', + ], + 'medium_image_width' => [ + 'name' => 'Gemiddelde afbeeldingsbreedte', + ], + 'medium_image_height' => [ + 'name' => 'Gemiddelde afbeeldingshoogte', + ], + 'thumbnail_width' => [ + 'name' => 'Thumbnail breedte', + ], + 'thumbnail_height' => [ + 'name' => 'Hoogte miniatuur', + ], + 'add_canvas' => [ + 'name' => 'Canvas toevoegen', + ], + 'image_canvas_width' => [ + 'name' => 'Breedte afbeelding canvas', + ], + 'image_canvas_height' => [ + 'name' => 'Hoogte afbeelding canvas', + ], + 'watermark_type' => [ + 'name' => 'Watermerk Type', + ], + 'watermark_text' => [ + 'name' => 'Watermerktekst', + ], + 'watermark_image' => [ + 'name' => 'Watermerk afbeelding', + ], + 'watermark_position' => [ + 'name' => 'Watermerkpositie', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/section.php b/addons/default/visiosoft/advs-module/resources/lang/pl/section.php index 80483f314..ed280efba 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pl/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pl/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opcje', ], + 'ads_image' => 'Obraz reklam', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php index 52f96627a..0b204de14 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Domyślna reklama GET', ], - 'add_canvas' => [ - 'name' => 'Dodaj płótno', - ], - 'thumbnail_width' => [ - 'name' => 'Szerokość miniatury', - ], - 'thumbnail_height' => [ - 'name' => 'Wysokość miniatury', - ], - 'picture_width' => [ - 'name' => 'Szerokość obrazu', - ], - 'picture_height' => [ - 'name' => 'Wysokość obrazu', - ], 'twitter' => [ 'name' => 'Świergot', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Rodzaj znaku wodnego', - ], - 'watermark_text' => [ - 'name' => 'Tekst znaku wodnego', - ], - 'watermark_image' => [ - 'name' => 'Obraz znaku wodnego', - ], - 'watermark_position' => [ - 'name' => 'Pozycja znaku wodnego', - ], 'listing_page_image' => [ 'name' => 'Obraz strony z listą', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Limit popularnych reklam', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Image Resize Backend', + ], + 'full_image_width' => [ + 'name' => 'Pełna szerokość obrazu', + ], + 'full_image_height' => [ + 'name' => 'Pełna wysokość obrazu', + ], + 'medium_image_width' => [ + 'name' => 'Średnia szerokość obrazu', + ], + 'medium_image_height' => [ + 'name' => 'Średnia wysokość obrazu', + ], + 'thumbnail_width' => [ + 'name' => 'Szerokość miniatury', + ], + 'thumbnail_height' => [ + 'name' => 'Wysokość miniatury', + ], + 'add_canvas' => [ + 'name' => 'Dodaj płótno', + ], + 'image_canvas_width' => [ + 'name' => 'Szerokość obszaru roboczego obrazu', + ], + 'image_canvas_height' => [ + 'name' => 'Wysokość obszaru roboczego obrazu', + ], + 'watermark_type' => [ + 'name' => 'Rodzaj znaku wodnego', + ], + 'watermark_text' => [ + 'name' => 'Tekst znaku wodnego', + ], + 'watermark_image' => [ + 'name' => 'Obraz znaku wodnego', + ], + 'watermark_position' => [ + 'name' => 'Pozycja znaku wodnego', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/section.php b/addons/default/visiosoft/advs-module/resources/lang/pt/section.php index 293c32207..8602cf001 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pt/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pt/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opções', ], + 'ads_image' => 'Imagem de Anúncios', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php b/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php index 5004d7dea..505a5dd08 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Ad GET padrão', ], - 'add_canvas' => [ - 'name' => 'Adicionar tela', - ], - 'thumbnail_width' => [ - 'name' => 'Largura da miniatura', - ], - 'thumbnail_height' => [ - 'name' => 'Altura da miniatura', - ], - 'picture_width' => [ - 'name' => 'Largura da imagem', - ], - 'picture_height' => [ - 'name' => 'Altura da imagem', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Tipo de marca d\\'água', - ], - 'watermark_text' => [ - 'name' => 'Texto de marca d\\'água', - ], - 'watermark_image' => [ - 'name' => 'Imagem de marca d\\'água', - ], - 'watermark_position' => [ - 'name' => 'Posição da marca d\\'água', - ], 'listing_page_image' => [ 'name' => 'Listar imagem da página', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Limite de anúncios populares', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Backend de redimensionamento de imagem', + ], + 'full_image_width' => [ + 'name' => 'Largura total da imagem', + ], + 'full_image_height' => [ + 'name' => 'Altura total da imagem', + ], + 'medium_image_width' => [ + 'name' => 'Largura de imagem média', + ], + 'medium_image_height' => [ + 'name' => 'Altura Média da Imagem', + ], + 'thumbnail_width' => [ + 'name' => 'Largura da miniatura', + ], + 'thumbnail_height' => [ + 'name' => 'Altura da miniatura', + ], + 'add_canvas' => [ + 'name' => 'Adicionar tela', + ], + 'image_canvas_width' => [ + 'name' => 'Largura da tela da imagem', + ], + 'image_canvas_height' => [ + 'name' => 'Altura da tela da imagem', + ], + 'watermark_type' => [ + 'name' => 'Tipo de marca d\\'água', + ], + 'watermark_text' => [ + 'name' => 'Texto de marca d\\'água', + ], + 'watermark_image' => [ + 'name' => 'Imagem de marca d\\'água', + ], + 'watermark_position' => [ + 'name' => 'Posição da marca d\\'água', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/section.php b/addons/default/visiosoft/advs-module/resources/lang/ro/section.php index f05c48fa7..d52aea029 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ro/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ro/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opțiuni', ], + 'ads_image' => 'Imagine publicitară', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php index e79fa7e7d..2e9a5cab8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Anunț implicit GET', ], - 'add_canvas' => [ - 'name' => 'Adăugați pânză', - ], - 'thumbnail_width' => [ - 'name' => 'Lățimea miniaturii', - ], - 'thumbnail_height' => [ - 'name' => 'Înălțimea miniaturii', - ], - 'picture_width' => [ - 'name' => 'Lățimea imaginii', - ], - 'picture_height' => [ - 'name' => 'Înălțimea imaginii', - ], 'twitter' => [ 'name' => 'Stare de nervozitate', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Tip filigran', - ], - 'watermark_text' => [ - 'name' => 'Text Filigran', - ], - 'watermark_image' => [ - 'name' => 'Filigran imagine', - ], - 'watermark_position' => [ - 'name' => 'Poziția filigranului', - ], 'listing_page_image' => [ 'name' => 'Listare imagine pagină', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Limita de anunțuri populare', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Backend de redimensionare imagine', + ], + 'full_image_width' => [ + 'name' => 'Lățimea imaginii complete', + ], + 'full_image_height' => [ + 'name' => 'Înălțimea imaginii complete', + ], + 'medium_image_width' => [ + 'name' => 'Lățimea medie a imaginii', + ], + 'medium_image_height' => [ + 'name' => 'Înălțimea medie a imaginii', + ], + 'thumbnail_width' => [ + 'name' => 'Lățimea miniaturii', + ], + 'thumbnail_height' => [ + 'name' => 'Înălțimea miniaturii', + ], + 'add_canvas' => [ + 'name' => 'Adăugați pânză', + ], + 'image_canvas_width' => [ + 'name' => 'Lățimea pânzei imaginii', + ], + 'image_canvas_height' => [ + 'name' => 'Înălțimea imaginii pânzei', + ], + 'watermark_type' => [ + 'name' => 'Tip filigran', + ], + 'watermark_text' => [ + 'name' => 'Text Filigran', + ], + 'watermark_image' => [ + 'name' => 'Filigran imagine', + ], + 'watermark_position' => [ + 'name' => 'Poziția filigranului', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/section.php b/addons/default/visiosoft/advs-module/resources/lang/ru/section.php index 7c2ae7bd5..a36bd2601 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ru/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ru/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Параметры', ], + 'ads_image' => 'Рекламное изображение', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php index 344d09a6d..2ca00532e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Реклама по умолчанию GET', ], - 'add_canvas' => [ - 'name' => 'Добавить холст', - ], - 'thumbnail_width' => [ - 'name' => 'Ширина миниатюры', - ], - 'thumbnail_height' => [ - 'name' => 'Высота миниатюры', - ], - 'picture_width' => [ - 'name' => 'Ширина картинки', - ], - 'picture_height' => [ - 'name' => 'Высота картинки', - ], 'twitter' => [ 'name' => 'щебет', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Тип водяного знака', - ], - 'watermark_text' => [ - 'name' => 'Текст водяного знака', - ], - 'watermark_image' => [ - 'name' => 'Изображение водяного знака', - ], - 'watermark_position' => [ - 'name' => 'Положение водяного знака', - ], 'listing_page_image' => [ 'name' => 'Изображение страницы со списком', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Лимит популярной рекламы', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Бэкэнд изменения размера изображения', + ], + 'full_image_width' => [ + 'name' => 'Полная ширина изображения', + ], + 'full_image_height' => [ + 'name' => 'Полная высота изображения', + ], + 'medium_image_width' => [ + 'name' => 'Средняя ширина изображения', + ], + 'medium_image_height' => [ + 'name' => 'Средняя высота изображения', + ], + 'thumbnail_width' => [ + 'name' => 'Ширина миниатюры', + ], + 'thumbnail_height' => [ + 'name' => 'Высота миниатюры', + ], + 'add_canvas' => [ + 'name' => 'Добавить холст', + ], + 'image_canvas_width' => [ + 'name' => 'Ширина холста изображения', + ], + 'image_canvas_height' => [ + 'name' => 'Высота холста изображения', + ], + 'watermark_type' => [ + 'name' => 'Тип водяного знака', + ], + 'watermark_text' => [ + 'name' => 'Текст водяного знака', + ], + 'watermark_image' => [ + 'name' => 'Изображение водяного знака', + ], + 'watermark_position' => [ + 'name' => 'Положение водяного знака', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/section.php b/addons/default/visiosoft/advs-module/resources/lang/sq/section.php index 81ca43dbe..6b38db36e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Opsione', ], + 'ads_image' => 'Imazhi i reklamave', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php index 7e33fbb5c..444748716 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Përcaktuar SET', ], - 'add_canvas' => [ - 'name' => 'Shto Canvas', - ], - 'thumbnail_width' => [ - 'name' => 'Gjerësia e Thumbnail', - ], - 'thumbnail_height' => [ - 'name' => 'Lartësia e Thumbnail', - ], - 'picture_width' => [ - 'name' => 'Gjerësia e figurës', - ], - 'picture_height' => [ - 'name' => 'Lartësia e figurës', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Tipi Filigranit', - ], - 'watermark_text' => [ - 'name' => 'Teksti i Filigranit', - ], - 'watermark_image' => [ - 'name' => 'Imazhi i Filigranit', - ], - 'watermark_position' => [ - 'name' => 'Pozicioni i Filigranit', - ], 'listing_page_image' => [ 'name' => 'Lista e figurës së faqes', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Kufiri i reklamave popullore', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Ndryshimi i madhësisë së imazhit Backend', + ], + 'full_image_width' => [ + 'name' => 'Gjerësia e imazhit të plotë', + ], + 'full_image_height' => [ + 'name' => 'Lartësia e imazhit të plotë', + ], + 'medium_image_width' => [ + 'name' => 'Gjerësia Mesatare e Imazhit', + ], + 'medium_image_height' => [ + 'name' => 'Lartësia mesatare e figurës', + ], + 'thumbnail_width' => [ + 'name' => 'Gjerësia e Thumbnail', + ], + 'thumbnail_height' => [ + 'name' => 'Lartësia e Thumbnail', + ], + 'add_canvas' => [ + 'name' => 'Shto Canvas', + ], + 'image_canvas_width' => [ + 'name' => 'Gjerësia e kanavacës së imazhit', + ], + 'image_canvas_height' => [ + 'name' => 'Lartësia e kanavacës së imazhit', + ], + 'watermark_type' => [ + 'name' => 'Tipi Filigranit', + ], + 'watermark_text' => [ + 'name' => 'Teksti i Filigranit', + ], + 'watermark_image' => [ + 'name' => 'Imazhi i Filigranit', + ], + 'watermark_position' => [ + 'name' => 'Pozicioni i Filigranit', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/section.php b/addons/default/visiosoft/advs-module/resources/lang/sv/section.php index 29c6aaae6..85daf8b42 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sv/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sv/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'alternativ', ], + 'ads_image' => 'Annonsbild', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php index c82d762cd..751af7b8f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Standardannons GET', ], - 'add_canvas' => [ - 'name' => 'Lägg till Canvas', - ], - 'thumbnail_width' => [ - 'name' => 'Miniatyrbredd', - ], - 'thumbnail_height' => [ - 'name' => 'Miniatyrhöjd', - ], - 'picture_width' => [ - 'name' => 'Bildbredd', - ], - 'picture_height' => [ - 'name' => 'Bildhöjd', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Vattenmärketyp', - ], - 'watermark_text' => [ - 'name' => 'Vattenmärketekst', - ], - 'watermark_image' => [ - 'name' => 'Vattenmärkesbild', - ], - 'watermark_position' => [ - 'name' => 'Vattenmärkes position', - ], 'listing_page_image' => [ 'name' => 'Lista sidbild', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Gräns för populära annonser', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Bild Ändra storlek på backend', + ], + 'full_image_width' => [ + 'name' => 'Full bildbredd', + ], + 'full_image_height' => [ + 'name' => 'Full bildhöjd', + ], + 'medium_image_width' => [ + 'name' => 'Medium bildbredd', + ], + 'medium_image_height' => [ + 'name' => 'Medium bildhöjd', + ], + 'thumbnail_width' => [ + 'name' => 'Miniatyrbredd', + ], + 'thumbnail_height' => [ + 'name' => 'Miniatyrhöjd', + ], + 'add_canvas' => [ + 'name' => 'Lägg till Canvas', + ], + 'image_canvas_width' => [ + 'name' => 'Bild Canvas Bredd', + ], + 'image_canvas_height' => [ + 'name' => 'Bild Kanvashöjd', + ], + 'watermark_type' => [ + 'name' => 'Vattenmärketyp', + ], + 'watermark_text' => [ + 'name' => 'Vattenmärketekst', + ], + 'watermark_image' => [ + 'name' => 'Vattenmärkesbild', + ], + 'watermark_position' => [ + 'name' => 'Vattenmärkes position', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/section.php b/addons/default/visiosoft/advs-module/resources/lang/tr/section.php index c286a8554..5b566bbef 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Seçenekler', ], + 'ads_image' => 'Reklam Resmi', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 65ceea4d9..f09745ac0 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Varsayılan İlan GET', ], - 'add_canvas' => [ - 'name' => 'Tuval Ekle', - ], - 'thumbnail_width' => [ - 'name' => 'Küçük Resim Genişliği', - ], - 'thumbnail_height' => [ - 'name' => 'Küçük Resim Yüksekliği', - ], - 'picture_width' => [ - 'name' => 'Resim Genişliği', - ], - 'picture_height' => [ - 'name' => 'Resim Yüksekliği', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Filigran Türü', - ], - 'watermark_text' => [ - 'name' => 'Filigran Metni', - ], - 'watermark_image' => [ - 'name' => 'Filigran Görüntüsü', - ], - 'watermark_position' => [ - 'name' => 'Filigran Konumu', - ], 'listing_page_image' => [ 'name' => 'Sayfa Resmi Listeleme', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Popüler Reklam Limiti', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Görüntüyü Yeniden Boyutlandır Arka Uç', + ], + 'full_image_width' => [ + 'name' => 'Tam Resim Genişliği', + ], + 'full_image_height' => [ + 'name' => 'Tam Resim Yüksekliği', + ], + 'medium_image_width' => [ + 'name' => 'Orta Resim Genişliği', + ], + 'medium_image_height' => [ + 'name' => 'Orta Resim Yüksekliği', + ], + 'thumbnail_width' => [ + 'name' => 'Küçük Resim Genişliği', + ], + 'thumbnail_height' => [ + 'name' => 'Küçük Resim Yüksekliği', + ], + 'add_canvas' => [ + 'name' => 'Tuval Ekle', + ], + 'image_canvas_width' => [ + 'name' => 'Görüntü Tuvali Genişliği', + ], + 'image_canvas_height' => [ + 'name' => 'Resim Tuval Yüksekliği', + ], + 'watermark_type' => [ + 'name' => 'Filigran Türü', + ], + 'watermark_text' => [ + 'name' => 'Filigran Metni', + ], + 'watermark_image' => [ + 'name' => 'Filigran Görüntüsü', + ], + 'watermark_position' => [ + 'name' => 'Filigran Konumu', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/section.php b/addons/default/visiosoft/advs-module/resources/lang/uk/section.php index d93a621d2..ef8a84fe9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/uk/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/uk/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Параметри', ], + 'ads_image' => 'Зображення оголошень', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php b/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php index bd4e1cd21..5056bf078 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Оголошення за замовчуванням GET', ], - 'add_canvas' => [ - 'name' => 'Додати полотно', - ], - 'thumbnail_width' => [ - 'name' => 'Ширина мініатюри', - ], - 'thumbnail_height' => [ - 'name' => 'Висота мініатюри', - ], - 'picture_width' => [ - 'name' => 'Ширина зображення', - ], - 'picture_height' => [ - 'name' => 'Висота зображення', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Тип водяного знака', - ], - 'watermark_text' => [ - 'name' => 'Текст водяного знака', - ], - 'watermark_image' => [ - 'name' => 'Зображення водяного знака', - ], - 'watermark_position' => [ - 'name' => 'Позиція водяного знака', - ], 'listing_page_image' => [ 'name' => 'Зображення сторінки лістингу', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Ліміт популярних оголошень', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Змінення розміру зображення', + ], + 'full_image_width' => [ + 'name' => 'Повна ширина зображення', + ], + 'full_image_height' => [ + 'name' => 'Повна висота зображення', + ], + 'medium_image_width' => [ + 'name' => 'Середня ширина зображення', + ], + 'medium_image_height' => [ + 'name' => 'Середня висота зображення', + ], + 'thumbnail_width' => [ + 'name' => 'Ширина мініатюри', + ], + 'thumbnail_height' => [ + 'name' => 'Висота мініатюри', + ], + 'add_canvas' => [ + 'name' => 'Додати полотно', + ], + 'image_canvas_width' => [ + 'name' => 'Ширина полотна зображення', + ], + 'image_canvas_height' => [ + 'name' => 'Висота полотна зображення', + ], + 'watermark_type' => [ + 'name' => 'Тип водяного знака', + ], + 'watermark_text' => [ + 'name' => 'Текст водяного знака', + ], + 'watermark_image' => [ + 'name' => 'Зображення водяного знака', + ], + 'watermark_position' => [ + 'name' => 'Позиція водяного знака', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/section.php b/addons/default/visiosoft/advs-module/resources/lang/ur/section.php index 61ffc72a8..ad7aaf4a5 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ur/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ur/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'اختیارات', ], + 'ads_image' => 'اشتہارات کی تصویر', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php index 4727eb38e..26549bf87 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'ڈیفالٹ اشتہار GET', ], - 'add_canvas' => [ - 'name' => 'کینوس شامل کریں', - ], - 'thumbnail_width' => [ - 'name' => 'تھمب نیل چوڑائی', - ], - 'thumbnail_height' => [ - 'name' => 'تھمب نیل اونچائی', - ], - 'picture_width' => [ - 'name' => 'تصویر کی چوڑائی', - ], - 'picture_height' => [ - 'name' => 'تصویر کی اونچائی', - ], 'twitter' => [ 'name' => 'ٹویٹر', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'گوگل', ], - 'watermark_type' => [ - 'name' => 'واٹر مارک کی قسم', - ], - 'watermark_text' => [ - 'name' => 'واٹر مارک ٹیکسٹ', - ], - 'watermark_image' => [ - 'name' => 'واٹر مارک امیج', - ], - 'watermark_position' => [ - 'name' => 'واٹر مارک پوزیشن', - ], 'listing_page_image' => [ 'name' => 'صفحہ کی فہرست کی فہرست', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'مقبول اشتہارات کی حد', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'شبیہہ کا سائز تبدیل کریں پسدید', + ], + 'full_image_width' => [ + 'name' => 'مکمل تصویری چوڑائی', + ], + 'full_image_height' => [ + 'name' => 'مکمل امیج کی اونچائی', + ], + 'medium_image_width' => [ + 'name' => 'میڈیم تصویری چوڑائی', + ], + 'medium_image_height' => [ + 'name' => 'میڈیم امیج کی اونچائی', + ], + 'thumbnail_width' => [ + 'name' => 'تھمب نیل چوڑائی', + ], + 'thumbnail_height' => [ + 'name' => 'تھمب نیل اونچائی', + ], + 'add_canvas' => [ + 'name' => 'کینوس شامل کریں', + ], + 'image_canvas_width' => [ + 'name' => 'تصویری کینوس کی چوڑائی', + ], + 'image_canvas_height' => [ + 'name' => 'تصویری کینوس کی اونچائی', + ], + 'watermark_type' => [ + 'name' => 'واٹر مارک کی قسم', + ], + 'watermark_text' => [ + 'name' => 'واٹر مارک ٹیکسٹ', + ], + 'watermark_image' => [ + 'name' => 'واٹر مارک امیج', + ], + 'watermark_position' => [ + 'name' => 'واٹر مارک پوزیشن', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/section.php b/addons/default/visiosoft/advs-module/resources/lang/vi/section.php index 5efbd87d3..ddb28f2d2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/vi/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/vi/section.php @@ -44,4 +44,5 @@ return [ 'options' => [ 'title' => 'Tùy chọn', ], + 'ads_image' => 'Hình ảnh Quảng cáo', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php index 64abd5421..500915dcc 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php @@ -79,21 +79,6 @@ return [ 'default_GET' => [ 'name' => 'Quảng cáo mặc định NHẬN', ], - 'add_canvas' => [ - 'name' => 'Thêm Canvas', - ], - 'thumbnail_width' => [ - 'name' => 'Chiều rộng hình thu nhỏ', - ], - 'thumbnail_height' => [ - 'name' => 'Chiều cao hình thu nhỏ', - ], - 'picture_width' => [ - 'name' => 'Chiều rộng hình ảnh', - ], - 'picture_height' => [ - 'name' => 'Chiều cao hình ảnh', - ], 'twitter' => [ 'name' => 'Twitter', ], @@ -106,18 +91,6 @@ return [ 'google' => [ 'name' => 'Google', ], - 'watermark_type' => [ - 'name' => 'Loại hình mờ', - ], - 'watermark_text' => [ - 'name' => 'Văn bản thủy ấn', - ], - 'watermark_image' => [ - 'name' => 'Hình mờ', - ], - 'watermark_position' => [ - 'name' => 'Vị trí hình mờ', - ], 'listing_page_image' => [ 'name' => 'Danh sách trang hình ảnh', ], @@ -158,4 +131,49 @@ return [ 'popular_ads_limit' => [ 'name' => 'Giới hạn Quảng cáo Phổ biến', ], + + //Image + + 'image_resize_backend' => [ + 'name' => 'Phần phụ trợ thay đổi kích thước hình ảnh', + ], + 'full_image_width' => [ + 'name' => 'Chiều rộng hình ảnh đầy đủ', + ], + 'full_image_height' => [ + 'name' => 'Chiều cao toàn ảnh', + ], + 'medium_image_width' => [ + 'name' => 'Chiều rộng hình ảnh trung bình', + ], + 'medium_image_height' => [ + 'name' => 'Chiều cao hình ảnh trung bình', + ], + 'thumbnail_width' => [ + 'name' => 'Chiều rộng hình thu nhỏ', + ], + 'thumbnail_height' => [ + 'name' => 'Chiều cao hình thu nhỏ', + ], + 'add_canvas' => [ + 'name' => 'Thêm Canvas', + ], + 'image_canvas_width' => [ + 'name' => 'Chiều rộng canvas hình ảnh', + ], + 'image_canvas_height' => [ + 'name' => 'Chiều cao canvas hình ảnh', + ], + 'watermark_type' => [ + 'name' => 'Loại hình mờ', + ], + 'watermark_text' => [ + 'name' => 'Văn bản thủy ấn', + ], + 'watermark_image' => [ + 'name' => 'Hình mờ', + ], + 'watermark_position' => [ + 'name' => 'Vị trí hình mờ', + ], ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/ar/message.php b/addons/default/visiosoft/media-field_type/resources/lang/ar/message.php index 2f372c226..10c0a91fa 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/ar/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/ar/message.php @@ -1,12 +1,13 @@ 'ماهو المجلد الذي تريد الرفع إليه?', - 'upload' => 'انقر أو اسحب الملفات إلى هنا للرفع.', - 'choose_files' => 'ما هي الملفات التي تريد استخدامها?', + 'choose_folder' => 'ماهو المجلد الذي تريد الرفع إليه?', + 'upload' => 'انقر أو اسحب الملفات إلى هنا للرفع.', + 'choose_files' => 'ما هي الملفات التي تريد استخدامها?', 'no_files_selected' => 'لم يتم اختيار الملفات.', - 'no_uploads' => 'لم يتم رفع الملفات.', - 'overwrite' => 'لقد تم رفعه مسبقاً هل تريد استبداله?', - 'uploading' => 'جاري الرفع', - 'loading' => 'جاري التحميل', + 'no_uploads' => 'لم يتم رفع الملفات.', + 'overwrite' => 'لقد تم رفعه مسبقاً هل تريد استبداله?', + 'uploading' => 'جاري الرفع', + 'loading' => 'جاري التحميل', + 'error_upload' => 'كانت هناك مشكلة في تحميل الملف.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/az/message.php b/addons/default/visiosoft/media-field_type/resources/lang/az/message.php index 80a12d20d..8e178f086 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/az/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/az/message.php @@ -1,12 +1,13 @@ 'Hansı qovluğa yükləmək istərdiniz?', - 'upload' => 'İmages əlavə edin | İmages yüklə | Bir şəkil əlavə edin', - 'choose_files' => 'Hansı fayllardan istifadə etmək istərdiniz?', + 'choose_folder' => 'Hansı qovluğa yükləmək istərdiniz?', + 'upload' => 'İmages əlavə edin | İmages yüklə | Bir şəkil əlavə edin', + 'choose_files' => 'Hansı fayllardan istifadə etmək istərdiniz?', 'no_files_selected' => 'Fayl seçilməyib.', - 'no_uploads' => 'Fayl yüklənməyib.', - 'overwrite' => 'artıq yüklənib. Yenidən yazmaq istərdinizmi?', - 'uploading' => 'Yüklənir', - 'loading' => 'Yüklənir', + 'no_uploads' => 'Fayl yüklənməyib.', + 'overwrite' => 'artıq yüklənib. Yenidən yazmaq istərdinizmi?', + 'uploading' => 'Yüklənir', + 'loading' => 'Yüklənir', + 'error_upload' => 'Fayl yüklənərkən problem oldu.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/bn/message.php b/addons/default/visiosoft/media-field_type/resources/lang/bn/message.php index 76bea0e45..f7cf320dc 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/bn/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/bn/message.php @@ -1,12 +1,13 @@ 'আপনি কোন ফোল্ডারে আপলোড করতে চান?', - 'upload' => 'যোগ করুন İmages | আপলোড করুন | একটি ছবি সংযুক্ত করুন', - 'choose_files' => 'আপনি কোন ফাইলগুলি ব্যবহার করতে চান?', + 'choose_folder' => 'আপনি কোন ফোল্ডারে আপলোড করতে চান?', + 'upload' => 'যোগ করুন İmages | আপলোড করুন | একটি ছবি সংযুক্ত করুন', + 'choose_files' => 'আপনি কোন ফাইলগুলি ব্যবহার করতে চান?', 'no_files_selected' => 'কোনও ফাইল নির্বাচিত হয়নি।', - 'no_uploads' => 'কোনও ফাইল আপলোড করা হয়নি।', - 'overwrite' => 'ইতিমধ্যে আপলোড করা হয়েছে। আপনি কি এটি ওভাররাইট করতে চান?', - 'uploading' => 'আপলোড হচ্ছে', - 'loading' => 'বোঝাই', + 'no_uploads' => 'কোনও ফাইল আপলোড করা হয়নি।', + 'overwrite' => 'ইতিমধ্যে আপলোড করা হয়েছে। আপনি কি এটি ওভাররাইট করতে চান?', + 'uploading' => 'আপলোড হচ্ছে', + 'loading' => 'বোঝাই', + 'error_upload' => 'ফাইলটি আপলোড করতে সমস্যা হয়েছিল।', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/de/message.php b/addons/default/visiosoft/media-field_type/resources/lang/de/message.php index 94e67fea4..0b330961a 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/de/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/de/message.php @@ -1,12 +1,13 @@ 'In welchen Ordner möchten Sie hochladen?', - 'upload' => 'Klicken Sie oder ziehen Sie Dateien hierher um Sie hochzuladen.', - 'choose_files' => 'Welche Dateien möchten Sie benutzen?', + 'choose_folder' => 'In welchen Ordner möchten Sie hochladen?', + 'upload' => 'Klicken Sie oder ziehen Sie Dateien hierher um Sie hochzuladen.', + 'choose_files' => 'Welche Dateien möchten Sie benutzen?', 'no_files_selected' => 'Keine Dateien ausgewählt.', - 'no_uploads' => 'Keine Dateien hochgeladen.', - 'overwrite' => 'wurde bereits hochgeladen. Wollen Sie die Datei überscheiben?', - 'uploading' => 'Lädt hoch', - 'loading' => 'Lädt', + 'no_uploads' => 'Keine Dateien hochgeladen.', + 'overwrite' => 'wurde bereits hochgeladen. Wollen Sie die Datei überscheiben?', + 'uploading' => 'Lädt hoch', + 'loading' => 'Lädt', + 'error_upload' => 'Beim Hochladen der Datei ist ein Problem aufgetreten.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/el/message.php b/addons/default/visiosoft/media-field_type/resources/lang/el/message.php index 059f859e4..7655b2fad 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/el/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/el/message.php @@ -1,12 +1,13 @@ 'Σε ποιον φάκελο θέλετε να ανεβάσετε;', - 'upload' => 'Προσθήκη agesmages | Μεταφόρτωση İmages | Επισυνάψτε μια φωτογραφία', - 'choose_files' => 'Ποια αρχεία θέλετε να χρησιμοποιήσετε;', + 'choose_folder' => 'Σε ποιον φάκελο θέλετε να ανεβάσετε;', + 'upload' => 'Προσθήκη agesmages | Μεταφόρτωση İmages | Επισυνάψτε μια φωτογραφία', + 'choose_files' => 'Ποια αρχεία θέλετε να χρησιμοποιήσετε;', 'no_files_selected' => 'Δεν έχουν επιλεγεί αρχεία.', - 'no_uploads' => 'Δεν μεταφορτώθηκαν αρχεία.', - 'overwrite' => 'έχει ήδη μεταφορτωθεί. Θέλετε να το αντικαταστήσετε;', - 'uploading' => 'Μεταφόρτωση', - 'loading' => 'Φόρτωση', + 'no_uploads' => 'Δεν μεταφορτώθηκαν αρχεία.', + 'overwrite' => 'έχει ήδη μεταφορτωθεί. Θέλετε να το αντικαταστήσετε;', + 'uploading' => 'Μεταφόρτωση', + 'loading' => 'Φόρτωση', + 'error_upload' => 'Παρουσιάστηκε πρόβλημα κατά τη μεταφόρτωση του αρχείου.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/es/message.php b/addons/default/visiosoft/media-field_type/resources/lang/es/message.php index 403f3b36b..78cf46641 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/es/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/es/message.php @@ -1,12 +1,13 @@ '¿A qué carpeta le gustaría subir?', - 'upload' => 'Añadir imágenes | Subir imágenes | Adjuntar una foto', - 'choose_files' => '¿Qué archivos te gustaría usar?', + 'choose_folder' => '¿A qué carpeta le gustaría subir?', + 'upload' => 'Añadir imágenes | Subir imágenes | Adjuntar una foto', + 'choose_files' => '¿Qué archivos te gustaría usar?', 'no_files_selected' => 'No hay archivos seleccionados.', - 'no_uploads' => 'No hay archivos cargados.', - 'overwrite' => 'ya ha sido subido ¿Te gustaría sobrescribirlo?', - 'uploading' => 'Cargando', - 'loading' => 'Cargando', + 'no_uploads' => 'No hay archivos cargados.', + 'overwrite' => 'ya ha sido subido ¿Te gustaría sobrescribirlo?', + 'uploading' => 'Cargando', + 'loading' => 'Cargando', + 'error_upload' => 'Hubo un problema al cargar el archivo.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/fa/message.php b/addons/default/visiosoft/media-field_type/resources/lang/fa/message.php index da9329054..6db651711 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/fa/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/fa/message.php @@ -1,12 +1,13 @@ 'کدام پوشه را می خواهید بارگذاری کنید؟', - 'upload' => 'agesmages اضافه کنید | بارگیری agesmages | پیوست یک عکس', - 'choose_files' => 'از کدام پرونده ها می خواهید استفاده کنید؟', + 'choose_folder' => 'کدام پوشه را می خواهید بارگذاری کنید؟', + 'upload' => 'agesmages اضافه کنید | بارگیری agesmages | پیوست یک عکس', + 'choose_files' => 'از کدام پرونده ها می خواهید استفاده کنید؟', 'no_files_selected' => 'هیچ پرونده ای انتخاب نشده است.', - 'no_uploads' => 'هیچ پرونده بارگذاری نشده است.', - 'overwrite' => 'قبلاً بارگذاری شده است آیا می خواهید آن را بازنویسی کنید؟', - 'uploading' => 'بارگذاری', - 'loading' => 'بارگذاری', + 'no_uploads' => 'هیچ پرونده بارگذاری نشده است.', + 'overwrite' => 'قبلاً بارگذاری شده است آیا می خواهید آن را بازنویسی کنید؟', + 'uploading' => 'بارگذاری', + 'loading' => 'بارگذاری', + 'error_upload' => 'هنگام بارگذاری پرونده مشکلی پیش آمد.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/fr/message.php b/addons/default/visiosoft/media-field_type/resources/lang/fr/message.php index 0bcd6ccb0..306b47572 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/fr/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/fr/message.php @@ -1,12 +1,13 @@ 'Dans quel dossier souhaitez-vous télécharger?', - 'upload' => 'Ajouter des images | Téléchargez des images | Joindre une photo', - 'choose_files' => 'Quels fichiers aimeriez-vous utiliser?', + 'choose_folder' => 'Dans quel dossier souhaitez-vous télécharger?', + 'upload' => 'Ajouter des images | Téléchargez des images | Joindre une photo', + 'choose_files' => 'Quels fichiers aimeriez-vous utiliser?', 'no_files_selected' => 'Aucun fichier sélectionné.', - 'no_uploads' => 'Aucun fichier téléchargé.', - 'overwrite' => 'a déjà été téléchargé. Voulez-vous l\'écraser?', - 'uploading' => 'Téléchargement', - 'loading' => 'Chargement', + 'no_uploads' => 'Aucun fichier téléchargé.', + 'overwrite' => 'a déjà été téléchargé. Voulez-vous l\'écraser?', + 'uploading' => 'Téléchargement', + 'loading' => 'Chargement', + 'error_upload' => 'Un problème est survenu lors du téléchargement du fichier.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/he/message.php b/addons/default/visiosoft/media-field_type/resources/lang/he/message.php index 95e04d0f2..db09101f7 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/he/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/he/message.php @@ -1,12 +1,13 @@ 'לאיזו תיקיה תרצה להעלות?', - 'upload' => 'הוסף תמונות | העלה תמונות | לצרף תמונה', - 'choose_files' => 'באילו קבצים תרצה להשתמש?', + 'choose_folder' => 'לאיזו תיקיה תרצה להעלות?', + 'upload' => 'הוסף תמונות | העלה תמונות | לצרף תמונה', + 'choose_files' => 'באילו קבצים תרצה להשתמש?', 'no_files_selected' => 'לא נבחרו קבצים.', - 'no_uploads' => 'לא הועלו קבצים.', - 'overwrite' => 'כבר הועלה. האם תרצה להחליף אותו?', - 'uploading' => 'מעלה', - 'loading' => 'טעינה', + 'no_uploads' => 'לא הועלו קבצים.', + 'overwrite' => 'כבר הועלה. האם תרצה להחליף אותו?', + 'uploading' => 'מעלה', + 'loading' => 'טעינה', + 'error_upload' => 'הייתה בעיה בהעלאת הקובץ.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/hi/message.php b/addons/default/visiosoft/media-field_type/resources/lang/hi/message.php index b8ca4610b..5144ede79 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/hi/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/hi/message.php @@ -1,12 +1,13 @@ 'आप किस फ़ोल्डर में अपलोड करना चाहते हैं?', - 'upload' => 'जोड़ें Addmages | अपलोड İmages | एक तस्वीर लगाओ', - 'choose_files' => 'आप किन फ़ाइलों का उपयोग करना चाहेंगे?', + 'choose_folder' => 'आप किस फ़ोल्डर में अपलोड करना चाहते हैं?', + 'upload' => 'जोड़ें Addmages | अपलोड İmages | एक तस्वीर लगाओ', + 'choose_files' => 'आप किन फ़ाइलों का उपयोग करना चाहेंगे?', 'no_files_selected' => 'कोई फ़ाइल चयनित नहीं है।', - 'no_uploads' => 'कोई फ़ाइल अपलोड नहीं की गई।', - 'overwrite' => 'पहले ही अपलोड किया जा चुका है। क्या आप इसे अधिलेखित करना चाहेंगे?', - 'uploading' => 'अपलोड हो रहा है', - 'loading' => 'लोड हो रहा है', + 'no_uploads' => 'कोई फ़ाइल अपलोड नहीं की गई।', + 'overwrite' => 'पहले ही अपलोड किया जा चुका है। क्या आप इसे अधिलेखित करना चाहेंगे?', + 'uploading' => 'अपलोड हो रहा है', + 'loading' => 'लोड हो रहा है', + 'error_upload' => 'फ़ाइल अपलोड करने में समस्या थी।', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/it/message.php b/addons/default/visiosoft/media-field_type/resources/lang/it/message.php index 50da3f0f7..67b2847db 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/it/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/it/message.php @@ -1,12 +1,13 @@ 'In quale cartella desideri caricare?', - 'upload' => 'Aggiungi İmages | Carica İmages | Allega una foto', - 'choose_files' => 'Quali file vorresti usare?', + 'choose_folder' => 'In quale cartella desideri caricare?', + 'upload' => 'Aggiungi İmages | Carica İmages | Allega una foto', + 'choose_files' => 'Quali file vorresti usare?', 'no_files_selected' => 'Nessun file selezionato.', - 'no_uploads' => 'Nessun file caricato.', - 'overwrite' => 'è già stato caricato. Vuoi sovrascriverlo?', - 'uploading' => 'Caricamento', - 'loading' => 'Caricamento in corso', + 'no_uploads' => 'Nessun file caricato.', + 'overwrite' => 'è già stato caricato. Vuoi sovrascriverlo?', + 'uploading' => 'Caricamento', + 'loading' => 'Caricamento in corso', + 'error_upload' => 'Si è verificato un problema durante il caricamento del file.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/ja/message.php b/addons/default/visiosoft/media-field_type/resources/lang/ja/message.php index 2cf9dd0b0..112db4880 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/ja/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/ja/message.php @@ -1,12 +1,13 @@ 'どのフォルダにアップロードしますか？', - 'upload' => 'İmagesを追加する| İmagesをアップロードする|写真を添付', - 'choose_files' => 'どのファイルを使用しますか？', + 'choose_folder' => 'どのフォルダにアップロードしますか？', + 'upload' => 'İmagesを追加する| İmagesをアップロードする|写真を添付', + 'choose_files' => 'どのファイルを使用しますか？', 'no_files_selected' => 'ファイルが選択されていません。', - 'no_uploads' => 'アップロードされたファイルはありません。', - 'overwrite' => 'すでにアップロードされています。上書きしますか？', - 'uploading' => 'アップロードしています', - 'loading' => '読み込み中', + 'no_uploads' => 'アップロードされたファイルはありません。', + 'overwrite' => 'すでにアップロードされています。上書きしますか？', + 'uploading' => 'アップロードしています', + 'loading' => '読み込み中', + 'error_upload' => 'ファイルのアップロードで問題が発生しました。', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/ko/message.php b/addons/default/visiosoft/media-field_type/resources/lang/ko/message.php index 10087d812..a23aeb18e 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/ko/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/ko/message.php @@ -1,12 +1,13 @@ '어느 폴더에 업로드 하시겠습니까?', - 'upload' => 'İmages 추가 | İmages 업로드 | 사진 첨부', - 'choose_files' => '어떤 파일을 사용 하시겠습니까?', + 'choose_folder' => '어느 폴더에 업로드 하시겠습니까?', + 'upload' => 'İmages 추가 | İmages 업로드 | 사진 첨부', + 'choose_files' => '어떤 파일을 사용 하시겠습니까?', 'no_files_selected' => '선택된 파일이 없습니다.', - 'no_uploads' => '파일이 업로드되지 않았습니다.', - 'overwrite' => '이미 업로드되었습니다. 덮어 쓰시겠습니까?', - 'uploading' => '업로드 중', - 'loading' => '로딩', + 'no_uploads' => '파일이 업로드되지 않았습니다.', + 'overwrite' => '이미 업로드되었습니다. 덮어 쓰시겠습니까?', + 'uploading' => '업로드 중', + 'loading' => '로딩', + 'error_upload' => '파일을 업로드하는 중에 문제가 발생했습니다.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/nl/message.php b/addons/default/visiosoft/media-field_type/resources/lang/nl/message.php index 500f0f7b0..f39d3cd9d 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/nl/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/nl/message.php @@ -1,12 +1,13 @@ 'Naar welke map wil je uploaden?', - 'upload' => 'İmages | İmages uploaden | Voeg een foto toe', - 'choose_files' => 'Welke bestanden wil je gebruiken?', + 'choose_folder' => 'Naar welke map wil je uploaden?', + 'upload' => 'İmages | İmages uploaden | Voeg een foto toe', + 'choose_files' => 'Welke bestanden wil je gebruiken?', 'no_files_selected' => 'Geen bestanden geselecteerd.', - 'no_uploads' => 'Geen bestanden geüpload.', - 'overwrite' => 'is al geüpload. Wil je het overschrijven?', - 'uploading' => 'Uploaden', - 'loading' => 'Bezig met laden', + 'no_uploads' => 'Geen bestanden geüpload.', + 'overwrite' => 'is al geüpload. Wil je het overschrijven?', + 'uploading' => 'Uploaden', + 'loading' => 'Bezig met laden', + 'error_upload' => 'Er is een probleem opgetreden bij het uploaden van het bestand.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/pl/message.php b/addons/default/visiosoft/media-field_type/resources/lang/pl/message.php index 4b5c3dbf4..3bdc3a0f2 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/pl/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/pl/message.php @@ -1,12 +1,13 @@ 'Do którego folderu chcesz przesłać?', - 'upload' => 'Dodaj İmages | Prześlij İmages | Załącz zdjęcie', - 'choose_files' => 'Których plików chciałbyś użyć?', + 'choose_folder' => 'Do którego folderu chcesz przesłać?', + 'upload' => 'Dodaj İmages | Prześlij İmages | Załącz zdjęcie', + 'choose_files' => 'Których plików chciałbyś użyć?', 'no_files_selected' => 'Nie wybrano plików.', - 'no_uploads' => 'Brak przesłanych plików.', - 'overwrite' => 'został już przesłany. Czy chcesz go zastąpić?', - 'uploading' => 'Przesyłanie', - 'loading' => 'Ładowanie', + 'no_uploads' => 'Brak przesłanych plików.', + 'overwrite' => 'został już przesłany. Czy chcesz go zastąpić?', + 'uploading' => 'Przesyłanie', + 'loading' => 'Ładowanie', + 'error_upload' => 'Wystąpił problem podczas przesyłania pliku.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/pt/message.php b/addons/default/visiosoft/media-field_type/resources/lang/pt/message.php index 9a2249bd5..50a234b0a 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/pt/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/pt/message.php @@ -1,12 +1,13 @@ 'Para qual pasta você deseja enviar?', - 'upload' => 'Adicionar imagens | Carregar imagens | Anexe uma foto', - 'choose_files' => 'Quais arquivos você gostaria de usar?', + 'choose_folder' => 'Para qual pasta você deseja enviar?', + 'upload' => 'Adicionar imagens | Carregar imagens | Anexe uma foto', + 'choose_files' => 'Quais arquivos você gostaria de usar?', 'no_files_selected' => 'Nenhum arquivo selecionado.', - 'no_uploads' => 'Nenhum arquivo enviado.', - 'overwrite' => 'já foi enviado. Deseja substituí-lo?', - 'uploading' => 'Enviando', - 'loading' => 'Carregando', + 'no_uploads' => 'Nenhum arquivo enviado.', + 'overwrite' => 'já foi enviado. Deseja substituí-lo?', + 'uploading' => 'Enviando', + 'loading' => 'Carregando', + 'error_upload' => 'Ocorreu um problema ao enviar o arquivo.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/ro/message.php b/addons/default/visiosoft/media-field_type/resources/lang/ro/message.php index 48080a4f8..567c57a4b 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/ro/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/ro/message.php @@ -1,12 +1,13 @@ 'În ce folder doriți să încărcați?', - 'upload' => 'Adăugați İmages | Încărcați imagini | Atașați o fotografie', - 'choose_files' => 'Ce fișiere doriți să utilizați?', + 'choose_folder' => 'În ce folder doriți să încărcați?', + 'upload' => 'Adăugați İmages | Încărcați imagini | Atașați o fotografie', + 'choose_files' => 'Ce fișiere doriți să utilizați?', 'no_files_selected' => 'Nu au fost selectate fișiere.', - 'no_uploads' => 'Nu s-au încărcat fișiere.', - 'overwrite' => 'a fost deja încărcat. Doriți să îl suprascrieți?', - 'uploading' => 'Se încarcă', - 'loading' => 'Se încarcă', + 'no_uploads' => 'Nu s-au încărcat fișiere.', + 'overwrite' => 'a fost deja încărcat. Doriți să îl suprascrieți?', + 'uploading' => 'Se încarcă', + 'loading' => 'Se încarcă', + 'error_upload' => 'A apărut o problemă la încărcarea fișierului.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/ru/message.php b/addons/default/visiosoft/media-field_type/resources/lang/ru/message.php index c1150d1cc..14041c9a3 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/ru/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/ru/message.php @@ -1,12 +1,13 @@ 'В какую папку вы хотите загрузить файлы?', - 'upload' => 'Добавить изображения | Загрузить изображения | Прикрепить фото', - 'choose_files' => 'Какие файлы вы хотели бы использовать?', + 'choose_folder' => 'В какую папку вы хотите загрузить файлы?', + 'upload' => 'Добавить изображения | Загрузить изображения | Прикрепить фото', + 'choose_files' => 'Какие файлы вы хотели бы использовать?', 'no_files_selected' => 'Файлы не выбраны.', - 'no_uploads' => 'Файлы не загружены.', - 'overwrite' => 'уже был загружен. Хотите перезаписать это?', - 'uploading' => 'Выгрузка', - 'loading' => 'загрузка', + 'no_uploads' => 'Файлы не загружены.', + 'overwrite' => 'уже был загружен. Хотите перезаписать это?', + 'uploading' => 'Выгрузка', + 'loading' => 'загрузка', + 'error_upload' => 'При загрузке файла возникла проблема.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/sq/message.php b/addons/default/visiosoft/media-field_type/resources/lang/sq/message.php index 57eb4bc64..6b3da22cf 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/sq/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/sq/message.php @@ -1,12 +1,13 @@ 'Në cilën dosje dëshironi të ngarkoni?', - 'upload' => 'Shtoni agesmages | Ngarko İmages | Bashkangjit një fotografi', - 'choose_files' => 'Cilat skedarë dëshironi të përdorni?', + 'choose_folder' => 'Në cilën dosje dëshironi të ngarkoni?', + 'upload' => 'Shtoni agesmages | Ngarko İmages | Bashkangjit një fotografi', + 'choose_files' => 'Cilat skedarë dëshironi të përdorni?', 'no_files_selected' => 'Asnjë skedar i zgjedhur.', - 'no_uploads' => 'Asnjë fotografi të ngarkuar.', - 'overwrite' => 'tashmë është ngarkuar. Dëshiron ta rishkruash?', - 'uploading' => 'Ngarkimi...', - 'loading' => 'Ngarkim...', + 'no_uploads' => 'Asnjë fotografi të ngarkuar.', + 'overwrite' => 'tashmë është ngarkuar. Dëshiron ta rishkruash?', + 'uploading' => 'Ngarkimi...', + 'loading' => 'Ngarkim...', + 'error_upload' => 'Kishte një problem në ngarkimin e skedarit.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/sv/message.php b/addons/default/visiosoft/media-field_type/resources/lang/sv/message.php index 08c5ac4ea..ca09a8779 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/sv/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/sv/message.php @@ -1,12 +1,13 @@ 'Vilken mapp vill du ladda upp till?', - 'upload' => 'Lägg till İmages | Ladda upp İmages | Bifoga ett foto', - 'choose_files' => 'Vilka filer vill du använda?', + 'choose_folder' => 'Vilken mapp vill du ladda upp till?', + 'upload' => 'Lägg till İmages | Ladda upp İmages | Bifoga ett foto', + 'choose_files' => 'Vilka filer vill du använda?', 'no_files_selected' => 'Inga filer valda.', - 'no_uploads' => 'Inga filer laddas upp.', - 'overwrite' => 'har redan laddats upp. Vill du skriva över det?', - 'uploading' => 'uppladdning', - 'loading' => 'Läser in', + 'no_uploads' => 'Inga filer laddas upp.', + 'overwrite' => 'har redan laddats upp. Vill du skriva över det?', + 'uploading' => 'uppladdning', + 'loading' => 'Läser in', + 'error_upload' => 'Det gick inte att ladda upp filen.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php b/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php index 8f3ade422..06ac1b1b2 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/tr/message.php @@ -1,12 +1,13 @@ 'Hangi klasöre yüklemek istersiniz?', - 'upload' => 'Yüklemek için buraya tıklayın veya bırakın.', - 'choose_files' => 'Hangi dosyaları kullanmak istersiniz?', + 'choose_folder' => 'Hangi klasöre yüklemek istersiniz?', + 'upload' => 'Yüklemek için buraya tıklayın veya bırakın.', + 'choose_files' => 'Hangi dosyaları kullanmak istersiniz?', 'no_files_selected' => 'Seçili dosya yok.', - 'no_uploads' => 'Dosya yüklenmedi.', - 'overwrite' => 'zaten yüklendi. Üzerine yazmak ister misiniz?', - 'uploading' => 'Yükleme', - 'loading' => 'Yükleniyor', + 'no_uploads' => 'Dosya yüklenmedi.', + 'overwrite' => 'zaten yüklendi. Üzerine yazmak ister misiniz?', + 'uploading' => 'Yükleme', + 'loading' => 'Yükleniyor', + 'error_upload' => 'Dosyayı yüklerken bir sorun oluştu.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/uk/message.php b/addons/default/visiosoft/media-field_type/resources/lang/uk/message.php index 863771fde..4982196bc 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/uk/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/uk/message.php @@ -1,12 +1,13 @@ 'У яку папку ви хочете завантажити?', - 'upload' => 'Додати İmages | Завантажити İmages | Прикріпити фотографію', - 'choose_files' => 'Які файли ви хочете використовувати?', + 'choose_folder' => 'У яку папку ви хочете завантажити?', + 'upload' => 'Додати İmages | Завантажити İmages | Прикріпити фотографію', + 'choose_files' => 'Які файли ви хочете використовувати?', 'no_files_selected' => 'Файлів не вибрано.', - 'no_uploads' => 'Файлів не завантажено.', - 'overwrite' => 'вже завантажено. Чи хотіли б ви її перезаписати?', - 'uploading' => 'Завантаження', - 'loading' => 'Завантаження', + 'no_uploads' => 'Файлів не завантажено.', + 'overwrite' => 'вже завантажено. Чи хотіли б ви її перезаписати?', + 'uploading' => 'Завантаження', + 'loading' => 'Завантаження', + 'error_upload' => 'Не вдалося завантажити файл.', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/ur/message.php b/addons/default/visiosoft/media-field_type/resources/lang/ur/message.php index b1bcc2806..514127fdc 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/ur/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/ur/message.php @@ -1,12 +1,13 @@ 'آپ کس فولڈر میں اپ لوڈ کرنا چاہیں گے؟', - 'upload' => 'İmages شامل کریں اپ لوڈ İmages | تصویر منسلک کریں', - 'choose_files' => 'آپ کون سی فائلیں استعمال کرنا چاہیں گے؟', + 'choose_folder' => 'آپ کس فولڈر میں اپ لوڈ کرنا چاہیں گے؟', + 'upload' => 'İmages شامل کریں اپ لوڈ İmages | تصویر منسلک کریں', + 'choose_files' => 'آپ کون سی فائلیں استعمال کرنا چاہیں گے؟', 'no_files_selected' => 'کوئی فائلیں منتخب نہیں کی گئیں۔', - 'no_uploads' => 'کوئی فائلیں اپ لوڈ نہیں کی گئیں۔', - 'overwrite' => 'پہلے ہی اپ لوڈ ہوچکا ہے۔ کیا آپ اسے ادلیکھت کرنا چاہیں گے؟', - 'uploading' => 'اپ لوڈ ہو رہا ہے', - 'loading' => 'لوڈ ہو رہا ہے', + 'no_uploads' => 'کوئی فائلیں اپ لوڈ نہیں کی گئیں۔', + 'overwrite' => 'پہلے ہی اپ لوڈ ہوچکا ہے۔ کیا آپ اسے ادلیکھت کرنا چاہیں گے؟', + 'uploading' => 'اپ لوڈ ہو رہا ہے', + 'loading' => 'لوڈ ہو رہا ہے', + 'error_upload' => 'فائل اپ لوڈ کرنے میں دشواری تھی۔', ]; diff --git a/addons/default/visiosoft/media-field_type/resources/lang/vi/message.php b/addons/default/visiosoft/media-field_type/resources/lang/vi/message.php index 813c92cfa..57182f557 100644 --- a/addons/default/visiosoft/media-field_type/resources/lang/vi/message.php +++ b/addons/default/visiosoft/media-field_type/resources/lang/vi/message.php @@ -1,12 +1,13 @@ 'Thư mục nào bạn muốn tải lên?', - 'upload' => 'Thêm phần mềm | Tải lên | Đính kèm ảnh', - 'choose_files' => 'Những tập tin bạn muốn sử dụng?', + 'choose_folder' => 'Thư mục nào bạn muốn tải lên?', + 'upload' => 'Thêm phần mềm | Tải lên | Đính kèm ảnh', + 'choose_files' => 'Những tập tin bạn muốn sử dụng?', 'no_files_selected' => 'Không có tập tin được chọn.', - 'no_uploads' => 'Không có tập tin tải lên.', - 'overwrite' => 'đã được tải lên. Bạn có muốn ghi đè lên nó?', - 'uploading' => 'Đang tải lên', - 'loading' => 'Đang tải', + 'no_uploads' => 'Không có tập tin tải lên.', + 'overwrite' => 'đã được tải lên. Bạn có muốn ghi đè lên nó?', + 'uploading' => 'Đang tải lên', + 'loading' => 'Đang tải', + 'error_upload' => 'Đã xảy ra sự cố khi tải tệp lên.', ]; From aac63400251ef3883fa4775ebf2994f7d7e382b3 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 8 Oct 2020 18:11:02 +0300 Subject: [PATCH 07/72] #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 }} + {{ 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 10/72] #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 11/72] #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 12/72] #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 13/72] #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: Mon, 12 Oct 2020 22:38:43 +0300 Subject: [PATCH 15/72] Muammer (#714) * #2253 Do not show GET if it's off * #2253 Do not show GET if it's off Co-authored-by: Muammer Top --- .../resources/views/new-ad/new-create.twig | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 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..4ccfbcfda 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,33 @@ {{ form.fields.slug|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('.') %} -
- -
-
- -
+
+ {{ form.fields.standard_price.setAttributes({ + 'required' :true, + }).input|raw }}
+ {% if setting_value('visiosoft.module.advs::market_place') %} + {{ addBlock('new-ad/fields', {'adv': adv})|raw }} + +
+ + + {% set standardPriceValue = form.fields.standard_price.value|split('.') %} +
+ +
+
+ +
+
+ {% endif %} +
From 8ff6179572c02e3a95df0dac8a5f1d63fccc2400 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 13 Oct 2020 17:41:34 +0300 Subject: [PATCH 18/72] 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 19/72] 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 20/72] 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 21/72] 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 22/72] #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 23/72] 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 ec13fa7d96bdda1a88749928132fb1408bed6404 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 14 Oct 2020 13:48:48 +0300 Subject: [PATCH 24/72] added activation email for trail form --- .../profile-module/src/Events/UserActivatedByMail.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php b/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php index ecfe8b278..6e19425a7 100644 --- a/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php +++ b/addons/default/visiosoft/profile-module/src/Events/UserActivatedByMail.php @@ -14,4 +14,9 @@ class UserActivatedByMail { $this->user = $user; } + + public function getUser() + { + return $this->user; + } } \ No newline at end of file From 1d3fbda7f53d3916ea51243e214c93ca1ff415cb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 14 Oct 2020 16:59:17 +0300 Subject: [PATCH 25/72] created getAdmins function --- .../default/visiosoft/profile-module/composer.json | 5 ++++- .../profile-module/src/Support/Command/getAdmins.php | 12 ++++++++++++ .../profile-module/src/Support/_helpers.php | 10 ++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php create mode 100644 addons/default/visiosoft/profile-module/src/Support/_helpers.php diff --git a/addons/default/visiosoft/profile-module/composer.json b/addons/default/visiosoft/profile-module/composer.json index 9e60e3695..04878d89c 100644 --- a/addons/default/visiosoft/profile-module/composer.json +++ b/addons/default/visiosoft/profile-module/composer.json @@ -4,7 +4,10 @@ "autoload": { "psr-4": { "Visiosoft\\ProfileModule\\": "src/" - } + }, + "files": [ + "src/Support/_helpers.php" + ] }, "require": { "maatwebsite/excel": "*" diff --git a/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php b/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php new file mode 100644 index 000000000..9c01b9c29 --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Support/Command/getAdmins.php @@ -0,0 +1,12 @@ +findBySlug('admin'); + return $adminRole->getUsers(); + } +} diff --git a/addons/default/visiosoft/profile-module/src/Support/_helpers.php b/addons/default/visiosoft/profile-module/src/Support/_helpers.php new file mode 100644 index 000000000..276134d40 --- /dev/null +++ b/addons/default/visiosoft/profile-module/src/Support/_helpers.php @@ -0,0 +1,10 @@ + Date: Wed, 14 Oct 2020 19:03:21 +0300 Subject: [PATCH 26/72] #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 27/72] #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 fac01c5ca3352859ed518b4e1802d7107ddbfb66 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 14 Oct 2020 19:28:22 +0300 Subject: [PATCH 28/72] change helper name --- .../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: Wed, 14 Oct 2020 19:54:34 +0300 Subject: [PATCH 29/72] 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 30/72] 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 31/72] #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 32/72] #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 33/72] 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 34/72] #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 35/72] 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 36/72] 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; }, ], ], From 4a424ea7bd3f067e5fc430a23ac29960d0ddfdb7 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 16 Oct 2020 12:42:55 +0300 Subject: [PATCH 37/72] #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 ce3589993fd7d05530033decefd3ab6d80f8cb48 Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Fri, 16 Oct 2020 15:21:35 +0300 Subject: [PATCH 38/72] fixed declared functions --- .../default/visiosoft/profile-module/src/Support/_helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/src/Support/_helpers.php b/addons/default/visiosoft/profile-module/src/Support/_helpers.php index 6991cd3b8..e9cc6fde7 100644 --- a/addons/default/visiosoft/profile-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/profile-module/src/Support/_helpers.php @@ -4,7 +4,7 @@ use Visiosoft\ProfileModule\Support\Command\getAdminUsers; if (!function_exists('get_admins')) { - function getAdmins() { + function get_admins() { return dispatch_now(new getAdminUsers()); } } \ No newline at end of file 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 39/72] #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 40/72] #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 8dcc55da57f4fa0167b27b757214b964ac2131e7 Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Mon, 19 Oct 2020 10:11:17 +0300 Subject: [PATCH 41/72] Clear selected cities when country is changed --- .../visiosoft/location-module/resources/js/filterLocation.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js index 6da03fde9..8abd5100a 100644 --- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js +++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js @@ -200,6 +200,8 @@ function SelectOnClick() { if ($(this).attr('data-field') == "country") { $('.filter-location-modal,.filter-location-back,.filter-location-modal .countries').hide(); $('input[name="country"]').val(id) + $('.selected-city').html(''); + $('input[name="city[]"]').val(''); text_html.html(input_text) $(".filter-location-body input[type='checkbox']").prop('checked', false); $(".filter-location-body li[data-id='" + id + "'] input[type='checkbox']").prop('checked', true); From aaf85e04a8715540883dfeed3d261338ec400039 Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Mon, 19 Oct 2020 12:48:51 +0300 Subject: [PATCH 42/72] fixed register bug --- .../visiosoft/base-theme/resources/config/settings/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 268a0b6dd..c67ca3596 100644 --- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php +++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php @@ -79,7 +79,7 @@ return [ 'required' => false, 'config' => [ 'default_value' => function () { - return [config('visiosoft.theme.base::countries.default')]; + return config('visiosoft.theme.base::countries.default'); }, 'options' => function () { $array = CountryModel::query()->get()->pluck('name', 'abv')->toArray(); 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 43/72] #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 0a48d09668c1bd205b73b8c9bce87a376d0e7f7b Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Mon, 19 Oct 2020 18:34:53 +0300 Subject: [PATCH 44/72] product options created - first commit --- .../factories/OptionConfigurationFactory.php | 10 +++ .../factories/OptionsConfigurationFactory.php | 10 +++ .../factories/ProductoptionFactory.php | 10 +++ .../factories/ProductoptionsValueFactory.php | 10 +++ ...ule.advs__create_productoptions_stream.php | 47 +++++++++++++ ...vs__create_productoptions_value_stream.php | 56 +++++++++++++++ ...osoft.module.advs__added_options_field.php | 48 +++++++++++++ ...vs__create_option_configuration_stream.php | 58 ++++++++++++++++ .../resources/config/permissions.php | 25 +++++++ .../advs-module/resources/lang/en/button.php | 7 +- .../advs-module/resources/lang/en/field.php | 6 ++ .../resources/lang/en/permission.php | 40 +++++++++++ .../advs-module/resources/lang/en/section.php | 15 ++++ .../advs-module/resources/lang/en/stream.php | 15 ++++ .../resources/views/new-ad/new-create.twig | 9 +++ .../advs-module/src/Adv/AdvModel.php | 5 ++ .../src/Adv/Contract/AdvInterface.php | 2 + .../src/Adv/Form/AdvFormBuilder.php | 3 +- .../visiosoft/advs-module/src/AdvsModule.php | 17 ++++- .../src/AdvsModuleServiceProvider.php | 19 ++++++ .../Http/Controller/Admin/AdvsController.php | 4 ++ .../Admin/OptionConfigurationController.php | 32 +++++++++ .../Admin/ProductoptionsController.php | 43 ++++++++++++ .../Admin/ProductoptionsValueController.php | 43 ++++++++++++ .../Contract/OptionConfigurationInterface.php | 8 +++ ...OptionConfigurationRepositoryInterface.php | 8 +++ .../Form/OptionConfigurationFormBuilder.php | 7 ++ .../Form/OptionConfigurationFormFields.php | 40 +++++++++++ .../Form/OptionConfigurationFormHandler.php | 35 ++++++++++ .../OptionConfigurationCollection.php | 8 +++ .../OptionConfigurationCriteria.php | 8 +++ .../OptionConfigurationModel.php | 9 +++ .../OptionConfigurationObserver.php | 8 +++ .../OptionConfigurationPresenter.php | 8 +++ .../OptionConfigurationRepository.php | 36 ++++++++++ .../OptionConfigurationRouter.php | 8 +++ .../OptionConfigurationSeeder.php | 15 ++++ .../Table/OptionConfigurationTableBuilder.php | 10 +++ .../Table/OptionConfigurationTableColumns.php | 49 +++++++++++++ .../Contract/ProductoptionInterface.php | 8 +++ .../ProductoptionRepositoryInterface.php | 8 +++ .../Form/ProductoptionFormBuilder.php | 68 +++++++++++++++++++ .../Productoption/ProductoptionCollection.php | 8 +++ .../Productoption/ProductoptionCriteria.php | 8 +++ .../src/Productoption/ProductoptionModel.php | 12 ++++ .../Productoption/ProductoptionObserver.php | 8 +++ .../Productoption/ProductoptionPresenter.php | 8 +++ .../Productoption/ProductoptionRepository.php | 25 +++++++ .../src/Productoption/ProductoptionRouter.php | 8 +++ .../src/Productoption/ProductoptionSeeder.php | 15 ++++ .../Table/ProductoptionTableBuilder.php | 61 +++++++++++++++++ .../Contract/ProductoptionsValueInterface.php | 8 +++ ...ProductoptionsValueRepositoryInterface.php | 8 +++ .../Form/ProductoptionsValueFormBuilder.php | 68 +++++++++++++++++++ .../ProductoptionsValueCollection.php | 8 +++ .../ProductoptionsValueCriteria.php | 8 +++ .../ProductoptionsValueModel.php | 9 +++ .../ProductoptionsValueObserver.php | 8 +++ .../ProductoptionsValuePresenter.php | 8 +++ .../ProductoptionsValueRepository.php | 25 +++++++ .../ProductoptionsValueRouter.php | 8 +++ .../ProductoptionsValueSeeder.php | 15 ++++ .../MultipleFieldType/LookupTableBuilder.php | 25 +++++++ .../SelectedTableBuilder.php | 21 ++++++ .../MultipleFieldType/ValueTableBuilder.php | 21 ++++++ .../Table/ProductoptionsValueTableBuilder.php | 68 +++++++++++++++++++ .../OptionConfigurationFormBuilderTest.php | 8 +++ .../OptionConfigurationCollectionTest.php | 8 +++ .../OptionConfigurationCriteriaTest.php | 8 +++ .../OptionConfigurationModelTest.php | 8 +++ .../OptionConfigurationObserverTest.php | 8 +++ .../OptionConfigurationPresenterTest.php | 8 +++ .../OptionConfigurationRepositoryTest.php | 8 +++ .../OptionConfigurationRouterTest.php | 8 +++ .../OptionConfigurationSeederTest.php | 8 +++ .../OptionConfigurationTableBuilderTest.php | 8 +++ .../OptionsConfigurationFormBuilderTest.php | 8 +++ .../OptionsConfigurationCollectionTest.php | 8 +++ .../OptionsConfigurationCriteriaTest.php | 8 +++ .../OptionsConfigurationModelTest.php | 8 +++ .../OptionsConfigurationObserverTest.php | 8 +++ .../OptionsConfigurationPresenterTest.php | 8 +++ .../OptionsConfigurationRepositoryTest.php | 8 +++ .../OptionsConfigurationRouterTest.php | 8 +++ .../OptionsConfigurationSeederTest.php | 8 +++ .../OptionsConfigurationTableBuilderTest.php | 8 +++ .../Form/ProductoptionFormBuilderTest.php | 8 +++ .../ProductoptionCollectionTest.php | 8 +++ .../ProductoptionCriteriaTest.php | 8 +++ .../Productoption/ProductoptionModelTest.php | 8 +++ .../ProductoptionObserverTest.php | 8 +++ .../ProductoptionPresenterTest.php | 8 +++ .../ProductoptionRepositoryTest.php | 8 +++ .../Productoption/ProductoptionRouterTest.php | 8 +++ .../Productoption/ProductoptionSeederTest.php | 8 +++ .../Table/ProductoptionTableBuilderTest.php | 8 +++ .../ProductoptionsValueFormBuilderTest.php | 8 +++ .../ProductoptionsValueCollectionTest.php | 8 +++ .../ProductoptionsValueCriteriaTest.php | 8 +++ .../ProductoptionsValueModelTest.php | 8 +++ .../ProductoptionsValueObserverTest.php | 8 +++ .../ProductoptionsValuePresenterTest.php | 8 +++ .../ProductoptionsValueRepositoryTest.php | 8 +++ .../ProductoptionsValueRouterTest.php | 8 +++ .../ProductoptionsValueSeederTest.php | 8 +++ .../ProductoptionsValueTableBuilderTest.php | 8 +++ 106 files changed, 1652 insertions(+), 4 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php create mode 100644 addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php create mode 100644 addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php create mode 100644 addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_10_15_131614_visiosoft.module.advs__create_productoptions_value_stream.php create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_10_16_082339_visiosoft.module.advs__added_options_field.php create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php create mode 100644 addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php create mode 100644 addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php create mode 100644 addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCriteria.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationPresenter.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationSeeder.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/Form/ProductoptionFormBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCollection.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCriteria.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionModel.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionPresenter.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/ProductoptionSeeder.php create mode 100644 addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Form/ProductoptionsValueFormBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCollection.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCriteria.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValuePresenter.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueSeeder.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php create mode 100644 addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php create mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php diff --git a/addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php b/addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php new file mode 100644 index 000000000..86a320aa0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php @@ -0,0 +1,10 @@ +<?php + +$factory->define( + Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel::class, + function (Faker\Generator $faker) { + return [ + //'title' => $faker->words(2), + ]; + } +); diff --git a/addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php b/addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php new file mode 100644 index 000000000..b6bbb136f --- /dev/null +++ b/addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php @@ -0,0 +1,10 @@ +<?php + +$factory->define( + Visiosoft\AdvsModule\OptionsConfiguration\OptionsConfigurationModel::class, + function (Faker\Generator $faker) { + return [ + //'title' => $faker->words(2), + ]; + } +); diff --git a/addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php b/addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php new file mode 100644 index 000000000..7a1bc3379 --- /dev/null +++ b/addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php @@ -0,0 +1,10 @@ +<?php + +$factory->define( + Visiosoft\AdvsModule\Productoption\ProductoptionModel::class, + function (Faker\Generator $faker) { + return [ + //'title' => $faker->words(2), + ]; + } +); diff --git a/addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php b/addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php new file mode 100644 index 000000000..bdfb8e393 --- /dev/null +++ b/addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php @@ -0,0 +1,10 @@ +<?php + +$factory->define( + Visiosoft\AdvsModule\ProductoptionsValue\ProductoptionsValueModel::class, + function (Faker\Generator $faker) { + return [ + //'title' => $faker->words(2), + ]; + } +); diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php new file mode 100644 index 000000000..a8bdf8a7f --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php @@ -0,0 +1,47 @@ +<?php + +use Anomaly\Streams\Platform\Database\Migration\Migration; +use Visiosoft\AdvsModule\Adv\AdvModel; + +class VisiosoftModuleAdvsCreateProductoptionsStream extends Migration +{ + + /** + * This migration creates the stream. + * It should be deleted on rollback. + * + * @var bool + */ + protected $delete = true; + + protected $fields = [ + 'categories' => 'anomaly.field_type.select', + ]; + /** + * The stream definition. + * + * @var array + */ + protected $stream = [ + 'slug' => 'productoptions', + 'title_column' => 'name', + 'translatable' => true, + 'versionable' => false, + 'trashable' => true, + 'searchable' => false, + 'sortable' => false, + ]; + + /** + * The stream assignments. + * + * @var array + */ + protected $assignments = [ + 'categories', + 'name' => [ + 'translatable' => true, + 'required' => true, + ], + ]; +} diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_15_131614_visiosoft.module.advs__create_productoptions_value_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_15_131614_visiosoft.module.advs__create_productoptions_value_stream.php new file mode 100644 index 000000000..47fff9601 --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_15_131614_visiosoft.module.advs__create_productoptions_value_stream.php @@ -0,0 +1,56 @@ +<?php + +use Anomaly\Streams\Platform\Database\Migration\Migration; +use \Visiosoft\AdvsModule\Productoption\ProductoptionModel; + +class VisiosoftModuleAdvsCreateProductoptionsValueStream extends Migration +{ + + /** + * This migration creates the stream. + * It should be deleted on rollback. + * + * @var bool + */ + protected $delete = true; + + + protected $fields = [ + 'product_option' => [ + 'type' => 'anomaly.field_type.relationship', + 'config' => [ + 'related' => ProductoptionModel::class, + ], + ] + ]; + + /** + * The stream definition. + * + * @var array + */ + protected $stream = [ + 'slug' => 'productoptions_value', + 'title_column' => 'name', + 'translatable' => true, + 'versionable' => false, + 'trashable' => true, + 'searchable' => false, + 'sortable' => false, + ]; + + /** + * The stream assignments. + * + * @var array + */ + protected $assignments = [ + 'name' => [ + 'translatable' => true, + 'required' => true, + ], + 'product_option' => [ + 'required' => true, + ], + ]; +} diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_16_082339_visiosoft.module.advs__added_options_field.php b/addons/default/visiosoft/advs-module/migrations/2020_10_16_082339_visiosoft.module.advs__added_options_field.php new file mode 100644 index 000000000..d00e201c7 --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_16_082339_visiosoft.module.advs__added_options_field.php @@ -0,0 +1,48 @@ +<?php + +use Anomaly\Streams\Platform\Database\Migration\Migration; + +class VisiosoftModuleAdvsAddedOptionsField extends Migration +{ + + /** + * Don't delete stream on rollback + * because this isn't creating the + * stream only referencing it. + */ + protected $delete = false; + + /** + * Any additional information will + * be updated. Slug helps find + * the stream to work with for + * assignments that follow. + */ + protected $stream = [ + 'slug' => 'advs', + ]; + + /** + * The addon fields. + * + * @var array + */ + protected $fields = [ + 'product_options_value' => [ + 'type' => 'anomaly.field_type.multiple', + 'config' => [ + 'mode' => 'lookup', + 'related' => \Visiosoft\AdvsModule\ProductoptionsValue\ProductoptionsValueModel::class, + ], + ] + ]; + + /** + * The field's assignment. + * + * @var array + */ + protected $assignments = [ + 'product_options_value', + ]; +} diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php new file mode 100644 index 000000000..b42c31acf --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php @@ -0,0 +1,58 @@ +<?php + +use Anomaly\Streams\Platform\Database\Migration\Migration; + +class VisiosoftModuleAdvsCreateOptionConfigurationStream extends Migration +{ + + /** + * This migration creates the stream. + * It should be deleted on rollback. + * + * @var bool + */ + protected $delete = true; + + protected $fields = [ + 'option_json' => 'visiosoft.field_type.json', + ]; + + /** + * The stream definition. + * + * @var array + */ + protected $stream = [ + 'slug' => 'option_configuration', + 'title_column' => 'option_json', + 'translatable' => false, + 'versionable' => false, + 'trashable' => false, + 'searchable' => false, + 'sortable' => false, + ]; + + /** + * The stream assignments. + * + * @var array + */ + protected $assignments = [ + 'parent_adv' => [ + 'required' => true, + ], + 'price' => [ + 'required' => true, + ], + 'currency' => [ + 'required' => true, + ], + 'stock' => [ + 'required' => true, + ], + 'option_json' => [ + 'required' => true, + ], + ]; + +} diff --git a/addons/default/visiosoft/advs-module/resources/config/permissions.php b/addons/default/visiosoft/advs-module/resources/config/permissions.php index eae0b67cd..cead467e5 100644 --- a/addons/default/visiosoft/advs-module/resources/config/permissions.php +++ b/addons/default/visiosoft/advs-module/resources/config/permissions.php @@ -21,4 +21,29 @@ return [ 'write', 'delete', ], + 'productoptions' => [ + 'read', + 'write', + 'delete', + ], + 'productoptions_value' => [ + 'read', + 'write', + 'delete', + ], + 'options_configuration' => [ + 'read', + 'write', + 'delete', + ], + 'option_configuration' => [ + 'read', + 'write', + 'delete', + ], + 'option_configuration' => [ + 'read', + 'write', + 'delete', + ], ]; 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 ab988e7b0..c3ff863ad 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -32,5 +32,10 @@ return [ 'name' => 'Update Category' ], 'new_option' => 'New Option', - 'export' => 'Export' + 'export' => 'Export', + 'new_productoption' => 'New Productoption', + 'new_productoptions_value' => 'New Productoptions value', + 'new_options_configuration' => 'New Options configuration', + 'new_option_configuration' => 'New Option configuration', + 'new_option_configuration' => 'New Option configuration', ]; 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 7ebc16101..493583f1f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -313,4 +313,10 @@ return [ 'site' => 'Site', 'subscription' => 'Subscription', 'created' => 'Created', + 'product_option' => [ + 'name' => 'Product Option' + ], + 'option_json' => [ + 'name' => 'Option' + ] ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/permission.php b/addons/default/visiosoft/advs-module/resources/lang/en/permission.php index a75575d96..0a094c9f1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/permission.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/permission.php @@ -57,4 +57,44 @@ return [ 'delete' => 'Can delete options?', ], ], + 'productoptions' => [ + 'name' => 'Productoptions', + 'option' => [ + 'read' => 'Can read productoptions?', + 'write' => 'Can create/edit productoptions?', + 'delete' => 'Can delete productoptions?', + ], + ], + 'productoptions_value' => [ + 'name' => 'Productoptions value', + 'option' => [ + 'read' => 'Can read productoptions value?', + 'write' => 'Can create/edit productoptions value?', + 'delete' => 'Can delete productoptions value?', + ], + ], + 'options_configuration' => [ + 'name' => 'Options configuration', + 'option' => [ + 'read' => 'Can read options configuration?', + 'write' => 'Can create/edit options configuration?', + 'delete' => 'Can delete options configuration?', + ], + ], + 'option_configuration' => [ + 'name' => 'Option configuration', + 'option' => [ + 'read' => 'Can read option configuration?', + 'write' => 'Can create/edit option configuration?', + 'delete' => 'Can delete option configuration?', + ], + ], + 'option_configuration' => [ + 'name' => 'Option configuration', + 'option' => [ + 'read' => 'Can read option configuration?', + 'write' => 'Can create/edit option configuration?', + 'delete' => 'Can delete option configuration?', + ], + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php index b3ebe1995..fa686c524 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php @@ -45,4 +45,19 @@ return [ 'title' => 'Options', ], 'ads_image' => 'Ads Image', + 'product_options' => [ + 'title' => 'Product Options', + ], + 'productoptions_value' => [ + 'title' => 'Productoptions value', + ], + 'options_configuration' => [ + 'title' => 'Options configuration', + ], + 'option_configuration' => [ + 'title' => 'Option configuration', + ], + 'option_configuration' => [ + 'title' => 'Option configuration', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php index 29e720836..bd46a1466 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php @@ -22,4 +22,19 @@ return [ 'options' => [ 'name' => 'Options', ], + 'product_options' => [ + 'name' => 'Produc Options', + ], + 'productoptions_value' => [ + 'name' => 'Productoptions value', + ], + 'options_configuration' => [ + 'name' => 'Options configuration', + ], + 'option_configuration' => [ + 'name' => 'Option configuration', + ], + 'option_configuration' => [ + 'name' => 'Option configuration', + ], ]; 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 4ccfbcfda..94d172535 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 @@ -138,6 +138,15 @@ </div> </div> + <div class="row form-group product-options"> + <label for="productOptions" class="col-sm-2"> + {{ trans('visiosoft.module.advs::field.product_option.name') }} + </label> + <div class="col-sm-10"> + {{ form.fields.product_options_value.input|raw }} + </div> + </div> + <div class="row form-group brand-name"> <div class="col-md-12"> <div class="field-group advs_desc"> diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index bf879d2ad..4438cff88 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -377,4 +377,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface { return $this->finish_at ? $this->finish_at < Carbon::now() : true; } + + public function getProductOptionsValues() + { + return $this->product_options_value; + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php index a9cb314fd..ba2de06d3 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php @@ -5,4 +5,6 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface AdvInterface extends EntryInterface { public function expired(); + + public function getProductOptionsValues(); } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php index 0623c5ca6..8f58892f5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php @@ -60,7 +60,8 @@ class AdvFormBuilder extends FormBuilder ], 'files', 'popular_adv', - 'adv_day' + 'adv_day', + 'product_options_value' ]; protected $category = null; diff --git a/addons/default/visiosoft/advs-module/src/AdvsModule.php b/addons/default/visiosoft/advs-module/src/AdvsModule.php index 0eda5defc..e7835c641 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModule.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModule.php @@ -37,9 +37,22 @@ class AdvsModule extends Module ], ], ], + 'product_options' => [ + 'title' => 'visiosoft.module.advs::section.product_options.title', + 'buttons' => [ + 'new_productoption', + ], + ], + 'productoptions_value' => [ + 'title' => 'visiosoft.module.advs::section.productoptions_value.title', + 'buttons' => [ + 'new_productoptions_value', + ], + ], + 'option_configuration', 'assets_clear' => [ - 'title' => 'visiosoft.module.advs::section.assets_clear.name', - 'href' => '/admin/assets/clear', + 'title' => 'visiosoft.module.advs::section.assets_clear.name', + 'href' => '/admin/assets/clear', ] // 'custom_fields' => [ // 'buttons' => [ diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index ec32d05a9..e6a622850 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -15,6 +15,12 @@ use Visiosoft\AdvsModule\Http\Middleware\SetLang; use Visiosoft\AdvsModule\Listener\AddAdvsSettingsScript; use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface; use Visiosoft\AdvsModule\Option\OptionRepository; +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationRepository; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Visiosoft\AdvsModule\Productoption\ProductoptionRepository; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; +use Visiosoft\AdvsModule\ProductoptionsValue\ProductoptionsValueRepository; use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface; use Visiosoft\LocationModule\Village\VillageRepository; use Visiosoft\LocationModule\Village\VillageModel; @@ -214,6 +220,16 @@ class AdvsModuleServiceProvider extends AddonServiceProvider // Others 'advs/ttr/{id}' => 'Visiosoft\PackagesModule\Http\Controller\packageFEController@advsStatusbyUser', + + //Configrations Admin Controller + 'admin/advs/option_configuration/create' => [ + 'as' => 'visiosoft.module.advs::configrations.create', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@create', + ], + 'admin/advs/option_configuration' => [ + 'as' => 'visiosoft.module.advs::configrations.index', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@index', + ], ]; /** @@ -294,6 +310,9 @@ class AdvsModuleServiceProvider extends AddonServiceProvider CategoryRepositoryInterface::class => CategoryRepository::class, CountryRepositoryInterface::class => CountryRepository::class, OptionRepositoryInterface::class => OptionRepository::class, + ProductoptionRepositoryInterface::class => ProductoptionRepository::class, + OptionConfigurationRepositoryInterface::class => OptionConfigurationRepository::class, + ProductoptionsValueRepositoryInterface::class => ProductoptionsValueRepository::class, ]; /** 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 47032280d..44f95278e 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 @@ -108,6 +108,10 @@ class AdvsController extends AdminController 'replicate' => [ 'text' => 'Replicate', ], + 'create_configration' => [ + 'text' => 'Create Configrations', + 'href' => route('visiosoft.module.advs::configrations.create')."?ad={entry.id}" + ], ], ], ]); diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php new file mode 100644 index 000000000..2115f408f --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php @@ -0,0 +1,32 @@ +<?php namespace Visiosoft\AdvsModule\Http\Controller\Admin; + +use Visiosoft\AdvsModule\OptionConfiguration\Form\OptionConfigurationFormBuilder; +use Visiosoft\AdvsModule\OptionConfiguration\Table\OptionConfigurationTableBuilder; +use Anomaly\Streams\Platform\Http\Controller\AdminController; + +class OptionConfigurationController extends AdminController +{ + + /** + * Display an index of existing entries. + * + * @param OptionConfigurationTableBuilder $table + * @return \Symfony\Component\HttpFoundation\Response + */ + public function index(OptionConfigurationTableBuilder $table) + { + return $table->render(); + } + + /** + * Create a new entry. + * + * @param OptionConfigurationFormBuilder $form + * @return \Symfony\Component\HttpFoundation\Response + */ + public function create(OptionConfigurationFormBuilder $form) + { + $form->setOption('redirect', route('visiosoft.module.advs::configrations.index')); + return $form->render(); + } +} diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php new file mode 100644 index 000000000..c4e57e82d --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsController.php @@ -0,0 +1,43 @@ +<?php namespace Visiosoft\AdvsModule\Http\Controller\Admin; + +use Visiosoft\AdvsModule\Productoption\Form\ProductoptionFormBuilder; +use Visiosoft\AdvsModule\Productoption\Table\ProductoptionTableBuilder; +use Anomaly\Streams\Platform\Http\Controller\AdminController; + +class ProductoptionsController extends AdminController +{ + + /** + * Display an index of existing entries. + * + * @param ProductoptionTableBuilder $table + * @return \Symfony\Component\HttpFoundation\Response + */ + public function index(ProductoptionTableBuilder $table) + { + return $table->render(); + } + + /** + * Create a new entry. + * + * @param ProductoptionFormBuilder $form + * @return \Symfony\Component\HttpFoundation\Response + */ + public function create(ProductoptionFormBuilder $form) + { + return $form->render(); + } + + /** + * Edit an existing entry. + * + * @param ProductoptionFormBuilder $form + * @param $id + * @return \Symfony\Component\HttpFoundation\Response + */ + public function edit(ProductoptionFormBuilder $form, $id) + { + return $form->render($id); + } +} diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php new file mode 100644 index 000000000..2a5acfb58 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/ProductoptionsValueController.php @@ -0,0 +1,43 @@ +<?php namespace Visiosoft\AdvsModule\Http\Controller\Admin; + +use Visiosoft\AdvsModule\ProductoptionsValue\Form\ProductoptionsValueFormBuilder; +use Visiosoft\AdvsModule\ProductoptionsValue\Table\ProductoptionsValueTableBuilder; +use Anomaly\Streams\Platform\Http\Controller\AdminController; + +class ProductoptionsValueController extends AdminController +{ + + /** + * Display an index of existing entries. + * + * @param ProductoptionsValueTableBuilder $table + * @return \Symfony\Component\HttpFoundation\Response + */ + public function index(ProductoptionsValueTableBuilder $table) + { + return $table->render(); + } + + /** + * Create a new entry. + * + * @param ProductoptionsValueFormBuilder $form + * @return \Symfony\Component\HttpFoundation\Response + */ + public function create(ProductoptionsValueFormBuilder $form) + { + return $form->render(); + } + + /** + * Edit an existing entry. + * + * @param ProductoptionsValueFormBuilder $form + * @param $id + * @return \Symfony\Component\HttpFoundation\Response + */ + public function edit(ProductoptionsValueFormBuilder $form, $id) + { + return $form->render($id); + } +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php new file mode 100644 index 000000000..4d26c2bf8 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Contract; + +use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; + +interface OptionConfigurationInterface extends EntryInterface +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php new file mode 100644 index 000000000..9d4654747 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Contract; + +use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; + +interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterface +{ + public function createConfigration($ad_id,$price,$currency,$stock,$option_json); +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php new file mode 100644 index 000000000..e3f69f98a --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php @@ -0,0 +1,7 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Form; + +use Anomaly\Streams\Platform\Ui\Form\FormBuilder; + +class OptionConfigurationFormBuilder extends FormBuilder +{ +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php new file mode 100644 index 000000000..7c1bce60d --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php @@ -0,0 +1,40 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Form; + +use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; + +class OptionConfigurationFormFields +{ + public function handle( + OptionConfigurationFormBuilder $builder, + AdvRepositoryInterface $advRepository, + ProductoptionRepositoryInterface $productOptionRepository) + { + if(request()->has('ad')) + { + $ad = $advRepository->find(request('ad')); + + $options = $ad->getProductOptionsValues()->groupBy('product_option_id'); + + $options_fields = array(); + + foreach ($options as $option_id => $option_values) + { + if($option = $productOptionRepository->find($option_id)) + { + $options_fields['option-'.$option->getId()] = [ + 'type' => 'anomaly.field_type.select', + 'label' => $option->getName(), + 'required' => true, + 'config' => [ + 'options' => $option_values->pluck('name','id')->all(), + ] + ]; + } + } + $fields = array_merge($options_fields, ['price', 'currency', 'stock']); + + $builder->setFields($fields); + } + } +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php new file mode 100644 index 000000000..da93db1c2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php @@ -0,0 +1,35 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Form; + +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; + +class OptionConfigurationFormHandler +{ + public function handle( + OptionConfigurationFormBuilder $builder, + OptionConfigurationRepositoryInterface $repository + ) + { + if (!$builder->canSave()) { + return; + } + + $parameters = $builder->getPostData(); + $parameters['parent_adv_id'] = request()->get('ad'); + + $option_json = array(); + + foreach ($parameters as $key => $parameter_value) { + if (substr($key, 0, 7) === "option-") { + $option_id = substr($key, 7); + $option_json[$option_id] = $parameter_value; + unset($parameters[$key]); + } + } + $option_json = ['option_json' => json_encode($option_json)]; + $configration = array_merge($parameters, $option_json); + + + $entry = $repository->create($configration); + $builder->setFormEntry($entry); + } +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php new file mode 100644 index 000000000..64c3e2d1d --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCollection.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Anomaly\Streams\Platform\Entry\EntryCollection; + +class OptionConfigurationCollection extends EntryCollection +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCriteria.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCriteria.php new file mode 100644 index 000000000..e1a861cf7 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationCriteria.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Anomaly\Streams\Platform\Entry\EntryCriteria; + +class OptionConfigurationCriteria extends EntryCriteria +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php new file mode 100644 index 000000000..3550a3bf9 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -0,0 +1,9 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationInterface; +use Anomaly\Streams\Platform\Model\Advs\AdvsOptionConfigurationEntryModel; + +class OptionConfigurationModel extends AdvsOptionConfigurationEntryModel implements OptionConfigurationInterface +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php new file mode 100644 index 000000000..a954f8a1d --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationObserver.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Anomaly\Streams\Platform\Entry\EntryObserver; + +class OptionConfigurationObserver extends EntryObserver +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationPresenter.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationPresenter.php new file mode 100644 index 000000000..f0b8f8382 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationPresenter.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Anomaly\Streams\Platform\Entry\EntryPresenter; + +class OptionConfigurationPresenter extends EntryPresenter +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php new file mode 100644 index 000000000..48a4863fc --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php @@ -0,0 +1,36 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; +use Anomaly\Streams\Platform\Entry\EntryRepository; + +class OptionConfigurationRepository extends EntryRepository implements OptionConfigurationRepositoryInterface +{ + + /** + * The entry model. + * + * @var OptionConfigurationModel + */ + protected $model; + + /** + * Create a new OptionConfigurationRepository instance. + * + * @param OptionConfigurationModel $model + */ + public function __construct(OptionConfigurationModel $model) + { + $this->model = $model; + } + + public function createConfigration($ad_id,$price,$currency,$stock,$option_json) + { + return $this->create([ + 'parent_adv_id' => $ad_id, + 'price' => $price, + 'currency' => $currency, + 'stock' => $stock, + 'option_json' => $option_json, + ]); + } +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php new file mode 100644 index 000000000..87fe2c59c --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRouter.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Anomaly\Streams\Platform\Entry\EntryRouter; + +class OptionConfigurationRouter extends EntryRouter +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationSeeder.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationSeeder.php new file mode 100644 index 000000000..32fd650fb --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationSeeder.php @@ -0,0 +1,15 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration; + +use Anomaly\Streams\Platform\Database\Seeder\Seeder; + +class OptionConfigurationSeeder extends Seeder +{ + + /** + * Run the seeder. + */ + public function run() + { + // + } +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableBuilder.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableBuilder.php new file mode 100644 index 000000000..e00b92691 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableBuilder.php @@ -0,0 +1,10 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Table; + +use Anomaly\Streams\Platform\Ui\Table\TableBuilder; + +class OptionConfigurationTableBuilder extends TableBuilder +{ + protected $actions = [ + 'delete' + ]; +} diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php new file mode 100644 index 000000000..0690ea2a4 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php @@ -0,0 +1,49 @@ +<?php namespace Visiosoft\AdvsModule\OptionConfiguration\Table; + + +use Anomaly\Streams\Platform\Entry\EntryModel; +use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; + +class OptionConfigurationTableColumns +{ + public function handle( + OptionConfigurationTableBuilder $builder + ) + { + $builder->setColumns([ + 'name' => [ + 'value' => function (EntryModel $entry, + AdvRepositoryInterface $advRepository) { + + $adv = $advRepository->findById($entry->parent_adv_id); + return "<span><a href='" . route('adv_detail', [$entry->parent_adv_id]) ."'>$adv->name</a></span>"; + } + ], + 'option_json' => [ + 'value' => function (EntryModel $entry, + ProductoptionRepositoryInterface $productOptionRepository, + ProductoptionsValueRepositoryInterface $productOptionsValueRepository) { + + $values = json_decode($entry->option_json); + $text = ""; + + foreach ($values as $key => $value) { + $productOption = $productOptionRepository->findBy('entry_id', $key); + $productOptionsValue = $productOptionsValueRepository->findBy('entry_id', $value); + + $text .= + '<span class="tag tag-sm tag-info mr-1">'. + $productOption->name . ': ' . $productOptionsValue->name. + '</span>'; + + } + + return $text; + } + ], + ]); + } +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php new file mode 100644 index 000000000..66e68c2dc --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionInterface.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption\Contract; + +use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; + +interface ProductoptionInterface extends EntryInterface +{ + public function getName(); +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php new file mode 100644 index 000000000..3f79de073 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption\Contract; + +use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; + +interface ProductoptionRepositoryInterface extends EntryRepositoryInterface +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Form/ProductoptionFormBuilder.php b/addons/default/visiosoft/advs-module/src/Productoption/Form/ProductoptionFormBuilder.php new file mode 100644 index 000000000..3a26c48af --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/Form/ProductoptionFormBuilder.php @@ -0,0 +1,68 @@ +<?php namespace Visiosoft\AdvsModule\Productoption\Form; + +use Anomaly\Streams\Platform\Ui\Form\FormBuilder; +use Visiosoft\CatsModule\Category\CategoryModel; +use Visiosoft\CatsModule\Category\CategoryRepository; + +class ProductoptionFormBuilder extends FormBuilder +{ + + /** + * The form fields. + * + * @var array|string + */ + protected $fields = []; + + /** + * Additional validation rules. + * + * @var array|string + */ + protected $rules = []; + + /** + * Fields to skip. + * + * @var array|string + */ + protected $skips = []; + + /** + * The form actions. + * + * @var array|string + */ + protected $actions = []; + + /** + * The form buttons. + * + * @var array|string + */ + protected $buttons = [ + 'cancel', + ]; + + /** + * The form options. + * + * @var array + */ + protected $options = []; + + /** + * The form sections. + * + * @var array + */ + protected $sections = []; + + /** + * The form assets. + * + * @var array + */ + protected $assets = []; + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCollection.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCollection.php new file mode 100644 index 000000000..3c0b70adf --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCollection.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Anomaly\Streams\Platform\Entry\EntryCollection; + +class ProductoptionCollection extends EntryCollection +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCriteria.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCriteria.php new file mode 100644 index 000000000..17929805e --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionCriteria.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Anomaly\Streams\Platform\Entry\EntryCriteria; + +class ProductoptionCriteria extends EntryCriteria +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionModel.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionModel.php new file mode 100644 index 000000000..7602a29de --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionModel.php @@ -0,0 +1,12 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionInterface; +use Anomaly\Streams\Platform\Model\Advs\AdvsProductoptionsEntryModel; + +class ProductoptionModel extends AdvsProductoptionsEntryModel implements ProductoptionInterface +{ + public function getName() + { + return $this->name; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php new file mode 100644 index 000000000..e1a582328 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionObserver.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Anomaly\Streams\Platform\Entry\EntryObserver; + +class ProductoptionObserver extends EntryObserver +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionPresenter.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionPresenter.php new file mode 100644 index 000000000..6ac563150 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionPresenter.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Anomaly\Streams\Platform\Entry\EntryPresenter; + +class ProductoptionPresenter extends EntryPresenter +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php new file mode 100644 index 000000000..3bb583b27 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php @@ -0,0 +1,25 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Anomaly\Streams\Platform\Entry\EntryRepository; + +class ProductoptionRepository extends EntryRepository implements ProductoptionRepositoryInterface +{ + + /** + * The entry model. + * + * @var ProductoptionModel + */ + protected $model; + + /** + * Create a new ProductoptionRepository instance. + * + * @param ProductoptionModel $model + */ + public function __construct(ProductoptionModel $model) + { + $this->model = $model; + } +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php new file mode 100644 index 000000000..8067574e6 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRouter.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Anomaly\Streams\Platform\Entry\EntryRouter; + +class ProductoptionRouter extends EntryRouter +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionSeeder.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionSeeder.php new file mode 100644 index 000000000..79df6614e --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionSeeder.php @@ -0,0 +1,15 @@ +<?php namespace Visiosoft\AdvsModule\Productoption; + +use Anomaly\Streams\Platform\Database\Seeder\Seeder; + +class ProductoptionSeeder extends Seeder +{ + + /** + * Run the seeder. + */ + public function run() + { + // + } +} diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php b/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php new file mode 100644 index 000000000..50dbe3713 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php @@ -0,0 +1,61 @@ +<?php namespace Visiosoft\AdvsModule\Productoption\Table; + +use Anomaly\Streams\Platform\Ui\Table\TableBuilder; + +class ProductoptionTableBuilder extends TableBuilder +{ + + /** + * The table views. + * + * @var array|string + */ + protected $views = []; + + /** + * The table filters. + * + * @var array|string + */ + protected $filters = []; + + /** + * The table columns. + * + * @var array|string + */ + protected $columns = []; + + /** + * The table buttons. + * + * @var array|string + */ + protected $buttons = [ + 'edit' + ]; + + /** + * The table actions. + * + * @var array|string + */ + protected $actions = [ + 'delete' + ]; + + /** + * The table options. + * + * @var array + */ + protected $options = []; + + /** + * The table assets. + * + * @var array + */ + protected $assets = []; + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php new file mode 100644 index 000000000..3d64e4091 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Contract; + +use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; + +interface ProductoptionsValueInterface extends EntryInterface +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php new file mode 100644 index 000000000..80d519f08 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Contract; + +use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; + +interface ProductoptionsValueRepositoryInterface extends EntryRepositoryInterface +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Form/ProductoptionsValueFormBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Form/ProductoptionsValueFormBuilder.php new file mode 100644 index 000000000..712ed4730 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Form/ProductoptionsValueFormBuilder.php @@ -0,0 +1,68 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Form; + +use Anomaly\Streams\Platform\Ui\Form\FormBuilder; + +class ProductoptionsValueFormBuilder extends FormBuilder +{ + + /** + * The form fields. + * + * @var array|string + */ + protected $fields = [ + 'product_option','name' + ]; + + /** + * Additional validation rules. + * + * @var array|string + */ + protected $rules = []; + + /** + * Fields to skip. + * + * @var array|string + */ + protected $skips = []; + + /** + * The form actions. + * + * @var array|string + */ + protected $actions = []; + + /** + * The form buttons. + * + * @var array|string + */ + protected $buttons = [ + 'cancel', + ]; + + /** + * The form options. + * + * @var array + */ + protected $options = []; + + /** + * The form sections. + * + * @var array + */ + protected $sections = []; + + /** + * The form assets. + * + * @var array + */ + protected $assets = []; + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCollection.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCollection.php new file mode 100644 index 000000000..9a906eb83 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCollection.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Anomaly\Streams\Platform\Entry\EntryCollection; + +class ProductoptionsValueCollection extends EntryCollection +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCriteria.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCriteria.php new file mode 100644 index 000000000..3f11e3651 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueCriteria.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Anomaly\Streams\Platform\Entry\EntryCriteria; + +class ProductoptionsValueCriteria extends EntryCriteria +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php new file mode 100644 index 000000000..7358887d0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php @@ -0,0 +1,9 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueInterface; +use Anomaly\Streams\Platform\Model\Advs\AdvsProductoptionsValueEntryModel; + +class ProductoptionsValueModel extends AdvsProductoptionsValueEntryModel implements ProductoptionsValueInterface +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php new file mode 100644 index 000000000..0e323b8d3 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueObserver.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Anomaly\Streams\Platform\Entry\EntryObserver; + +class ProductoptionsValueObserver extends EntryObserver +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValuePresenter.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValuePresenter.php new file mode 100644 index 000000000..d06e2af00 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValuePresenter.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Anomaly\Streams\Platform\Entry\EntryPresenter; + +class ProductoptionsValuePresenter extends EntryPresenter +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php new file mode 100644 index 000000000..7dbc8e29e --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php @@ -0,0 +1,25 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; +use Anomaly\Streams\Platform\Entry\EntryRepository; + +class ProductoptionsValueRepository extends EntryRepository implements ProductoptionsValueRepositoryInterface +{ + + /** + * The entry model. + * + * @var ProductoptionsValueModel + */ + protected $model; + + /** + * Create a new ProductoptionsValueRepository instance. + * + * @param ProductoptionsValueModel $model + */ + public function __construct(ProductoptionsValueModel $model) + { + $this->model = $model; + } +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php new file mode 100644 index 000000000..e912ae9bf --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRouter.php @@ -0,0 +1,8 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Anomaly\Streams\Platform\Entry\EntryRouter; + +class ProductoptionsValueRouter extends EntryRouter +{ + +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueSeeder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueSeeder.php new file mode 100644 index 000000000..6acb88e6a --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueSeeder.php @@ -0,0 +1,15 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue; + +use Anomaly\Streams\Platform\Database\Seeder\Seeder; + +class ProductoptionsValueSeeder extends Seeder +{ + + /** + * Run the seeder. + */ + public function run() + { + // + } +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php new file mode 100644 index 000000000..07d441e94 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php @@ -0,0 +1,25 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Support\MultipleFieldType; + +/** + * Class LookupTableBuilder + * + * @link http://pyrocms.com/ + * @author PyroCMS, Inc. <support@pyrocms.com> + * @author Ryan Thompson <ryan@pyrocms.com> + */ +class LookupTableBuilder extends \Anomaly\MultipleFieldType\Table\LookupTableBuilder +{ + + protected $filters = [ + 'product_option' + ]; + + /** + * The table columns. + * + * @var array + */ + protected $columns = [ + 'name', 'product_option' + ]; +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php new file mode 100644 index 000000000..dccc81c96 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php @@ -0,0 +1,21 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Support\MultipleFieldType; + +/** + * Class SelectedTableBuilder + * + * @link http://pyrocms.com/ + * @author PyroCMS, Inc. <support@pyrocms.com> + * @author Ryan Thompson <ryan@pyrocms.com> + */ +class SelectedTableBuilder extends \Anomaly\MultipleFieldType\Table\SelectedTableBuilder +{ + + /** + * The table columns. + * + * @var array + */ + protected $columns = [ + 'name', 'product_option' + ]; +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php new file mode 100644 index 000000000..b9a42c19b --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php @@ -0,0 +1,21 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Support\MultipleFieldType; + +/** + * Class ValueTableBuilder + * + * @link http://pyrocms.com/ + * @author PyroCMS, Inc. <support@pyrocms.com> + * @author Ryan Thompson <ryan@pyrocms.com> + */ +class ValueTableBuilder extends \Anomaly\MultipleFieldType\Table\ValueTableBuilder +{ + + /** + * The table columns. + * + * @var array + */ + protected $columns = [ + 'name', 'product_option' + ]; +} diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php new file mode 100644 index 000000000..8c331821d --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Table/ProductoptionsValueTableBuilder.php @@ -0,0 +1,68 @@ +<?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Table; + +use Anomaly\Streams\Platform\Ui\Table\TableBuilder; + +class ProductoptionsValueTableBuilder extends TableBuilder +{ + + /** + * The table views. + * + * @var array|string + */ + protected $views = []; + + /** + * The table filters. + * + * @var array|string + */ + protected $filters = [ + 'name', 'product_option' + ]; + + /** + * The table columns. + * + * @var array|string + */ + protected $columns = [ + 'title' => [ + 'value' => 'entry.name' + ], + 'product_option', + ]; + + /** + * The table buttons. + * + * @var array|string + */ + protected $buttons = [ + 'edit' + ]; + + /** + * The table actions. + * + * @var array|string + */ + protected $actions = [ + 'delete' + ]; + + /** + * The table options. + * + * @var array + */ + protected $options = []; + + /** + * The table assets. + * + * @var array + */ + protected $assets = []; + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php new file mode 100644 index 000000000..ae86aaf37 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationFormBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php new file mode 100644 index 000000000..94450076f --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationCollectionTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php new file mode 100644 index 000000000..5b95723b4 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationCriteriaTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php new file mode 100644 index 000000000..7c46282dc --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationModelTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php new file mode 100644 index 000000000..502207ef3 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationObserverTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php new file mode 100644 index 000000000..7d6513448 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationPresenterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php new file mode 100644 index 000000000..24328be5e --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationRepositoryTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php new file mode 100644 index 000000000..bc1a92c02 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationRouterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php new file mode 100644 index 000000000..0481cee9d --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationSeederTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php new file mode 100644 index 000000000..e556d274a --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; + +class OptionConfigurationTableBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php new file mode 100644 index 000000000..fd04ab4fa --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationFormBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php new file mode 100644 index 000000000..5a264d715 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationCollectionTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php new file mode 100644 index 000000000..edf081e5e --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationCriteriaTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php new file mode 100644 index 000000000..23e76ccd2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationModelTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php new file mode 100644 index 000000000..3761df9c4 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationObserverTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php new file mode 100644 index 000000000..89b79d0a7 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationPresenterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php new file mode 100644 index 000000000..75e606cdd --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationRepositoryTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php new file mode 100644 index 000000000..62b813c61 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationRouterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php new file mode 100644 index 000000000..596cc0b1d --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationSeederTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php new file mode 100644 index 000000000..71f5f4d2f --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; + +class OptionsConfigurationTableBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php new file mode 100644 index 000000000..d76847c0e --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionFormBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php new file mode 100644 index 000000000..2b50b1872 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionCollectionTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php new file mode 100644 index 000000000..a6ec968e4 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionCriteriaTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php new file mode 100644 index 000000000..f5b9228b7 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionModelTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php new file mode 100644 index 000000000..97a9223f5 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionObserverTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php new file mode 100644 index 000000000..53df54333 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionPresenterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php new file mode 100644 index 000000000..12252bdd0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionRepositoryTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php new file mode 100644 index 000000000..5631eb119 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionRouterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php new file mode 100644 index 000000000..dbb9023cf --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionSeederTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php new file mode 100644 index 000000000..0234508a3 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\Productoption; + +class ProductoptionTableBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php new file mode 100644 index 000000000..83acfc4f9 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueFormBuilderTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php new file mode 100644 index 000000000..168cc9552 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueCollectionTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php new file mode 100644 index 000000000..6f9b59c88 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueCriteriaTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php new file mode 100644 index 000000000..e20495d3e --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueModelTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php new file mode 100644 index 000000000..c8af3f85a --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueObserverTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php new file mode 100644 index 000000000..a6c7cd808 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValuePresenterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php new file mode 100644 index 000000000..6f3e9fa67 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueRepositoryTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php new file mode 100644 index 000000000..f67b0e3c5 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueRouterTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php new file mode 100644 index 000000000..29ce9c517 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueSeederTest extends \TestCase +{ + +} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php new file mode 100644 index 000000000..76d7e3cb4 --- /dev/null +++ b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php @@ -0,0 +1,8 @@ +<?php + +namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; + +class ProductoptionsValueTableBuilderTest extends \TestCase +{ + +} 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 45/72] 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 46/72] 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 47/72] #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 48/72] #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 49/72] 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, { From 3c0c978706dc175abefb37bcc196fdfdbce2b68c Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Wed, 21 Oct 2020 10:13:50 +0300 Subject: [PATCH 50/72] added markdown and Update Date doping types --- ...ft.module.advs__create_old_price_field.php | 27 +++++++++++++++++++ .../advs-module/resources/lang/en/field.php | 3 +++ .../src/Http/Controller/advsController.php | 6 +++++ 3 files changed, 36 insertions(+) create mode 100644 addons/default/visiosoft/advs-module/migrations/2020_10_21_061025_visiosoft.module.advs__create_old_price_field.php diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_21_061025_visiosoft.module.advs__create_old_price_field.php b/addons/default/visiosoft/advs-module/migrations/2020_10_21_061025_visiosoft.module.advs__create_old_price_field.php new file mode 100644 index 000000000..f559bed8e --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_21_061025_visiosoft.module.advs__create_old_price_field.php @@ -0,0 +1,27 @@ +<?php + +use Anomaly\Streams\Platform\Database\Migration\Migration; + +class VisiosoftModuleAdvsCreateOldPriceField extends Migration +{ + protected $delete = false; + + protected $stream = [ + 'slug' => 'advs', + ]; + + protected $fields = [ + 'old_price' => [ + 'type' => 'visiosoft.field_type.decimal', + 'config' => [ + 'decimal' => 2, + 'separator' => '.', + 'point' => ',' + ], + ], + ]; + + protected $assignments = [ + 'old_price' + ]; +} 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 7ebc16101..bd9bfeb76 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -313,4 +313,7 @@ return [ 'site' => 'Site', 'subscription' => 'Subscription', 'created' => 'Created', + 'old_price' => [ + 'name' => 'Old Price' + ], ]; 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 969f80a16..dadc699a7 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -674,6 +674,12 @@ class AdvsController extends PublicController /* Update Adv */ $adv = AdvsAdvsEntryModel::find($request->update_id); + + //Set Old Price + $old_price = ($adv->slug == "") ? $request->price : $adv->price; + $adv->old_price = $old_price; + + $allowPendingAdCreation = false; if ($advModel->is_enabled('packages') and $adv->slug == "") { $cat = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForNewAd($request); From 694603ab88631755f1808b9dca9ae15d9790831b Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Wed, 21 Oct 2020 10:15:10 +0300 Subject: [PATCH 51/72] phonefield default country fixed --- .../default/visiosoft/base-theme/resources/js/phonefield.js | 5 +++-- .../addons/anomaly/users-module/partials/register-form.twig | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index ef6dc6dde..9f91e799e 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -1,6 +1,7 @@ function phoneMask(fields) { - var country = document.getElementById('country') - ? document.getElementById('country').innerText : null; + var country = document.getElementById('default-phone-country') + ? document.getElementById('default-phone-country').innerText : null; + alert(country) var inputQueries = document.querySelectorAll(fields); inputQueries.forEach(function (inputQuery, key) { var iti = intlTelInput(inputQuery, { 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 24946f203..00e7c48d7 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.module.location::country_for_phone_field') }}</div> + <div id="default-phone-country" class="hidden">{{ setting_value('visiosoft.module.location::country_for_phone_field') }}</div> </div> </div> </div> From 3f9d5c33817fcdf8fae545f3fac6ad67f725d5fb Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Wed, 21 Oct 2020 10:25:37 +0300 Subject: [PATCH 52/72] phonefield default country fixed --- addons/default/visiosoft/base-theme/resources/js/phonefield.js | 1 - 1 file changed, 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 9f91e799e..0bffd3409 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -1,7 +1,6 @@ function phoneMask(fields) { var country = document.getElementById('default-phone-country') ? document.getElementById('default-phone-country').innerText : null; - alert(country) var inputQueries = document.querySelectorAll(fields); inputQueries.forEach(function (inputQuery, key) { var iti = intlTelInput(inputQuery, { From 5ee2b011c5050f90dbcb4a8f5c1c1d51778f8157 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Wed, 21 Oct 2020 10:26:53 +0300 Subject: [PATCH 53/72] #2411 [emadencilik] [bonus] Fields to fill in to earn bonuses --- .../profile-module/resources/lang/en/message.php | 1 + .../src/Profile/Profile/ProfileFormHandler.php | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/message.php b/addons/default/visiosoft/profile-module/resources/lang/en/message.php index e35fde682..49cef7e64 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'No address or not authorized to view.', 'empty_password_sms_message' => 'Due to security issues, we changed your password! Your new password is:', 'required_all' => "All Field is Required!", + 'can_not_remove_filled_fields' => "You can not remove filled fields!", // Forgot Password 'email_phone_not_found' => 'The E-mail, Phone Number is not correct!', 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 3a5b2a9bf..f98368903 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php @@ -33,6 +33,14 @@ class ProfileFormHandler $user = $userModel->newQuery()->find(\auth()->id()); + // Prevent removing already filled fields + foreach ($parameters as $field => $value) { + if ($user->$field && !$value) { + $messages->error('visiosoft.module.profile::message.can_not_changed_filled_fields'); + return; + } + } + $oldCustomerInfo = $user->toArray(); $changes = $this->change($user, $parameters); From 2f8bed62bd2b437950d8f579957583fa17cd4e6d Mon Sep 17 00:00:00 2001 From: Fatih Alp <fatihalp89@gmail.com> Date: Wed, 21 Oct 2020 15:38:41 +0300 Subject: [PATCH 54/72] New Crowdin updates (#734) * New translations field.php (Italian) * New translations button.php (Japanese) * New translations field.php (Japanese) * New translations button.php (Korean) * New translations field.php (Korean) * New translations button.php (Dutch) * New translations field.php (Dutch) * New translations button.php (Polish) * New translations field.php (Hindi) * New translations setting.php (Romanian) * New translations setting.php (Russian) * New translations setting.php (Azerbaijani) * New translations setting.php (Bengali) * New translations setting.php (Persian) * New translations setting.php (Vietnamese) * New translations setting.php (Urdu (Pakistan)) * New translations setting.php (Ukrainian) * New translations setting.php (Turkish) * New translations setting.php (Swedish) * New translations setting.php (Albanian) * New translations setting.php (Portuguese) * New translations setting.php (French) * New translations setting.php (Polish) * New translations setting.php (Dutch) * New translations setting.php (Korean) * New translations setting.php (Japanese) * New translations setting.php (Italian) * New translations setting.php (Hebrew) * New translations setting.php (Greek) * New translations setting.php (German) * New translations setting.php (Arabic) * New translations setting.php (Spanish) * New translations setting.php (Hindi) * New translations setting.php (Romanian) * New translations setting.php (Russian) * New translations setting.php (Azerbaijani) * New translations setting.php (Bengali) * New translations setting.php (Persian) * New translations setting.php (Vietnamese) * New translations setting.php (Urdu (Pakistan)) * New translations setting.php (Ukrainian) * New translations setting.php (Turkish) * New translations setting.php (Swedish) * New translations setting.php (Albanian) * New translations setting.php (Portuguese) * New translations setting.php (French) * New translations setting.php (Polish) * New translations setting.php (Dutch) * New translations setting.php (Korean) * New translations setting.php (Japanese) * New translations setting.php (Italian) * New translations setting.php (Hebrew) * New translations setting.php (Greek) * New translations setting.php (German) * New translations setting.php (Arabic) * New translations setting.php (Spanish) * New translations setting.php (Hindi) * New translations field.php (Romanian) * New translations field.php (Urdu (Pakistan)) * New translations message.php (Russian) * New translations field.php (Albanian) * New translations message.php (Albanian) * New translations field.php (Swedish) * New translations message.php (Swedish) * New translations field.php (Turkish) * New translations message.php (Turkish) * New translations field.php (Ukrainian) * New translations message.php (Ukrainian) * New translations message.php (Urdu (Pakistan)) * New translations message.php (Portuguese) * New translations field.php (Vietnamese) * New translations message.php (Vietnamese) * New translations field.php (Persian) * New translations message.php (Persian) * New translations field.php (Bengali) * New translations message.php (Bengali) * New translations field.php (Azerbaijani) * New translations message.php (Azerbaijani) * New translations field.php (Hindi) * New translations field.php (Russian) * New translations field.php (Portuguese) * New translations message.php (Romanian) * New translations message.php (Greek) * New translations field.php (French) * New translations message.php (French) * New translations field.php (Spanish) * New translations message.php (Spanish) * New translations field.php (Arabic) * New translations message.php (Arabic) * New translations field.php (German) * New translations message.php (German) * New translations field.php (Greek) * New translations field.php (Hebrew) * New translations message.php (Polish) * New translations message.php (Hebrew) * New translations field.php (Italian) * New translations message.php (Italian) * New translations field.php (Japanese) * New translations message.php (Japanese) * New translations field.php (Korean) * New translations message.php (Korean) * New translations field.php (Dutch) * New translations message.php (Dutch) * New translations field.php (Polish) * New translations message.php (Hindi) * New translations setting.php (Italian) * New translations button.php (Italian) * New translations field.php (Italian) * New translations setting.php (Italian) * New translations button.php (Japanese) * New translations setting.php (Japanese) * New translations field.php (Japanese) * New translations field.php (Italian) * New translations message.php (Italian) * New translations button.php (Hebrew) * New translations field.php (Hebrew) * New translations setting.php (Hebrew) * New translations field.php (Greek) * New translations message.php (Greek) * New translations field.php (Hebrew) * New translations message.php (Hebrew) * New translations setting.php (Hebrew) * New translations setting.php (Dutch) * New translations button.php (Dutch) * New translations field.php (Dutch) * New translations button.php (Polish) * New translations field.php (Polish) * New translations setting.php (Dutch) * New translations field.php (Dutch) * New translations message.php (Dutch) * New translations message.php (Japanese) * New translations button.php (Korean) * New translations field.php (Japanese) * New translations setting.php (Japanese) * New translations field.php (Korean) * New translations setting.php (Korean) * New translations field.php (Korean) * New translations message.php (Korean) * New translations setting.php (Korean) * New translations button.php (Spanish) * New translations field.php (Spanish) * New translations setting.php (French) * New translations message.php (French) * New translations field.php (French) * New translations setting.php (Spanish) * New translations field.php (Spanish) * New translations message.php (Spanish) * New translations setting.php (Spanish) * New translations setting.php (Romanian) * New translations field.php (Romanian) * New translations setting.php (Romanian) * New translations setting.php (French) * New translations field.php (French) * New translations button.php (French) * New translations field.php (Romanian) * New translations message.php (Romanian) * New translations field.php (German) * New translations setting.php (German) * New translations message.php (German) * New translations setting.php (Greek) * New translations field.php (Greek) * New translations button.php (Greek) * New translations setting.php (Greek) * New translations setting.php (German) * New translations setting.php (Arabic) * New translations button.php (Arabic) * New translations field.php (Arabic) * New translations field.php (German) * New translations setting.php (Arabic) * New translations message.php (Arabic) * New translations field.php (Albanian) * New translations message.php (Albanian) * New translations setting.php (Swedish) * New translations field.php (Swedish) * New translations button.php (Swedish) * New translations setting.php (Albanian) * New translations field.php (Albanian) * New translations button.php (Albanian) * New translations setting.php (Albanian) * New translations setting.php (Turkish) * New translations field.php (Turkish) * New translations setting.php (Turkish) * New translations section.php (Turkish) * New translations message.php (Turkish) * New translations field.php (Turkish) * New translations setting.php (Turkish) * New translations button.php (Turkish) * New translations setting.php (Swedish) * New translations message.php (Swedish) * New translations field.php (Swedish) * New translations field.php (Portuguese) * New translations button.php (Portuguese) * New translations setting.php (Portuguese) * New translations setting.php (Polish) * New translations message.php (Polish) * New translations field.php (Polish) * New translations setting.php (Polish) * New translations setting.php (Russian) * New translations setting.php (Russian) * New translations message.php (Russian) * New translations field.php (Russian) * New translations message.php (Portuguese) * New translations field.php (Portuguese) * New translations setting.php (Portuguese) * New translations field.php (Russian) * New translations button.php (Russian) * New translations setting.php (Bengali) * New translations field.php (Bengali) * New translations message.php (Bengali) * New translations field.php (Azerbaijani) * New translations button.php (Azerbaijani) * New translations message.php (Persian) * New translations field.php (Persian) * New translations setting.php (Persian) * New translations field.php (Bengali) * New translations setting.php (Bengali) * New translations button.php (Bengali) * New translations setting.php (Hindi) * New translations setting.php (Hindi) * New translations message.php (Hindi) * New translations field.php (Hindi) * New translations setting.php (Azerbaijani) * New translations setting.php (Azerbaijani) * New translations field.php (Hindi) * New translations button.php (Hindi) * New translations message.php (Azerbaijani) * New translations field.php (Azerbaijani) * New translations button.php (Urdu (Pakistan)) * New translations message.php (Ukrainian) * New translations field.php (Ukrainian) * New translations field.php (Urdu (Pakistan)) * New translations setting.php (Urdu (Pakistan)) * New translations button.php (Turkish) * New translations field.php (Ukrainian) * New translations button.php (Ukrainian) * New translations message.php (Turkish) * New translations field.php (Turkish) * New translations setting.php (Ukrainian) * New translations setting.php (Ukrainian) * New translations message.php (Vietnamese) * New translations field.php (Vietnamese) * New translations setting.php (Vietnamese) * New translations setting.php (Persian) * New translations field.php (Persian) * New translations button.php (Persian) * New translations message.php (Urdu (Pakistan)) * New translations setting.php (Urdu (Pakistan)) * New translations setting.php (Vietnamese) * New translations field.php (Vietnamese) * New translations button.php (Vietnamese) --- .../advs-module/resources/lang/ar/button.php | 1 + .../advs-module/resources/lang/ar/field.php | 10 ++++++++++ .../advs-module/resources/lang/az/button.php | 1 + .../advs-module/resources/lang/az/field.php | 10 ++++++++++ .../advs-module/resources/lang/bn/button.php | 1 + .../advs-module/resources/lang/bn/field.php | 10 ++++++++++ .../advs-module/resources/lang/de/button.php | 1 + .../advs-module/resources/lang/de/field.php | 10 ++++++++++ .../advs-module/resources/lang/el/button.php | 1 + .../advs-module/resources/lang/el/field.php | 10 ++++++++++ .../advs-module/resources/lang/es/button.php | 1 + .../advs-module/resources/lang/es/field.php | 10 ++++++++++ .../advs-module/resources/lang/fa/button.php | 1 + .../advs-module/resources/lang/fa/field.php | 10 ++++++++++ .../advs-module/resources/lang/fr/button.php | 1 + .../advs-module/resources/lang/fr/field.php | 10 ++++++++++ .../advs-module/resources/lang/he/button.php | 1 + .../advs-module/resources/lang/he/field.php | 10 ++++++++++ .../advs-module/resources/lang/hi/button.php | 1 + .../advs-module/resources/lang/hi/field.php | 10 ++++++++++ .../advs-module/resources/lang/it/button.php | 1 + .../advs-module/resources/lang/it/field.php | 10 ++++++++++ .../advs-module/resources/lang/ja/button.php | 1 + .../advs-module/resources/lang/ja/field.php | 10 ++++++++++ .../advs-module/resources/lang/ko/button.php | 1 + .../advs-module/resources/lang/ko/field.php | 10 ++++++++++ .../advs-module/resources/lang/nl/button.php | 1 + .../advs-module/resources/lang/nl/field.php | 10 ++++++++++ .../advs-module/resources/lang/pl/button.php | 1 + .../advs-module/resources/lang/pl/field.php | 10 ++++++++++ .../advs-module/resources/lang/pt/button.php | 1 + .../advs-module/resources/lang/pt/field.php | 10 ++++++++++ .../advs-module/resources/lang/ro/button.php | 1 + .../advs-module/resources/lang/ro/field.php | 10 ++++++++++ .../advs-module/resources/lang/ru/button.php | 1 + .../advs-module/resources/lang/ru/field.php | 10 ++++++++++ .../advs-module/resources/lang/sq/button.php | 1 + .../advs-module/resources/lang/sq/field.php | 10 ++++++++++ .../advs-module/resources/lang/sv/button.php | 1 + .../advs-module/resources/lang/sv/field.php | 10 ++++++++++ .../advs-module/resources/lang/tr/button.php | 1 + .../advs-module/resources/lang/tr/field.php | 18 ++++++++++++++---- .../advs-module/resources/lang/tr/message.php | 4 ++-- .../advs-module/resources/lang/tr/section.php | 2 +- .../advs-module/resources/lang/tr/setting.php | 4 ++-- .../advs-module/resources/lang/uk/button.php | 1 + .../advs-module/resources/lang/uk/field.php | 10 ++++++++++ .../advs-module/resources/lang/ur/button.php | 1 + .../advs-module/resources/lang/ur/field.php | 10 ++++++++++ .../advs-module/resources/lang/vi/button.php | 1 + .../advs-module/resources/lang/vi/field.php | 10 ++++++++++ .../base-theme/resources/lang/ar/setting.php | 3 +++ .../base-theme/resources/lang/az/setting.php | 3 +++ .../base-theme/resources/lang/bn/setting.php | 3 +++ .../base-theme/resources/lang/de/setting.php | 3 +++ .../base-theme/resources/lang/el/setting.php | 3 +++ .../base-theme/resources/lang/es/setting.php | 3 +++ .../base-theme/resources/lang/fa/setting.php | 3 +++ .../base-theme/resources/lang/fr/setting.php | 3 +++ .../base-theme/resources/lang/he/setting.php | 3 +++ .../base-theme/resources/lang/hi/setting.php | 3 +++ .../base-theme/resources/lang/it/setting.php | 3 +++ .../base-theme/resources/lang/ja/setting.php | 3 +++ .../base-theme/resources/lang/ko/setting.php | 3 +++ .../base-theme/resources/lang/nl/setting.php | 3 +++ .../base-theme/resources/lang/pl/setting.php | 3 +++ .../base-theme/resources/lang/pt/setting.php | 3 +++ .../base-theme/resources/lang/ro/setting.php | 3 +++ .../base-theme/resources/lang/ru/setting.php | 3 +++ .../base-theme/resources/lang/sq/setting.php | 3 +++ .../base-theme/resources/lang/sv/setting.php | 3 +++ .../base-theme/resources/lang/tr/field.php | 8 ++++---- .../base-theme/resources/lang/tr/setting.php | 7 +++++-- .../base-theme/resources/lang/uk/setting.php | 3 +++ .../base-theme/resources/lang/ur/setting.php | 3 +++ .../base-theme/resources/lang/vi/setting.php | 3 +++ .../resources/lang/tr/button.php | 2 +- .../resources/lang/ar/setting.php | 3 +++ .../resources/lang/az/setting.php | 3 +++ .../resources/lang/bn/setting.php | 3 +++ .../resources/lang/de/setting.php | 3 +++ .../resources/lang/el/setting.php | 3 +++ .../resources/lang/es/setting.php | 3 +++ .../resources/lang/fa/setting.php | 3 +++ .../resources/lang/fr/setting.php | 3 +++ .../resources/lang/he/setting.php | 3 +++ .../resources/lang/hi/setting.php | 3 +++ .../resources/lang/it/setting.php | 3 +++ .../resources/lang/ja/setting.php | 3 +++ .../resources/lang/ko/setting.php | 3 +++ .../resources/lang/nl/setting.php | 3 +++ .../resources/lang/pl/setting.php | 3 +++ .../resources/lang/pt/setting.php | 3 +++ .../resources/lang/ro/setting.php | 3 +++ .../resources/lang/ru/setting.php | 3 +++ .../resources/lang/sq/setting.php | 3 +++ .../resources/lang/sv/setting.php | 3 +++ .../resources/lang/tr/setting.php | 5 ++++- .../resources/lang/uk/setting.php | 3 +++ .../resources/lang/ur/setting.php | 3 +++ .../resources/lang/vi/setting.php | 3 +++ .../profile-module/resources/lang/ar/field.php | 3 +++ .../resources/lang/ar/message.php | 1 + .../profile-module/resources/lang/az/field.php | 3 +++ .../resources/lang/az/message.php | 1 + .../profile-module/resources/lang/bn/field.php | 3 +++ .../resources/lang/bn/message.php | 1 + .../profile-module/resources/lang/de/field.php | 3 +++ .../resources/lang/de/message.php | 1 + .../profile-module/resources/lang/el/field.php | 3 +++ .../resources/lang/el/message.php | 1 + .../profile-module/resources/lang/es/field.php | 3 +++ .../resources/lang/es/message.php | 1 + .../profile-module/resources/lang/fa/field.php | 3 +++ .../resources/lang/fa/message.php | 1 + .../profile-module/resources/lang/fr/field.php | 3 +++ .../resources/lang/fr/message.php | 1 + .../profile-module/resources/lang/he/field.php | 3 +++ .../resources/lang/he/message.php | 1 + .../profile-module/resources/lang/hi/field.php | 3 +++ .../resources/lang/hi/message.php | 1 + .../profile-module/resources/lang/it/field.php | 3 +++ .../resources/lang/it/message.php | 1 + .../profile-module/resources/lang/ja/field.php | 3 +++ .../resources/lang/ja/message.php | 1 + .../profile-module/resources/lang/ko/field.php | 3 +++ .../resources/lang/ko/message.php | 1 + .../profile-module/resources/lang/nl/field.php | 3 +++ .../resources/lang/nl/message.php | 1 + .../profile-module/resources/lang/pl/field.php | 3 +++ .../resources/lang/pl/message.php | 1 + .../profile-module/resources/lang/pt/field.php | 3 +++ .../resources/lang/pt/message.php | 1 + .../profile-module/resources/lang/ro/field.php | 3 +++ .../resources/lang/ro/message.php | 1 + .../profile-module/resources/lang/ru/field.php | 3 +++ .../resources/lang/ru/message.php | 1 + .../profile-module/resources/lang/sq/field.php | 3 +++ .../resources/lang/sq/message.php | 1 + .../profile-module/resources/lang/sv/field.php | 3 +++ .../resources/lang/sv/message.php | 1 + .../profile-module/resources/lang/tr/field.php | 3 +++ .../resources/lang/tr/message.php | 3 ++- .../profile-module/resources/lang/uk/field.php | 3 +++ .../resources/lang/uk/message.php | 1 + .../profile-module/resources/lang/ur/field.php | 3 +++ .../resources/lang/ur/message.php | 1 + .../profile-module/resources/lang/vi/field.php | 3 +++ .../resources/lang/vi/message.php | 1 + 149 files changed, 522 insertions(+), 18 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/button.php b/addons/default/visiosoft/advs-module/resources/lang/ar/button.php index 619791e2c..48e15c7a6 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'تحديث الفئة' ], 'new_option' => 'خيار جديد', + 'export' => 'تصدير' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/field.php b/addons/default/visiosoft/advs-module/resources/lang/ar/field.php index e9700e6ad..76f2ec990 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'و ما فوق', 'and_below' => 'و تحت', 'clear_all' => 'امسح الكل', + 'balances' => 'الرصيد', + 'packages' => 'الحزمة', + 'dopings' => 'المنشطات', + 'advs' => 'Advs', + 'site' => 'الموقع', + 'subscription' => 'اشتراك', + 'created' => 'خلقت', + 'old_price' => [ + 'name' => 'سعر قديم' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/button.php b/addons/default/visiosoft/advs-module/resources/lang/az/button.php index 2b2b78363..d3d3d0609 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/az/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/az/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Kateqoriya yeniləyin' ], 'new_option' => 'Yeni Seçim', + 'export' => 'İxrac' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/field.php b/addons/default/visiosoft/advs-module/resources/lang/az/field.php index 15e855630..401ee36bc 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/az/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/az/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'və yuxarıda', 'and_below' => 'və aşağıda', 'clear_all' => 'Hamısını sil, hamısını təmizlə', + 'balances' => 'Qalıqlar', + 'packages' => 'Paketlər', + 'dopings' => 'Dopinqlər', + 'advs' => 'Advs', + 'site' => 'Sayt', + 'subscription' => 'Abunə', + 'created' => 'Yarandı', + 'old_price' => [ + 'name' => 'Köhnə Qiymət' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/button.php b/addons/default/visiosoft/advs-module/resources/lang/bn/button.php index 0eb42cdbf..507b20b1e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bn/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bn/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'আপডেট বিভাগ' ], 'new_option' => 'নতুন বিকল্প', + 'export' => 'রফতানি' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/field.php b/addons/default/visiosoft/advs-module/resources/lang/bn/field.php index daac50ac7..aa268613f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bn/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bn/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'এবং উপরে', 'and_below' => 'এবং নিচে', 'clear_all' => 'সব পরিষ্কার করে দাও', + 'balances' => 'ব্যালেন্স', + 'packages' => 'প্যাকেজগুলি', + 'dopings' => 'ডোপিংস', + 'advs' => 'অ্যাড', + 'site' => 'সাইট', + 'subscription' => 'সাবস্ক্রিপশন', + 'created' => 'তৈরি হয়েছে', + 'old_price' => [ + 'name' => 'পুরাতন মূল্য' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/button.php b/addons/default/visiosoft/advs-module/resources/lang/de/button.php index f396f1363..bdff5f8bf 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Kategorie aktualisieren' ], 'new_option' => 'Neue Option', + 'export' => 'Export' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/field.php b/addons/default/visiosoft/advs-module/resources/lang/de/field.php index ed94fe3fe..547cef5eb 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'und darüber', 'and_below' => 'und darunter', 'clear_all' => 'Alles löschen', + 'balances' => 'Guthaben', + 'packages' => 'Pakete', + 'dopings' => 'Dopings', + 'advs' => 'Advs', + 'site' => 'Seite? ˅', + 'subscription' => 'Abonnement', + 'created' => 'Erstellt', + 'old_price' => [ + 'name' => 'Alter Preis' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/button.php b/addons/default/visiosoft/advs-module/resources/lang/el/button.php index 9f8e6dda7..2d57a0c0a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Ενημέρωση κατηγορίας' ], 'new_option' => 'Νέα επιλογή', + 'export' => 'Εξαγωγή' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/field.php b/addons/default/visiosoft/advs-module/resources/lang/el/field.php index 1a6ee9765..8765550a7 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'και παραπανω', 'and_below' => 'και παρακάτω', 'clear_all' => 'Τα καθαρίζω όλα', + 'balances' => 'Υπόλοιπα', + 'packages' => 'Πακέτα', + 'dopings' => 'Ντόπινγκ', + 'advs' => 'Advs', + 'site' => 'Ιστοσελίδα', + 'subscription' => 'Συνδρομή', + 'created' => 'Δημιουργήθηκε', + 'old_price' => [ + 'name' => 'Παλιά τιμή' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/button.php b/addons/default/visiosoft/advs-module/resources/lang/es/button.php index 02ae9a86e..f5ccc5cf2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/es/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/es/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Actualizar categoría' ], 'new_option' => 'Nueva opción', + 'export' => 'Exportar' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/field.php b/addons/default/visiosoft/advs-module/resources/lang/es/field.php index e6794e3d7..bf50bef0f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/es/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/es/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'y por encima', 'and_below' => 'y por debajo', 'clear_all' => 'Limpiar todo', + 'balances' => 'Saldos', + 'packages' => 'Paquetes', + 'dopings' => 'Dopings', + 'advs' => 'Advs', + 'site' => 'Sitio', + 'subscription' => 'Suscripción', + 'created' => 'Creado', + 'old_price' => [ + 'name' => 'Precio anterior' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/button.php b/addons/default/visiosoft/advs-module/resources/lang/fa/button.php index 47ed58fa8..f047c1f03 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fa/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fa/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'رده به روزرسانی' ], 'new_option' => 'گزینه جدید', + 'export' => 'صادرات' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/field.php b/addons/default/visiosoft/advs-module/resources/lang/fa/field.php index 24f7a4e22..95588f96a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fa/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fa/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'و بالاتر', 'and_below' => 'و در زیر', 'clear_all' => 'همه را پاک کن', + 'balances' => 'موازنه', + 'packages' => 'بسته ها', + 'dopings' => 'دوپینگ', + 'advs' => 'تبلیغات', + 'site' => 'سایت', + 'subscription' => 'اشتراک، ابونمان', + 'created' => 'ایجاد شده', + 'old_price' => [ + 'name' => 'قیمت قدیمی' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/button.php b/addons/default/visiosoft/advs-module/resources/lang/fr/button.php index 43f94b5d4..a0d77878b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fr/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fr/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Mettre à jour la catégorie' ], 'new_option' => 'Nouvelle option', + 'export' => 'Exportation' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/field.php b/addons/default/visiosoft/advs-module/resources/lang/fr/field.php index 82bb8cffc..599c32431 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fr/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'et ci-dessus', 'and_below' => 'et plus bas', 'clear_all' => 'Tout effacer', + 'balances' => 'Soldes', + 'packages' => 'Paquets', + 'dopings' => 'Dopage', + 'advs' => 'Advs', + 'site' => 'Site', + 'subscription' => 'Abonnement', + 'created' => 'Créé', + 'old_price' => [ + 'name' => 'Ancien prix' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/button.php b/addons/default/visiosoft/advs-module/resources/lang/he/button.php index b68b537ce..466fdbe0e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/he/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/he/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'עדכן קטגוריה' ], 'new_option' => 'אפשרות חדשה', + 'export' => 'יְצוּא' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/field.php b/addons/default/visiosoft/advs-module/resources/lang/he/field.php index cf39a5c15..ff06ade7a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/he/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/he/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'ומעל', 'and_below' => 'ומתחת', 'clear_all' => 'נקה הכל', + 'balances' => 'יתרות', + 'packages' => 'חבילות', + 'dopings' => 'סמים', + 'advs' => 'עו"ד', + 'site' => 'אֲתַר', + 'subscription' => 'מִנוּי', + 'created' => 'נוצר', + 'old_price' => [ + 'name' => 'מחיר ישן' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/button.php b/addons/default/visiosoft/advs-module/resources/lang/hi/button.php index 802142448..04d35da16 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hi/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hi/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'अद्यतन श्रेणी' ], 'new_option' => 'नया विकल्प', + 'export' => 'निर्यात' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/field.php b/addons/default/visiosoft/advs-module/resources/lang/hi/field.php index 3e21a0cba..c4ad70f8c 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hi/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hi/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'और ऊपर', 'and_below' => 'और नीचे', 'clear_all' => 'सभी साफ करें', + 'balances' => 'शेष', + 'packages' => 'संकुल', + 'dopings' => 'dopings', + 'advs' => 'advs', + 'site' => 'साइट', + 'subscription' => 'अंशदान', + 'created' => 'बनाया था', + 'old_price' => [ + 'name' => 'पुरानी कीमत' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/button.php b/addons/default/visiosoft/advs-module/resources/lang/it/button.php index eebc61d89..973973321 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/it/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/it/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Categoria di aggiornamento' ], 'new_option' => 'Nuova opzione', + 'export' => 'Esportare' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/field.php b/addons/default/visiosoft/advs-module/resources/lang/it/field.php index 528ef3366..6f2d10da6 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/it/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/it/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'e al di sopra', 'and_below' => 'e sotto', 'clear_all' => 'Cancella tutto', + 'balances' => 'Saldi', + 'packages' => 'Pacchi', + 'dopings' => 'Dopings', + 'advs' => 'Advs', + 'site' => 'Luogo', + 'subscription' => 'Sottoscrizione', + 'created' => 'Creato', + 'old_price' => [ + 'name' => 'Vecchio prezzo' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/button.php b/addons/default/visiosoft/advs-module/resources/lang/ja/button.php index b937e7866..2e19aa162 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ja/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ja/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'カテゴリを更新' ], 'new_option' => '新しいオプション', + 'export' => '書き出す' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/field.php b/addons/default/visiosoft/advs-module/resources/lang/ja/field.php index 9b68ead52..46ea2dc81 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ja/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ja/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => '以上', 'and_below' => '以下', 'clear_all' => 'すべてクリア', + 'balances' => 'バランス', + 'packages' => 'パッケージ', + 'dopings' => 'ドーピング', + 'advs' => 'アドバンス', + 'site' => '地点', + 'subscription' => 'サブスクリプション', + 'created' => '作成した', + 'old_price' => [ + 'name' => '古い価格' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/button.php b/addons/default/visiosoft/advs-module/resources/lang/ko/button.php index db3009a49..2870d56ec 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ko/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ko/button.php @@ -32,4 +32,5 @@ return [ 'name' => '카테고리 업데이트' ], 'new_option' => '새로운 옵션', + 'export' => '수출' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/field.php b/addons/default/visiosoft/advs-module/resources/lang/ko/field.php index e19e6a372..7d762de2c 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ko/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ko/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => '이상', 'and_below' => '이하', 'clear_all' => '모두 지우기', + 'balances' => '균형', + 'packages' => '패키지', + 'dopings' => '도핑', + 'advs' => 'Advs', + 'site' => '대지', + 'subscription' => '신청', + 'created' => '만들어진', + 'old_price' => [ + 'name' => '이전 가격' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/button.php b/addons/default/visiosoft/advs-module/resources/lang/nl/button.php index bc54f1937..0d59ef1fd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Categorie bijwerken' ], 'new_option' => 'Nieuwe optie', + 'export' => 'Exporteren' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/field.php b/addons/default/visiosoft/advs-module/resources/lang/nl/field.php index 95d2cc31f..b6c3e3252 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'en hoger', 'and_below' => 'en onder', 'clear_all' => 'Wis alles', + 'balances' => 'Weegschalen', + 'packages' => 'Pakketjes', + 'dopings' => 'Dopings', + 'advs' => 'Advs', + 'site' => 'Site', + 'subscription' => 'Abonnement', + 'created' => 'Gemaakt', + 'old_price' => [ + 'name' => 'Oude prijs' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/button.php b/addons/default/visiosoft/advs-module/resources/lang/pl/button.php index 36752c315..b5b6249a8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pl/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pl/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Zaktualizuj kategorię' ], 'new_option' => 'Nowa opcja', + 'export' => 'Eksport' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/field.php b/addons/default/visiosoft/advs-module/resources/lang/pl/field.php index 3d1d8b019..f47f2ad86 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pl/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pl/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'i powyżej', 'and_below' => 'i poniżej', 'clear_all' => 'Wyczyść wszystko', + 'balances' => 'Salda', + 'packages' => 'Pakiety', + 'dopings' => 'Dopingi', + 'advs' => 'Advs', + 'site' => 'Teren', + 'subscription' => 'Subskrypcja', + 'created' => 'Utworzony', + 'old_price' => [ + 'name' => 'Stara cena' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/button.php b/addons/default/visiosoft/advs-module/resources/lang/pt/button.php index 53d5d0a7e..b443ea231 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pt/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pt/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Atualizar categoria' ], 'new_option' => 'Nova Opção', + 'export' => 'Exportar' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/field.php b/addons/default/visiosoft/advs-module/resources/lang/pt/field.php index 1429a94fe..60067ae2c 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pt/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pt/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'e acima', 'and_below' => 'e abaixo', 'clear_all' => 'Limpar tudo', + 'balances' => 'Saldos', + 'packages' => 'Pacotes', + 'dopings' => 'Dopings', + 'advs' => 'Advs', + 'site' => 'Local', + 'subscription' => 'Inscrição', + 'created' => 'Criado', + 'old_price' => [ + 'name' => 'Preço antigo' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/button.php b/addons/default/visiosoft/advs-module/resources/lang/ro/button.php index b9170691e..05365e89e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ro/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ro/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Actualizare categorie' ], 'new_option' => 'Opțiune nouă', + 'export' => 'Export' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/field.php b/addons/default/visiosoft/advs-module/resources/lang/ro/field.php index 07aabded1..3a7c2ce03 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ro/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ro/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'Si mai sus', 'and_below' => 'si sub', 'clear_all' => 'Curata tot', + 'balances' => 'Solduri', + 'packages' => 'Pachete', + 'dopings' => 'Dopaje', + 'advs' => 'Sfaturi', + 'site' => 'Site', + 'subscription' => 'Abonament', + 'created' => 'Creată', + 'old_price' => [ + 'name' => 'Preț vechi' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/button.php b/addons/default/visiosoft/advs-module/resources/lang/ru/button.php index ef3b7785c..7db3d66cb 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ru/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ru/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Обновить категорию' ], 'new_option' => 'Новый вариант', + 'export' => 'Экспорт' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/field.php b/addons/default/visiosoft/advs-module/resources/lang/ru/field.php index 63f2056ce..8cc41cf7a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ru/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ru/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'и выше', 'and_below' => 'и ниже', 'clear_all' => 'Очистить все', + 'balances' => 'Балансы', + 'packages' => 'Пакеты', + 'dopings' => 'Допинг', + 'advs' => 'Advs', + 'site' => 'Сайт', + 'subscription' => 'Подписка', + 'created' => 'Создано', + 'old_price' => [ + 'name' => 'Старая цена' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/button.php b/addons/default/visiosoft/advs-module/resources/lang/sq/button.php index 004a53e08..ea5c36fbd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Kategoria Azhornimeve' ], 'new_option' => 'Opsioni i ri', + 'export' => 'Eksporto' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/field.php b/addons/default/visiosoft/advs-module/resources/lang/sq/field.php index 5364d6b0c..58fe05860 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/field.php @@ -307,4 +307,14 @@ return [ 'and_above' => 'dhe më lart', 'and_below' => 'dhe më poshtë', 'clear_all' => 'Pastroji të gjitha', + 'balances' => 'Bilancet', + 'packages' => 'Paketat', + 'dopings' => 'Dopingët', + 'advs' => 'Adv', + 'site' => 'Faqen', + 'subscription' => 'Abonim', + 'created' => 'Krijuar', + 'old_price' => [ + 'name' => 'Çmimi i Vjetër' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/button.php b/addons/default/visiosoft/advs-module/resources/lang/sv/button.php index fe78e694e..f992ccff6 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sv/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sv/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Uppdatera kategori' ], 'new_option' => 'Nytt alternativ', + 'export' => 'Exportera' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/field.php b/addons/default/visiosoft/advs-module/resources/lang/sv/field.php index 2a05f75c9..634294430 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sv/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sv/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'och ovan', 'and_below' => 'och under', 'clear_all' => 'Rensa alla', + 'balances' => 'Balanser', + 'packages' => 'Paket', + 'dopings' => 'Dopings', + 'advs' => 'Adv', + 'site' => 'Webbplats', + 'subscription' => 'Prenumeration', + 'created' => 'Skapad', + 'old_price' => [ + 'name' => 'Gammalt pris' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php index 6721c2085..0ee3ab8a2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Kategori Güncelle' ], 'new_option' => 'Yeni Seçenek', + 'export' => 'İhracat' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php index cc2f95416..e1c05d54c 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -150,7 +150,7 @@ return [ 'search_desc' => 'Burada favori arama seçimlerinizi ekleyebilir ve yönetebilirsiniz.', 'complaint_placeholder' => 'Şikayet ayrıntılarınızı buraya yazın.', 'show_details' => 'Detayları göster', - 'ad_actions' => 'Reklam İşlemleri', + 'ad_actions' => 'İlan İşlemleri', 'edit' => 'Düzenle', 'approve' => 'Onayla', 'passive' => "Pasif", @@ -275,11 +275,11 @@ return [ "were_found" => 'bulundular.', // Pending screen - 'pending_message_1' => 'Reklam Onay Sürecinde', - 'pending_message_2' => "Reklamın Güncelleme Tarihi", + 'pending_message_1' => 'İlan Onay Sürecinde', + 'pending_message_2' => "İlan Güncelleme Tarihi", 'pending_message_3' => 'Tahmini Bekleme Süresi', 'pending_message_4' => 'Onay sürecinde geçirilen süre doping zamanına eklenecektir.', - 'pending_message_5' => 'Onay sürecinde reklamla ilgili çağrı merkezinden hiçbir işlem yapılamaz.', + 'pending_message_5' => 'Onay sürecinde ilanla ilgili çağrı merkezinden hiçbir işlem yapılamaz.', 'hours' => 'saatler', // Preview page @@ -308,4 +308,14 @@ return [ 'and_above' => 've yukarıda', 'and_below' => 've aşağıda', 'clear_all' => 'Hepsini temizle', + 'balances' => 'Bakiyeler', + 'packages' => 'Paketler', + 'dopings' => 'Dopingler', + 'advs' => 'Advs', + 'site' => 'Site', + 'subscription' => 'Abonelik', + 'created' => 'Oluşturuldu', + 'old_price' => [ + 'name' => 'Eski fiyat' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php index 00fd03e21..82df978e8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php @@ -23,6 +23,6 @@ return [ 'choose_user' => 'Bir kullanıcı seçin', 'owner_updated_successfully' => 'Sahibi Başarıyla Güncellenmiştir!', 'no_add_found' => 'İlan Bulunamadı!', - 'replicated_success' => 'Reklam başarıyla kopyalandı!', - 'ad_doesnt_exist' => "Bu reklam mevcut değil!", + 'replicated_success' => 'İlan başarıyla kopyalandı!', + 'ad_doesnt_exist' => "Bu İlan mevcut değil!", ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/section.php b/addons/default/visiosoft/advs-module/resources/lang/tr/section.php index 5b566bbef..f7adc843e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/section.php @@ -44,5 +44,5 @@ return [ 'options' => [ 'title' => 'Seçenekler', ], - 'ads_image' => 'Reklam Resmi', + 'ads_image' => 'İlan Resmi', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index f09745ac0..9e3c9d652 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -9,7 +9,7 @@ return [ ], 'hide_zero_price' => [ 'name' => 'Sıfır ise Fiyatı Gizle', - 'instructions' => 'Reklam fiyatı 0 ise fiyatı gizle', + 'instructions' => 'İlan fiyatı 0 ise fiyatı gizle', ], 'estimated_pending_time' => [ 'name' => 'Tahmini Bekleme Süresi', @@ -129,7 +129,7 @@ return [ 'name' => 'TCMB Exchange URL\'si', ], 'popular_ads_limit' => [ - 'name' => 'Popüler Reklam Limiti', + 'name' => 'Popüler İlan Limiti', ], //Image diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/button.php b/addons/default/visiosoft/advs-module/resources/lang/uk/button.php index 6b7277f53..fe6de7c4a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/uk/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/uk/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Оновити категорію' ], 'new_option' => 'Нова опція', + 'export' => 'Експорт' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/field.php b/addons/default/visiosoft/advs-module/resources/lang/uk/field.php index 628c6f494..09fe095f1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/uk/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/uk/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'і вище', 'and_below' => 'і нижче', 'clear_all' => 'Очистити все', + 'balances' => 'Баланси', + 'packages' => 'Пакети', + 'dopings' => 'Допінг', + 'advs' => 'Advs', + 'site' => 'Сайт', + 'subscription' => 'Передплата', + 'created' => 'Створено', + 'old_price' => [ + 'name' => 'Стара ціна' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/button.php b/addons/default/visiosoft/advs-module/resources/lang/ur/button.php index 9b412a895..48e176b96 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ur/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ur/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'زمرہ اپ ڈیٹ کریں' ], 'new_option' => 'نیا آپشن', + 'export' => 'برآمد کریں' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/field.php b/addons/default/visiosoft/advs-module/resources/lang/ur/field.php index 000857a60..d38e74af5 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ur/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ur/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'اور اوپر', 'and_below' => 'اور نیچے', 'clear_all' => 'تمام کو صاف کریں', + 'balances' => 'توازن', + 'packages' => 'پیکیجز', + 'dopings' => 'ڈوپنگز', + 'advs' => 'ایڈز', + 'site' => 'سائٹ', + 'subscription' => 'سب سکریپشن', + 'created' => 'بنائی گئی', + 'old_price' => [ + 'name' => 'پرانی قیمت' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/button.php b/addons/default/visiosoft/advs-module/resources/lang/vi/button.php index 5cc1766d8..f1f73f281 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/vi/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/vi/button.php @@ -32,4 +32,5 @@ return [ 'name' => 'Cập nhật danh mục' ], 'new_option' => 'Tùy chọn mới', + 'export' => 'Xuất khẩu' ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/field.php b/addons/default/visiosoft/advs-module/resources/lang/vi/field.php index 50d4e9dd8..0b5e767e2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/vi/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/vi/field.php @@ -306,4 +306,14 @@ return [ 'and_above' => 'trở lên', 'and_below' => 'và dưới đây', 'clear_all' => 'Làm sạch tất cả', + 'balances' => 'Cân bằng', + 'packages' => 'Các gói', + 'dopings' => 'Liều lượng', + 'advs' => 'Lời khuyên', + 'site' => 'Địa điểm', + 'subscription' => 'Đăng ký', + 'created' => 'Tạo', + 'old_price' => [ + 'name' => 'Giá cũ' + ], ]; diff --git a/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php index 8221638f8..8ccab5bff 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ar/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'حد الفئات الفرعية للصفحة الرئيسية', ], + 'default_country' => [ + 'name' => 'صفحة التسجيل ، البلد الافتراضي للهاتف', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/az/setting.php b/addons/default/visiosoft/base-theme/resources/lang/az/setting.php index 8317d134d..d3d7a5483 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/az/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/az/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Əsas alt kateqoriyalar məhdudiyyəti', ], + 'default_country' => [ + 'name' => 'Qeydiyyat səhifəsi, telefon üçün standart ölkə', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php b/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php index 37dd14199..083bc581b 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/bn/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'হোমপেজ সাব বিভাগের সীমা', ], + 'default_country' => [ + 'name' => 'ফোনের জন্য পৃষ্ঠা, ডিফল্ট দেশ নিবন্ধ করুন', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/de/setting.php b/addons/default/visiosoft/base-theme/resources/lang/de/setting.php index ec0ba8165..b535ea2ec 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/de/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/de/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Homepage Unterkategorien Limit', ], + 'default_country' => [ + 'name' => 'Registrierungsseite, Standardland für Telefon', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/el/setting.php b/addons/default/visiosoft/base-theme/resources/lang/el/setting.php index 4f4c3ecfc..7f8e37b92 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/el/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/el/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Όριο υποκατηγοριών αρχικής σελίδας', ], + 'default_country' => [ + 'name' => 'Σελίδα εγγραφής, προεπιλεγμένη χώρα για τηλέφωνο', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/es/setting.php b/addons/default/visiosoft/base-theme/resources/lang/es/setting.php index f6a949c76..d505c2f04 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/es/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/es/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Límite de subcategorías de la página de inicio', ], + 'default_country' => [ + 'name' => 'Página de registro, país predeterminado para el teléfono', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php b/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php index d77025933..3c0671d87 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/fa/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'زیرمجموعه ها', ], + 'default_country' => [ + 'name' => 'صفحه ثبت نام ، کشور پیش فرض تلفن', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php b/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php index c9b04e6e3..4cdc5fe72 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/fr/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Limite des sous-catégories de la page d\'accueil', ], + 'default_country' => [ + 'name' => 'Page d\'enregistrement, pays par défaut pour le téléphone', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/he/setting.php b/addons/default/visiosoft/base-theme/resources/lang/he/setting.php index fd6e10e06..77f45592b 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/he/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/he/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'מגבלת קטגוריות המשנה לדף הבית', ], + 'default_country' => [ + 'name' => 'דף הרשמה, ארץ ברירת המחדל לטלפון', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php b/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php index 91ac0ef7e..fb4dcb8d2 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/hi/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'मुखपृष्ठ उप श्रेणियाँ श्रेणियाँ सीमा', ], + 'default_country' => [ + 'name' => 'रजिस्टर पेज, फोन के लिए डिफ़ॉल्ट देश', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/it/setting.php b/addons/default/visiosoft/base-theme/resources/lang/it/setting.php index 30d283ac0..f6ba36f00 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/it/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/it/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Limite delle sottocategorie della home page', ], + 'default_country' => [ + 'name' => 'Pagina di registrazione, paese predefinito per il telefono', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php index 9ca3676c1..f91bc8f5f 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ja/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'ホームページのサブカテゴリの制限', ], + 'default_country' => [ + 'name' => '登録ページ、電話のデフォルトの国', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php index d1fa6353e..8baafa55e 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ko/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => '홈페이지 하위 카테고리 제한', ], + 'default_country' => [ + 'name' => '등록 페이지, 전화의 기본 국가', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php b/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php index 2b23dac74..96546c7ac 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/nl/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Limiet subcategorieën op homepage', ], + 'default_country' => [ + 'name' => 'Registratiepagina, standaardland voor telefoon', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php b/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php index 5f3e95453..511898486 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/pl/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Limit podkategorii strony głównej', ], + 'default_country' => [ + 'name' => 'Strona rejestracji, domyślny kraj dla telefonu', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php b/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php index 26ef6f439..f192800fe 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/pt/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Limite de subcategorias da página inicial', ], + 'default_country' => [ + 'name' => 'Página de registro, país padrão para telefone', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php index 10067e769..03263f563 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ro/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Limita de subcategorii pentru pagina principală', ], + 'default_country' => [ + 'name' => 'Pagina de înregistrare, țara implicită pentru telefon', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php index 9849ee374..08dfb72f6 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ru/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Ограничение подкатегорий домашней страницы', ], + 'default_country' => [ + 'name' => 'Страница регистрации, страна по умолчанию для телефона', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php index 7286cbb1a..b6b542e51 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/sq/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Nënkategoritë e faqes kryesore Kufiri', ], + 'default_country' => [ + 'name' => 'Faqja e regjistrimit, vendi i paracaktuar për telefon', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php b/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php index 9d805bc60..052911649 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/sv/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Hemsida Underkategorier Begränsning', ], + 'default_country' => [ + 'name' => 'Registrera sida, standardland för telefon', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php index 5ff970318..161be2f65 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php @@ -27,9 +27,9 @@ return [ // Registration instructions 'personal_registration_header' => 'Bireysel Üyelik Avantajları Nelerdir?', 'personal_registration_body' => 'Evinizi, arabanızı satmak ve kiralamak, kullanılmayan eşyalarınızı satmak, yenilerini almak.', - 'personal_registration_list_1' => 'Ücretsiz bir reklam gönderin,', - 'personal_registration_list_2' => 'İlgilendiğiniz reklamları ekleyin, favorilerinize ekledikten sonra fiyat değişikliklerini takip edin, kriterlerinize uygun favori aramalar oluşturun,', - 'personal_registration_list_3' => 'Sitedeki reklam sahiplerine mesaj gönderin.', + 'personal_registration_list_1' => 'Ücretsiz bir İlan gönderin,', + 'personal_registration_list_2' => 'İlgilendiğiniz ilanları ekleyin, favorilerinize ekledikten sonra fiyat değişikliklerini takip edin, kriterlerinize uygun favori aramalar oluşturun,', + 'personal_registration_list_3' => 'Sitedeki İlan sahiplerine mesaj gönderin.', 'register_information_note' => 'Bu sayfadaki bilgiler ' . env('APPLICATION_DOMAIN') . ' üyelik. Kişisel verilerin korunması hakkında ayrıntılı bilgiyi burada bulabilirsiniz.', // Register page @@ -45,7 +45,7 @@ return [ // Side menu links 'company_directory' => 'Firma Rehberi', - 'popular_ads' => 'popüler reklamlar', + 'popular_ads' => 'Popüler İlanlar', 'last_48_hours' => 'son 48 saat', 'secure_e-commerce_ads' => 'güvenli e-ticaret', 'sms' => 'Kısa Mesaj Gönder (SMS)', diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php b/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php index b5e3e3bb3..0ab08307f 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/setting.php @@ -20,10 +20,10 @@ return [ 'name' => 'Breadcrumb', ], 'ad_details' => [ - 'name' => 'Reklam Ayrıntıları', + 'name' => 'İlan Ayrıntıları', ], 'ad_details_tab' => [ - 'name' => 'Reklam Ayrıntıları Sekmesi', + 'name' => 'İlan Ayrıntıları Sekmesi', ], 'latest_and_view_all_btn' => [ 'name' => 'Tümünü Görüntüle', @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Ana Sayfa Alt Kategoriler Sınırı', ], + 'default_country' => [ + 'name' => 'Kayıt sayfası, telefon için varsayılan ülke', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php b/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php index f74df18be..564dca707 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/uk/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Підкатегорії домашньої сторінки Обмеження', ], + 'default_country' => [ + 'name' => 'Сторінка реєстрації, країна за замовчуванням для телефону', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php b/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php index b63083f14..ab7f1b6c9 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/ur/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'مرکزی صفحہ ذیلی زمرے کی حد', ], + 'default_country' => [ + 'name' => 'صفحہ کیلئے رجسٹر ، فون کے لئے پہلے سے طے شدہ ملک', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php b/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php index c133c17cb..9db82be46 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php +++ b/addons/default/visiosoft/base-theme/resources/lang/vi/setting.php @@ -40,4 +40,7 @@ return [ 'home_page_sub_categories_limit' => [ 'name' => 'Giới hạn danh mục phụ của trang chủ', ], + 'default_country' => [ + 'name' => 'Trang đăng ký, quốc gia mặc định cho điện thoại', + ] ]; \ No newline at end of file diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/button.php b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/button.php index 33ed84ff3..02dd41f5d 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/button.php +++ b/addons/default/visiosoft/defaultadmin-theme/resources/lang/tr/button.php @@ -1,5 +1,5 @@ <?php return [ - 'view_ads' => 'Reklamlara göz at', + 'view_ads' => 'İlanlara göz at', ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/ar/setting.php b/addons/default/visiosoft/location-module/resources/lang/ar/setting.php index 46c416cec..ba95ff19d 100644 --- a/addons/default/visiosoft/location-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/ar/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'إخفاء عامل تصفية الموقع', ], + 'country_for_phone_field' => [ + 'name' => 'البلد الافتراضي لتسجيل حقل الهاتف' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/az/setting.php b/addons/default/visiosoft/location-module/resources/lang/az/setting.php index 908fdaeaa..513c4cd25 100644 --- a/addons/default/visiosoft/location-module/resources/lang/az/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/az/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Yer filtrini gizlət', ], + 'country_for_phone_field' => [ + 'name' => 'Telefon sahəsi üçün qeydiyyatdan keçmiş ölkə' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/bn/setting.php b/addons/default/visiosoft/location-module/resources/lang/bn/setting.php index 80ed5bd8c..00b0156ac 100644 --- a/addons/default/visiosoft/location-module/resources/lang/bn/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/bn/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'অবস্থান ফিল্টার লুকান', ], + 'country_for_phone_field' => [ + 'name' => 'রেজিস্টার ফোন ফিল্ডের জন্য ডিফল্ট দেশ' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/de/setting.php b/addons/default/visiosoft/location-module/resources/lang/de/setting.php index c07cc85d1..4eecbf26f 100644 --- a/addons/default/visiosoft/location-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/de/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Standortfilter ausblenden', ], + 'country_for_phone_field' => [ + 'name' => 'Standardland für das Feld "Telefon registrieren"' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/el/setting.php b/addons/default/visiosoft/location-module/resources/lang/el/setting.php index 6982015cf..f5f5de767 100644 --- a/addons/default/visiosoft/location-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/el/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Απόκρυψη φίλτρου τοποθεσίας', ], + 'country_for_phone_field' => [ + 'name' => 'Προεπιλεγμένη χώρα για εγγραφή πεδίου τηλεφώνου' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/es/setting.php b/addons/default/visiosoft/location-module/resources/lang/es/setting.php index cba0a41fd..8c9d151a1 100644 --- a/addons/default/visiosoft/location-module/resources/lang/es/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/es/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Ocultar filtro de ubicación', ], + 'country_for_phone_field' => [ + 'name' => 'País predeterminado para el campo de teléfono de registro' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/fa/setting.php b/addons/default/visiosoft/location-module/resources/lang/fa/setting.php index 030faba0a..1fda17655 100644 --- a/addons/default/visiosoft/location-module/resources/lang/fa/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/fa/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'فیلتر مکان را مخفی کنید', ], + 'country_for_phone_field' => [ + 'name' => 'کشور پیش فرض برای ثبت نام قسمت تلفن' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/fr/setting.php b/addons/default/visiosoft/location-module/resources/lang/fr/setting.php index 6f3097d01..855822da0 100644 --- a/addons/default/visiosoft/location-module/resources/lang/fr/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/fr/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Masquer le filtre de localisation', ], + 'country_for_phone_field' => [ + 'name' => 'Pays par défaut pour le champ de téléphone d\'enregistrement' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/he/setting.php b/addons/default/visiosoft/location-module/resources/lang/he/setting.php index 67bee08f4..69d19c3cc 100644 --- a/addons/default/visiosoft/location-module/resources/lang/he/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/he/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'הסתר מסנן מיקום', ], + 'country_for_phone_field' => [ + 'name' => 'מדינה ברירת מחדל לשדה טלפון רישום' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/hi/setting.php b/addons/default/visiosoft/location-module/resources/lang/hi/setting.php index 9f34d73fd..caf3346d0 100644 --- a/addons/default/visiosoft/location-module/resources/lang/hi/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/hi/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'स्थान फ़िल्टर छिपाएँ', ], + 'country_for_phone_field' => [ + 'name' => 'डिफ़ॉल्ट देश रजिस्टर फोन क्षेत्र के लिए' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/it/setting.php b/addons/default/visiosoft/location-module/resources/lang/it/setting.php index 4f3932431..95098365f 100644 --- a/addons/default/visiosoft/location-module/resources/lang/it/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/it/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Nascondi filtro posizione', ], + 'country_for_phone_field' => [ + 'name' => 'Paese predefinito per il campo del telefono di registrazione' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/ja/setting.php b/addons/default/visiosoft/location-module/resources/lang/ja/setting.php index c5d1850af..90b738b2a 100644 --- a/addons/default/visiosoft/location-module/resources/lang/ja/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/ja/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => '場所フィルターを非表示', ], + 'country_for_phone_field' => [ + 'name' => '電話登録フィールドのデフォルトの国' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/ko/setting.php b/addons/default/visiosoft/location-module/resources/lang/ko/setting.php index 384ece314..d37762457 100644 --- a/addons/default/visiosoft/location-module/resources/lang/ko/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/ko/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => '위치 필터 숨기기', ], + 'country_for_phone_field' => [ + 'name' => '전화 번호 등록 필드의 기본 국가' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/nl/setting.php b/addons/default/visiosoft/location-module/resources/lang/nl/setting.php index e40132984..974ca86fa 100644 --- a/addons/default/visiosoft/location-module/resources/lang/nl/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/nl/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Verberg locatiefilter', ], + 'country_for_phone_field' => [ + 'name' => 'Standaardland voor register telefoonveld' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/pl/setting.php b/addons/default/visiosoft/location-module/resources/lang/pl/setting.php index aaadbc034..1e8482f37 100644 --- a/addons/default/visiosoft/location-module/resources/lang/pl/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/pl/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Ukryj filtr lokalizacji', ], + 'country_for_phone_field' => [ + 'name' => 'Domyślny kraj dla pola numeru rejestracji' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/pt/setting.php b/addons/default/visiosoft/location-module/resources/lang/pt/setting.php index dedbb290e..035107b50 100644 --- a/addons/default/visiosoft/location-module/resources/lang/pt/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/pt/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Ocultar filtro de localização', ], + 'country_for_phone_field' => [ + 'name' => 'País padrão para campo de telefone de registro' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/ro/setting.php b/addons/default/visiosoft/location-module/resources/lang/ro/setting.php index 295ed9238..26b2fabc0 100644 --- a/addons/default/visiosoft/location-module/resources/lang/ro/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/ro/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Ascundeți filtrul de locație', ], + 'country_for_phone_field' => [ + 'name' => 'Țara implicită pentru câmpul de telefon al înregistrării' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/ru/setting.php b/addons/default/visiosoft/location-module/resources/lang/ru/setting.php index 99c4ea4a9..eb3a75344 100644 --- a/addons/default/visiosoft/location-module/resources/lang/ru/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/ru/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Скрыть фильтр местоположения', ], + 'country_for_phone_field' => [ + 'name' => 'Страна по умолчанию для поля регистрации телефона' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/sq/setting.php b/addons/default/visiosoft/location-module/resources/lang/sq/setting.php index 9703b8d3e..202cf53dd 100644 --- a/addons/default/visiosoft/location-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/sq/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Fshih Filtrin e Vendndodhjes', ], + 'country_for_phone_field' => [ + 'name' => 'Vendi i paracaktuar për fushën e regjistrimit të telefonit' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/sv/setting.php b/addons/default/visiosoft/location-module/resources/lang/sv/setting.php index 2043691ab..5e5cca33f 100644 --- a/addons/default/visiosoft/location-module/resources/lang/sv/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/sv/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Dölj platsfilter', ], + 'country_for_phone_field' => [ + 'name' => 'Standardland för att registrera telefonfält' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/tr/setting.php b/addons/default/visiosoft/location-module/resources/lang/tr/setting.php index efd8c1bc7..eaaedeaac 100644 --- a/addons/default/visiosoft/location-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/tr/setting.php @@ -17,7 +17,7 @@ return [ 'name' => 'Varsayılan Ülke', ], 'create_ad_page_location' => [ - 'name' => 'Reklam Sayfası Konumu Oluşturun', + 'name' => 'İlan Sayfası Konumu Oluşturun', ], 'default_city' => [ 'name' => 'Varsayılan İl', @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Konum Filtresini Gizle', ], + 'country_for_phone_field' => [ + 'name' => 'Kayıtlı Telefon Alanı İçin Varsayılan Ülke' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/uk/setting.php b/addons/default/visiosoft/location-module/resources/lang/uk/setting.php index 70f89f2f7..46c6bb7c6 100644 --- a/addons/default/visiosoft/location-module/resources/lang/uk/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/uk/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Сховати фільтр місцеположення', ], + 'country_for_phone_field' => [ + 'name' => 'Країна за замовчуванням для телефонного поля реєстрації' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/ur/setting.php b/addons/default/visiosoft/location-module/resources/lang/ur/setting.php index 2dcc964d9..aef8b0755 100644 --- a/addons/default/visiosoft/location-module/resources/lang/ur/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/ur/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'لوکیشن فلٹر چھپائیں', ], + 'country_for_phone_field' => [ + 'name' => 'ڈیفالٹ کنٹری برائے رجسٹر فون فیلڈ' + ] ]; diff --git a/addons/default/visiosoft/location-module/resources/lang/vi/setting.php b/addons/default/visiosoft/location-module/resources/lang/vi/setting.php index 9f51b6d10..541ddd58d 100644 --- a/addons/default/visiosoft/location-module/resources/lang/vi/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/vi/setting.php @@ -44,4 +44,7 @@ return [ 'hide_location_filter' => [ 'name' => 'Ẩn Bộ lọc Vị trí', ], + 'country_for_phone_field' => [ + 'name' => 'Quốc gia mặc định để đăng ký trường điện thoại' + ] ]; diff --git a/addons/default/visiosoft/profile-module/resources/lang/ar/field.php b/addons/default/visiosoft/profile-module/resources/lang/ar/field.php index 06260197a..37a4db21c 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ar/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ar/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'نوع السجل' ], + 'birthday' => [ + 'name' => 'عيد ميلاد' + ], 'identification_number' => [ 'name' => 'رقم الهوية' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/ar/message.php b/addons/default/visiosoft/profile-module/resources/lang/ar/message.php index 6a32416c9..a0ce07369 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ar/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ar/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'لا يوجد عنوان أو غير مصرح له بالمشاهدة.', 'empty_password_sms_message' => 'نظرًا لمشاكل الأمان ، قمنا بتغيير كلمة المرور الخاصة بك! كلمة المرور الجديدة:', 'required_all' => "كل الحقول مطلوبة!", + 'can_not_remove_filled_fields' => "لا يمكنك إزالة الحقول المملوءة!", // Forgot Password 'email_phone_not_found' => 'البريد الإلكتروني ، رقم الهاتف غير صحيح!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/az/field.php b/addons/default/visiosoft/profile-module/resources/lang/az/field.php index bbe9d9d37..cf93cb6e5 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/az/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/az/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Qeyd Növü' ], + 'birthday' => [ + 'name' => 'Ad günü' + ], 'identification_number' => [ 'name' => 'İdentifikasiya nömrəsi' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/az/message.php b/addons/default/visiosoft/profile-module/resources/lang/az/message.php index 2228931ed..718772fca 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/az/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/az/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Heç bir ünvan və ya görmək icazəsi yoxdur.', 'empty_password_sms_message' => 'Təhlükəsizlik problemləri ilə əlaqədar olaraq şifrənizi dəyişdirdik! Yeni parolunuz:', 'required_all' => "Bütün sahə tələb olunur!", + 'can_not_remove_filled_fields' => "Doldurulmuş sahələri silə bilməzsiniz!", // Forgot Password 'email_phone_not_found' => 'Elektron poçt, telefon nömrəsi düzgün deyil!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/bn/field.php b/addons/default/visiosoft/profile-module/resources/lang/bn/field.php index 330265a88..b8c537e52 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/bn/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/bn/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'রেজিস্টার প্রকার' ], + 'birthday' => [ + 'name' => 'জন্মদিন' + ], 'identification_number' => [ 'name' => 'সনাক্তকরণ নম্বর' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/bn/message.php b/addons/default/visiosoft/profile-module/resources/lang/bn/message.php index eccc91049..7faa1c7e9 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/bn/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/bn/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'কোনও ঠিকানা নেই বা দেখার অনুমতি নেই।', 'empty_password_sms_message' => 'সুরক্ষা সমস্যার কারণে আমরা আপনার পাসওয়ার্ড পরিবর্তন করেছি! আপনার নতুন পাসওয়ার্ডটি হ\'ল:', 'required_all' => "সমস্ত ক্ষেত্র প্রয়োজন!", + 'can_not_remove_filled_fields' => "আপনি ভরাট ক্ষেত্র সরাতে পারবেন না!", // Forgot Password 'email_phone_not_found' => 'ই-মেইল, ফোন নম্বর ঠিক নয়!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/de/field.php b/addons/default/visiosoft/profile-module/resources/lang/de/field.php index a5ebc6e2c..a6dfa642e 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/de/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/de/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Registertyp' ], + 'birthday' => [ + 'name' => 'Geburtstag' + ], 'identification_number' => [ 'name' => 'Identifikationsnummer' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/de/message.php b/addons/default/visiosoft/profile-module/resources/lang/de/message.php index 2ab48b44b..026edd871 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/de/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/de/message.php @@ -29,6 +29,7 @@ return [ 'ajax_address_error' => 'Keine Adresse oder nicht zum Anzeigen berechtigt.', 'empty_password_sms_message' => 'Aus Sicherheitsgründen haben wir Ihr Passwort geändert! Dein neues Passwort ist:', 'required_all' => "Alle Felder sind erforderlich!", + 'can_not_remove_filled_fields' => "Sie können gefüllte Felder nicht entfernen!", // Forgot Password 'email_phone_not_found' => 'Die E-Mail, Telefonnummer ist nicht korrekt!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/el/field.php b/addons/default/visiosoft/profile-module/resources/lang/el/field.php index 2212a1263..121d527c0 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/el/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/el/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Τύπος μητρώου' ], + 'birthday' => [ + 'name' => 'Γενέθλια' + ], 'identification_number' => [ 'name' => 'Αριθμός αναγνώρισης' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/el/message.php b/addons/default/visiosoft/profile-module/resources/lang/el/message.php index 56af6606b..5c6449ed7 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/el/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/el/message.php @@ -29,6 +29,7 @@ return [ 'ajax_address_error' => 'Καμία διεύθυνση ή μη εξουσιοδοτημένη προβολή.', 'empty_password_sms_message' => 'Λόγω προβλημάτων ασφαλείας, αλλάξαμε τον κωδικό πρόσβασής σας! Ο νέος κωδικός πρόσβασής σας είναι:', 'required_all' => "Απαιτείται όλο το πεδίο!", + 'can_not_remove_filled_fields' => "Δεν μπορείτε να καταργήσετε τα γεμάτα πεδία!", // Forgot Password 'email_phone_not_found' => 'Το E-mail, ο αριθμός τηλεφώνου δεν είναι σωστός!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/es/field.php b/addons/default/visiosoft/profile-module/resources/lang/es/field.php index 59afc16df..bfc6832a5 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/es/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/es/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Tipo de registro' ], + 'birthday' => [ + 'name' => 'Cumpleaños' + ], 'identification_number' => [ 'name' => 'Número de identificación' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/es/message.php b/addons/default/visiosoft/profile-module/resources/lang/es/message.php index 7ee667ddf..efb500a35 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/es/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/es/message.php @@ -29,6 +29,7 @@ return [ 'ajax_address_error' => 'Sin dirección o sin autorización para ver.', 'empty_password_sms_message' => '¡Debido a problemas de seguridad, cambiamos su contraseña! Tu nueva contraseña es:', 'required_all' => "¡Todo el campo es obligatorio!", + 'can_not_remove_filled_fields' => "¡No puedes eliminar los campos llenos!", // Forgot Password 'email_phone_not_found' => 'El correo electrónico, número de teléfono no es correcto!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/fa/field.php b/addons/default/visiosoft/profile-module/resources/lang/fa/field.php index ebb7805f3..386414b7e 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fa/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fa/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'نوع ثبت نام' ], + 'birthday' => [ + 'name' => 'روز تولد' + ], 'identification_number' => [ 'name' => 'شماره شناسایی' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/fa/message.php b/addons/default/visiosoft/profile-module/resources/lang/fa/message.php index f0c90c6a3..c43ae6c18 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fa/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fa/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'هیچ آدرس و یا مجاز به مشاهده نیست.', 'empty_password_sms_message' => 'به دلیل مشکلات امنیتی رمز عبور شما را تغییر دادیم! گذرواژه جدید شما این است:', 'required_all' => "همه زمینه لازم است!", + 'can_not_remove_filled_fields' => "شما نمی توانید زمینه های پر شده را حذف کنید!", // Forgot Password 'email_phone_not_found' => 'ایمیل ، شماره تلفن صحیح نیست!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/fr/field.php b/addons/default/visiosoft/profile-module/resources/lang/fr/field.php index db342a737..333268bc7 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fr/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fr/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Type de registre' ], + 'birthday' => [ + 'name' => 'Anniversaire' + ], 'identification_number' => [ 'name' => 'Numéro d\\'identification' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/fr/message.php b/addons/default/visiosoft/profile-module/resources/lang/fr/message.php index 6c114ed4b..6d6d43389 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/fr/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/fr/message.php @@ -29,6 +29,7 @@ return [ 'ajax_address_error' => 'Aucune adresse ou non autorisé à voir.', 'empty_password_sms_message' => 'En raison de problèmes de sécurité, nous avons changé votre mot de passe! Votre nouveau mot de passe est:', 'required_all' => "Tous les champs sont obligatoires!", + 'can_not_remove_filled_fields' => "Vous ne pouvez pas supprimer les champs remplis!", // Forgot Password 'email_phone_not_found' => 'L\'e-mail, le numéro de téléphone n\'est pas correct!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/he/field.php b/addons/default/visiosoft/profile-module/resources/lang/he/field.php index 11f643910..a565b9804 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/he/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/he/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'סוג הרשמה' ], + 'birthday' => [ + 'name' => 'יום הולדת' + ], 'identification_number' => [ 'name' => 'מספר זיהוי' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/he/message.php b/addons/default/visiosoft/profile-module/resources/lang/he/message.php index f619d2074..831282291 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/he/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/he/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'אין כתובת או לא מורשה להציג.', 'empty_password_sms_message' => 'בגלל בעיות אבטחה, שינינו את הסיסמא שלך! הסיסמה החדשה שלך היא:', 'required_all' => "כל השדה נדרש!", + 'can_not_remove_filled_fields' => "אינך יכול להסיר שדות מלאים!", // Forgot Password 'email_phone_not_found' => 'הדואר האלקטרוני, מספר הטלפון אינו תקין!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/hi/field.php b/addons/default/visiosoft/profile-module/resources/lang/hi/field.php index 952b5e8a3..50931b04d 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/hi/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/hi/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'रजिस्टर प्रकार' ], + 'birthday' => [ + 'name' => 'जन्मदिन' + ], 'identification_number' => [ 'name' => 'पहचान संख्या' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/hi/message.php b/addons/default/visiosoft/profile-module/resources/lang/hi/message.php index 1c8a9086f..c16b451c5 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/hi/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/hi/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'कोई पता या देखने के लिए अधिकृत नहीं है।', 'empty_password_sms_message' => 'सुरक्षा समस्याओं के कारण, हमने आपका पासवर्ड बदल दिया है! आपका नया पासवर्ड है:', 'required_all' => "सभी फ़ील्ड आवश्यक है!", + 'can_not_remove_filled_fields' => "आप भरे हुए खेतों को नहीं हटा सकते हैं!", // Forgot Password 'email_phone_not_found' => 'ई-मेल, फोन नंबर सही नहीं है!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/it/field.php b/addons/default/visiosoft/profile-module/resources/lang/it/field.php index 21c9d7e35..09934961b 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/it/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/it/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Tipo di registro' ], + 'birthday' => [ + 'name' => 'Compleanno' + ], 'identification_number' => [ 'name' => 'Numero identificativo' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/it/message.php b/addons/default/visiosoft/profile-module/resources/lang/it/message.php index 9f94f247e..e41aeab35 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/it/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/it/message.php @@ -29,6 +29,7 @@ return [ 'ajax_address_error' => 'Nessun indirizzo o non autorizzato a visualizzare.', 'empty_password_sms_message' => 'Per problemi di sicurezza, abbiamo cambiato la tua password! La tua nuova password è:', 'required_all' => "Tutti i campi sono obbligatori!", + 'can_not_remove_filled_fields' => "Non puoi rimuovere i campi compilati!", // Forgot Password 'email_phone_not_found' => 'L\'e-mail, il numero di telefono non è corretto!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/ja/field.php b/addons/default/visiosoft/profile-module/resources/lang/ja/field.php index ac91892ea..480340bba 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ja/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ja/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => '登録タイプ' ], + 'birthday' => [ + 'name' => 'お誕生日' + ], 'identification_number' => [ 'name' => '識別番号' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/ja/message.php b/addons/default/visiosoft/profile-module/resources/lang/ja/message.php index 914a5e122..d9f2c769e 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ja/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ja/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => '住所がないか、表示する権限がありません。', 'empty_password_sms_message' => 'セキュリティ上の問題により、パスワードを変更しました！新しいパスワードは：', 'required_all' => "すべてのフィールドが必要です！", + 'can_not_remove_filled_fields' => "塗りつぶされたフィールドは削除できません！", // Forgot Password 'email_phone_not_found' => 'メール、電話番号が違います！', diff --git a/addons/default/visiosoft/profile-module/resources/lang/ko/field.php b/addons/default/visiosoft/profile-module/resources/lang/ko/field.php index 773c78dce..e5bc74744 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ko/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ko/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => '등록 유형' ], + 'birthday' => [ + 'name' => '생신' + ], 'identification_number' => [ 'name' => '식별 번호' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/ko/message.php b/addons/default/visiosoft/profile-module/resources/lang/ko/message.php index 118e4327d..0981f167b 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ko/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ko/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => '주소가 없거나 볼 권한이 없습니다.', 'empty_password_sms_message' => '보안 문제로 인해 비밀번호가 변경되었습니다. 새 비밀번호는 다음과 같습니다.', 'required_all' => "모든 필드는 필수입니다!", + 'can_not_remove_filled_fields' => "채워진 필드를 제거 할 수 없습니다!", // Forgot Password 'email_phone_not_found' => '이메일, 전화 번호가 올바르지 않습니다!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php index 10d14ac4b..366fb9158 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Type register' ], + 'birthday' => [ + 'name' => 'Verjaardag' + ], 'identification_number' => [ 'name' => 'Identificatie Nummer' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/nl/message.php b/addons/default/visiosoft/profile-module/resources/lang/nl/message.php index 906ed3b30..86b307c49 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/nl/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/nl/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Geen adres of niet geautoriseerd om te bekijken.', 'empty_password_sms_message' => 'Vanwege beveiligingsproblemen hebben we uw wachtwoord gewijzigd! Je nieuwe wachtwoord is:', 'required_all' => "Alle velden zijn vereist!", + 'can_not_remove_filled_fields' => "U kunt geen ingevulde velden verwijderen!", // Forgot Password 'email_phone_not_found' => 'Het e-mailadres, telefoonnummer is niet correct!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/pl/field.php b/addons/default/visiosoft/profile-module/resources/lang/pl/field.php index 29b51337c..7ea14b05c 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/pl/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/pl/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Typ rejestru' ], + 'birthday' => [ + 'name' => 'Urodziny' + ], 'identification_number' => [ 'name' => 'Numer identyfikacyjny' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/pl/message.php b/addons/default/visiosoft/profile-module/resources/lang/pl/message.php index ee42e0a49..982b4c085 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/pl/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/pl/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Brak adresu lub brak uprawnień do przeglądania.', 'empty_password_sms_message' => 'Ze względów bezpieczeństwa zmieniliśmy twoje hasło! Twoje nowe hasło to:', 'required_all' => "Wszystkie pola są wymagane!", + 'can_not_remove_filled_fields' => "Nie możesz usunąć wypełnionych pól!", // Forgot Password 'email_phone_not_found' => 'Adres e-mail, numer telefonu jest nieprawidłowy!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/pt/field.php b/addons/default/visiosoft/profile-module/resources/lang/pt/field.php index 670041b11..3eecb6c9f 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/pt/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/pt/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Tipo de registro' ], + 'birthday' => [ + 'name' => 'Aniversário' + ], 'identification_number' => [ 'name' => 'Número de identificação' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/pt/message.php b/addons/default/visiosoft/profile-module/resources/lang/pt/message.php index 3d2f57b67..025a7949a 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/pt/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/pt/message.php @@ -31,6 +31,7 @@ return [ 'ajax_address_error' => 'Nenhum endereço ou não está autorizado a visualizar.', 'empty_password_sms_message' => 'Devido a problemas de segurança, alteramos sua senha! Sua nova senha é:', 'required_all' => "Todo o campo é obrigatório!", + 'can_not_remove_filled_fields' => "Você não pode remover os campos preenchidos!", // Forgot Password 'email_phone_not_found' => 'O e-mail, número de telefone não está correto!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/ro/field.php b/addons/default/visiosoft/profile-module/resources/lang/ro/field.php index e37ca927d..586452d10 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ro/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ro/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Tip de înregistrare' ], + 'birthday' => [ + 'name' => 'Zi de nastere' + ], 'identification_number' => [ 'name' => 'Numar de identificare' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/ro/message.php b/addons/default/visiosoft/profile-module/resources/lang/ro/message.php index 83347bf85..34702bc7a 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ro/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ro/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Nicio adresă sau nu este autorizată să vizualizeze.', 'empty_password_sms_message' => 'Din cauza problemelor de securitate, v-am schimbat parola! Noua dvs. parolă este:', 'required_all' => "Tot câmpul este obligatoriu!", + 'can_not_remove_filled_fields' => "Nu puteți elimina câmpurile umplute!", // Forgot Password 'email_phone_not_found' => 'E-mailul, numărul de telefon nu este corect!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/ru/field.php b/addons/default/visiosoft/profile-module/resources/lang/ru/field.php index 14810a8c9..5b04cb53d 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ru/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ru/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Тип регистрации' ], + 'birthday' => [ + 'name' => 'День рождения' + ], 'identification_number' => [ 'name' => 'Идентификационный номер' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/ru/message.php b/addons/default/visiosoft/profile-module/resources/lang/ru/message.php index 3ce635297..473d42daf 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ru/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ru/message.php @@ -31,6 +31,7 @@ return [ 'ajax_address_error' => 'Нет адреса или не авторизован для просмотра.', 'empty_password_sms_message' => 'Из-за проблем безопасности мы изменили ваш пароль! Ваш новый пароль:', 'required_all' => "Все поля обязательны для заполнения!", + 'can_not_remove_filled_fields' => "Заполненные поля удалить нельзя!", // Forgot Password 'email_phone_not_found' => 'E-mail, номер телефона неверен!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/sq/field.php b/addons/default/visiosoft/profile-module/resources/lang/sq/field.php index f0c632930..9d4e84e43 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/sq/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/sq/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Tipi i regjistrimit' ], + 'birthday' => [ + 'name' => 'Ditëlindja' + ], 'identification_number' => [ 'name' => 'Numrin e identifikimit' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/sq/message.php b/addons/default/visiosoft/profile-module/resources/lang/sq/message.php index 16dc3cee2..d8cdd5aae 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/sq/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/sq/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Asnjë adresë ose jo e autorizuar për të parë.', 'empty_password_sms_message' => 'Për shkak të çështjeve të sigurisë, ne ndryshuam fjalëkalimin tuaj! Fjalëkalimi juaj i ri është:', 'required_all' => "Kërkohet e gjithë fusha!", + 'can_not_remove_filled_fields' => "Ju nuk mund të hiqni fushat e mbushura!", // Forgot Password 'email_phone_not_found' => 'E-maili, numri i telefonit nuk është i saktë!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/sv/field.php b/addons/default/visiosoft/profile-module/resources/lang/sv/field.php index 28bfa9638..64ebdf25d 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/sv/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/sv/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Registreringstyp' ], + 'birthday' => [ + 'name' => 'Födelsedag' + ], 'identification_number' => [ 'name' => 'Identifieringsnummer' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/sv/message.php b/addons/default/visiosoft/profile-module/resources/lang/sv/message.php index c20f75d1a..ff42328d8 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/sv/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/sv/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Ingen adress eller inte behörig att visa.', 'empty_password_sms_message' => 'På grund av säkerhetsproblem har vi ändrat ditt lösenord! Ditt nya lösenord är:', 'required_all' => "Allt fält krävs!", + 'can_not_remove_filled_fields' => "Du kan inte ta bort fyllda fält!", // Forgot Password 'email_phone_not_found' => 'E-post, telefonnummer är inte korrekt!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/field.php b/addons/default/visiosoft/profile-module/resources/lang/tr/field.php index fd2610675..54c038dca 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/tr/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Üyelik Tipi' ], + 'birthday' => [ + 'name' => 'Doğum günü' + ], 'identification_number' => [ 'name' => 'Kimlik Numarası' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/tr/message.php b/addons/default/visiosoft/profile-module/resources/lang/tr/message.php index 68aed29b7..0dd4f3d0e 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/tr/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/tr/message.php @@ -13,7 +13,7 @@ return [ "login_info_old_user" => "E-posta adresinize yeni bir şifre gönderildi.", "success" => "İşlem Başarılı", "notified_new_updates" => "Yeni güncellemelerden haberdar olmak istiyorum", - "notified_about_ads" => "Reklamlarım hakkında bildirimlere izin ver", + "notified_about_ads" => "İlanlarım hakkında bildirimlere izin ver", "receive_messages_email" => "Mesajları e-posta olarak almak istiyorum", "no_packages_module" => "Paket Modülü Bulunamadı!", "required_add"=> "Lütfen gerekli tüm satırları doldurun.", @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Adres yok veya görüntüleme yetkiniz bulunmamaktadır.', 'empty_password_sms_message' => 'Güvenlik sorunları nedeniyle şifrenizi değiştirdik! Yeni parolanız:', 'required_all' => "Tüm Alanlar Zorunludur!", + 'can_not_remove_filled_fields' => "Doldurulmuş alanları kaldıramazsınız!", // Forgot Password 'email_phone_not_found' => 'E-posta, Telefon Numarası doğru değil!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/uk/field.php b/addons/default/visiosoft/profile-module/resources/lang/uk/field.php index d81046cbf..c48fb8e9f 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/uk/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/uk/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Тип реєстру' ], + 'birthday' => [ + 'name' => 'День народження' + ], 'identification_number' => [ 'name' => 'Ідентифікаційний номер' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/uk/message.php b/addons/default/visiosoft/profile-module/resources/lang/uk/message.php index 61a7c1b44..39de4a60c 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/uk/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/uk/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Немає адреси або не має права перегляду.', 'empty_password_sms_message' => 'Через проблеми безпеки ми змінили ваш пароль! Ваш новий пароль:', 'required_all' => "Поле обов'язкове!", + 'can_not_remove_filled_fields' => "Ви не можете видалити заповнені поля!", // Forgot Password 'email_phone_not_found' => 'Неправильний електронний лист, номер телефону!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/ur/field.php b/addons/default/visiosoft/profile-module/resources/lang/ur/field.php index 31f5216b5..5ccf5245b 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ur/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ur/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'رجسٹر کی قسم' ], + 'birthday' => [ + 'name' => 'Birthday' + ], 'identification_number' => [ 'name' => 'شناختی نمبر' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/ur/message.php b/addons/default/visiosoft/profile-module/resources/lang/ur/message.php index 79fdc2703..ec3e56351 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/ur/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/ur/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'کوئی پتہ اور نہ ہی دیکھنے کا اختیار ہے۔', 'empty_password_sms_message' => 'سیکیورٹی کے مسائل کی وجہ سے ، ہم نے آپ کا پاس ورڈ تبدیل کردیا! آپ کا نیا پاس ورڈ یہ ہے:', 'required_all' => "تمام فیلڈ کی ضرورت ہے!", + 'can_not_remove_filled_fields' => "آپ بھرے کھیتوں کو نہیں ہٹا سکتے!", // Forgot Password 'email_phone_not_found' => 'ای میل ، فون نمبر درست نہیں ہے!', diff --git a/addons/default/visiosoft/profile-module/resources/lang/vi/field.php b/addons/default/visiosoft/profile-module/resources/lang/vi/field.php index ed2e4c01a..b5a5101ac 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/vi/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/vi/field.php @@ -55,6 +55,9 @@ return [ 'register_type' => [ 'name' => 'Đăng ký loại' ], + 'birthday' => [ + 'name' => 'Sinh nhật' + ], 'identification_number' => [ 'name' => 'Mã số' ], diff --git a/addons/default/visiosoft/profile-module/resources/lang/vi/message.php b/addons/default/visiosoft/profile-module/resources/lang/vi/message.php index 34e932c10..481efc259 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/vi/message.php +++ b/addons/default/visiosoft/profile-module/resources/lang/vi/message.php @@ -28,6 +28,7 @@ return [ 'ajax_address_error' => 'Không có địa chỉ hoặc không được phép xem.', 'empty_password_sms_message' => 'Do vấn đề bảo mật, chúng tôi đã thay đổi mật khẩu của bạn! Mật khẩu mới của bạn là:', 'required_all' => "Tất cả các lĩnh vực là bắt buộc!", + 'can_not_remove_filled_fields' => "Bạn không thể loại bỏ các trường đã điền!", // Forgot Password 'email_phone_not_found' => 'E-mail, số điện thoại không chính xác!', From 821bcd4cc81621168df649c12c9778cf3c6a5944 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Wed, 21 Oct 2020 15:40:50 +0300 Subject: [PATCH 55/72] #2342 [seo-module] Create --- .../src/Http/Controller/advsController.php | 69 +++++++++++-------- .../src/Category/CategoryRepository.php | 2 +- 2 files changed, 40 insertions(+), 31 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 969f80a16..8c8a3b8a1 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -254,15 +254,6 @@ class AdvsController extends PublicController if ($categoryId) { - $seo_keywords = $this->category_model->getMeta_keywords($categoryId->id); - $seo_description = $this->category_model->getMeta_description($categoryId->id); - $seo_title = $this->category_model->getMeta_title($categoryId->id); - - $this->template->set('og_description', $seo_description); - $this->template->set('meta_description', $seo_description); - $this->template->set('meta_title', $seo_title); - $this->template->set('meta_keywords', implode(', ', $seo_keywords)); - $mainCats = $this->category_model->getMains($categoryId->id); $current_cat = $this->category_model->getCat($categoryId->id); $mainCats[] = [ @@ -369,13 +360,36 @@ class AdvsController extends PublicController $viewType = $this->requestHttp->cookie('viewType'); - $catText = ''; - if (!$allCats) { - if (count($mainCats) == 1 || count($mainCats) == 2) { + list('catText' => $catText, 'user' => $user) = $this->handleSeo($categoryId, $mainCats, $cityId); + + $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'param', + 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', + 'seenList', 'radio', 'categoryId', 'cityId', 'allCats', 'catText', 'cFArray'); + + return $this->viewTypeBasedRedirect($viewType, $compact); + } + + private function handleSeo($category, $mainCats, $city) + { + $showTitle = true; + $metaTitle = ''; + + if ($category) { + $seo_keywords = $this->category_model->getMeta_keywords($category->id); + $seo_description = $this->category_model->getMeta_description($category->id); + $seo_title = $this->category_model->getMeta_title($category->id); + + $this->template->set('og_description', $seo_description); + $this->template->set('meta_description', $seo_description); + $this->template->set('meta_keywords', implode(', ', $seo_keywords)); + + $catText = ''; + if ($city) { + $catText = "$city->name $catText"; + } elseif (count($mainCats) == 1 || count($mainCats) == 2) { $catText = end($mainCats)['val']; } elseif (count($mainCats) > 2) { $catArray = array_slice($mainCats, 2); - $catText = ''; $loop = 0; foreach ($catArray as $cat) { $catText = !$loop ? $catText . $cat['val'] : $catText . ' ' . $cat['val']; @@ -383,34 +397,29 @@ class AdvsController extends PublicController } } - if ($cityId) { - $catText = "$cityId->name $catText"; - } - - $this->template->set('showTitle', false); - $this->template->set('meta_title', $catText); + $showTitle = false; + $metaTitle = $catText ?: $seo_title; } $user = null; - if (!empty($param['user'])) { - $user = $this->userRepository->find($param['user']); - $this->template->set('showTitle', false); - $this->template->set('meta_title', $user->name() . ' ' . trans('visiosoft.module.advs::field.ads')); + if (\request()->user) { + $user = $this->userRepository->find(\request()->user); + $showTitle = false; + $metaTitle = $user->name() . ' ' . trans('visiosoft.module.advs::field.ads'); } + $this->template->set('showTitle', $showTitle); + $this->template->set('meta_title', $metaTitle); + // Set rel="canonical" - if (array_key_exists('sort_by', $param) || array_key_exists('doping', $param)) { - $canonParam = $param; + if (\request()->sort_by || \request()->doping) { + $canonParam = \request()->all(); 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', - 'seenList', 'radio', 'categoryId', 'cityId', 'allCats', 'catText', 'cFArray'); - - return $this->viewTypeBasedRedirect($viewType, $compact); + return compact('catText', 'user'); } public function viewTypeBasedRedirect($viewType, $compact) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php index 3f7995a8b..d92229ef1 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php @@ -35,7 +35,7 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn public function mainCats() { - return $this->model->where('parent_category_id', null)->where('deleted_at', null)->orderBy('sort_order')->get(); + return $this->model->where('parent_category_id', null)->orderBy('sort_order')->get(); } public function getItem($cat) From 161977ef08c9f5b9944b80a8534853dc0c2e2e93 Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Wed, 21 Oct 2020 17:12:01 +0300 Subject: [PATCH 56/72] #2438 standard price always 0 fixed --- .../resources/views/new-ad/new-create.twig | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 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 4ccfbcfda..bd3a7c660 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,33 +58,33 @@ {{ form.fields.slug|raw }} </div> </div> - <div class="col-12 standard-price-hidden d-none"> - {{ form.fields.standard_price.setAttributes({ - 'required' :true, - }).input|raw }} - </div> + {% if setting_value('visiosoft.module.advs::market_place') %} {{ addBlock('new-ad/fields', {'adv': adv})|raw }} - - <div class="row form-group select-price{{ setting_value('visiosoft.module.advs::hide_standard_price_field') ? ' d-none' }}"> - <label class="col-sm-2 col-xs-12"> - {{ form.fields.standard_price.label|raw }} - <span class="required">*</span> - </label> - - {% set standardPriceValue = form.fields.standard_price.value|split('.') %} - <div class="col-8 pr-0 col-md-3"> - <input class="form-control standard-price-field whole-price" - value="{{ standardPriceValue|first }}"> - </div> - <div class="col-4 col-md-1"> - <input class="form-control standard-price-decimal-field decimal-price" - placeholder="00" maxlength="2" - value="{{ standardPriceValue[1] }}"> - </div> - </div> {% endif %} - + <div class="row form-group select-price + {{ setting_value('visiosoft.module.advs::hide_standard_price_field') ? ' d-none' }} + {{ setting_value('visiosoft.module.advs::market_place') != true ? 'd-none' }}"> + <label class="col-sm-2 col-xs-12"> + {{ form.fields.standard_price.label|raw }} + <span class="required">*</span> + </label> + <div class="col-12 standard-price-hidden d-none"> + {{ form.fields.standard_price.setAttributes({ + 'required' :true + }).input|raw }} + </div> + {% set standardPriceValue = form.fields.standard_price.value|split('.') %} + <div class="col-8 pr-0 col-md-3"> + <input class="form-control standard-price-field whole-price" + value="{{ standardPriceValue|first }}"> + </div> + <div class="col-4 col-md-1"> + <input class="form-control standard-price-decimal-field decimal-price" + placeholder="00" maxlength="2" + value="{{ standardPriceValue[1] }}"> + </div> + </div> <div class="row form-group select-price"> <label class="col-sm-2 col-xs-12"> From b60004ae1548574b03fd89b77ed05a51a3854225 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Wed, 21 Oct 2020 18:01:21 +0300 Subject: [PATCH 57/72] =?UTF-8?q?#2436=20Ad=20post=20"L=C3=BCtfen=20Paket?= =?UTF-8?q?=20Sat=C4=B1n=20Al=C4=B1n!"=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 4 ++-- .../advs-module/src/Http/Controller/advsController.php | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index bf879d2ad..e48dab82a 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -67,9 +67,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface return $query->where('advs_advs.slug', '!=', ""); } - public function userAdv($nullable_ad = false) + public function userAdv($nullable_ad = false, $checkRole = true) { - if (Auth::user()->hasRole('admin')) { + if (Auth::user()->hasRole('admin') && $checkRole) { return $this->getAdv(null, $nullable_ad); } else { return $this->getAdv(null, $nullable_ad) 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 710bbbbce..788713470 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -667,8 +667,7 @@ class AdvsController extends PublicController CategoryRepositoryInterface $categoryRepository, Dispatcher $events, AdvModel $advModel, - AdressRepositoryInterface $address, - CategoryModel $categoryModel + AdressRepositoryInterface $address ) { if (!Auth::user()) { @@ -693,10 +692,10 @@ class AdvsController extends PublicController if ($advModel->is_enabled('packages') and $adv->slug == "") { $cat = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForNewAd($request); if (!is_null($cat)) { - if (is_array($cat) && array_key_exists('allowPendingAds', $cat)) { + if (array_key_exists('allowPendingAds', $cat)) { $allowPendingAdCreation = $cat['allowPendingAds']; } else { - return redirect('/'); + return redirect($cat['redirect']); } } } From ab1791f10a3fa42cde5b257441f475c31961a267 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Wed, 21 Oct 2020 18:04:45 +0300 Subject: [PATCH 58/72] fix --- .../advs-module/src/Http/Controller/advsController.php | 2 +- 1 file changed, 1 insertion(+), 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 788713470..62c5af4da 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -373,6 +373,7 @@ class AdvsController extends PublicController { $showTitle = true; $metaTitle = ''; + $catText = ''; if ($category) { $seo_keywords = $this->category_model->getMeta_keywords($category->id); @@ -383,7 +384,6 @@ class AdvsController extends PublicController $this->template->set('meta_description', $seo_description); $this->template->set('meta_keywords', implode(', ', $seo_keywords)); - $catText = ''; if ($city) { $catText = "$city->name $catText"; } elseif (count($mainCats) == 1 || count($mainCats) == 2) { From 2a0ed75c9d993691a3e1b9fa9d735d3e60b2694c Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Thu, 22 Oct 2020 09:53:58 +0300 Subject: [PATCH 59/72] #2445 When auto approve is closed, the owner can't see his ad --- .../advs-module/src/Http/Controller/advsController.php | 2 +- 1 file changed, 1 insertion(+), 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 62c5af4da..5604faefe 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -450,7 +450,7 @@ class AdvsController extends PublicController $adv = $this->adv_repository->getListItemAdv($id); - if ($adv && !$adv->expired()) { + if ($adv && (!$adv->expired()) || $adv->created_by_id === \auth()->id()) { if ($this->adv_model->is_enabled('complaints')) { $complaints = ComplaintsComplainTypesEntryModel::all(); From 06cab5b2033c27bc460a7c32b0e03ee7f38c35d8 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Thu, 22 Oct 2020 09:56:02 +0300 Subject: [PATCH 60/72] #2445 When auto approve is closed, the owner can't see his ad --- .../advs-module/src/Http/Controller/advsController.php | 2 +- 1 file changed, 1 insertion(+), 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 5604faefe..db7d0b52d 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -450,7 +450,7 @@ class AdvsController extends PublicController $adv = $this->adv_repository->getListItemAdv($id); - if ($adv && (!$adv->expired()) || $adv->created_by_id === \auth()->id()) { + if ($adv && (!$adv->expired() || $adv->created_by_id === \auth()->id())) { if ($this->adv_model->is_enabled('complaints')) { $complaints = ComplaintsComplainTypesEntryModel::all(); From 187bc7bb933fd63ac2a27abe0fcde6cc26cfb374 Mon Sep 17 00:00:00 2001 From: vedatakd <vedat@vebze.com> Date: Thu, 22 Oct 2020 17:23:58 +0300 Subject: [PATCH 61/72] fixed message --- .../profile-module/src/Profile/Profile/ProfileFormHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f98368903..aae2f88f6 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Profile/ProfileFormHandler.php @@ -36,7 +36,7 @@ class ProfileFormHandler // Prevent removing already filled fields foreach ($parameters as $field => $value) { if ($user->$field && !$value) { - $messages->error('visiosoft.module.profile::message.can_not_changed_filled_fields'); + $messages->error('visiosoft.module.profile::message.can_not_remove_filled_fields'); return; } } From 508e0ab15d8cc3ce0ff58a60ce069c75edd18f5e Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 23 Oct 2020 10:46:01 +0300 Subject: [PATCH 62/72] #2450 store module (e-madencilik) improvments --- .../advs-module/src/Adv/AdvModel.php | 8 ++ .../src/Adv/Contract/AdvInterface.php | 76 +++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index e48dab82a..4ca026c95 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -13,6 +13,7 @@ use Visiosoft\LocationModule\Country\CountryModel; use Visiosoft\CartsModule\Cart\Command\GetCart; use Visiosoft\LocationModule\District\DistrictModel; use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel; +use Visiosoft\LocationModule\Village\VillageModel; class AdvModel extends AdvsAdvsEntryModel implements AdvInterface { @@ -373,6 +374,13 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface return $neighborhood ? $neighborhood->name : false; } + public function getVillage() + { + $villageModel = new VillageModel(); + $village = $villageModel->newQuery()->find($this->village); + return $village ? $village->name : false; + } + public function expired() { return $this->finish_at ? $this->finish_at < Carbon::now() : true; diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php index a9cb314fd..586b7a94a 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php @@ -4,5 +4,81 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface AdvInterface extends EntryInterface { + public function is_enabled($slug); + + public function is_enabled_extension($slug); + + public function is_active($id); + + public function getAdv($id = null, $nullable_ad = false, $trashed = false); + + public function userAdv($nullable_ad = false, $checkRole = true); + + public function getAdvByCat($cat_id); + + public function pendingAdvsByUser(); + + public function favsAdvsByUser($fav_ids); + + public function myAdvsByUser(); + + public function foreignCurrency($currency, $price, $isUpdate, $settings); + + public function popularAdvs(); + + public function advsofDay(); + + public function statusAds($id, $status); + + public function finish_at_Ads($id, $endDate); + + public function publish_at_Ads($id); + + public function getLastUserAdv(); + + public function getLocationNames($advs); + + public function isAdv($id); + + public function addCart($item, $quantity = 1, $name = null); + + public function getAdvDetailLinkByModel($object, $type = null); + + public function getAdvDetailLinkByAdId($id); + + public function getAdvimage($id); + + public function getLatestField($slug); + + public function updateStock($id, $quantity); + + public function stockControl($id, $quantity); + + public function saveCustomField($category_id, $field_id, $name); + + public function customfields(); + + public function priceFormat($adv); + + public function AddAdsDefaultCoverImage($ad); + + public function GetAdsDefaultCoverImageByAdId($id); + + public function viewed_Ad($id); + + public function getRecommended($id); + + public function authControl(); + + public function inStock(); + + public function getCity(); + + public function getDistrict(); + + public function getNeighborhood(); + + public function getVillage(); + public function expired(); } From 3f22510051aa1217c67a99b3090dfdd6f85226bf Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 23 Oct 2020 10:55:32 +0300 Subject: [PATCH 63/72] add repo --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 4ca026c95..41949da7a 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -13,6 +13,7 @@ use Visiosoft\LocationModule\Country\CountryModel; use Visiosoft\CartsModule\Cart\Command\GetCart; use Visiosoft\LocationModule\District\DistrictModel; use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel; +use Visiosoft\LocationModule\Village\Contract\VillageRepositoryInterface; use Visiosoft\LocationModule\Village\VillageModel; class AdvModel extends AdvsAdvsEntryModel implements AdvInterface @@ -376,8 +377,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface public function getVillage() { - $villageModel = new VillageModel(); - $village = $villageModel->newQuery()->find($this->village); + $village = app(VillageRepositoryInterface::class)->find($this->village); return $village ? $village->name : false; } From 99a53a863f432bfe19a04574c1804eba61eb26c1 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 23 Oct 2020 11:17:47 +0300 Subject: [PATCH 64/72] #2466 [packages-module] error when trying to approve package --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index a843841bd..34a6266a4 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -451,7 +451,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface public function approveAds($adsIDs) { $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time'); - $ads = $this->newQuery()->where('advs_advs.id', $adsIDs)->update([ + $ads = $this->newQuery()->whereIn('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') From 6981ac09f0e455e320ade6d239cfe6d2d34f8918 Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Fri, 23 Oct 2020 12:05:55 +0300 Subject: [PATCH 65/72] product options add cart --- .../factories/OptionConfigurationFactory.php | 10 -- .../factories/OptionsConfigurationFactory.php | 10 -- .../factories/ProductoptionFactory.php | 10 -- .../factories/ProductoptionsValueFactory.php | 10 -- ...ule.advs__create_productoptions_stream.php | 7 +- ...vs__create_option_configuration_stream.php | 1 + .../views/ad-detail/partials/detail.twig | 39 +++++- .../views/new-ad/preview/preview.twig | 8 ++ .../advs-module/src/Adv/AdvRepository.php | 4 + .../Adv/Contract/AdvRepositoryInterface.php | 2 + .../src/AdvsModuleServiceProvider.php | 14 +- .../OptionConfigurationController.php | 59 +++++++++ .../src/Http/Controller/advsController.php | 24 +++- ...OptionConfigurationRepositoryInterface.php | 2 + .../OptionConfigurationModel.php | 8 +- .../OptionConfigurationRepository.php | 122 ++++++++++++++---- .../Table/OptionConfigurationTableColumns.php | 6 +- .../src/OptionHandler/CategoriesOptions.php | 21 +++ .../Contract/ProductoptionsValueInterface.php | 2 +- .../ProductoptionsValueModel.php | 5 +- .../OptionConfigurationFormBuilderTest.php | 8 -- .../OptionConfigurationCollectionTest.php | 8 -- .../OptionConfigurationCriteriaTest.php | 8 -- .../OptionConfigurationModelTest.php | 8 -- .../OptionConfigurationObserverTest.php | 8 -- .../OptionConfigurationPresenterTest.php | 8 -- .../OptionConfigurationRepositoryTest.php | 8 -- .../OptionConfigurationRouterTest.php | 8 -- .../OptionConfigurationSeederTest.php | 8 -- .../OptionConfigurationTableBuilderTest.php | 8 -- .../OptionsConfigurationFormBuilderTest.php | 8 -- .../OptionsConfigurationCollectionTest.php | 8 -- .../OptionsConfigurationCriteriaTest.php | 8 -- .../OptionsConfigurationModelTest.php | 8 -- .../OptionsConfigurationObserverTest.php | 8 -- .../OptionsConfigurationPresenterTest.php | 8 -- .../OptionsConfigurationRepositoryTest.php | 8 -- .../OptionsConfigurationRouterTest.php | 8 -- .../OptionsConfigurationSeederTest.php | 8 -- .../OptionsConfigurationTableBuilderTest.php | 8 -- .../Form/ProductoptionFormBuilderTest.php | 8 -- .../ProductoptionCollectionTest.php | 8 -- .../ProductoptionCriteriaTest.php | 8 -- .../Productoption/ProductoptionModelTest.php | 8 -- .../ProductoptionObserverTest.php | 8 -- .../ProductoptionPresenterTest.php | 8 -- .../ProductoptionRepositoryTest.php | 8 -- .../Productoption/ProductoptionRouterTest.php | 8 -- .../Productoption/ProductoptionSeederTest.php | 8 -- .../Table/ProductoptionTableBuilderTest.php | 8 -- .../ProductoptionsValueFormBuilderTest.php | 8 -- .../ProductoptionsValueCollectionTest.php | 8 -- .../ProductoptionsValueCriteriaTest.php | 8 -- .../ProductoptionsValueModelTest.php | 8 -- .../ProductoptionsValueObserverTest.php | 8 -- .../ProductoptionsValuePresenterTest.php | 8 -- .../ProductoptionsValueRepositoryTest.php | 8 -- .../ProductoptionsValueRouterTest.php | 8 -- .../ProductoptionsValueSeederTest.php | 8 -- .../ProductoptionsValueTableBuilderTest.php | 8 -- 60 files changed, 284 insertions(+), 400 deletions(-) delete mode 100644 addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php delete mode 100644 addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php delete mode 100644 addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php delete mode 100644 addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php create mode 100644 addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php create mode 100644 addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php delete mode 100644 addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php diff --git a/addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php b/addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php deleted file mode 100644 index 86a320aa0..000000000 --- a/addons/default/visiosoft/advs-module/factories/OptionConfigurationFactory.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -$factory->define( - Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel::class, - function (Faker\Generator $faker) { - return [ - //'title' => $faker->words(2), - ]; - } -); diff --git a/addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php b/addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php deleted file mode 100644 index b6bbb136f..000000000 --- a/addons/default/visiosoft/advs-module/factories/OptionsConfigurationFactory.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -$factory->define( - Visiosoft\AdvsModule\OptionsConfiguration\OptionsConfigurationModel::class, - function (Faker\Generator $faker) { - return [ - //'title' => $faker->words(2), - ]; - } -); diff --git a/addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php b/addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php deleted file mode 100644 index 7a1bc3379..000000000 --- a/addons/default/visiosoft/advs-module/factories/ProductoptionFactory.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -$factory->define( - Visiosoft\AdvsModule\Productoption\ProductoptionModel::class, - function (Faker\Generator $faker) { - return [ - //'title' => $faker->words(2), - ]; - } -); diff --git a/addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php b/addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php deleted file mode 100644 index bdfb8e393..000000000 --- a/addons/default/visiosoft/advs-module/factories/ProductoptionsValueFactory.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -$factory->define( - Visiosoft\AdvsModule\ProductoptionsValue\ProductoptionsValueModel::class, - function (Faker\Generator $faker) { - return [ - //'title' => $faker->words(2), - ]; - } -); diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php index a8bdf8a7f..0f1e87a29 100644 --- a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php @@ -15,7 +15,12 @@ class VisiosoftModuleAdvsCreateProductoptionsStream extends Migration protected $delete = true; protected $fields = [ - 'categories' => 'anomaly.field_type.select', + 'categories' => [ + 'type' => 'anomaly.field_type.select', + 'config' => [ + 'handler' => 'Visiosoft\AdvsModule\OptionHandler\CategoriesOptions@handle' + ] + ], ]; /** * The stream definition. diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php index b42c31acf..456ec6a8c 100644 --- a/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_16_124151_visiosoft.module.advs__create_option_configuration_stream.php @@ -52,6 +52,7 @@ class VisiosoftModuleAdvsCreateOptionConfigurationStream extends Migration ], 'option_json' => [ 'required' => true, + 'unique' => true, ], ]; 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..6d48e678c 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 @@ -44,10 +44,41 @@ {{ adv.created_at|date('d/m/Y') }} </div> - <!-- Detail With Block --> - {{ addBlock('ad-detail/details',{'adv':adv, 'options':options})|raw }} - {{ addBlock('ad-detail/widget-details',{'adv':adv})|raw }} - <!-- Detail With Block --> + +{# {{ dd(configurations) }}#} + {% if configurations != null %} + <div class="col-12 justify-content-start pl-0 row m-0"> + <form action="{{ route('configuration::add_cart') }}" class=""> + <div class="row mb-1"> + <div class="input-group col-12"> + <select name="configuration" id="" class="form-control"> + {% for key, configuration in configurations %} + <option value="{{ key }}"> + {{ configuration.name }} - {{ configuration.price }} {{ configuration.currency }} + </option> + {% endfor %} + </select> + </div> + </div> + <div class="row"> + <div class="input-group col-6 quantity-row"> + <input type="number" data-id="29" name="quantity" class="form-control text-center quantity" value="1" min="1"> + </div> + <div class="col-6 p-0"> + <button class="btn btn-success text-white" type="submit"> + <i class="fa fa-shopping-cart"></i> + Sepete Ekle + </button> + </div> + </div> + </form> + </div> + {% else %} + <!-- Detail With Block --> + {{ addBlock('ad-detail/details',{'adv':adv, 'options':options})|raw }} + {{ addBlock('ad-detail/widget-details',{'adv':adv})|raw }} + <!-- Detail With Block --> + {% endif %} {% if adv.isCorporate == 2 %} <div class="col-md-12 m-2"> diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index 1c52f2e32..243164093 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -14,6 +14,10 @@ {% else %} {% set continueLink = url_route('adv_detail_seo', [adv.slug, adv.id]) %} {% endif %} + <a href="{{ route('visiosoft.module.advs::user.configrations.create') }}?ad={{ adv.id }}" + class="btn btn-warning shadow-sm mr-4 text-white"> + Konfigürasyon Oluştur + </a> <a href="{{ url_route('visiosoft.module.advs::edit_adv', [adv.id]) }}" class="btn preview-edit shadow-sm border"> {{ trans('visiosoft.module.advs::field.edit') }} @@ -27,6 +31,10 @@ <div class="preview-overlay position-absolute"></div> </div> <div class="preview-actions text-center"> + <a href="{{ route('visiosoft.module.advs::user.configrations.create') }}?ad={{ adv.id }}" + class="btn btn-warning shadow-sm mr-4 text-white"> + Konfigürasyon Oluştur + </a> <a href="{{ url_route('visiosoft.module.advs::edit_adv', [adv.id]) }}" class="btn preview-edit shadow-sm border"> {{ trans('visiosoft.module.advs::field.edit') }} </a> diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index e39e5580a..226494a47 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -447,4 +447,8 @@ 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 getName($id){ + return $this->find($id)->name; + } } 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..bb2504338 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 getName($id); } diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index e6a622850..1070f7bb7 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -221,7 +221,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider // Others 'advs/ttr/{id}' => 'Visiosoft\PackagesModule\Http\Controller\packageFEController@advsStatusbyUser', - //Configrations Admin Controller + //Configurations Admin Controller 'admin/advs/option_configuration/create' => [ 'as' => 'visiosoft.module.advs::configrations.create', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@create', @@ -230,6 +230,18 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'visiosoft.module.advs::configrations.index', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@index', ], + + //Configuration Controller + 'advs/option_configuration/create' => [ + 'as' => 'visiosoft.module.advs::user.configrations.create', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@create', + ], + 'conf/addCart' => [ + 'as' => 'configuration::add_cart', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@confAddCart', + ], + + ]; /** diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php new file mode 100644 index 000000000..5c63a842c --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php @@ -0,0 +1,59 @@ +<?php namespace Visiosoft\AdvsModule\Http\Controller; + +use Anomaly\Streams\Platform\Http\Controller\PublicController; +use Anomaly\Streams\Platform\Model\Configuration\ConfigurationConfigurationEntryModel; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; +use Visiosoft\AdvsModule\Adv\AdvModel; +use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\Form\OptionConfigurationFormBuilder; +use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel; +use Visiosoft\CartsModule\Cart\CartModel; +use Visiosoft\CartsModule\Cart\CartRepository; +use Visiosoft\CartsModule\Cart\Command\GetCart; + +class OptionConfigurationController extends PublicController +{ + private $advRepository; + private $adv_model; + private $optionConfigurationModel; + private $optionConfigurationRepository; + + public function __construct( + AdvRepositoryInterface $advRepository, + AdvModel $advModel, + OptionConfigurationModel $optionConfigurationModel, + OptionConfigurationRepositoryInterface $optionConfigurationRepository + ) + { + $this->advRepository = $advRepository; + $this->adv_model = $advModel; + $this->optionConfigurationModel = $optionConfigurationModel; + $this->optionConfigurationRepository = $optionConfigurationRepository; + parent::__construct(); + } + + public function create(OptionConfigurationFormBuilder $form) + { + $form->setOption('redirect', route('advs_preview', [request('ad')])); + return $form->render(); + } + + public function confAddCart() + { + $conf = $this->optionConfigurationRepository->find($this->request->configuration); + + $conf->name = $this->optionConfigurationRepository->getName($this->request->configuration); + + $this->adv_model->authControl(); + + if ($conf->stock < $this->request->quantity){ + return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]); + }else{ + $cart = $this->dispatch(new GetCart()); + $cart->add($conf, $this->request->quantity); + return $this->redirect->to(route('visiosoft.module.carts::cart')); + } + } +} 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..43cc8df16 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -19,6 +19,10 @@ use Visiosoft\AdvsModule\Adv\Event\showAdPhone; use Visiosoft\AdvsModule\Adv\Event\viewAd; use Visiosoft\AdvsModule\Adv\Form\AdvFormBuilder; use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; use Visiosoft\AlgoliaModule\Search\SearchModel; use Visiosoft\CatsModule\Category\CategoryModel; use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface; @@ -40,6 +44,10 @@ class AdvsController extends PublicController private $adv_model; private $adv_repository; + private $optionConfigurationRepository; + private $productOptionRepository; + private $productOptionsValueRepository; + private $country_repository; private $city_model; @@ -66,6 +74,10 @@ class AdvsController extends PublicController AdvModel $advModel, AdvRepositoryInterface $advRepository, + OptionConfigurationRepositoryInterface $optionConfigurationRepository, + ProductoptionRepositoryInterface $productOptionRepository, + ProductoptionsValueRepositoryInterface $productOptionsValueRepository, + CountryRepositoryInterface $country_repository, CityModel $city_model, @@ -94,6 +106,10 @@ class AdvsController extends PublicController $this->adv_model = $advModel; $this->adv_repository = $advRepository; + $this->optionConfigurationRepository = $optionConfigurationRepository; + $this->productOptionRepository = $productOptionRepository; + $this->productOptionsValueRepository = $productOptionsValueRepository; + $this->country_repository = $country_repository; $this->city_model = $city_model; @@ -502,9 +518,11 @@ class AdvsController extends PublicController } $this->template->set('meta_image', $coverPhoto); - if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") { + $configurations = $this->optionConfigurationRepository->getConf($adv->id); + + 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', - 'recommended_advs', 'categories', 'features', 'comments', 'qrSRC', 'options')); + 'recommended_advs', 'categories', 'features', 'comments', 'qrSRC', 'options', 'configurations')); } else { return back(); } @@ -545,7 +563,7 @@ class AdvsController extends PublicController $isActiveDopings = $this->adv_model->is_enabled('dopings'); return $this->view->make('visiosoft.module.advs::new-ad/preview/preview', - compact('adv', 'categories', 'features', 'isActiveDopings', 'options')); + compact('adv', 'categories', 'features', 'isActiveDopings', 'configurations')); } public function getLocations() diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php index 9d4654747..d483bd89c 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php @@ -5,4 +5,6 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterface { public function createConfigration($ad_id,$price,$currency,$stock,$option_json); + + public function getConf($ad_id); } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php index 3550a3bf9..c81b0405e 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -1,9 +1,15 @@ <?php namespace Visiosoft\AdvsModule\OptionConfiguration; +use Visiosoft\AdvsModule\Adv\AdvModel; use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationInterface; use Anomaly\Streams\Platform\Model\Advs\AdvsOptionConfigurationEntryModel; class OptionConfigurationModel extends AdvsOptionConfigurationEntryModel implements OptionConfigurationInterface { - + public function getName($id) + { + $configuration = $this->find($id); + $adv = $this->adv_model->find($configuration->parent_adv_id); + dd($adv); + } } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php index 48a4863fc..ca2ba2820 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php @@ -1,36 +1,108 @@ <?php namespace Visiosoft\AdvsModule\OptionConfiguration; +use Anomaly\Streams\Platform\Model\Configuration\ConfigurationConfigurationEntryModel; +use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; use Anomaly\Streams\Platform\Entry\EntryRepository; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; class OptionConfigurationRepository extends EntryRepository implements OptionConfigurationRepositoryInterface { - /** - * The entry model. - * - * @var OptionConfigurationModel - */ - protected $model; + /** + * The entry model. + * + * @var OptionConfigurationModel + */ + protected $model; + protected $advRepository; + protected $productOptionsValueRepository; - /** - * Create a new OptionConfigurationRepository instance. - * - * @param OptionConfigurationModel $model - */ - public function __construct(OptionConfigurationModel $model) - { - $this->model = $model; - } + /** + * Create a new OptionConfigurationRepository instance. + * + * @param OptionConfigurationModel $model + */ + public function __construct( + OptionConfigurationModel $model, + AdvRepositoryInterface $advRepository, + ProductoptionsValueRepositoryInterface $productoptionsValueRepository + ) + { + $this->model = $model; + $this->advRepository = $advRepository; + $this->productOptionsValueRepository = $productoptionsValueRepository; + } - public function createConfigration($ad_id,$price,$currency,$stock,$option_json) - { - return $this->create([ - 'parent_adv_id' => $ad_id, - 'price' => $price, - 'currency' => $currency, - 'stock' => $stock, - 'option_json' => $option_json, - ]); - } + public function createConfigration($ad_id, $price, $currency, $stock, $option_json) + { + return $this->create([ + 'parent_adv_id' => $ad_id, + 'price' => $price, + 'currency' => $currency, + 'stock' => $stock, + 'option_json' => $option_json, + ]); + } + + public function getConf($ad_id, $conf_id = null) + { + $adv = $this->advRepository->find($ad_id); + $configurations = array(); + + if ($conf_id == null) { + $product_configurations = $this->model->where('stock', '>', '0')->where('parent_adv_id', $ad_id)->get(); + + foreach ($product_configurations as $product_configuration) { + $configurations_item = json_decode($product_configuration->option_json, true); + $option_group_value = ""; + foreach ($configurations_item as $option_id => $value) { + $value_entry = $this->productOptionsValueRepository->find($value); + $option_group_value .= " " . $value_entry->getName(); + } + $configurations[$product_configuration->getId()] = [ + 'name' => $option_group_value, + 'price' => $product_configuration->price, + 'currency' => $product_configuration->currency, + 'stock' => $product_configuration->stock, + 'adv' => $adv->name . ' (' . trim($option_group_value, ' ') . ')', + ]; + } + } else { + $product_configuration = $this->model->find($conf_id); + $configurations_item = json_decode($product_configuration->option_json, true); + $option_group_value = ""; + + foreach ($configurations_item as $option_id => $value) { + $value_entry = $this->productOptionsValueRepository->find($value); + $option_group_value .= " " . $value_entry->getName(); + } + + $configurations = [ + 'name' => trim($option_group_value), + 'price' => $product_configuration->price, + 'currency' => $product_configuration->currency, + 'stock' => $product_configuration->stock, + 'adv' => $adv->name . ' (' . trim($option_group_value, ' ') . ')', + ]; + + } + + return $configurations; + } + + public function getName($id){ + $configuration = $this->find($id); + $adv = $this->advRepository->getName($configuration->parent_adv_id); + + $configurations_item = json_decode($configuration->option_json, true); + $option_group_value = ""; + + foreach ($configurations_item as $option_id => $value) { + $value_entry = $this->productOptionsValueRepository->find($value); + $option_group_value .= " " . $value_entry->getName(); + } + + return $adv . ' | ' . trim($option_group_value, ' '); + } } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php index 0690ea2a4..1b8f11618 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Table/OptionConfigurationTableColumns.php @@ -19,7 +19,7 @@ class OptionConfigurationTableColumns AdvRepositoryInterface $advRepository) { $adv = $advRepository->findById($entry->parent_adv_id); - return "<span><a href='" . route('adv_detail', [$entry->parent_adv_id]) ."'>$adv->name</a></span>"; + return "<span><a href='" . route('adv_detail', [$entry->parent_adv_id]) . "'>$adv->name</a></span>"; } ], 'option_json' => [ @@ -35,8 +35,8 @@ class OptionConfigurationTableColumns $productOptionsValue = $productOptionsValueRepository->findBy('entry_id', $value); $text .= - '<span class="tag tag-sm tag-info mr-1">'. - $productOption->name . ': ' . $productOptionsValue->name. + '<span class="tag tag-sm tag-info mr-1">' . + $productOption->name . ': ' . $productOptionsValue->name . '</span>'; } diff --git a/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php new file mode 100644 index 000000000..4083e31f0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php @@ -0,0 +1,21 @@ +<?php namespace Visiosoft\AdvsModule\OptionHandler; + +use Anomaly\SelectFieldType\SelectFieldType; +use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface; + +class CategoriesOptions +{ + private $categoryRepository; + + public function __construct(CategoryRepositoryInterface $categoryRepository) + { + $this->categoryRepository = $categoryRepository; + } + + public function handle(SelectFieldType $fieldType) + { + $categories = $this->categoryRepository->mainCats(); + $options[] = $categories->pluck('name', 'id'); + $fieldType->setOptions($options); + } +} \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php index 3d64e4091..82fbb4f25 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueInterface.php @@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface ProductoptionsValueInterface extends EntryInterface { - + public function getName(); } diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php index 7358887d0..184b0c482 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueModel.php @@ -5,5 +5,8 @@ use Anomaly\Streams\Platform\Model\Advs\AdvsProductoptionsValueEntryModel; class ProductoptionsValueModel extends AdvsProductoptionsValueEntryModel implements ProductoptionsValueInterface { - + public function getName() + { + return $this->name; + } } diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php deleted file mode 100644 index ae86aaf37..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Form/OptionConfigurationFormBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationFormBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php deleted file mode 100644 index 94450076f..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCollectionTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationCollectionTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php deleted file mode 100644 index 5b95723b4..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationCriteriaTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationCriteriaTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php deleted file mode 100644 index 7c46282dc..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationModelTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationModelTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php deleted file mode 100644 index 502207ef3..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationObserverTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationObserverTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php deleted file mode 100644 index 7d6513448..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationPresenterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationPresenterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php deleted file mode 100644 index 24328be5e..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRepositoryTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationRepositoryTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php deleted file mode 100644 index bc1a92c02..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationRouterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationRouterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php deleted file mode 100644 index 0481cee9d..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/OptionConfigurationSeederTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationSeederTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php deleted file mode 100644 index e556d274a..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionConfiguration/Table/OptionConfigurationTableBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionConfiguration; - -class OptionConfigurationTableBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php deleted file mode 100644 index fd04ab4fa..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Form/OptionsConfigurationFormBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationFormBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php deleted file mode 100644 index 5a264d715..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCollectionTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationCollectionTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php deleted file mode 100644 index edf081e5e..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationCriteriaTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationCriteriaTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php deleted file mode 100644 index 23e76ccd2..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationModelTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationModelTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php deleted file mode 100644 index 3761df9c4..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationObserverTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationObserverTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php deleted file mode 100644 index 89b79d0a7..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationPresenterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationPresenterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php deleted file mode 100644 index 75e606cdd..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRepositoryTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationRepositoryTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php deleted file mode 100644 index 62b813c61..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationRouterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationRouterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php deleted file mode 100644 index 596cc0b1d..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/OptionsConfigurationSeederTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationSeederTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php deleted file mode 100644 index 71f5f4d2f..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/OptionsConfiguration/Table/OptionsConfigurationTableBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\OptionsConfiguration; - -class OptionsConfigurationTableBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php deleted file mode 100644 index d76847c0e..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Form/ProductoptionFormBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionFormBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php deleted file mode 100644 index 2b50b1872..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCollectionTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionCollectionTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php deleted file mode 100644 index a6ec968e4..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionCriteriaTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionCriteriaTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php deleted file mode 100644 index f5b9228b7..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionModelTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionModelTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php deleted file mode 100644 index 97a9223f5..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionObserverTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionObserverTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php deleted file mode 100644 index 53df54333..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionPresenterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionPresenterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php deleted file mode 100644 index 12252bdd0..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRepositoryTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionRepositoryTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php deleted file mode 100644 index 5631eb119..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionRouterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionRouterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php deleted file mode 100644 index dbb9023cf..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/ProductoptionSeederTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionSeederTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php deleted file mode 100644 index 0234508a3..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/Productoption/Table/ProductoptionTableBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\Productoption; - -class ProductoptionTableBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php deleted file mode 100644 index 83acfc4f9..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Form/ProductoptionsValueFormBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueFormBuilderTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php deleted file mode 100644 index 168cc9552..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCollectionTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueCollectionTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php deleted file mode 100644 index 6f9b59c88..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueCriteriaTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueCriteriaTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php deleted file mode 100644 index e20495d3e..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueModelTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueModelTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php deleted file mode 100644 index c8af3f85a..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueObserverTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueObserverTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php deleted file mode 100644 index a6c7cd808..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValuePresenterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValuePresenterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php deleted file mode 100644 index 6f3e9fa67..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRepositoryTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueRepositoryTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php deleted file mode 100644 index f67b0e3c5..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueRouterTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueRouterTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php deleted file mode 100644 index 29ce9c517..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/ProductoptionsValueSeederTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueSeederTest extends \TestCase -{ - -} diff --git a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php b/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php deleted file mode 100644 index 76d7e3cb4..000000000 --- a/addons/default/visiosoft/advs-module/tests/Unit/ProductoptionsValue/Table/ProductoptionsValueTableBuilderTest.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -namespace Visiosoft\AdvsModule\Test\Unit\ProductoptionsValue; - -class ProductoptionsValueTableBuilderTest extends \TestCase -{ - -} From 34a403203ca2489e2d4120356bbd3081f37c9a9c Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Fri, 23 Oct 2020 12:18:48 +0300 Subject: [PATCH 66/72] product options add cart --- .../views/ad-detail/partials/detail.twig | 39 ++----------------- 1 file changed, 4 insertions(+), 35 deletions(-) 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 6d48e678c..5d44a8108 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 @@ -44,41 +44,10 @@ {{ adv.created_at|date('d/m/Y') }} </div> - -{# {{ dd(configurations) }}#} - {% if configurations != null %} - <div class="col-12 justify-content-start pl-0 row m-0"> - <form action="{{ route('configuration::add_cart') }}" class=""> - <div class="row mb-1"> - <div class="input-group col-12"> - <select name="configuration" id="" class="form-control"> - {% for key, configuration in configurations %} - <option value="{{ key }}"> - {{ configuration.name }} - {{ configuration.price }} {{ configuration.currency }} - </option> - {% endfor %} - </select> - </div> - </div> - <div class="row"> - <div class="input-group col-6 quantity-row"> - <input type="number" data-id="29" name="quantity" class="form-control text-center quantity" value="1" min="1"> - </div> - <div class="col-6 p-0"> - <button class="btn btn-success text-white" type="submit"> - <i class="fa fa-shopping-cart"></i> - Sepete Ekle - </button> - </div> - </div> - </form> - </div> - {% else %} - <!-- Detail With Block --> - {{ addBlock('ad-detail/details',{'adv':adv, 'options':options})|raw }} - {{ addBlock('ad-detail/widget-details',{'adv':adv})|raw }} - <!-- Detail With Block --> - {% endif %} + <!-- Detail With Block --> + {{ addBlock('ad-detail/details',{'adv':adv, 'options':options, 'configurations':configurations})|raw }} + {{ addBlock('ad-detail/widget-details',{'adv':adv})|raw }} + <!-- Detail With Block --> {% if adv.isCorporate == 2 %} <div class="col-md-12 m-2"> From e04870fcd23051660b4c1b51d4d756367160b603 Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Fri, 23 Oct 2020 12:38:28 +0300 Subject: [PATCH 67/72] product options add cart --- .../advs-module/resources/lang/en/button.php | 1 + .../views/new-ad/preview/preview.twig | 4 +-- .../Http/Controller/Admin/AdvsController.php | 2 +- ...OptionConfigurationRepositoryInterface.php | 2 ++ .../OptionConfigurationModel.php | 7 +---- .../OptionConfigurationRepository.php | 30 ++++--------------- 6 files changed, 12 insertions(+), 34 deletions(-) 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 c3ff863ad..1b49391ae 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -38,4 +38,5 @@ return [ 'new_options_configuration' => 'New Options configuration', 'new_option_configuration' => 'New Option configuration', 'new_option_configuration' => 'New Option configuration', + 'create_configurations' => 'Create Configurations', ]; diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index 243164093..f016f7040 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -16,7 +16,7 @@ {% endif %} <a href="{{ route('visiosoft.module.advs::user.configrations.create') }}?ad={{ adv.id }}" class="btn btn-warning shadow-sm mr-4 text-white"> - Konfigürasyon Oluştur + {{trans('visiosoft.module.advs::button.create_configurations')}} </a> <a href="{{ url_route('visiosoft.module.advs::edit_adv', [adv.id]) }}" class="btn preview-edit shadow-sm border"> @@ -33,7 +33,7 @@ <div class="preview-actions text-center"> <a href="{{ route('visiosoft.module.advs::user.configrations.create') }}?ad={{ adv.id }}" class="btn btn-warning shadow-sm mr-4 text-white"> - Konfigürasyon Oluştur + {{trans('visiosoft.module.advs::button.create_configurations')}} </a> <a href="{{ url_route('visiosoft.module.advs::edit_adv', [adv.id]) }}" class="btn preview-edit shadow-sm border"> {{ trans('visiosoft.module.advs::field.edit') }} 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 44f95278e..2321df840 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 @@ -109,7 +109,7 @@ class AdvsController extends AdminController 'text' => 'Replicate', ], 'create_configration' => [ - 'text' => 'Create Configrations', + 'text' => trans('visiosoft.module.advs::button.create_configurations'), 'href' => route('visiosoft.module.advs::configrations.create')."?ad={entry.id}" ], ], diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php index d483bd89c..a72308585 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php @@ -7,4 +7,6 @@ interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterfac public function createConfigration($ad_id,$price,$currency,$stock,$option_json); public function getConf($ad_id); + + public function getName($id); } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php index c81b0405e..8b862fe54 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -6,10 +6,5 @@ use Anomaly\Streams\Platform\Model\Advs\AdvsOptionConfigurationEntryModel; class OptionConfigurationModel extends AdvsOptionConfigurationEntryModel implements OptionConfigurationInterface { - public function getName($id) - { - $configuration = $this->find($id); - $adv = $this->adv_model->find($configuration->parent_adv_id); - dd($adv); - } + } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php index ca2ba2820..1ed025ce3 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php @@ -45,47 +45,27 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon ]); } - public function getConf($ad_id, $conf_id = null) + public function getConf($ad_id) { $adv = $this->advRepository->find($ad_id); $configurations = array(); - if ($conf_id == null) { - $product_configurations = $this->model->where('stock', '>', '0')->where('parent_adv_id', $ad_id)->get(); + $product_configurations = $this->model->where('stock', '>', '0')->where('parent_adv_id', $ad_id)->get(); - foreach ($product_configurations as $product_configuration) { - $configurations_item = json_decode($product_configuration->option_json, true); - $option_group_value = ""; - foreach ($configurations_item as $option_id => $value) { - $value_entry = $this->productOptionsValueRepository->find($value); - $option_group_value .= " " . $value_entry->getName(); - } - $configurations[$product_configuration->getId()] = [ - 'name' => $option_group_value, - 'price' => $product_configuration->price, - 'currency' => $product_configuration->currency, - 'stock' => $product_configuration->stock, - 'adv' => $adv->name . ' (' . trim($option_group_value, ' ') . ')', - ]; - } - } else { - $product_configuration = $this->model->find($conf_id); + foreach ($product_configurations as $product_configuration) { $configurations_item = json_decode($product_configuration->option_json, true); $option_group_value = ""; - foreach ($configurations_item as $option_id => $value) { $value_entry = $this->productOptionsValueRepository->find($value); $option_group_value .= " " . $value_entry->getName(); } - - $configurations = [ - 'name' => trim($option_group_value), + $configurations[$product_configuration->getId()] = [ + 'name' => $option_group_value, 'price' => $product_configuration->price, 'currency' => $product_configuration->currency, 'stock' => $product_configuration->stock, 'adv' => $adv->name . ' (' . trim($option_group_value, ' ') . ')', ]; - } return $configurations; From beedf72eba409161250431c9acdac4ec6d4299e2 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 23 Oct 2020 13:49:15 +0300 Subject: [PATCH 68/72] #2417 [packages] users can't see the right to declare (maden) --- .../advs-module/src/Adv/AdvRepository.php | 10 ++++++++++ .../advs-module/src/Adv/Command/GetUserAds.php | 18 ++++++++++++++++++ .../Adv/Contract/AdvRepositoryInterface.php | 2 ++ .../advs-module/src/AdvsModulePlugin.php | 8 +++++++- 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 34a6266a4..a87a12e76 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -459,4 +459,14 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface return $ads; } + + public function getUserAds($userID = null) + { + $userID = auth_id_if_null($userID); + return $this->newQuery() + ->where('advs_advs.created_by_id', $userID) + ->where('status', 'approved') + ->where('finish_at', '>', date('Y-m-d H:i:s')) + ->get(); + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php b/addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php new file mode 100644 index 000000000..4541f1a40 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Command/GetUserAds.php @@ -0,0 +1,18 @@ +<?php namespace Visiosoft\AdvsModule\Adv\Command; + +use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; + +class GetUserAds +{ + protected $userID; + + public function __construct($userID) + { + $this->userID = $userID; + } + + public function handle(AdvRepositoryInterface $advRepository) + { + return $advRepository->getUserAds($this->userID); + } +} 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 eb59f6eb2..37104c3f2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php @@ -46,4 +46,6 @@ interface AdvRepositoryInterface extends EntryRepositoryInterface public function getPopular(); public function approveAds($adsIDs); + + public function getUserAds($userID = null); } diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 475def11a..40186316b 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -7,9 +7,9 @@ use Visiosoft\AdvsModule\Adv\Command\appendRequestURL; use Visiosoft\AdvsModule\Adv\Command\GetAd; use Visiosoft\AdvsModule\Adv\Command\getExchange; use Visiosoft\AdvsModule\Adv\Command\getPopular; +use Visiosoft\AdvsModule\Adv\Command\GetUserAds; use Visiosoft\AdvsModule\Adv\Command\isActive; use Visiosoft\AdvsModule\Adv\Command\LatestAds; -use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; use Visiosoft\AdvsModule\Currency\Currency; use Visiosoft\AdvsModule\Currency\CurrencyFormat; @@ -78,6 +78,12 @@ class AdvsModulePlugin extends Plugin ->get(); } ), + new \Twig_SimpleFunction( + 'getUserAds', + function ($userID = null) { + return $this->dispatch(new GetUserAds($userID)); + } + ), new \Twig_SimpleFunction( 'getUserPassiveAdvs', function ($user = null) { From 0bfce3957a81d3acce2cc269d8f75230210419a0 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Fri, 23 Oct 2020 16:07:52 +0300 Subject: [PATCH 69/72] #2342 [seo-module] Create --- .../src/Http/Controller/advsController.php | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 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 db7d0b52d..f57340647 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -32,6 +32,7 @@ use Visiosoft\LocationModule\Neighborhood\NeighborhoodModel; use Visiosoft\LocationModule\Village\VillageModel; use Visiosoft\PackagesModule\Package\PackageModel; use Visiosoft\ProfileModule\Adress\Contract\AdressRepositoryInterface; +use Visiosoft\SeoModule\Legend\Command\AddMetaData; class AdvsController extends PublicController { @@ -378,10 +379,10 @@ class AdvsController extends PublicController if ($category) { $seo_keywords = $this->category_model->getMeta_keywords($category->id); $seo_description = $this->category_model->getMeta_description($category->id); - $seo_title = $this->category_model->getMeta_title($category->id); - $this->template->set('og_description', $seo_description); - $this->template->set('meta_description', $seo_description); + $metaTitle = $this->category_model->getMeta_title($category->id); + $metaDesc = $seo_description; + $this->template->set('meta_keywords', implode(', ', $seo_keywords)); if ($city) { @@ -396,9 +397,21 @@ class AdvsController extends PublicController $loop++; } } + $metaTitle = $catText ?: $metaTitle; + + if (is_module_installed('visiosoft.module.seo')) { + $metaData = dispatch_now(new AddMetaData($category->id, 'category')); + if ($metaData) { + list('metaTitle' => $seoMetaTitle, 'metaDesc' => $seoMetaDesc) = $metaData; + $metaTitle = $seoMetaTitle ?: $metaTitle; + $metaDesc = $seoMetaDesc ?: $metaDesc; + } + } + + $this->template->set('og_description', $metaDesc); + $this->template->set('meta_description', $metaDesc); $showTitle = false; - $metaTitle = $catText ?: $seo_title; } $user = null; @@ -501,13 +514,6 @@ class AdvsController extends PublicController $this->event->dispatch(new viewAd($adv));//view ad - $this->template->set('meta_keywords', implode(',', explode(' ', $adv->name))); - $this->template->set('meta_description', strip_tags($adv->advs_desc, '')); - $this->template->set('showTitle', false); - $this->template->set( - 'meta_title', - $adv->name . " " . end($categories)['name'] . ' ' . setting_value('streams::domain') - ); if (substr($adv->cover_photo, 0, 4) === "http") { $coverPhoto = $adv->cover_photo; } else { @@ -517,6 +523,19 @@ class AdvsController extends PublicController $coverPhoto = \Illuminate\Support\Facades\Request::root() . '/' . $adv->cover_photo; } } + + $metaTitle = $adv->name . " " . end($categories)['name'] . ' ' . setting_value('streams::domain'); + $metaDesc = strip_tags($adv->advs_desc, ''); + + if (is_module_installed('visiosoft.module.seo')) { + $metaData = dispatch_now(new AddMetaData($adv->cat1, 'ad', $adv->id)); + if ($metaData) { + list('metaTitle' => $seoMetaTitle, 'metaDesc' => $seoMetaDesc) = $metaData; + $metaTitle = $seoMetaTitle ?: $metaTitle; + $metaDesc = $seoMetaDesc ?: $metaDesc; + } + } + $coverPhotoInfo = pathinfo($coverPhoto); if (substr($coverPhotoInfo['basename'], 0, 3) === "tn-") { $ogImage = substr(basename($coverPhotoInfo['basename']), 3); @@ -524,7 +543,12 @@ class AdvsController extends PublicController } else { $ogImage = $coverPhoto; } + $this->template->set('meta_image', $ogImage); + $this->template->set('meta_keywords', implode(',', explode(' ', $adv->name))); + $this->template->set('meta_description', $metaDesc); + $this->template->set('showTitle', false); + $this->template->set('meta_title', $metaTitle); 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 c764f6f5ea9d64416b3b626b65fa40cde580d24f Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Fri, 23 Oct 2020 18:24:49 +0300 Subject: [PATCH 70/72] =?UTF-8?q?#1879=20=C3=9Cr=C3=BCn=20se=C3=A7enekleri?= =?UTF-8?q?=20ve=20GET=20se=C3=A7enekleri?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ule.advs__create_productoptions_stream.php | 4 +-- .../advs-module/resources/lang/en/field.php | 4 ++- .../advs-module/resources/lang/en/section.php | 12 ++----- .../advs-module/resources/lang/en/stream.php | 12 ++----- .../src/OptionHandler/CategoriesOptions.php | 2 +- .../ProductoptionRepositoryInterface.php | 2 +- .../Productoption/ProductoptionRepository.php | 5 +++ .../Table/ProductoptionTableBuilder.php | 12 +++++++ ...ProductoptionsValueRepositoryInterface.php | 2 +- .../ProductoptionsValueRepository.php | 35 +++++++++++-------- .../MultipleFieldType/LookupTableBuilder.php | 14 ++++++++ 11 files changed, 65 insertions(+), 39 deletions(-) diff --git a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php index 0f1e87a29..2961bbc3c 100644 --- a/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2020_10_15_130044_visiosoft.module.advs__create_productoptions_stream.php @@ -15,7 +15,7 @@ class VisiosoftModuleAdvsCreateProductoptionsStream extends Migration protected $delete = true; protected $fields = [ - 'categories' => [ + 'category' => [ 'type' => 'anomaly.field_type.select', 'config' => [ 'handler' => 'Visiosoft\AdvsModule\OptionHandler\CategoriesOptions@handle' @@ -43,7 +43,7 @@ class VisiosoftModuleAdvsCreateProductoptionsStream extends Migration * @var array */ protected $assignments = [ - 'categories', + 'category', 'name' => [ 'translatable' => true, 'required' => true, 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 f650cb5a0..6fd4f4005 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -137,7 +137,9 @@ return [ 'oldest' => 'Oldest', 'address_a_z' => 'Address (A to Z)', 'address_z_a' => 'Address (Z to A)', - 'categories' => 'Categories', + 'categories' => [ + 'name' => 'Categories' + ], 'all_categories' => 'All Categories', 'location' => 'Location', 'send_message' => 'Send Message', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php index fa686c524..cdd4948d1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php @@ -46,18 +46,12 @@ return [ ], 'ads_image' => 'Ads Image', 'product_options' => [ - 'title' => 'Product Options', + 'title' => 'Options', ], 'productoptions_value' => [ - 'title' => 'Productoptions value', - ], - 'options_configuration' => [ - 'title' => 'Options configuration', + 'title' => 'Options Value', ], 'option_configuration' => [ - 'title' => 'Option configuration', - ], - 'option_configuration' => [ - 'title' => 'Option configuration', + 'title' => 'Configuration', ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php index bd46a1466..761fa569d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php @@ -23,18 +23,12 @@ return [ 'name' => 'Options', ], 'product_options' => [ - 'name' => 'Produc Options', + 'name' => 'Product Options', ], 'productoptions_value' => [ - 'name' => 'Productoptions value', - ], - 'options_configuration' => [ - 'name' => 'Options configuration', + 'name' => 'Options value', ], 'option_configuration' => [ - 'name' => 'Option configuration', - ], - 'option_configuration' => [ - 'name' => 'Option configuration', + 'name' => 'Configuration', ], ]; diff --git a/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php index 4083e31f0..ce3958242 100644 --- a/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php +++ b/addons/default/visiosoft/advs-module/src/OptionHandler/CategoriesOptions.php @@ -15,7 +15,7 @@ class CategoriesOptions public function handle(SelectFieldType $fieldType) { $categories = $this->categoryRepository->mainCats(); - $options[] = $categories->pluck('name', 'id'); + $options = $categories->pluck('name', 'id')->all(); $fieldType->setOptions($options); } } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php index 3f79de073..419fe12d1 100644 --- a/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Productoption/Contract/ProductoptionRepositoryInterface.php @@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; interface ProductoptionRepositoryInterface extends EntryRepositoryInterface { - + public function getWithCategoryId($id); } diff --git a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php index 3bb583b27..639d328c8 100644 --- a/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php +++ b/addons/default/visiosoft/advs-module/src/Productoption/ProductoptionRepository.php @@ -22,4 +22,9 @@ class ProductoptionRepository extends EntryRepository implements ProductoptionRe { $this->model = $model; } + + public function getWithCategoryId($id) + { + return $this->findAllBy('category',$id); + } } diff --git a/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php b/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php index 50dbe3713..36dc31d43 100644 --- a/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Productoption/Table/ProductoptionTableBuilder.php @@ -1,10 +1,22 @@ <?php namespace Visiosoft\AdvsModule\Productoption\Table; use Anomaly\Streams\Platform\Ui\Table\TableBuilder; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; class ProductoptionTableBuilder extends TableBuilder { + public function setTableEntries(\Illuminate\Support\Collection $entries) + { + $option_repository = app(ProductoptionRepositoryInterface::class); + $value_repository = app(ProductoptionsValueRepositoryInterface::class); + + $options_id = $option_repository->getWithCategoryId(7)->pluck('id')->all(); + + $values = $value_repository->getWithOptionsId($options_id); + return parent::setTableEntries($values); + } /** * The table views. * diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php index 80d519f08..8ad968cc2 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Contract/ProductoptionsValueRepositoryInterface.php @@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryRepositoryInterface; interface ProductoptionsValueRepositoryInterface extends EntryRepositoryInterface { - + public function getWithOptionsId(array $ids); } diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php index 7dbc8e29e..0f68a0aec 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/ProductoptionsValueRepository.php @@ -6,20 +6,25 @@ use Anomaly\Streams\Platform\Entry\EntryRepository; class ProductoptionsValueRepository extends EntryRepository implements ProductoptionsValueRepositoryInterface { - /** - * The entry model. - * - * @var ProductoptionsValueModel - */ - protected $model; + /** + * The entry model. + * + * @var ProductoptionsValueModel + */ + protected $model; - /** - * Create a new ProductoptionsValueRepository instance. - * - * @param ProductoptionsValueModel $model - */ - public function __construct(ProductoptionsValueModel $model) - { - $this->model = $model; - } + /** + * Create a new ProductoptionsValueRepository instance. + * + * @param ProductoptionsValueModel $model + */ + public function __construct(ProductoptionsValueModel $model) + { + $this->model = $model; + } + + public function getWithOptionsId(array $ids) + { + return $this->newQuery()->whereIn('product_option_id', $ids)->get(); + } } diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php index 07d441e94..da83a178c 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php @@ -1,5 +1,9 @@ <?php namespace Visiosoft\AdvsModule\ProductoptionsValue\Support\MultipleFieldType; +use Illuminate\Database\Eloquent\Builder; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; + /** * Class LookupTableBuilder * @@ -9,6 +13,16 @@ */ class LookupTableBuilder extends \Anomaly\MultipleFieldType\Table\LookupTableBuilder { + public function setTableEntries(\Illuminate\Support\Collection $entries) + { + $option_repository = app(ProductoptionRepositoryInterface::class); + $value_repository = app(ProductoptionsValueRepositoryInterface::class); + + $options_id = $option_repository->getWithCategoryId(7)->pluck('id')->all(); + + $values = $value_repository->getWithOptionsId($options_id); + return parent::setTableEntries($values); + } protected $filters = [ 'product_option' From 047a21b2d40bfad9f4be264c2915b626ebbc89cd Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Fri, 23 Oct 2020 19:02:57 +0300 Subject: [PATCH 71/72] =?UTF-8?q?#1879=20=C3=9Cr=C3=BCn=20se=C3=A7enekleri?= =?UTF-8?q?=20ve=20GET=20se=C3=A7enekleri?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OptionConfigurationController.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php index 5c63a842c..b3f4ce198 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php @@ -42,18 +42,20 @@ class OptionConfigurationController extends PublicController public function confAddCart() { - $conf = $this->optionConfigurationRepository->find($this->request->configuration); - $conf->name = $this->optionConfigurationRepository->getName($this->request->configuration); + if($conf = $this->optionConfigurationRepository->find($this->request->configuration)) + { + $conf->name = $conf->getName(); - $this->adv_model->authControl(); + $this->adv_model->authControl(); - if ($conf->stock < $this->request->quantity){ - return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]); - }else{ - $cart = $this->dispatch(new GetCart()); - $cart->add($conf, $this->request->quantity); - return $this->redirect->to(route('visiosoft.module.carts::cart')); + if ($conf->stock < $this->request->quantity){ + return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]); + }else{ + $cart = $this->dispatch(new GetCart()); + $cart->add($conf, $this->request->quantity); + return $this->redirect->to(route('visiosoft.module.carts::cart')); + } } } } From 48b6791ed7ceb8b89f2a752ae818900358ac3aba Mon Sep 17 00:00:00 2001 From: Muammer Top <muammer@visiosoft.com.tr> Date: Fri, 23 Oct 2020 19:03:02 +0300 Subject: [PATCH 72/72] =?UTF-8?q?#1879=20=C3=9Cr=C3=BCn=20se=C3=A7enekleri?= =?UTF-8?q?=20ve=20GET=20se=C3=A7enekleri?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contract/OptionConfigurationInterface.php | 2 +- .../OptionConfigurationRepositoryInterface.php | 2 -- .../OptionConfigurationModel.php | 17 +++++++++++++++++ .../OptionConfigurationRepository.php | 15 --------------- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php index 4d26c2bf8..99be0f686 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationInterface.php @@ -4,5 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface OptionConfigurationInterface extends EntryInterface { - + public function getName(); } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php index a72308585..d483bd89c 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php @@ -7,6 +7,4 @@ interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterfac public function createConfigration($ad_id,$price,$currency,$stock,$option_json); public function getConf($ad_id); - - public function getName($id); } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php index 8b862fe54..c7153d80d 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -1,10 +1,27 @@ <?php namespace Visiosoft\AdvsModule\OptionConfiguration; use Visiosoft\AdvsModule\Adv\AdvModel; +use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationInterface; use Anomaly\Streams\Platform\Model\Advs\AdvsOptionConfigurationEntryModel; +use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; +use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; class OptionConfigurationModel extends AdvsOptionConfigurationEntryModel implements OptionConfigurationInterface { + public function getName() + { + if($adv = app(AdvRepositoryInterface::class)->find($this->parent_adv_id)) + { + $configurations_item = json_decode($this->option_json, true); + $option_group_value = ""; + foreach ($configurations_item as $option_id => $value) { + $value_entry = app(ProductoptionsValueRepositoryInterface::class)->find($value); + $option_group_value .= " " . $value_entry->getName(); + } + + return $adv->name . ' | ' . trim($option_group_value, ' '); + } + } } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php index 1ed025ce3..a471830d6 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php @@ -70,19 +70,4 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon return $configurations; } - - public function getName($id){ - $configuration = $this->find($id); - $adv = $this->advRepository->getName($configuration->parent_adv_id); - - $configurations_item = json_decode($configuration->option_json, true); - $option_group_value = ""; - - foreach ($configurations_item as $option_id => $value) { - $value_entry = $this->productOptionsValueRepository->find($value); - $option_group_value .= " " . $value_entry->getName(); - } - - return $adv . ' | ' . trim($option_group_value, ' '); - } }