From 6df025240205a3ed5b0cd6af12bb2ebf7bddd1b7 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 6 Nov 2020 14:32:31 +0300 Subject: [PATCH 1/3] #2595 e-madencilik export bug fixed --- addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php index f02d21cd5..f8abb0be2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -33,10 +33,9 @@ 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') ->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")]) + ->select(['advs_advs.*', 'location_countries_translations.name as country', 'location_cities_translations.name as city_name', DB::raw("group_concat(default_cats_category_translations.name SEPARATOR ', ') as categories")]) ->groupBy('advs_advs.id') ->get(); @@ -56,7 +55,6 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings $adv->categories, $adv->country, $adv->city_name, - $adv->district, ]; } From c3a1b293369aa7420bf75a3e4194e116818a1166 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 6 Nov 2020 14:55:52 +0300 Subject: [PATCH 2/3] #2595 e-madencilik export bug fixed --- addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php index f8abb0be2..8a22ef668 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -35,10 +35,10 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings ->leftJoin('location_cities_translations','advs_advs.city', 'location_cities_translations.entry_id') ->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', DB::raw("group_concat(default_cats_category_translations.name SEPARATOR ', ') as categories")]) + ->select(['advs_advs_translations.name', 'advs_advs_translations.advs_desc', 'location_countries_translations.name as country', 'location_cities_translations.name as city_name', DB::raw("group_concat(default_cats_category_translations.name SEPARATOR ', ') as categories")]) ->groupBy('advs_advs.id') ->get(); - +//dd($cats); return $cats; } @@ -71,7 +71,6 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings trans('module::field.categories.name'), trans('module::field.country.name'), trans('module::field.city.name'), - trans('module::field.district.name'), ]; } } From a726eeee63b7488f2631de80f5f294de9efaf823 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 6 Nov 2020 14:56:16 +0300 Subject: [PATCH 3/3] #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 8a22ef668..0a8d6aac7 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsExport.php @@ -38,7 +38,7 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings ->select(['advs_advs_translations.name', 'advs_advs_translations.advs_desc', 'location_countries_translations.name as country', 'location_cities_translations.name as city_name', DB::raw("group_concat(default_cats_category_translations.name SEPARATOR ', ') as categories")]) ->groupBy('advs_advs.id') ->get(); -//dd($cats); + return $cats; }