From e1e2270400dbfe29eb5eb23636ccba0b4dcd20a5 Mon Sep 17 00:00:00 2001 From: sumit panwar Date: Mon, 8 Feb 2021 17:54:39 +0530 Subject: [PATCH] getHotelCartBookingData() : function multiplication optimized --- modules/blockcart/blockcart.php | 106 +----- .../classes/HotelCartBookingData.php | 328 +++++++++--------- 2 files changed, 179 insertions(+), 255 deletions(-) diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php index 73791ad1b..425a62027 100644 --- a/modules/blockcart/blockcart.php +++ b/modules/blockcart/blockcart.php @@ -62,7 +62,12 @@ class blockcart extends Module $useTax = !($taxCalculationMethod == PS_TAX_EXC); $products = $params['cart']->getProducts(true); - $htlCartData = $this->getHotelCartBookingData(); + + $totalRooms = 0; + if ($htlCartData = HotelCartBookingData::getHotelCartBookingData(0)) { + $totalRooms = array_sum(array_column($htlCartData, 'total_num_rooms')); + } + $nbTotalProducts = 0; foreach ($products as $product) { $nbTotalProducts += (int) $product['cart_quantity']; @@ -160,8 +165,8 @@ class blockcart extends Module 'ajax_allowed' => (int) (Configuration::get('PS_BLOCK_CART_AJAX')) == 1 ? true : false, 'static_token' => Tools::getToken(false), 'free_shipping' => $total_free_shipping, - 'cart_htl_data' => $htlCartData['cart_htl_data'], - 'total_rooms_in_cart' => $htlCartData['total_rooms_in_cart'], + 'cart_htl_data' => $htlCartData, + 'total_rooms_in_cart' => $totalRooms, )); if (is_array($errors) && count($errors)) { $this->smarty->assign('errors', $errors); @@ -403,99 +408,4 @@ class blockcart extends Module 'PS_BLOCK_CART_XSELL_LIMIT' => (int) Tools::getValue('PS_BLOCK_CART_XSELL_LIMIT', Configuration::get('PS_BLOCK_CART_XSELL_LIMIT')), ); } - - //by webkul - public function getHotelCartBookingData() - { - $total_rooms = 0; - $cart_htl_data = array(); - $priceDisplay = Group::getPriceDisplayMethod(Group::getCurrent()->id); - if (!$priceDisplay || $priceDisplay == 2) { - $price_tax = true; - } elseif ($priceDisplay == 1) { - $price_tax = false; - } - if (Module::isInstalled('hotelreservationsystem')) { - require_once _PS_MODULE_DIR_.'hotelreservationsystem/define.php'; - - $obj_cart_bk_data = new HotelCartBookingData(); - $obj_htl_bk_dtl = new HotelBookingDetail(); - $obj_rm_type = new HotelRoomType(); - - $htl_rm_types = $this->context->cart->getProducts(); - if (!empty($htl_rm_types)) { - foreach ($htl_rm_types as $type_key => $type_value) { - $product = new Product($type_value['id_product'], false, $this->context->language->id); - $cover_image_arr = $product->getCover($type_value['id_product']); - - if (!empty($cover_image_arr)) { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $product->id.'-'.$cover_image_arr['id_image'], 'small_default'); - } else { - $cover_img = $this->context->link->getImageLink($product->link_rewrite, $this->context->language->iso_code.'-default', 'small_default'); - } - - $unit_price = Product::getPriceStatic($type_value['id_product'], $price_tax, null, 6, null, false, true, 1); - - if (isset($this->context->customer->id)) { - $cart_bk_data = $obj_cart_bk_data->getOnlyCartBookingData($this->context->cart->id, $this->context->cart->id_guest, $type_value['id_product']); - } else { - $cart_bk_data = $obj_cart_bk_data->getOnlyCartBookingData($this->context->cart->id, $this->context->cart->id_guest, $type_value['id_product']); - } - $rm_dtl = $obj_rm_type->getRoomTypeInfoByIdProduct($type_value['id_product']); - $cart_htl_data[$type_key]['total_num_rooms'] = 0; - $cart_htl_data[$type_key]['id_product'] = $type_value['id_product']; - $cart_htl_data[$type_key]['cover_img'] = $cover_img; - $cart_htl_data[$type_key]['name'] = $product->name; - $cart_htl_data[$type_key]['unit_price'] = $unit_price; - $cart_htl_data[$type_key]['adult'] = $rm_dtl['adult']; - $cart_htl_data[$type_key]['children'] = $rm_dtl['children']; - if (isset($cart_bk_data) && $cart_bk_data) { - foreach ($cart_bk_data as $data_k => $data_v) { - $date_join = strtotime($data_v['date_from']).strtotime($data_v['date_to']); - - if (isset($cart_htl_data[$type_key]['date_diff'][$date_join])) { - $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] += 1; - $total_rooms += 1; - $num_days = $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days']; - $vart_quant = (int) $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm']; - - //// By webkul New way to calculate product prices with feature Prices - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice($type_value['id_product'], $data_v['date_from'], $data_v['date_to']); - if (!$price_tax) { - $amount = $roomTypeDateRangePrice['total_price_tax_excl']; - } else { - $amount = $roomTypeDateRangePrice['total_price_tax_incl']; - } - //END - - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = $amount * $vart_quant; - } else { - $num_days = $obj_htl_bk_dtl->getNumberOfDays($data_v['date_from'], $data_v['date_to']); - $total_rooms += 1; - $cart_htl_data[$type_key]['date_diff'][$date_join]['num_rm'] = 1; - $cart_htl_data[$type_key]['date_diff'][$date_join]['data_form'] = date('Y-m-d', strtotime($data_v['date_from'])); - $cart_htl_data[$type_key]['date_diff'][$date_join]['data_to'] = date('Y-m-d', strtotime($data_v['date_to'])); - $cart_htl_data[$type_key]['date_diff'][$date_join]['num_days'] = $num_days; - - // By webkul New way to calculate product prices with feature Prices - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice($type_value['id_product'], $data_v['date_from'], $data_v['date_to']); - if (!$price_tax) { - $amount = $roomTypeDateRangePrice['total_price_tax_excl']; - } else { - $amount = $roomTypeDateRangePrice['total_price_tax_incl']; - } - // END - - $cart_htl_data[$type_key]['date_diff'][$date_join]['amount'] = $amount; - } - } - foreach ($cart_htl_data[$type_key]['date_diff'] as $key => $value) { - $cart_htl_data[$type_key]['total_num_rooms'] += $value['num_rm']; - } - } - } - } - } - return array('cart_htl_data' => $cart_htl_data, 'total_rooms_in_cart' => $total_rooms); - } } diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php index c8b196b9e..fc234d227 100644 --- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php +++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php @@ -789,10 +789,11 @@ class HotelCartBookingData extends ObjectModel } /** - * [getHotelCartBookingData description] - * @return [type] [description] - */ - public static function getHotelCartBookingData() + * Returns booking info of the current cart + * @param integer $detailed : send 1 for detailedd info and 0 for normal info + * @return array of booking info of the current cart + */ + public static function getHotelCartBookingData($detailed = 1) { $cartHotelData = array(); $context = Context::getContext(); @@ -812,169 +813,182 @@ class HotelCartBookingData extends ObjectModel if (Validate::isLoadedObject( $objProduct = new Product($product['id_product'], false, $idLang) )) { - $coverImageArr = $objProduct->getCover($product['id_product']); - // get cover image link - if (!empty($coverImageArr)) { - $coverImg = $context->link->getImageLink( - $objProduct->link_rewrite, - $objProduct->id.'-'.$coverImageArr['id_image'], - 'small_default' + // check if room type mapped with hotel + if ($roomDetail = $objRoomType->getRoomTypeInfoByIdProduct($product['id_product'])) { + $unitPrice = Product::getPriceStatic( + $product['id_product'], + $price_tax, + null, + 6, + null, + false, + true, + 1 ); - } else { - $coverImg = $context->link->getImageLink( - $objProduct->link_rewrite, - $context->language->iso_code.'-default', - 'small_default' - ); - } - $unitPrice = Product::getPriceStatic( - $product['id_product'], - $price_tax, - null, - 6, - null, - false, - true, - 1 - ); - $unitPriceWithoutReduction = $objProduct->getPriceWithoutReduct(!$price_tax); - $roomDetail = $objRoomType->getRoomTypeInfoByIdProduct($product['id_product']); - $cartHotelData[$prodKey]['adult'] = $roomDetail['adult']; - $cartHotelData[$prodKey]['children'] = $roomDetail['children']; - $cartHotelData[$prodKey]['total_num_rooms'] = 0; - $cartHotelData[$prodKey]['id_product'] = $product['id_product']; - $cartHotelData[$prodKey]['cover_img'] = $coverImg; - $cartHotelData[$prodKey]['name'] = $objProduct->name; - $cartHotelData[$prodKey]['unit_price'] = $unitPrice; - $cartHotelData[$prodKey]['unit_price_without_reduction'] = $unitPriceWithoutReduction; - $cartHotelData[$prodKey]['extra_demands'] = $objRoomDemands->getRoomTypeDemands( - $product['id_product'] - ); - // add hotel info of the room - if ($hotelInfo = $objHotelBranch->hotelBranchesInfo(false, 2, 1, $roomDetail['id_hotel'])) { - $hotelInfo['location'] = $hotelInfo['hotel_name'].', '.$hotelInfo['city'].', '. - State::getNameById($hotelInfo['state_id']).', '. - Country::getNameById($idLang, $hotelInfo['country_id']) - .', '.$hotelInfo['zipcode']; + $unitPriceWithoutReduction = $objProduct->getPriceWithoutReduct(!$price_tax); + $cartHotelData[$prodKey]['adult'] = $roomDetail['adult']; + $cartHotelData[$prodKey]['children'] = $roomDetail['children']; + $cartHotelData[$prodKey]['total_num_rooms'] = 0; + $cartHotelData[$prodKey]['id_product'] = $product['id_product']; + $cartHotelData[$prodKey]['name'] = $objProduct->name; + $cartHotelData[$prodKey]['unit_price'] = $unitPrice; + $cartHotelData[$prodKey]['unit_price_without_reduction'] = $unitPriceWithoutReduction; - // append hotel features - if ($hotelFeaureIds = $objHotelBranch->getFeaturesOfHotelByHotelId($roomDetail['id_hotel'])) { - $hotelFeatures = array(); - foreach ($hotelFeaureIds as $value) { - $htlFeatureInfo = $objHtlFeatures->getFeatureInfoById($value['feature_id']); - if ($htlFeatureInfo = $objHtlFeatures->getFeatureInfoById($value['feature_id'])) { - $hotelFeatures[] = $htlFeatureInfo['name']; - } - } - if ($hotelFeatures) { - $hotelInfo['htl_features'] = $hotelFeatures; - } - } - // append roomtype features - $hotelInfo['room_features'] = $objProduct->getFrontFeatures($idLang); - - $cartHotelData[$prodKey]['hotel_info'] = $hotelInfo; - } - if (isset($context->customer->id)) { - $cartBookingDetails = $objCartBooking->getOnlyCartBookingData( - $context->cart->id, - $context->cart->id_guest, - $product['id_product'] - ); - } else { - $cartBookingDetails = $objCartBooking->getOnlyCartBookingData( - $context->cart->id, - $context->cart->id_guest, - $product['id_product'] - ); - } - if (isset($cartBookingDetails) && $cartBookingDetails) { - foreach ($cartBookingDetails as $data_k => $data_v) { - $dateJoin = strtotime($data_v['date_from']).strtotime($data_v['date_to']); - $demandPrice = $objCartBookingData->getCartExtraDemands( - $context->cart->id, - $data_v['id_product'], - $data_v['id_room'], - $data_v['date_from'], - $data_v['date_to'], - 1 + // get cover image link + $coverImageArr = $objProduct->getCover($product['id_product']); + if (!empty($coverImageArr)) { + $coverImg = $context->link->getImageLink( + $objProduct->link_rewrite, + $objProduct->id.'-'.$coverImageArr['id_image'], + 'small_default' + ); + } else { + $coverImg = $context->link->getImageLink( + $objProduct->link_rewrite, + $context->language->iso_code.'-default', + 'small_default' ); - if (isset($cartHotelData[$prodKey]['date_diff'][$dateJoin])) { - $numDays = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] += $demandPrice; - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm'] += 1; - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; - $varQty = (int) $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm']; - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( - $product['id_product'], - $data_v['date_from'], - $data_v['date_to'] - ); - if (!$price_tax) { - $amount = $roomTypeDateRangePrice['total_price_tax_excl']; - } else { - $amount = $roomTypeDateRangePrice['total_price_tax_incl']; - } - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount'] = $amount * $varQty; - } else { - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] = $demandPrice; - $numDays = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm'] = 1; - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['data_form'] = date( - 'Y-m-d', - strtotime($data_v['date_from']) - ); - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['data_to'] = date( - 'Y-m-d', - strtotime($data_v['date_to']) - ); - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; - $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( - $product['id_product'], - $data_v['date_from'], - $data_v['date_to'] - ); - if (!$price_tax) { - $amount = $roomTypeDateRangePrice['total_price_tax_excl']; - } else { - $amount = $roomTypeDateRangePrice['total_price_tax_incl']; - } - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount'] = $amount; - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['link'] = $context->link->getPageLink( - 'order-opc', - null, - $idLang, - "id_product=".$product['id_product']."&deleteFromOrderLine=1&date_from=". - $data_v['date_from']."&date_to=".$data_v['date_to'] - ); - } - if ($price_tax) { - $feature_price = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay( - $product['id_product'], - $data_v['date_from'], - $data_v['date_to'], - true - ); - } else { - $feature_price = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay( - $product['id_product'], - $data_v['date_from'], - $data_v['date_to'], - false - ); - } - $feature_price_diff = (float)($unitPriceWithoutReduction - $feature_price); - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['feature_price'] = $feature_price; - $cartHotelData[$prodKey]['date_diff'][$dateJoin]['feature_price_diff'] = $feature_price_diff; } - foreach ($cartHotelData[$prodKey]['date_diff'] as $key => $value) { - $cartHotelData[$prodKey]['total_num_rooms'] += $value['num_rm']; + $cartHotelData[$prodKey]['cover_img'] = $coverImg; + + if ($detailed) { + // extra demands + $cartHotelData[$prodKey]['extra_demands'] = $objRoomDemands->getRoomTypeDemands($product['id_product']); + + // add hotel info of the room + if ($hotelInfo = $objHotelBranch->hotelBranchesInfo( + false, + 2, + 1, + $roomDetail['id_hotel'] + )) { + $hotelInfo['location'] = $hotelInfo['hotel_name'].', '.$hotelInfo['city'].', '.State::getNameById($hotelInfo['state_id']).', '. + Country::getNameById($idLang, $hotelInfo['country_id']) + .', '.$hotelInfo['zipcode']; + + // append hotel features + if ($hotelFeaureIds = $objHotelBranch->getFeaturesOfHotelByHotelId($roomDetail['id_hotel'])) { + $hotelFeatures = array(); + foreach ($hotelFeaureIds as $value) { + $htlFeatureInfo = $objHtlFeatures->getFeatureInfoById($value['feature_id']); + if ($htlFeatureInfo = $objHtlFeatures->getFeatureInfoById($value['feature_id'])) { + $hotelFeatures[] = $htlFeatureInfo['name']; + } + } + if ($hotelFeatures) { + $hotelInfo['htl_features'] = $hotelFeatures; + } + } + // append roomtype features + $hotelInfo['room_features'] = $objProduct->getFrontFeatures($idLang); + + $cartHotelData[$prodKey]['hotel_info'] = $hotelInfo; + } + } + + if (isset($context->customer->id)) { + $cartBookingDetails = $objCartBooking->getOnlyCartBookingData( + $context->cart->id, + $context->cart->id_guest, + $product['id_product'] + ); + } else { + $cartBookingDetails = $objCartBooking->getOnlyCartBookingData( + $context->cart->id, + $context->cart->id_guest, + $product['id_product'] + ); + } + if (isset($cartBookingDetails) && $cartBookingDetails) { + foreach ($cartBookingDetails as $data_k => $data_v) { + $dateJoin = strtotime($data_v['date_from']).strtotime($data_v['date_to']); + $demandPrice = $objCartBookingData->getCartExtraDemands( + $context->cart->id, + $data_v['id_product'], + $data_v['id_room'], + $data_v['date_from'], + $data_v['date_to'], + 1 + ); + + if (isset($cartHotelData[$prodKey]['date_diff'][$dateJoin])) { + $numDays = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] += $demandPrice; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm'] += 1; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; + $varQty = (int) $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm']; + + $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $product['id_product'], + $data_v['date_from'], + $data_v['date_to'] + ); + if (!$price_tax) { + $amount = $roomTypeDateRangePrice['total_price_tax_excl']; + } else { + $amount = $roomTypeDateRangePrice['total_price_tax_incl']; + } + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount'] = $amount * $varQty; + } else { + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['demand_price'] = $demandPrice; + $numDays = $objBookingDetail->getNumberOfDays($data_v['date_from'], $data_v['date_to']); + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_rm'] = 1; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['data_form'] = date( + 'Y-m-d', + strtotime($data_v['date_from']) + ); + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['data_to'] = date( + 'Y-m-d', + strtotime($data_v['date_to']) + ); + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['num_days'] = $numDays; + $roomTypeDateRangePrice = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice( + $product['id_product'], + $data_v['date_from'], + $data_v['date_to'] + ); + if (!$price_tax) { + $amount = $roomTypeDateRangePrice['total_price_tax_excl']; + } else { + $amount = $roomTypeDateRangePrice['total_price_tax_incl']; + } + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['amount'] = $amount; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['link'] = $context->link->getPageLink( + 'order-opc', + null, + $idLang, + "id_product=".$product['id_product']."&deleteFromOrderLine=1&date_from=". + $data_v['date_from']."&date_to=".$data_v['date_to'] + ); + } + if ($price_tax) { + $feature_price = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay( + $product['id_product'], + $data_v['date_from'], + $data_v['date_to'], + true + ); + } else { + $feature_price = HotelRoomTypeFeaturePricing::getRoomTypeFeaturePricesPerDay( + $product['id_product'], + $data_v['date_from'], + $data_v['date_to'], + false + ); + } + $feature_price_diff = (float)($unitPriceWithoutReduction - $feature_price); + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['feature_price'] = $feature_price; + $cartHotelData[$prodKey]['date_diff'][$dateJoin]['feature_price_diff'] = $feature_price_diff; + } + + $cartHotelData[$prodKey]['total_num_rooms'] = array_sum(array_column($cartHotelData[$prodKey]['date_diff'], 'num_rm')); } } } } } + return $cartHotelData; }