Merge pull request #781 from openclassify/muammertop

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

View File

@ -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_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();
@ -56,7 +55,6 @@ class AdvsExport implements WithMapping, FromCollection, WithHeadings
$adv->categories,
$adv->country,
$adv->city_name,
$adv->district,
];
}
@ -73,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'),
];
}
}