diff --git a/modules/hotelreservationsystem/classes/HotelImage.php b/modules/hotelreservationsystem/classes/HotelImage.php
index 1a94b8744..0fc87152f 100644
--- a/modules/hotelreservationsystem/classes/HotelImage.php
+++ b/modules/hotelreservationsystem/classes/HotelImage.php
@@ -25,6 +25,7 @@ class HotelImage extends ObjectModel
{
public $id;
public $id_hotel;
+ public $id_htl_image_category;
public $cover;
public $source_index;
public $image_dir;
@@ -37,6 +38,7 @@ class HotelImage extends ObjectModel
'primary' => 'id',
'fields' => array(
'id_hotel' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
+ 'id_htl_image_category' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'allow_null' => true),
'cover' => array('type' => self::TYPE_BOOL,'validate' => 'isBool')
),
);
@@ -99,7 +101,7 @@ class HotelImage extends ObjectModel
* @param [int] $n [number of images per page for paginated images data]
* @return [array|boolean] [if data found returns array containing information of the images of the hotel which id is passed]
*/
- public function getImagesByHotelId($id_hotel, $p = 1, $n = null)
+ public function getImagesByHotelId($id_hotel, $p = 1, $n = null, $idLang = null)
{
$p = (int) $p;
$n = $n !== null ? (int) $n : $n; // n = null for no pagination
@@ -107,9 +109,16 @@ class HotelImage extends ObjectModel
$p = 1;
}
- $sql = 'SELECT *
- FROM `'._DB_PREFIX_.'htl_image`
- WHERE `id_hotel` = '.(int) $id_hotel.
+ if (!$idLang) {
+ $idLang = (int) Context::getContext()->language->id;
+ }
+
+ $sql = 'SELECT hi.*, hicl.`name` AS `category_name`
+ FROM `'._DB_PREFIX_.'htl_image` hi
+ LEFT JOIN `'._DB_PREFIX_.'htl_image_category_lang` hicl
+ ON (hicl.`id_htl_image_category` = hi.`id_htl_image_category`
+ AND hicl.`id_lang` = '.(int) $idLang.')
+ WHERE hi.`id_hotel` = '.(int) $id_hotel.
($n ? ' LIMIT '.(int) (($p - 1) * $n).', '.(int) ($n) : '');
return Db::getInstance()->executeS($sql);
@@ -174,107 +183,80 @@ class HotelImage extends ObjectModel
);
}
- public function uploadHotelImages($images, $idHotel)
+ public function uploadHotelImages($images, $idHotel, $idHtlImageCategory = 0, $objCategory = null)
{
- if (isset($images) && $idHotel) {
- $objHotelHelper = new HotelHelper();
- $hotelImages = $images['tmp_name'];
- if (is_array($images['tmp_name'])) {
- foreach ($hotelImages as $image) {
- $objHtlImage = new HotelImage();
- $objHtlImage->id_hotel = $idHotel;
- if ($coverImgExist = HotelImage::getCover($idHotel)) {
- $objHtlImage->cover = 0;
- } else {
- $objHtlImage->cover = 1;
- }
- if ($objHtlImage->save()) {
- if ($path = $objHtlImage->getPathForCreation()) {
- if (ImageManager::resize(
- $image,
- $path.$objHtlImage->id.'.'.$objHtlImage->image_format
- )) {
- // add hotel images in all required sizes
- $imagesTypes = ImageType::getImagesTypes('hotels');
- $generate_hight_dpi_images = (bool)Configuration::get('PS_HIGHT_DPI');
+ if (!isset($images['tmp_name']) || !$idHotel) {
+ return false;
+ }
- foreach ($imagesTypes as $imageType) {
- if (!ImageManager::resize(
- $image,
- $path.$objHtlImage->id.'-'.stripslashes($imageType['name']).'.'.$objHtlImage->image_format,
- $imageType['width'],
- $imageType['height']
- )) {
- continue;
- }
+ $isMultiple = is_array($images['tmp_name']);
+ $tmpFiles = $isMultiple ? $images['tmp_name'] : array($images['tmp_name']);
- if ($generate_hight_dpi_images) {
- if (!ImageManager::resize(
- $image,
- $path.$objHtlImage->id.'-'.stripslashes($imageType['name']).'.'.$objHtlImage->image_format,
- (int)$imageType['width']*2,
- (int)$imageType['height']*2
- )) {
- continue;
- }
- }
- }
+ $generateHighDpiImages = (bool) Configuration::get('PS_HIGHT_DPI');
+ $imagesTypes = ImageType::getImagesTypes('hotels');
+ $addedImage = false;
+ $allSucceeded = true;
- }
- }
- }
+ foreach ($tmpFiles as $tmpFile) {
+ if (!is_string($tmpFile) || $tmpFile === '') {
+ $allSucceeded = false;
+ continue;
+ }
+
+ $objHtlImage = new HotelImage();
+ $objHtlImage->id_hotel = $idHotel;
+ $objHtlImage->id_htl_image_category = $idHtlImageCategory ?: null;
+ $objHtlImage->cover = self::getCover($idHotel) ? 0 : 1;
+
+ if (!$objHtlImage->save()
+ || !($path = $objHtlImage->getPathForCreation())
+ || !ImageManager::resize($tmpFile, $path.$objHtlImage->id.'.'.$objHtlImage->image_format)
+ ) {
+ $allSucceeded = false;
+ continue;
+ }
+
+ foreach ($imagesTypes as $imageType) {
+ if (!ImageManager::resize(
+ $tmpFile,
+ $path.$objHtlImage->id.'-'.stripslashes($imageType['name']).'.'.$objHtlImage->image_format,
+ $imageType['width'],
+ $imageType['height']
+ )) {
+ continue;
}
- } else {
- $objHtlImage = new HotelImage();
- $objHtlImage->id_hotel = $idHotel;
- if ($coverImgExist = HotelImage::getCover($idHotel)) {
- $objHtlImage->cover = 0;
- } else {
- $objHtlImage->cover = 1;
- }
- if ($objHtlImage->save()) {
- if ($path = $objHtlImage->getPathForCreation()) {
- if (ImageManager::resize(
- $hotelImages,
- $path.$objHtlImage->id.'.'.$objHtlImage->image_format
- )) {
- $imagesTypes = ImageType::getImagesTypes('hotels');
- $generate_hight_dpi_images = (bool)Configuration::get('PS_HIGHT_DPI');
- foreach ($imagesTypes as $imageType) {
- if (!ImageManager::resize(
- $hotelImages,
- $path.$objHtlImage->id.'-'.stripslashes($imageType['name']).'.'.$objHtlImage->image_format,
- $imageType['width'],
- $imageType['height']
- )) {
- continue;
- }
- if ($generate_hight_dpi_images) {
- if (!ImageManager::resize(
- $hotelImages,
- $path.$objHtlImage->id.'-'.stripslashes($imageType['name']).'.'.$objHtlImage->image_format,
- (int)$imageType['width']*2,
- (int)$imageType['height']*2
- )) {
- continue;
- }
- }
- }
- $addedImage = array(
- 'id' => $objHtlImage->id,
- 'cover' => $objHtlImage->cover,
- 'image_link' => Context::getContext()->link->getMediaLink($objHtlImage->getImageLink($objHtlImage->id)),
- );
- return $addedImage;
- }
- }
+ if ($generateHighDpiImages) {
+ ImageManager::resize(
+ $tmpFile,
+ $path.$objHtlImage->id.'-'.stripslashes($imageType['name']).'.'.$objHtlImage->image_format,
+ (int) $imageType['width'] * 2,
+ (int) $imageType['height'] * 2
+ );
}
}
- return true;
+
+ if (!$isMultiple) {
+ if (!$objCategory || (int) $objCategory->id !== $idHtlImageCategory) {
+ $objCategory = new HotelImageCategory($idHtlImageCategory, Context::getContext()->language->id);
+ }
+
+ $addedImage = array(
+ 'id' => $objHtlImage->id,
+ 'cover' => $objHtlImage->cover,
+ 'id_htl_image_category' => $idHtlImageCategory,
+ 'category_name' => (string) $objCategory->name,
+ 'image_link' => Context::getContext()->link->getMediaLink($objHtlImage->getImageLink($objHtlImage->id)),
+ );
+ }
}
- return false;
+
+ if ($isMultiple) {
+ return $allSucceeded;
+ }
+
+ return $allSucceeded ? $addedImage : false;
}
public function getPathForCreation()
diff --git a/modules/hotelreservationsystem/classes/HotelImageCategory.php b/modules/hotelreservationsystem/classes/HotelImageCategory.php
new file mode 100644
index 000000000..863aadc5c
--- /dev/null
+++ b/modules/hotelreservationsystem/classes/HotelImageCategory.php
@@ -0,0 +1,63 @@
+ 'htl_image_category',
+ 'primary' => 'id_htl_image_category',
+ 'multilang' => true,
+ 'fields' => array(
+ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 128),
+ 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'copy_post' => false),
+ 'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDate', 'copy_post' => false),
+ ),
+ );
+
+ public static function getImageCategories($idLang = null)
+ {
+ if (!$idLang) {
+ $idLang = (int) Context::getContext()->language->id;
+ }
+
+ $defaultLangId = (int) Configuration::get('PS_LANG_DEFAULT');
+
+ return Db::getInstance()->executeS(
+ 'SELECT hic.`id_htl_image_category`, COALESCE(hicl.`name`, hiclDefault.`name`) AS `name`
+ FROM `'._DB_PREFIX_.'htl_image_category` hic
+ LEFT JOIN `'._DB_PREFIX_.'htl_image_category_lang` hicl
+ ON (hicl.`id_htl_image_category` = hic.`id_htl_image_category`
+ AND hicl.`id_lang` = '.(int) $idLang.')
+ LEFT JOIN `'._DB_PREFIX_.'htl_image_category_lang` hiclDefault
+ ON (hiclDefault.`id_htl_image_category` = hic.`id_htl_image_category`
+ AND hiclDefault.`id_lang` = '.(int) $defaultLangId.')
+ WHERE COALESCE(hicl.`name`, hiclDefault.`name`) IS NOT NULL
+ ORDER BY `name` ASC'
+ );
+ }
+}
diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
index e474ef68c..be397dc23 100644
--- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
+++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
@@ -87,10 +87,27 @@ class HotelReservationSystemDb
"CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_image` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`id_hotel` int(10) unsigned NOT NULL,
+ `id_htl_image_category` int(10) unsigned DEFAULT NULL,
`cover` tinyint(1) NOT NULL DEFAULT '0',
+ KEY `id_hotel` (`id_hotel`),
+ KEY `id_htl_image_category` (`id_htl_image_category`),
PRIMARY KEY (`id`)
) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;",
+ "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_image_category` (
+ `id_htl_image_category` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `date_add` datetime NOT NULL,
+ `date_upd` datetime NOT NULL,
+ PRIMARY KEY (`id_htl_image_category`)
+ ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;",
+
+ "CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_image_category_lang` (
+ `id_htl_image_category` int(10) unsigned NOT NULL,
+ `id_lang` int(10) unsigned NOT NULL,
+ `name` varchar(128) NOT NULL,
+ PRIMARY KEY (`id_htl_image_category`, `id_lang`)
+ ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;",
+
"CREATE TABLE IF NOT EXISTS `"._DB_PREFIX_."htl_amenity` (
`id_amenity` int(10) unsigned NOT NULL AUTO_INCREMENT,
`id_parent` int(10) unsigned NOT NULL,
@@ -588,6 +605,8 @@ class HotelReservationSystemDb
`'._DB_PREFIX_.'htl_branch_info`,
`'._DB_PREFIX_.'htl_branch_info_lang`,
`'._DB_PREFIX_.'htl_image`,
+ `'._DB_PREFIX_.'htl_image_category`,
+ `'._DB_PREFIX_.'htl_image_category_lang`,
`'._DB_PREFIX_.'htl_branch_amenity`,
`'._DB_PREFIX_.'htl_room_type_amenity`,
`'._DB_PREFIX_.'htl_amenity`,
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
index 9ebe57852..918595bf5 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminAddHotelController.php
@@ -204,6 +204,9 @@ class AdminAddHotelController extends ModuleAdminController
} else {
$idCountry = Tools::getValue('hotel_country');
}
+
+ $smartyVars['hotelImageCategories'] = HotelImageCategory::getImageCategories($this->context->language->id);
+
// manage state option
$stateOptions = null;
if ($idCountry) {
@@ -816,10 +819,12 @@ class AdminAddHotelController extends ModuleAdminController
$conf = 4;
}
+ $tabParam = Tools::getValue('htl_active_tab') ? '&htl_active_tab='.urlencode(Tools::getValue('htl_active_tab')) : '';
+
if (Tools::isSubmit('submitAdd'.$this->table.'AndStay')) {
- Tools::redirectAdmin(self::$currentIndex.'&id='.(int) $newIdHotel.'&update'.$this->table.'&conf='.$conf.'&token='.$this->token );
+ Tools::redirectAdmin(self::$currentIndex.'&id='.(int) $newIdHotel.'&update'.$this->table.'&conf='.$conf.'&token='.$this->token.$tabParam);
} else {
- Tools::redirectAdmin(self::$currentIndex.'&conf='.$conf.'&token='.$this->token);
+ Tools::redirectAdmin(self::$currentIndex.'&conf='.$conf.'&token='.$this->token.$tabParam);
}
}
@@ -867,38 +872,35 @@ class AdminAddHotelController extends ModuleAdminController
$this->ajaxDie(json_encode($response));
}
- public function ajaxProcessUploadHotelImages()
+ public function ajaxProcessUploadHotelImage()
{
- $response = array('success' => false);
- $idHotel = Tools::getValue('id_hotel');
+ $response = array('success' => false, 'errors' => array());
+ $idHotel = (int) Tools::getValue('id_hotel');
+ $idHtlImageCategory = (int) Tools::getValue('id_htl_image_category');
+ $file = isset($_FILES['hotel_image']) ? $_FILES['hotel_image'] : null;
+
if ($idHotel) {
- $invalidImg = ImageManager::validateUpload(
- $_FILES['hotel_image'],
- Tools::getMaxUploadSize()
- );
- if (!$invalidImg) {
- // Add Hotel images
- $objHotelImage = new HotelImage();
- $imageDetail = $objHotelImage->uploadHotelImages($_FILES['hotel_image'], $idHotel);
- if ($imageDetail) {
- $response['success'] = true;
- $imageDetail['image_link'] = $this->context->link->getMediaLink($objHotelImage->getImageLink($imageDetail['id'],ImageType::getFormatedName('large')));
- $imageDetail['image_link_small'] = $this->context->link->getMediaLink($objHotelImage->getImageLink($imageDetail['id'], ImageType::getFormatedName('small')));
- $response['data']['image_info'] = $imageDetail;
- // get image row
- $this->context->smarty->assign(array(
- 'image' => $imageDetail,
- 'hotel_info' => array('id' => $idHotel)
- ));
- $response['data']['image_row'] = $this->context->smarty->fetch(
- _PS_MODULE_DIR_.$this->module->name.
- '/views/templates/admin/add_hotel/_partials/htl-images-list-row.tpl'
- );
+ if ($file && $file['size']) {
+ $objCategory = $idHtlImageCategory ? new HotelImageCategory($idHtlImageCategory, $this->context->language->id) : null;
+ if ($idHtlImageCategory && !Validate::isLoadedObject($objCategory)) {
+ $response['errors'][] = $this->l('Selected image category is invalid.');
+ } elseif ($error = ImageManager::validateUpload($file, Tools::getMaxUploadSize())) {
+ $response['errors'][] = $error;
} else {
- $response['errors'][] = $this->l('Unable to uploade image. Please try again');
+ $objHotelImage = new HotelImage();
+ $imageDetail = $objHotelImage->uploadHotelImages($file, $idHotel, $idHtlImageCategory, $objCategory);
+ if ($imageDetail) {
+ $imageDetail['image_link'] = $this->context->link->getMediaLink($objHotelImage->getImageLink($imageDetail['id'], ImageType::getFormatedName('large')));
+ $imageDetail['image_link_small'] = $this->context->link->getMediaLink($objHotelImage->getImageLink($imageDetail['id'], ImageType::getFormatedName('small')));
+
+ $response['success'] = true;
+ $response['image_row'] = $this->renderHotelImageRow($imageDetail, $idHotel);
+ } else {
+ $response['errors'][] = $this->l('Unable to upload image. Please try again');
+ }
}
} else {
- $response['errors'][] = $_FILES['hotel_image']['name'].': '.$invalidImg;
+ $response['errors'][] = $this->l('No file received.');
}
} else {
$response['errors'][] = $this->l('Hotel info not found. Please try reloading the page');
@@ -908,38 +910,181 @@ class AdminAddHotelController extends ModuleAdminController
public function ajaxProcessChangeCoverImage()
{
- $idImage = Tools::getValue('id_image');
+ $idImage = (int) Tools::getValue('id_image');
+ $idHotel = (int) Tools::getValue('id_hotel');
$response = array('status' => false);
- if ($idImage) {
- $idHotel = Tools::getValue('id_hotel');
+
+ if ($idImage && $idHotel && Validate::isLoadedObject($objHtlImage = new HotelImage($idImage)) && (int) $objHtlImage->id_hotel === $idHotel) {
+ $oldCoverId = null;
+ $affectedCoverImage = null;
if ($coverImg = HotelImage::getCover($idHotel)) {
- $objHtlImage = new HotelImage((int) $coverImg['id']);
- $objHtlImage->cover = 0;
- $objHtlImage->save();
+ $oldCoverId = (int) $coverImg['id'];
+ $affectedCoverImage = new HotelImage($oldCoverId);
+ $affectedCoverImage->cover = 0;
+ $affectedCoverImage->save();
}
- $objHtlImage = new HotelImage((int) $idImage);
$objHtlImage->cover = 1;
- if ($objHtlImage->update()) {
- $response['status'] = true;
+ $objHtlImage->update();
+
+ $response['status'] = true;
+ $response['image_row'] = $this->renderHotelImageRow($this->getHotelImageRowData($objHtlImage), $idHotel);
+
+ if ($oldCoverId) {
+ $response['old_cover_id'] = $oldCoverId;
+ $response['old_cover_row'] = $this->renderHotelImageRow(
+ $this->getHotelImageRowData($affectedCoverImage),
+ $idHotel
+ );
}
}
$this->ajaxDie(json_encode($response));
}
+ public function ajaxProcessEditHotelImage()
+ {
+ $response = array('status' => false);
+ $idImage = (int) Tools::getValue('id_image');
+ $idHotel = (int) Tools::getValue('id_hotel');
+ $idHtlImageCategory = (int) Tools::getValue('id_htl_image_category');
+ $setCover = (bool) Tools::getValue('cover');
+
+ if ($idImage && $idHotel && Validate::isLoadedObject($objHtlImage = new HotelImage($idImage)) && (int) $objHtlImage->id_hotel === $idHotel) {
+ $objCategory = $idHtlImageCategory ? new HotelImageCategory($idHtlImageCategory, $this->context->language->id) : null;
+ if ($idHtlImageCategory && !Validate::isLoadedObject($objCategory)) {
+ $response['errors'][] = $this->l('Selected image category is invalid.');
+ $this->ajaxDie(json_encode($response));
+ }
+
+ $otherImage = null;
+ if (!$setCover && $objHtlImage->cover) {
+ foreach ($objHtlImage->getImagesByHotelId($idHotel, 1, 2) as $image) {
+ if ((int) $image['id'] !== $idImage) {
+ $otherImage = $image;
+ break;
+ }
+ }
+ if (!$otherImage) {
+ $response['errors'][] = $this->l('At least one image must remain marked as cover.');
+ $this->ajaxDie(json_encode($response));
+ }
+ }
+
+ $objHtlImage->id_htl_image_category = $idHtlImageCategory ?: null;
+
+ $oldCoverId = null;
+ $affectedCoverImage = null;
+ if ($setCover && !$objHtlImage->cover) {
+ if ($coverImg = HotelImage::getCover($idHotel)) {
+ $oldCoverId = (int) $coverImg['id'];
+ $affectedCoverImage = new HotelImage($oldCoverId);
+ $affectedCoverImage->cover = 0;
+ $affectedCoverImage->save();
+ }
+
+ $objHtlImage->cover = 1;
+ } elseif ($otherImage) {
+ $objHtlImage->cover = 0;
+
+ $affectedCoverImage = new HotelImage($otherImage['id']);
+ $affectedCoverImage->cover = 1;
+ $affectedCoverImage->save();
+ $oldCoverId = (int) $affectedCoverImage->id;
+ }
+
+ $objHtlImage->update();
+
+ $response['status'] = true;
+ $response['image_row'] = $this->renderHotelImageRow($this->getHotelImageRowData($objHtlImage, $objCategory), $idHotel);
+
+ if ($oldCoverId) {
+ $response['old_cover_id'] = $oldCoverId;
+ $response['old_cover_row'] = $this->renderHotelImageRow(
+ $this->getHotelImageRowData($affectedCoverImage),
+ $idHotel
+ );
+ }
+ } else {
+ $response['errors'][] = $this->l('Image not found.');
+ }
+
+ $this->ajaxDie(json_encode($response));
+ }
+
+ private function getHotelImageRowData($objHtlImage, ?HotelImageCategory $objCategory = null)
+ {
+ $idHtlImageCategory = (int) $objHtlImage->id_htl_image_category;
+ if (!$objCategory || (int) $objCategory->id !== $idHtlImageCategory) {
+ $objCategory = new HotelImageCategory($idHtlImageCategory, $this->context->language->id);
+ }
+
+ return array(
+ 'id' => $objHtlImage->id,
+ 'cover' => $objHtlImage->cover,
+ 'id_htl_image_category' => $idHtlImageCategory,
+ 'category_name' => (string) $objCategory->name,
+ 'image_link' => $this->context->link->getMediaLink($objHtlImage->getImageLink($objHtlImage->id, ImageType::getFormatedName('large'))),
+ 'image_link_small' => $this->context->link->getMediaLink($objHtlImage->getImageLink($objHtlImage->id, ImageType::getFormatedName('small'))),
+ );
+ }
+
+ private function renderHotelImageRow($imageData, $idHotel)
+ {
+ $this->context->smarty->assign(array(
+ 'image' => $imageData,
+ 'hotel_info' => array('id' => $idHotel),
+ ));
+
+ return $this->context->smarty->fetch(_PS_MODULE_DIR_.$this->module->name.'/views/templates/admin/add_hotel/_partials/htl-images-list-row.tpl');
+ }
+
+ public function ajaxProcessBulkUpdateHotelImage()
+ {
+ $response = array('status' => false, 'errors' => array());
+ $idHotel = (int) Tools::getValue('id_hotel');
+ $idHtlImageCategory = (int) Tools::getValue('id_htl_image_category');
+ $imageIds = array_filter(array_map('intval', (array) Tools::getValue('image_ids', array())));
+
+ if ($idHotel && $imageIds) {
+ $objCategory = $idHtlImageCategory ? new HotelImageCategory($idHtlImageCategory, $this->context->language->id) : null;
+ if ($idHtlImageCategory && !Validate::isLoadedObject($objCategory)) {
+ $response['errors'][] = $this->l('Selected image category is invalid.');
+ } else {
+ foreach ($imageIds as $idImage) {
+ $objHtlImage = new HotelImage($idImage);
+ if (Validate::isLoadedObject($objHtlImage) && (int) $objHtlImage->id_hotel === $idHotel) {
+ $objHtlImage->id_htl_image_category = $idHtlImageCategory ?: null;
+ $objHtlImage->update();
+ }
+ }
+
+ $response['status'] = true;
+ $response['image_ids'] = $imageIds;
+ $response['category_name'] = $objCategory ? (string) $objCategory->name : '';
+ }
+ } else {
+ $response['errors'][] = $this->l('No images selected.');
+ }
+
+ $this->ajaxDie(json_encode($response));
+ }
+
public function ajaxProcessDeleteHotelImage()
{
$response = array('status' => false);
if ($idImage = Tools::getValue('id_image')) {
if ($idHotel = Tools::getValue('id_hotel')) {
- if (Validate::isLoadedObject($objHtlImage = new HotelImage((int) $idImage))) {
+ if (Validate::isLoadedObject($objHtlImage = new HotelImage((int) $idImage)) && (int) $objHtlImage->id_hotel === (int) $idHotel) {
if ($objHtlImage->delete()) {
if (!HotelImage::getCover($idHotel)) {
- $images = $objHtlImage->getImagesByHotelId($idHotel);
+ $images = $objHtlImage->getImagesByHotelId($idHotel, 1, 1);
if ($images) {
- $objHtlImage = new HotelImage($images[0]['id']);
- $objHtlImage->cover = 1;
- $objHtlImage->save();
+ $objNewCover = new HotelImage($images[0]['id']);
+ $objNewCover->cover = 1;
+ $objNewCover->save();
+
+ $response['new_cover_id'] = (int) $objNewCover->id;
+ $response['new_cover_row'] = $this->renderHotelImageRow($this->getHotelImageRowData($objNewCover), $idHotel);
}
}
$response['status'] = true;
@@ -950,6 +1095,43 @@ class AdminAddHotelController extends ModuleAdminController
$this->ajaxDie(json_encode($response));
}
+ public function ajaxProcessBulkDeleteHotelImage()
+ {
+ $response = array('status' => false, 'errors' => array());
+ $idHotel = (int) Tools::getValue('id_hotel');
+ $imageIds = array_filter(array_map('intval', (array) Tools::getValue('image_ids', array())));
+
+ if (!$idHotel || !$imageIds) {
+ $response['errors'][] = $this->l('No images selected.');
+ $this->ajaxDie(json_encode($response));
+ }
+
+ $deletedIds = array();
+ foreach ($imageIds as $idImage) {
+ $objHtlImage = new HotelImage($idImage);
+ if (Validate::isLoadedObject($objHtlImage) && (int) $objHtlImage->id_hotel === $idHotel && $objHtlImage->delete()) {
+ $deletedIds[] = $idImage;
+ }
+ }
+
+ if (!HotelImage::getCover($idHotel)) {
+ $objHelper = new HotelImage();
+ $images = $objHelper->getImagesByHotelId($idHotel, 1, 1);
+ if ($images) {
+ $objNewCover = new HotelImage($images[0]['id']);
+ $objNewCover->cover = 1;
+ $objNewCover->save();
+
+ $response['new_cover_id'] = (int) $objNewCover->id;
+ $response['new_cover_row'] = $this->renderHotelImageRow($this->getHotelImageRowData($objNewCover), $idHotel);
+ }
+ }
+
+ $response['status'] = true;
+ $response['deleted_ids'] = $deletedIds;
+ $this->ajaxDie(json_encode($response));
+ }
+
public function ajaxProcessUpdateSlidesPosition()
{
if (($slideIds = Tools::getValue('slides'))
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelImageCategoryController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelImageCategoryController.php
new file mode 100644
index 000000000..e0fdb8474
--- /dev/null
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelImageCategoryController.php
@@ -0,0 +1,153 @@
+bootstrap = true;
+ $this->table = 'htl_image_category';
+ $this->className = 'HotelImageCategory';
+ $this->identifier = 'id_htl_image_category';
+ $this->lang = true;
+ $this->context = Context::getContext();
+
+ parent::__construct();
+
+ $this->addRowAction('edit');
+ $this->addRowAction('delete');
+
+ $this->fields_list = array(
+ 'id_htl_image_category' => array(
+ 'title' => $this->l('ID'),
+ 'align' => 'center',
+ 'class' => 'fixed-width-xs',
+ ),
+ 'name' => array(
+ 'title' => $this->l('Name'),
+ 'align' => 'center',
+ ),
+ 'date_add' => array(
+ 'title' => $this->l('Created On'),
+ 'type' => 'date',
+ 'align' => 'right'
+ ),
+ );
+
+ $this->bulk_actions = array(
+ 'delete' => array(
+ 'text' => $this->l('Delete selected'),
+ 'icon' => 'icon-trash',
+ 'confirm' => $this->l('Delete selected items?'),
+ ),
+ );
+ }
+
+ public function initToolbar()
+ {
+ parent::initToolbar();
+ if (!$this->display || $this->display == 'list') {
+ $this->page_header_toolbar_btn['new'] = array(
+ 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token,
+ 'desc' => $this->l('Add new category'),
+ );
+ }
+ }
+
+ public function renderForm()
+ {
+ if (!$this->loadObject(true)) {
+ return;
+ }
+
+ $this->fields_form = array(
+ 'legend' => array(
+ 'title' => $this->l('Hotel Image Category'),
+ 'icon' => 'icon-tags',
+ ),
+ 'input' => array(
+ array(
+ 'type' => 'text',
+ 'label' => $this->l('Name'),
+ 'name' => 'name',
+ 'required' => true,
+ 'lang' => true,
+ 'col' => 4,
+ 'hint' => $this->l('Enter the name of the hotel image category.'),
+ ),
+ ),
+ 'submit' => array(
+ 'title' => $this->l('Save'),
+ ),
+ 'buttons' => array(
+ 'save-and-stay' => array(
+ 'title' => $this->l('Save and stay'),
+ 'name' => 'submitAdd'.$this->table.'AndStay',
+ 'type' => 'submit',
+ 'class' => 'btn btn-default pull-right',
+ 'icon' => 'process-icon-save',
+ ),
+ ),
+ );
+
+ return parent::renderForm();
+ }
+
+ public function processSave()
+ {
+ if (!$this->loadObject(true)) {
+ return;
+ }
+
+ $defaultLangId = (int) Configuration::get('PS_LANG_DEFAULT');
+ $defaultLanguage = Language::getLanguage($defaultLangId);
+ $languages = Language::getLanguages(false);
+
+ if (!trim(Tools::getValue('name_'.$defaultLangId))) {
+ $this->errors[] = $this->l('Category name is required at least in ').$defaultLanguage['name'];
+ } else {
+ foreach ($languages as $lang) {
+ $langName = trim(Tools::getValue('name_'.$lang['id_lang']));
+ if ($langName && !Validate::isCatalogName($langName)) {
+ $this->errors[] = $this->l('Invalid category name in ').$lang['name'];
+ }
+ }
+ }
+
+ return parent::processSave();
+ }
+
+ public function initPageHeaderToolbar()
+ {
+ if (!$this->display || $this->display == 'list') {
+ $back = $this->context->link->getAdminLink('AdminAddHotel');
+ $this->page_header_toolbar_btn['back_to_list'] = array(
+ 'href' => $back,
+ 'desc' => $this->l('Back to hotel list'),
+ 'icon' => 'process-icon-back'
+ );
+ }
+ parent::initPageHeaderToolbar();
+ }
+
+}
diff --git a/modules/hotelreservationsystem/define.php b/modules/hotelreservationsystem/define.php
index 1f6809c2b..d17929877 100644
--- a/modules/hotelreservationsystem/define.php
+++ b/modules/hotelreservationsystem/define.php
@@ -26,6 +26,7 @@ require_once 'classes/HotelRoomType.php';
require_once 'classes/HotelRoomInformation.php';
require_once 'classes/HotelBranchInformation.php';
require_once 'classes/HotelImage.php';
+require_once 'classes/HotelImageCategory.php';
require_once 'classes/HotelAmenities.php';
require_once 'classes/HotelBranchAmenities.php';
require_once 'classes/HotelRoomTypeAmenities.php';
diff --git a/modules/hotelreservationsystem/hotelreservationsystem.php b/modules/hotelreservationsystem/hotelreservationsystem.php
index 9b35b1b0d..6bd5443e3 100644
--- a/modules/hotelreservationsystem/hotelreservationsystem.php
+++ b/modules/hotelreservationsystem/hotelreservationsystem.php
@@ -529,6 +529,7 @@ class HotelReservationSystem extends Module
$this->installTab('AdminHotelFeaturePricesSettings', 'Advanced Price Rules', 'AdminHotelConfigurationSetting', false);
$this->installTab('AdminRoomTypeGlobalDemand', 'Additional Demand Configuration', 'AdminHotelConfigurationSetting', false);
$this->installTab('AdminBookingDocument', 'Booking Documents', false, false);
+ $this->installTab('AdminHotelImageCategory', 'Hotel Image Category', false, false);
return true;
}
diff --git a/modules/hotelreservationsystem/views/js/hotelImage.js b/modules/hotelreservationsystem/views/js/hotelImage.js
index c1fd5f666..25df2800d 100644
--- a/modules/hotelreservationsystem/views/js/hotelImage.js
+++ b/modules/hotelreservationsystem/views/js/hotelImage.js
@@ -21,82 +21,126 @@
*/
$(document).ready(function () {
- $('.htl-img-preview').fancybox({
- width: 'auto',
- height: 'auto',
- autoSize : false,
- maxWidth: 700,
- 'hideOnContentClick': false,
- });
-
- $("#hotel_images").on("change", function(event) {
- const files = Array.from(event.target.files);
- uploadSelectedImages(files);
- });
-
- function uploadSelectedImages(files)
+ function initHotelImagePreview()
{
- if (files.length == 0) return; // all done
- let file = files[0];
- files.splice(0, 1);
- createImageUploadRequest(file).then((formData) => {
- uploadHotelImages(formData).then(() => {
- uploadSelectedImages(files)
- });
- })
+ $('.htl-img-preview').fancybox({
+ width: 'auto',
+ height: 'auto',
+ autoSize : false,
+ maxWidth: 700,
+ 'hideOnContentClick': false,
+ });
}
- function createImageUploadRequest(file)
+ initHotelImagePreview();
+
+ function initHotelImageModal(modalId)
{
- return new Promise((resolve, reject) => {
- if (typeof file != 'undefined') {
- if (file.size > maxSizeAllowed) {
- reject(filesizeError + '[' + file.name + ']');
- } else {
- var formData = new FormData();
- var idHotel = $("#id-hotel").val();
- formData.append('hotel_image', file);
- formData.append('id_hotel', idHotel);
- formData.append('ajax', true);
- formData.append('action', 'uploadHotelImages');
- resolve(formData);
- }
+ $('#page-loader').show();
+ $(modalId).modal('show');
+ setTimeout(function () {
+ $('#page-loader').hide();
+ }, 0);
+ }
+
+ function getCheckedImageIds()
+ {
+ return $('.hotel-image-checkbox:checked').map(function () {
+ return $(this).val();
+ }).get();
+ }
+
+ function showEmptyRowIfNoImagesLeft()
+ {
+ if (!$('#hotel-image-table tbody tr[data-id-image]').length) {
+ $('.list-empty-tr').show();
+ }
+ }
+
+ $('#open-add-hotel-images-modal').on('click', function () {
+ var fileInput = document.getElementById('hotel-images-file-input');
+ if (fileInput) {
+ fileInput.value = '';
+ }
+ $('#hotel-images-file-name').val('');
+ initHotelImageModal('#addHotelImagesModal');
+ });
+
+ $('#hotel-images-file-add-btn').on('click', function () {
+ $('#hotel-images-file-input').trigger('click');
+ });
+
+ $('#hotel-images-file-name').on('click', function () {
+ $('#hotel-images-file-input').trigger('click');
+ });
+
+ $('#hotel-images-file-input').on('change', function () {
+ var fileNames = Array.prototype.map.call(this.files, function (file) {
+ return file.name;
+ });
+ $('#hotel-images-file-name').val(fileNames.join(', '));
+ });
+
+ $('#hotel-images-upload-btn').on('click', function () {
+ var fileInput = document.getElementById('hotel-images-file-input');
+ var files = fileInput ? Array.prototype.slice.call(fileInput.files) : [];
+ if (!files.length) {
+ showErrorMessage(imgSelectErrorMsg);
+ return;
+ }
+ uploadHotelImagesSequentially(files);
+ });
+
+ function uploadHotelImagesSequentially(files)
+ {
+ var index = 0;
+ var idHotel = $('#id-hotel').val();
+ var idHtlImageCategory = $('#id_htl_image_category').val();
+ var $btn = $('#hotel-images-upload-btn').prop('disabled', true);
+
+ $('#page-loader').show();
+
+ function next() {
+ if (index >= files.length) {
+ $btn.prop('disabled', false);
+ $('#page-loader').hide();
+ $('#addHotelImagesModal').modal('hide');
+ return;
}
- });
- }
- function uploadHotelImages(formData) {
- return new Promise((resolve, reject) => {
+ var file = files[index++];
+ var formData = new FormData();
+ formData.append('hotel_image', file);
+ formData.append('ajax', true);
+ formData.append('action', 'UploadHotelImage');
+ formData.append('id_hotel', idHotel);
+ formData.append('id_htl_image_category', idHtlImageCategory);
+
$.ajax({
- type:'POST',
- dataType:'JSON',
+ type: 'POST',
url: adminHotelCtrlUrl,
+ dataType: 'json',
data: formData,
- cache:false,
- contentType: false,
processData: false,
- success:function(response){
- if (response.success) {
- $('.list-empty-tr').remove();
- $("#hotel-image-table tbody").append(response.data.image_row);
+ contentType: false,
+ success: function (resp) {
+ if (resp && resp.success) {
+ $('.list-empty-tr').hide();
+ $('#hotel-image-table tbody').append(resp.image_row);
+ initHotelImagePreview();
showSuccessMessage(imgUploadSuccessMsg);
- resolve(imgUploadSuccessMsg);
} else {
- if (typeof response.errors != 'undefined') {
- showErrorMessage(response.errors);
- reject(response.errors);
- } else {
- showErrorMessage(imgUploadErrorMsg);
- reject(imgUploadErrorMsg);
- }
+ showErrorMessage(file.name + ': ' + ((resp && resp.errors && resp.errors.join(', ')) || imgUploadErrorMsg));
}
+ next();
},
- error: function(data) {
- showErrorMessage(imgUploadErrorMsg);
- reject(imgUploadErrorMsg);
+ error: function () {
+ showErrorMessage(file.name + ': ' + imgUploadErrorMsg);
+ next();
}
});
- });
+ }
+ next();
}
$('body').on('click', '.changer-cover-image', function(e){
@@ -104,8 +148,8 @@ $(document).ready(function () {
var idHotel = $(this).attr('data-id-hotel');
var idImage = $(this).attr('data-id-image');
var isCover = $(this).attr('data-is-cover');
- var triggerElement = $(this);
if (isCover == 0) {
+ $('#page-loader').show();
$.ajax({
type:'POST',
url: adminHotelCtrlUrl,
@@ -118,15 +162,11 @@ $(document).ready(function () {
},
success: function(result) {
if (result.status) {
- // remover cover image identifier from old cover image
- var oldCoverImageTr = $("#hotel-image-table tbody tr.cover-image-tr");
- oldCoverImageTr.removeClass("cover-image-tr").find("td.cover-image-td").removeClass("cover-image-td").find("a.changer-cover-image").removeClass("text-success").addClass("text-danger").attr("data-is-cover", "0").find("i.icon-check").removeClass("icon-check").addClass("icon-times");
- oldCoverImageTr.find("td button.delete-hotel-image").attr("data-is-cover", "0");
-
- // Add classes in new covre image elements
- triggerElement.removeClass("text-danger").addClass("text-success").find("i.icon-times").removeClass("icon-times").addClass("icon-check");
- triggerElement.parent().addClass("cover-image-td").parent().addClass("cover-image-tr").find("td button.delete-hotel-image").attr("data-is-cover", "1");
-
+ $('#hotel-image-table tr[data-id-image="' + idImage + '"]').replaceWith(result.image_row);
+ if (result.old_cover_row) {
+ $('#hotel-image-table tr[data-id-image="' + result.old_cover_id + '"]').replaceWith(result.old_cover_row);
+ }
+ initHotelImagePreview();
showSuccessMessage(coverImgSuccessMsg);
} else {
showErrorMessage(coverImgErrorMsg);
@@ -135,18 +175,207 @@ $(document).ready(function () {
error: function(data){
showErrorMessage(coverImgErrorMsg);
}
+ }).always(function () {
+ $('#page-loader').hide();
});
}
});
- $('body').on('click', '.delete-hotel-image', function(e){
+ $('body').on('click', '.edit-hotel-image', function () {
+ var idImage = $(this).data('id-image');
+ var idCategory = parseInt($(this).data('id-htl-image-category'), 10) || 0;
+ var isCover = parseInt($(this).attr('data-is-cover'), 10) === 1;
+
+ var $categorySelect = $('#edit_id_htl_image_category');
+
+ $('#edit_hotel_image_id').val(idImage);
+ $categorySelect.val($categorySelect.find('option[value="' + idCategory + '"]').length ? idCategory : 0);
+ $('#edit_hotel_image_cover_on').prop('checked', isCover);
+ $('#edit_hotel_image_cover_off').prop('checked', !isCover);
+
+ initHotelImageModal('#editHotelImageModal');
+ });
+
+ $('#save-edit-hotel-image-btn').on('click', function () {
+ var idImage = $('#edit_hotel_image_id').val();
+ var idHotel = $('#id-hotel').val();
+ var $btn = $(this).prop('disabled', true);
+
+ $('#page-loader').show();
+
+ $.ajax({
+ type: 'POST',
+ url: adminHotelCtrlUrl,
+ dataType: 'json',
+ data: {
+ ajax: true,
+ action: 'EditHotelImage',
+ id_hotel: idHotel,
+ id_image: idImage,
+ id_htl_image_category: $('#edit_id_htl_image_category').val(),
+ cover: $('input[name="edit_hotel_image_cover"]:checked').val()
+ },
+ success: function (resp) {
+ if (resp && resp.status) {
+ $('#hotel-image-table tr[data-id-image="' + idImage + '"]').replaceWith(resp.image_row);
+ if (resp.old_cover_row) {
+ $('#hotel-image-table tr[data-id-image="' + resp.old_cover_id + '"]').replaceWith(resp.old_cover_row);
+ }
+ initHotelImagePreview();
+ showSuccessMessage(imgUpdateSuccessMsg);
+ $('#editHotelImageModal').modal('hide');
+ } else {
+ showErrorMessage((resp && resp.errors && resp.errors.join('
')) || imgUploadErrorMsg);
+ }
+ },
+ error: function () {
+ showErrorMessage(imgUploadErrorMsg);
+ }
+ }).always(function () {
+ $btn.prop('disabled', false);
+ $('#page-loader').hide();
+ });
+ });
+
+ $('#hotel-image-select-all').on('click', function (e) {
e.preventDefault();
- var idHotel = $(this).attr('data-id-hotel');
- var idImage = $(this).attr('data-id-image');
- var isCover = $(this).attr('data-is-cover');
- var triggerElement = $(this);
+ $('.hotel-image-checkbox').prop('checked', true);
+ });
+
+ $('#hotel-image-unselect-all').on('click', function (e) {
+ e.preventDefault();
+ $('.hotel-image-checkbox').prop('checked', false);
+ });
+
+ $('#hotel-image-bulk-update').on('click', function (e) {
+ e.preventDefault();
+ if (!$('.hotel-image-checkbox:checked').length) {
+ showErrorMessage(bulkUpdateSelectErrorMsg);
+ return;
+ }
+
+ $('#bulk_id_htl_image_category').val(0);
+ initHotelImageModal('#bulkUpdateHotelImageModal');
+ });
+
+ var pendingBulkDeleteImageIds = null;
+
+ $('#hotel-image-bulk-delete').on('click', function (e) {
+ e.preventDefault();
+ var imageIds = getCheckedImageIds();
+ if (!imageIds.length) {
+ showErrorMessage(bulkDeleteSelectErrorMsg);
+ return;
+ }
+ pendingBulkDeleteImageIds = imageIds;
+ $('#confirmDeleteHotelImageModal').modal('show');
+ });
+
+ $('#save-bulk-hotel-image-btn').on('click', function () {
+ var idHotel = $('#id-hotel').val();
+ var idHtlImageCategory = $('#bulk_id_htl_image_category').val();
+ var imageIds = getCheckedImageIds();
+ var $btn = $(this).prop('disabled', true);
+
+ $('#page-loader').show();
+
+ $.ajax({
+ type: 'POST',
+ url: adminHotelCtrlUrl,
+ dataType: 'json',
+ data: {
+ ajax: true,
+ action: 'BulkUpdateHotelImage',
+ id_hotel: idHotel,
+ id_htl_image_category: idHtlImageCategory,
+ image_ids: imageIds
+ },
+ success: function (resp) {
+ if (resp && resp.status) {
+ $.each(resp.image_ids, function (i, idImage) {
+ var $row = $('#hotel-image-table tr[data-id-image="' + idImage + '"]');
+ $row.find('.hotel-image-category-cell').text(resp.category_name || '—');
+ $row.find('.edit-hotel-image').attr('data-id-htl-image-category', idHtlImageCategory);
+ });
+ $('.hotel-image-checkbox').prop('checked', false);
+ showSuccessMessage(imgUpdateSuccessMsg);
+ $('#bulkUpdateHotelImageModal').modal('hide');
+ } else {
+ showErrorMessage((resp && resp.errors && resp.errors.join('
')) || imgUploadErrorMsg);
+ }
+ },
+ error: function () {
+ showErrorMessage(imgUploadErrorMsg);
+ }
+ }).always(function () {
+ $btn.prop('disabled', false);
+ $('#page-loader').hide();
+ });
+ });
+
+ var pendingDeleteHotelImage = null;
+
+ $('body').on('click', '.delete-hotel-image', function (e) {
+ e.preventDefault();
+ pendingDeleteHotelImage = $(this);
+ pendingBulkDeleteImageIds = null;
+ $('#confirmDeleteHotelImageModal').modal('show');
+ });
+
+ $('#confirm-delete-hotel-image-btn').on('click', function () {
+ $('#confirmDeleteHotelImageModal').modal('hide');
+
+ if (pendingBulkDeleteImageIds && pendingBulkDeleteImageIds.length) {
+ var bulkImageIds = pendingBulkDeleteImageIds;
+ var bulkIdHotel = $('#id-hotel').val();
+ pendingBulkDeleteImageIds = null;
+
+ $('#page-loader').show();
+ $.ajax({
+ type: 'POST',
+ url: adminHotelCtrlUrl,
+ dataType: 'json',
+ data: {
+ ajax: true,
+ action: 'BulkDeleteHotelImage',
+ id_hotel: bulkIdHotel,
+ image_ids: bulkImageIds
+ },
+ success: function (result) {
+ if (result.status) {
+ $.each(result.deleted_ids, function (i, idImage) {
+ $('#hotel-image-table tr[data-id-image="' + idImage + '"]').fadeOut().remove();
+ });
+ if (result.new_cover_row) {
+ $('#hotel-image-table tr[data-id-image="' + result.new_cover_id + '"]').replaceWith(result.new_cover_row);
+ initHotelImagePreview();
+ }
+ showEmptyRowIfNoImagesLeft();
+ $('.hotel-image-checkbox').prop('checked', false);
+ showSuccessMessage(deleteImgSuccessMsg);
+ } else {
+ showErrorMessage((result.errors && result.errors.join('
')) || deleteImgErrorMsg);
+ }
+ },
+ error: function () {
+ showErrorMessage(deleteImgErrorMsg);
+ }
+ }).always(function () {
+ $('#page-loader').hide();
+ });
+ return;
+ }
+
+ var triggerElement = pendingDeleteHotelImage;
+ if (!triggerElement) {
+ return;
+ }
+
+ var idHotel = triggerElement.attr('data-id-hotel');
+ var idImage = triggerElement.attr('data-id-image');
if (parseInt(idHotel) && parseInt(idImage)) {
+ $('#page-loader').show();
$.ajax({
type:'POST',
url: adminHotelCtrlUrl,
@@ -159,19 +388,16 @@ $(document).ready(function () {
},
success: function(result) {
if (result.status) {
- if (parseInt(isCover)) {
- location.reload();
- } else {
- var currentPosition = parseInt(triggerElement.parents('tr').find('td.image-position').text());
- var nextAllSiblings = triggerElement.parents('tr').nextAll();
- triggerElement.parents('tr').fadeOut().remove();
+ triggerElement.parents('tr').fadeOut().remove();
- // Correct Images Positions
- $(nextAllSiblings).each(function(index, element) {
- $(this).find('td.image-position').text(parseInt(currentPosition + parseInt(index)));
- });
- showSuccessMessage(deleteImgSuccessMsg);
+ if (result.new_cover_row) {
+ $('#hotel-image-table tr[data-id-image="' + result.new_cover_id + '"]').replaceWith(result.new_cover_row);
+ initHotelImagePreview();
}
+
+ showEmptyRowIfNoImagesLeft();
+
+ showSuccessMessage(deleteImgSuccessMsg);
} else {
showErrorMessage(deleteImgErrorMsg);
}
@@ -179,9 +405,11 @@ $(document).ready(function () {
error: function(data){
showErrorMessage(deleteImgErrorMsg);
}
+ }).always(function () {
+ $('#page-loader').hide();
});
} else {
showErrorMessage(deleteImgErrorMsg);
}
});
-});
\ No newline at end of file
+});
diff --git a/modules/hotelreservationsystem/views/templates/admin/add_hotel/_partials/htl-images-list-row.tpl b/modules/hotelreservationsystem/views/templates/admin/add_hotel/_partials/htl-images-list-row.tpl
index 4a28112c7..700f21f24 100644
--- a/modules/hotelreservationsystem/views/templates/admin/add_hotel/_partials/htl-images-list-row.tpl
+++ b/modules/hotelreservationsystem/views/templates/admin/add_hotel/_partials/htl-images-list-row.tpl
@@ -20,16 +20,25 @@
* @license https://opensource.org/license/osl-3-0-php Open Software License version 3.0
*}
-
| {l s='Image Id' mod='hotelreservationsystem'} | {l s='Image' mod='hotelreservationsystem'} | +{l s='Category' mod='hotelreservationsystem'} | {l s='Cover' mod='hotelreservationsystem'} | {l s='Action' mod='hotelreservationsystem'} | |
|---|---|---|---|---|---|
|
-
-
- {l s='No Image Found' mod='hotelreservationsystem'}
-
- |
- |||||
|
+
+
+ {l s='No Image Found' mod='hotelreservationsystem'}
+
+ |
+ |||||