From 4d5a9b95367033b170f28c50f4435d026e523be4 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 6 Nov 2020 12:37:12 +0300 Subject: [PATCH 1/2] #2595 e-madencilik export bug fixed --- addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php | 4 ++-- 1 file changed, 2 insertions(+), 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 ef50835c4..79005980f 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -34,8 +34,8 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings ->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'))) + ->whereIn('cats_category_translations.locale', array(Request()->session()->get('_locale'), setting_value('streams::default_locale'), 'en')) + ->whereIn('advs_advs_translations.locale', array(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(); From f3746c5ac227239b545134540db736cfb25d6de6 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 6 Nov 2020 12:39:48 +0300 Subject: [PATCH 2/2] #2595 e-madencilik export bug fixed --- addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php index 79005980f..f02d21cd5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -70,7 +70,7 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings trans('module::field.price.name'), trans('module::field.standard_price.name'), trans('module::field.created'), - trans('module::field.categories'), + trans('module::field.categories.name'), trans('module::field.country.name'), trans('module::field.city.name'), trans('module::field.district.name'),