Merge pull request #780 from openclassify/muammertop

#2595 e-madencilik export bug fixed
This commit is contained in:
Fatih Alp 2020-11-06 13:25:48 +03:00 committed by GitHub
commit 114a2bc5de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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();
@ -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'),