Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed : displayed false columns were also exorted

Browse Source
This commit is contained in:
azhar bhat
2026-07-23 15:54:37 +05:30
parent 2462b6e1bd
commit 6b03e4c493
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
classes/CSV.php
View File

@@ -31,9 +31,6 @@
*/
class CSVCore
{
const QLO_EXPORT_FIELDS_ALL = 0;
const QLO_EXPORT_FIELDS_SELECTED = 1;
public $filename;
public $collection;
public $delimiter;

14
classes/controller/AdminController.php
View File

@@ -1211,18 +1211,26 @@ class AdminControllerCore extends Controller
if (ob_get_level() && ob_get_length() > 0) {
ob_clean();
}
$base_fields_list = $this->fields_list;
$this->getList($this->context->language->id, null, null, 0, false);
if (!count($this->_list)) {
return;
}
if ((int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === CSV::QLO_EXPORT_FIELDS_SELECTED) {
if ((int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === HelperList::QLO_EXPORT_FIELDS_SELECTED) {
$list_visibility = json_decode($this->context->cookie->{'list_visibility_'.$this->context->controller->controller_name});
foreach ($this->fields_list as $key => $field) {
if (!isset($field['optional']) || !$field['optional']) {
$reference_field = isset($base_fields_list[$key]) ? $base_fields_list[$key] : $field;
if (isset($reference_field['displayed']) && !$reference_field['displayed']) {
unset($this->fields_list[$key]);
continue;
}
$is_selected = (!is_array($list_visibility) && isset($field['visible_default']) && $field['visible_default'])
if ((!isset($reference_field['optional']) || !$reference_field['optional']) && isset($base_fields_list[$key])) {
continue;
}
$is_selected = (!is_array($list_visibility) && isset($reference_field['visible_default']) && $reference_field['visible_default'])
|| ($list_visibility && in_array($key, $list_visibility));
if (!$is_selected) {
unset($this->fields_list[$key]);

2
classes/helper/HelperList.php
View File

@@ -29,6 +29,8 @@
*/
class HelperListCore extends Helper
{
const QLO_EXPORT_FIELDS_ALL = 0;
const QLO_EXPORT_FIELDS_SELECTED = 1;
/**
* @var int|null
*/

6
controllers/admin/AdminPreferencesController.php
View File

@@ -202,11 +202,11 @@ class AdminPreferencesControllerCore extends AdminController
'cast' => 'intval',
'type' => 'select',
'list' => array(
array('id' => CSV::QLO_EXPORT_FIELDS_ALL, 'name' => $this->l('All Fields')),
array('id' => CSV::QLO_EXPORT_FIELDS_SELECTED, 'name' => $this->l('Selected Fields')),
array('id' => HelperList::QLO_EXPORT_FIELDS_ALL, 'name' => $this->l('All Fields')),
array('id' => HelperList::QLO_EXPORT_FIELDS_SELECTED, 'name' => $this->l('Selected Fields')),
),
'identifier' => 'id',
'defaultValue' => CSV::QLO_EXPORT_FIELDS_ALL,
'defaultValue' => HelperList::QLO_EXPORT_FIELDS_ALL,
),
// 'PS_DISPLAY_SUPPLIERS' => array(
// 'title' => $this->l('Display suppliers and manufacturers'),