From e83b7ad785648b518765b019913bd9b08f3b7962 Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Fri, 16 Aug 2019 23:27:27 +0200 Subject: [PATCH 1/6] Fix css syntax --- modules/wktestimonialblock/views/css/testimonialblock.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/wktestimonialblock/views/css/testimonialblock.css b/modules/wktestimonialblock/views/css/testimonialblock.css index df1bdedd3..7b4ea42c6 100644 --- a/modules/wktestimonialblock/views/css/testimonialblock.css +++ b/modules/wktestimonialblock/views/css/testimonialblock.css @@ -49,7 +49,7 @@ font-weight: 400; word-spacing: 3px; letter-spacing: 1px; - word-wrap: break-word + word-wrap: break-word; line-height:20px; } .testi_block_content { From 4392414c30944241683bb4704d30963860e4854d Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Mon, 2 Sep 2019 15:17:11 +0530 Subject: [PATCH 2/6] Null Quantity while add rooms to cart is resolved. Issue Link- https://github.com/webkul/hotelcommerce/issues/74 --- controllers/front/CartController.php | 77 +++++++++++++++++----------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php index 9a2315219..16c372b45 100644 --- a/controllers/front/CartController.php +++ b/controllers/front/CartController.php @@ -269,41 +269,56 @@ class CartControllerCore extends FrontController $id_cart = $this->context->cart->id; $id_guest = $this->context->cart->id_guest; - /* - * By Webkul - * This code is to check available quantity of Room before adding it to cart. - */ + // By Webkul : This code is to check available quantity of Room before adding it to cart. if (Module::isInstalled('hotelreservationsystem') && Module::isEnabled('hotelreservationsystem')) { require_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - - $obj_booking_detail = new HotelBookingDetail(); - $num_days = $obj_booking_detail->getNumberOfDays($date_from, $date_to); - - $req_rm = $this->qty; - $this->qty = $this->qty * (int) $num_days; - $obj_room_type = new HotelRoomType(); - $room_info_by_id_product = $obj_room_type->getRoomTypeInfoByIdProduct($this->id_product); - - if ($room_info_by_id_product) { - $id_hotel = $room_info_by_id_product['id_hotel']; - - if ($id_hotel) { - /*Check Order restrict condition before adding in to cart*/ - $max_order_date = HotelOrderRestrictDate::getMaxOrderDate($id_hotel); - if ($max_order_date) { - $max_order_date = date('Y-m-d', strtotime($max_order_date)); - if ($max_order_date < $date_from || $max_order_date < $date_to) { - $this->errors[] = Tools::displayError('You can\'t Book room after date '.$max_order_date); + $objRoomType = new HotelRoomType(); + if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($this->id_product)) { + if ($id_hotel = $roomTypeInfo['id_hotel']) { + if (strtotime($date_from) < strtotime(date('Y-m-d'))) { + $this->errors[] = Tools::displayError('You can\'t book room before current date'); + } elseif (strtotime($date_from) >= strtotime($date_to)) { + $this->errors[] = Tools::displayError('Check-out date must be after check-in date'); + } elseif ($maxOrdDate = HotelOrderRestrictDate::getMaxOrderDate($id_hotel)) { + // Check Order restrict condition before adding in to cart + if (strtotime($maxOrdDate) < strtotime($date_from) + || strtotime($maxOrdDate) < strtotime($date_to) + ) { + $maxOrdDate = date('d-m-Y', strtotime($maxOrdDate)); + $this->errors[] = Tools::displayError('You can\'t book room after date '.$maxOrdDate); } } - /*END*/ - $obj_booking_dtl = new HotelBookingDetail(); - $hotel_room_data = $obj_booking_dtl->DataForFrontSearch($date_from, $date_to, $id_hotel, $this->id_product, 1, 0, 0, -1, 0, 0, $id_cart, $id_guest); - - $total_available_rooms = $hotel_room_data['stats']['num_avail']; - - if ($total_available_rooms < $req_rm) { - die(Tools::jsonEncode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms))); + if (!$this->errors) { + $objBookingDtl = new HotelBookingDetail(); + $num_days = $objBookingDtl->getNumberOfDays($date_from, $date_to); + $req_rm = $this->qty; + $this->qty = $this->qty * (int) $num_days; + $obj_booking_dtl = new HotelBookingDetail(); + if ($hotel_room_data = $obj_booking_dtl->DataForFrontSearch( + $date_from, + $date_to, + $id_hotel, + $this->id_product, + 1, + 0, + 0, + -1, + 0, + 0, + $id_cart, + $id_guest + )) { + if (isset($hotel_room_data['stats']['num_avail'])) { + $total_available_rooms = $hotel_room_data['stats']['num_avail']; + if ($total_available_rooms < $req_rm) { + die(Tools::jsonEncode(array('status' => 'unavailable_quantity', 'avail_rooms' => $total_available_rooms))); + } + } else { + $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); + } + } else { + $this->errors[] = Tools::displayError('Rooms are unavailable. Please try with different dates'); + } } } else { die(Tools::jsonEncode(array('status' => 'failed3'))); From 2ec7f2c608ecc52d52dbcdb6cf71fc3a941653bf Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Mon, 9 Sep 2019 22:15:14 +0200 Subject: [PATCH 3/6] Fix path Feature Logo --- controllers/admin/AdminFeaturesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index fa72862a6..b3a1fc14e 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -171,7 +171,7 @@ class AdminFeaturesControllerCore extends AdminController } $ps_img_url = _PS_IMG_DIR_.'rf/'.$obj->id.'.png'; if ($img_exist = file_exists($ps_img_url)) { - $img_url = '../../hotelcommerce/img/rf/'.$obj->id.'.png'; + $img_url = '../img/rf/'.$obj->id.'.png'; $image = ""; } From 7789d883c5d847349f61e891c39ca6979f6e24ec Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Mon, 9 Sep 2019 22:28:32 +0200 Subject: [PATCH 4/6] better terminology Feature to Room Feature --- controllers/admin/AdminFeaturesController.php | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index b3a1fc14e..9dff6b6a5 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -175,10 +175,10 @@ class AdminFeaturesControllerCore extends AdminController $image = ""; } - $this->toolbar_title = $this->l('Add a new feature'); + $this->toolbar_title = $this->l('Add a new room feature'); $this->fields_form = array( 'legend' => array( - 'title' => $this->l('Feature'), + 'title' => $this->l('Room feature'), 'icon' => 'icon-info-sign' ), 'input' => array( @@ -188,16 +188,16 @@ class AdminFeaturesControllerCore extends AdminController 'name' => 'name', 'lang' => true, 'size' => 33, - 'hint' => $this->l('Enter a name for the feature. Invalid characters:').' <>;=#{}', + 'hint' => $this->l('Enter a name for the room feature. Invalid characters:').' <>;=#{}', 'required' => true ), array( 'type' => 'file', - 'label' => $this->l('Feature Logo'), + 'label' => $this->l('Room Feature Logo'), 'name' => 'logo', 'image' => $img_exist ? $image : false, 'display_image' => true, - 'hint' => $this->l('Upload a feature logo.'), + 'hint' => $this->l('Upload a room feature logo.'), 'required' => true ) ) @@ -223,13 +223,13 @@ class AdminFeaturesControllerCore extends AdminController if (empty($this->display)) { $this->page_header_toolbar_btn['new_feature'] = array( 'href' => self::$currentIndex.'&addfeature&token='.$this->token, - 'desc' => $this->l('Add new feature', null, null, false), + 'desc' => $this->l('Add new room feature', null, null, false), 'icon' => 'process-icon-new' ); $this->page_header_toolbar_btn['new_feature_value'] = array( 'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token, - 'desc' => $this->l('Add new feature value', null, null, false), + 'desc' => $this->l('Add new room feature value', null, null, false), 'icon' => 'process-icon-new' ); } @@ -237,7 +237,7 @@ class AdminFeaturesControllerCore extends AdminController if ($this->display == 'view') { $this->page_header_toolbar_btn['new_feature_value'] = array( 'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token, - 'desc' => $this->l('Add new feature value', null, null, false), + 'desc' => $this->l('Add new room feature value', null, null, false), 'icon' => 'process-icon-new' ); } @@ -283,7 +283,7 @@ class AdminFeaturesControllerCore extends AdminController case 'view': $this->toolbar_btn['newAttributes'] = array( 'href' => self::$currentIndex.'&addfeature_value&id_feature='.(int)Tools::getValue('id_feature').'&token='.$this->token, - 'desc' => $this->l('Add new feature values') + 'desc' => $this->l('Add new room feature values') ); $this->toolbar_btn['back'] = array( 'href' => self::$currentIndex.'&token='.$this->token, @@ -301,12 +301,12 @@ class AdminFeaturesControllerCore extends AdminController switch ($this->display) { case 'edit': - $bread_extended[] = $this->l('Edit New Feature'); + $bread_extended[] = $this->l('Edit New Room Feature'); $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); break; case 'add': - $bread_extended[] = $this->l('Add New Feature'); + $bread_extended[] = $this->l('Add New Room Feature'); $this->addMetaTitle($bread_extended[count($bread_extended) - 1]); break; @@ -351,13 +351,13 @@ class AdminFeaturesControllerCore extends AdminController $this->fields_form[0]['form'] = array( 'legend' => array( - 'title' => $this->l('Feature value'), + 'title' => $this->l('Room feature value'), 'icon' => 'icon-info-sign' ), 'input' => array( array( 'type' => 'select', - 'label' => $this->l('Feature'), + 'label' => $this->l('Room feature'), 'name' => 'id_feature', 'options' => array( 'query' => Feature::getFeatures($this->context->language->id), @@ -425,7 +425,7 @@ class AdminFeaturesControllerCore extends AdminController $helper->allow_employee_form_lang = $this->allow_employee_form_lang; $helper->fields_value = $this->getFieldsValue($feature_value); $helper->toolbar_btn = $this->toolbar_btn; - $helper->title = $this->l('Add a new feature value'); + $helper->title = $this->l('Add a new room feature value'); $this->content .= $helper->generateForm($this->fields_form); } @@ -464,7 +464,7 @@ class AdminFeaturesControllerCore extends AdminController } } else { $url = ''.$this->l('Performance').''; - $this->displayWarning(sprintf($this->l('This feature has been disabled. You can activate it here: %s.'), $url)); + $this->displayWarning(sprintf($this->l('This room feature has been disabled. You can activate it here: %s.'), $url)); } $this->context->smarty->assign( @@ -615,7 +615,7 @@ class AdminFeaturesControllerCore extends AdminController // upload feature image $imgPath = _PS_IMG_DIR_.'rf/'.$objFeature->id.'.png'; if (!ImageManager::resize($featureImage['tmp_name'], $imgPath)) { - $this->errors[] = $this->l('Some error occurred while uploding feature image. Please try again.'); + $this->errors[] = $this->l('Some error occurred while uploding room feature image. Please try again.'); } } @@ -695,12 +695,12 @@ class AdminFeaturesControllerCore extends AdminController if (isset($pos[2]) && (int)$pos[2] === $idFeature) { if ($feature = new Feature((int)$pos[2])) { if (isset($position) && $feature->updatePosition($way, $position, $idFeature)) { - echo 'ok position '.(int)$position.' for feature '.(int)$pos[1].'\r\n'; + echo 'ok position '.(int)$position.' for room feature '.(int)$pos[1].'\r\n'; } else { - echo '{"hasError" : true, "errors" : "Can not update feature '.(int)$idFeature.' to position '.(int)$position.' "}'; + echo '{"hasError" : true, "errors" : "Can not update room feature '.(int)$idFeature.' to position '.(int)$position.' "}'; } } else { - echo '{"hasError" : true, "errors" : "This feature ('.(int)$idFeature.') can t be loaded"}'; + echo '{"hasError" : true, "errors" : "This room feature ('.(int)$idFeature.') can t be loaded"}'; } break; From ae684d733f9e5de1224de3c5695d018e35300734 Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Tue, 10 Sep 2019 09:46:28 +0530 Subject: [PATCH 5/6] Fix path Feature Logo Image is not showing while feature update (Catalog->features) and issue while updating feature. --- controllers/admin/AdminFeaturesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index fa72862a6..2340b5d03 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -171,7 +171,7 @@ class AdminFeaturesControllerCore extends AdminController } $ps_img_url = _PS_IMG_DIR_.'rf/'.$obj->id.'.png'; if ($img_exist = file_exists($ps_img_url)) { - $img_url = '../../hotelcommerce/img/rf/'.$obj->id.'.png'; + $img_url = _PS_IMG_.'rf/'.$obj->id.'.png'; $image = ""; } From f567ac935d8985579641574e37d7636cbf0c0b92 Mon Sep 17 00:00:00 2001 From: wdammak <26695620+wdammak@users.noreply.github.com> Date: Tue, 10 Sep 2019 16:47:53 +0200 Subject: [PATCH 6/6] Better terminology --- controllers/admin/AdminFeaturesController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php index 9dff6b6a5..94bd3d898 100644 --- a/controllers/admin/AdminFeaturesController.php +++ b/controllers/admin/AdminFeaturesController.php @@ -171,7 +171,7 @@ class AdminFeaturesControllerCore extends AdminController } $ps_img_url = _PS_IMG_DIR_.'rf/'.$obj->id.'.png'; if ($img_exist = file_exists($ps_img_url)) { - $img_url = '../img/rf/'.$obj->id.'.png'; + $img_url = _PS_IMG_.'rf/'.$obj->id.'.png'; $image = ""; }