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

Merge branch 'develop' into gli-2206

Browse Source
This commit is contained in:
vishalsingh.qlo325
2025-02-21 15:50:59 +05:30
parent 84b169aba0 b13ef0a185
commit 20c25d1b26
37 changed files with 236 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/admin/AdminImportController.php
View File

@@ -230,7 +230,7 @@ class AdminImportControllerCore extends AdminController
'no' => array('label' => $this->l('Ignore this column')),
'room_num' => array('label' => $this->l('Room No *'),),
'floor' => array('label' => $this->l('Floor')),
'id_product' => array('label' => $this->l('Product ID *')),
'id_product' => array('label' => $this->l('Room Type ID *')),
'id_status' => array(
'label' => $this->l('Room status (1/2/3)'),
'help' => $this->l('1 = Active, 2 = Inactive, 3 = Temporarily Inactive')),
@@ -2043,7 +2043,7 @@ class AdminImportControllerCore extends AdminController
}
} else {
$this->errors[] = sprintf(
Tools::displayError('Invalid ID Product for %1$s (ID: %2$s).'),
Tools::displayError('Invalid ID Room Type for %1$s (ID: %2$s).'),
(isset($info['room_num']) && !empty($info['room_num']))? Tools::safeOutput($info['room_num']) : 'No Name',
(isset($info['id']) && !empty($info['id']))? Tools::safeOutput($info['id']) : 'No ID'
);