From 5265247e16a5b014fbc08716bd2e5b70d8cefb0a Mon Sep 17 00:00:00 2001
From: Sumit Panwar <sumit201@webkul.in>
Date: Sat, 8 Mar 2025 17:41:29 +0530
Subject: [PATCH] Fixed: Standard product flow issues

---
 .../normal_products/helpers/form/form.tpl     |   7 +-
 .../normal_products/informations.tpl          |  43 +-
 .../controllers/orders/helpers/view/view.tpl  |  12 +-
 classes/Cart.php                              | 366 ++++++++++++------
 classes/PaymentModule.php                     | 160 +++++---
 classes/Product.php                           | 159 +++++---
 classes/order/Order.php                       |  28 +-
 classes/order/OrderDetail.php                 |   6 +-
 classes/order/OrderInvoice.php                |  14 +-
 classes/pdf/HTMLTemplateInvoice.php           |  20 +-
 classes/pdf/HTMLTemplateOrderSlip.php         |   2 +-
 .../WebserviceSpecificManagementBookings.php  |   4 +-
 controllers/admin/AdminImportController.php   |   6 +-
 .../admin/AdminNormalProductsController.php   | 105 ++++-
 controllers/admin/AdminOrdersController.php   |  22 +-
 controllers/front/CartController.php          |  50 ++-
 controllers/front/GuestTrackingController.php |   4 +-
 .../front/OrderConfirmationController.php     |  42 +-
 controllers/front/OrderDetailController.php   |   8 +-
 controllers/front/OrderOpcController.php      |  20 +-
 controllers/front/ParentOrderController.php   |  28 +-
 controllers/front/ProductController.php       |  26 +-
 install/data/db_structure.sql                 |   4 +-
 install/upgrade/sql/1.6.0.0.sql               |   8 +-
 js/admin/normal_products.js                   |  44 ++-
 js/admin/orders.js                            |   2 +-
 modules/blockcart/ajax-cart.js                |   2 +-
 modules/blockcart/blockcart.php               |  31 +-
 modules/blockcart/blockcart.tpl               |   2 +-
 .../classes/HotelBookingDetail.php            |   7 +-
 .../classes/HotelCartBookingData.php          |  18 +-
 .../classes/HotelHelper.php                   |   2 +-
 .../classes/HotelReservationSystemDb.php      |  16 +-
 .../classes/HotelRoomTypeFeaturePricing.php   |  34 +-
 .../classes/RoomTypeServiceProduct.php        |   4 +-
 .../RoomTypeServiceProductCartDetail.php      | 247 +++++++-----
 .../RoomTypeServiceProductOrderDetail.php     |  14 +-
 .../classes/RoomTypeServiceProductPrice.php   |   6 +-
 .../classes/ServiceProductOption.php          |  30 +-
 .../AdminHotelRoomsBookingController.php      |  10 +-
 .../_partials/booking-form.tpl                |  10 +-
 themes/hotel-reservation-theme/css/global.css |   1 +
 .../js/cart-summary.js                        |  34 +-
 .../js/modules/blockcart/ajax-cart.js         |  38 +-
 .../hotel-reservation-theme/js/order-opc.js   |  14 +-
 themes/hotel-reservation-theme/js/product.js  |   2 +-
 .../modules/blockcart/blockcart.tpl           |  10 +-
 .../modules/blockcart/cartrow.tpl             |  14 +-
 .../order-confirmation.tpl                    |   2 +-
 .../hotel-reservation-theme/order-detail.tpl  |  29 +-
 .../shopping-cart-detail.tpl                  |  24 +-
 51 files changed, 1092 insertions(+), 699 deletions(-)

diff --git a/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl b/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl
index 86a30fe2f..2c869bd3c 100644
--- a/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl
+++ b/admin/themes/default/template/controllers/normal_products/helpers/form/form.tpl
@@ -79,9 +79,10 @@
 			var product_type_virtual = {Product::PTYPE_VIRTUAL|intval};
 			var product_type_simple = {Product::PTYPE_SIMPLE|intval};
 
-			var SERVICE_PRODUCT_WITH_ROOMTYPE = {Product::SERVICE_PRODUCT_WITH_ROOMTYPE|intval};
-			var SERVICE_PRODUCT_STANDALONE = {Product::SERVICE_PRODUCT_STANDALONE|intval};
-			var SERVICE_PRODUCT_lINKED_WITH_HOTEL = {Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL|intval};
+			var SELLING_PREFERENCE_WITH_ROOM_TYPE = {Product::SELLING_PREFERENCE_WITH_ROOM_TYPE|intval};
+			var SELLING_PREFERENCE_HOTEL_STANDALONE = {Product::SELLING_PREFERENCE_HOTEL_STANDALONE|intval};
+			var SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE = {Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE|intval};
+			var SELLING_PREFERENCE_STANDALONE = {Product::SELLING_PREFERENCE_STANDALONE|intval};
 
 			var price_addition_type_with_room = {Product::PRICE_ADDITION_TYPE_WITH_ROOM|intval};
 			var price_addition_type_independent = {Product::PRICE_ADDITION_TYPE_INDEPENDENT|intval};
diff --git a/admin/themes/default/template/controllers/normal_products/informations.tpl b/admin/themes/default/template/controllers/normal_products/informations.tpl
index 3ebfe90d7..70ecb1252 100644
--- a/admin/themes/default/template/controllers/normal_products/informations.tpl
+++ b/admin/themes/default/template/controllers/normal_products/informations.tpl
@@ -233,33 +233,21 @@
 		</script>
 	</div>
 	<div class="form-group" id="global_product_type_container">
-		<label class="control-label col-lg-3" for="service_product_type">
+		<label class="control-label col-lg-3" for="selling_preference_type">
 			<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether this product will be sold with room type or as an standalone product'}">
 				{l s='Product selling preference'}
 			<span>
 		</label>
 		<div class="col-lg-4">
-			<select name="service_product_type" id="service_product_type">
-				<option value="{Product::SERVICE_PRODUCT_WITH_ROOMTYPE}" {if $product->service_product_type == Product::SERVICE_PRODUCT_WITH_ROOMTYPE}selected="selected"{/if} >{l s='sell with room type'}</option>
-				<option value="{Product::SERVICE_PRODUCT_STANDALONE}" {if $product->service_product_type == Product::SERVICE_PRODUCT_STANDALONE}selected="selected"{/if} >{l s='Sell as standalone product'}</option>
-				<option value="{Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}" {if $product->service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}selected="selected"{/if} >{l s='Sell as independert product linked with hotel'}</option>
+			<select name="selling_preference_type" id="selling_preference_type">
+                <option value="{Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}selected="selected"{/if} >{l s='Sell with room types'}</option>
+                <option value="{Product::SELLING_PREFERENCE_HOTEL_STANDALONE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE}selected="selected"{/if} >{l s='Sell with hotels'}</option>
+                <option value="{Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}selected="selected"{/if} >{l s='Sell with hotels and room types'}</option>
+                <option value="{Product::SELLING_PREFERENCE_STANDALONE}" {if $product->selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE}selected="selected"{/if} >{l s='Sell as standalone product'}</option>
 			</select>
 		</div>
 	</div>
-	<div class="form-group" id="associated_hotel_rooms_tree" {if $product->service_product_type != Product::SERVICE_PRODUCT_WITH_ROOMTYPE && $product->service_product_type != 0}style="display:none;"{/if}>
-		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
-		<label class="control-label col-lg-2" for="hotel_room_block">
-			<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select room type and hotels for which this service will be available.'}">
-				{l s='Associated Hotels and Room Types'}
-			</span>
-		</label>
-		<div class="col-lg-9">
-			<div id="hotel_room_block">
-				{$hotel_room_tree}
-			</div>
-		</div>
-	</div>
-	<div class="form-group" id="associated_hotel_tree" {if $product->service_product_type != Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}style="display:none;"{/if}>
+    <div class="form-group" id="associated_hotel_tree" {if ($product->selling_preference_type != Product::SELLING_PREFERENCE_HOTEL_STANDALONE && $product->selling_preference_type != Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE)}style="display:none;"{/if}>
 		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
 		<label class="control-label col-lg-2" for="hotel_block">
 			<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select hotels for which this service will be available.'}">
@@ -272,7 +260,20 @@
 			</div>
 		</div>
 	</div>
-	<div class="form-group" id="auto_add_to_cart_container" {if $product->service_product_type != Product::SERVICE_PRODUCT_WITH_ROOMTYPE && $product->service_product_type != 0}style="display:none;"{/if}>
+	<div class="form-group" id="associated_hotel_rooms_tree" {if ($product->selling_preference_type != Product::SELLING_PREFERENCE_WITH_ROOM_TYPE && $product->selling_preference_type != Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE && $product->selling_preference_type != 0)}style="display:none;"{/if}>
+		<div class="col-lg-1"><span class="pull-right">{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}</span></div>
+		<label class="control-label col-lg-2" for="hotel_room_block">
+			<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select room type and hotels for which this service will be available.'}">
+				{l s='Associated Room Types'}
+			</span>
+		</label>
+		<div class="col-lg-9">
+			<div id="hotel_room_block">
+				{$hotel_room_tree}
+			</div>
+		</div>
+	</div>
+	<div class="form-group" id="auto_add_to_cart_container" {if $product->selling_preference_type != Product::SELLING_PREFERENCE_WITH_ROOM_TYPE && $product->selling_preference_type != 0}style="display:none;"{/if}>
 		<label class="control-label col-lg-3" for="">
 			<span class="label-tooltip" data-toggle="tooltip" title="{l s='When enabled, this service will be added in cart for each associated Room type or Hotel when they are added in cart. Also auto added services will not be visible to customers.'}">
 				{l s='Auto add to cart this product'}
@@ -295,7 +296,7 @@
 
 	<div id="price_addition_type_container" {if !$product->auto_add_to_cart || !$product->isAssociatedToShop()}style="display:none;"{/if}>
 		<div class="form-group">
-			<label class="control-label col-lg-3" for="service_product_type">
+			<label class="control-label col-lg-3" for="selling_preference_type">
 				<span class="label-tooltip" data-toggle="tooltip" title="{l s='Select whether price will be added in the base room price or as Convenience Fee'}">
 					{l s='Price display preference'}
 				<span>
diff --git a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
index 2cdf7a05f..4bbe013c4 100644
--- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -910,16 +910,16 @@
                             {assign var=total_rooms_price_tax_incl value=$order->getTotalProductsWithTaxes(false, true)}
 
                             {* Get total extra services including convenience fees prices *}
-                            {assign var=total_products_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) + $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE))}
-                            {assign var=total_products_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) + $order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE))}
+                            {assign var=total_products_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE) + $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE))}
+                            {assign var=total_products_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE) + $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE))}
 
                             {* Get total of extra services and extra demands prices(excluding convenience fee) *}
-                            {assign var=total_room_services_and_demands_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $totalDemandsPriceTE)}
-                            {assign var=total_room_services_and_demands_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $totalDemandsPriceTI)}
+                            {assign var=total_room_services_and_demands_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) + $totalDemandsPriceTE)}
+                            {assign var=total_room_services_and_demands_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) + $totalDemandsPriceTI)}
 
                             {* Get total of only convenience fees prices *}
-                            {assign var=total_convenience_fee_tax_excl value=$order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT)}
-                            {assign var=total_convenience_fee_tax_incl value=$order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT)}
+                            {assign var=total_convenience_fee_tax_excl value=$order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT)}
+                            {assign var=total_convenience_fee_tax_incl value=$order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT)}
 
                             {assign var=order_total_price_tax_excl value=($total_rooms_price_tax_excl + $total_room_services_and_demands_tax_excl + $total_convenience_fee_tax_excl)}
                             {assign var=order_total_price_tax_incl value=($total_rooms_price_tax_incl + $total_room_services_and_demands_tax_incl + $total_convenience_fee_tax_incl)}
diff --git a/classes/Cart.php b/classes/Cart.php
index 719883337..0ad8a4051 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -534,7 +534,7 @@ class CartCore extends ObjectModel
         $sql = new DbQuery();
 
         // Build SELECT
-        $sql->select('cp.`id_product_attribute`, cp.`id_product`, cp.`quantity` AS cart_quantity, cp.id_shop, pl.`name`, p.`is_virtual`, p.`booking_product`, p.`service_product_type`,  p.`auto_add_to_cart`, p.`price_addition_type`, p.`show_at_front`, product_shop.`allow_multiple_quantity`, product_shop.`price_calculation_method`,
+        $sql->select('cp.`id_product_attribute`, cp.`id_product`, cp.`quantity` AS cart_quantity, cp.id_shop, pl.`name`, p.`is_virtual`, p.`booking_product`, p.`selling_preference_type`,  p.`auto_add_to_cart`, p.`price_addition_type`, p.`show_at_front`, product_shop.`allow_multiple_quantity`, product_shop.`price_calculation_method`,
 						pl.`description_short`, pl.`available_now`, pl.`available_later`, product_shop.`id_category_default`, p.`id_supplier`,
 						p.`id_manufacturer`, product_shop.`on_sale`, product_shop.`ecotax`, product_shop.`additional_shipping_cost`,
 						product_shop.`available_for_order`, product_shop.`price`, product_shop.`active`, product_shop.`unity`, product_shop.`unit_price_ratio`,
@@ -752,7 +752,7 @@ class CartCore extends ObjectModel
                     $row['total'] = Tools::processPriceRounding($totalPriceByProductTaxExcl);
                     $row['total_wt'] = Tools::processPriceRounding($totalPriceByProductTaxIncl);
                 }
-            } else if  (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $row['service_product_type']) {
+            } else if  (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $row['selling_preference_type']) {
                 $row['total'] = 0;
                 $row['total_wt'] = 0;
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
@@ -776,12 +776,32 @@ class CartCore extends ObjectModel
                         $row['total_wt'] += Tools::processPriceRounding($service['unit_price_tax_incl'], $service['quantity']);
                     }
                 }
-            } else if  (ProductCore::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $row['service_product_type']) {
+            } else if  (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $row['selling_preference_type']) {
                 $row['total'] = 0;
                 $row['total_wt'] = 0;
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                $price_tax_excl = $objRoomTypeServiceProductCartDetail->getProducts($this->id, $row['id_product'], 0, null, 0, null, 0, 1, false);
-                $price_tax_incl = $objRoomTypeServiceProductCartDetail->getProducts($this->id, $row['id_product'], 0, null, 0, null, 0, 1, true);
+                $price_tax_excl = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                    $this->id,
+                    [],
+                    null,
+                    null,
+                    null,
+                    $row['id_product'],
+                    null,
+                    false,
+                    1
+                );
+                $price_tax_incl = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                    $this->id,
+                    [],
+                    null,
+                    null,
+                    null,
+                    $row['id_product'],
+                    null,
+                    true,
+                    1
+                );
                 // Rounding as per configurations
                 $row['total'] += Tools::processPriceRounding($price_tax_excl, $row['cart_quantity']);
                 $row['total_wt'] += Tools::processPriceRounding($price_tax_incl, $row['cart_quantity']);
@@ -791,8 +811,28 @@ class CartCore extends ObjectModel
                 $row['total'] = 0;
                 $row['total_wt'] = 0;
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                $price_tax_excl = $objRoomTypeServiceProductCartDetail->getProducts($this->id, $row['id_product'], 0, null, 0, null, 0, 1, false);
-                $price_tax_incl = $objRoomTypeServiceProductCartDetail->getProducts($this->id, $row['id_product'], 0, null, 0, null, 0, 1, true);
+                $price_tax_excl = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                    $this->id,
+                    [],
+                    null,
+                    null,
+                    null,
+                    $row['id_product'],
+                    null,
+                    false,
+                    1
+                );
+                $price_tax_incl = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                    $this->id,
+                    [],
+                    null,
+                    null,
+                    null,
+                    $row['id_product'],
+                    null,
+                    true,
+                    1
+                );
                 // Rounding as per configurations
                 $row['total'] += Tools::processPriceRounding($price_tax_excl, $row['cart_quantity']);
                 $row['total_wt'] += Tools::processPriceRounding($price_tax_incl, $row['cart_quantity']);
@@ -838,7 +878,7 @@ class CartCore extends ObjectModel
         $serviceProducts = array();
         $context = Context::getContext();
         foreach ($productList as $key => $product) {
-            if (!$product['booking_product'] && (Product::SERVICE_PRODUCT_STANDALONE == $product['service_product_type'])) {
+            if (!$product['booking_product'] && (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type'])) {
                 if (Validate::isLoadedObject(
                     $objProduct = new Product($product['id_product'], false, $this->id_lang)
                 )) {
@@ -1668,15 +1708,16 @@ class CartCore extends ObjectModel
                     continue;
                 }
 
-                if (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type']) {
-                    if ($type == Cart::ONLY_STANDALONE_PRODUCTS) {
+                if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']
+                    || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+                ) {
+                    if ($type == Cart::ONLY_STANDALONE_PRODUCTS && Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']) {
                         continue;
                     }
                     if ($product['auto_add_to_cart']) {
                         if ($type == Cart::ONLY_ROOM_SERVICES_WITHOUT_AUTO_ADD) {
                             continue;
                         }
-
                         if (Product::PRICE_ADDITION_TYPE_WITH_ROOM == $product['price_addition_type']) {
                             if ($type == Cart::ONLY_CONVENIENCE_FEE) {
                                 continue;
@@ -1696,7 +1737,9 @@ class CartCore extends ObjectModel
                             continue;
                         }
                     }
-                } elseif (Product::SERVICE_PRODUCT_STANDALONE == $product['service_product_type'] || Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $product['service_product_type']) {
+                } elseif (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']
+                    || Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']
+                ) {
                     if ($type == Cart::ONLY_ROOM_SERVICES
                         || $type == Cart::ONLY_CONVENIENCE_FEE
                         || $type == Cart::ONLY_ROOM_SERVICES_WITHOUT_AUTO_ADD
@@ -1758,34 +1801,70 @@ class CartCore extends ObjectModel
             } elseif (!isset($products_total[$id_tax_rules_group.'_'.$id_address])) {
                 $products_total[$id_tax_rules_group.'_'.$id_address] = 0;
             }
-            if (!$product['booking_product'] && Product::SERVICE_PRODUCT_STANDALONE == $product['service_product_type']) {
-                $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                if ($servicePorducts = $objRoomTypeServiceProductCartDetail->getProducts(
-                    $this->id,
-                    (int)$product['id_product']
-                )) {
-                    foreach ($servicePorducts as $servicePorduct) {
-                        if ($with_taxes) {
-                            $priceAdd = $servicePorduct['unit_price_tax_incl'];
-                        } else {
-                            $priceAdd = $servicePorduct['unit_price_tax_excl'];
-                        }
-                        if ($ps_round_type == Order::ROUND_TOTAL) {
-                            $products_total[$id_tax_rules_group.'_'.$id_address] += Tools::processPriceRounding($priceAdd, (int)$servicePorduct['quantity']);
-                        } else {
-                            $products_total[$id_tax_rules_group] += Tools::processPriceRounding($priceAdd, (int)$servicePorduct['quantity']);
+            if (!$product['booking_product']) {
+                if (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
+                    $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
+                    if ($servicePorducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                        $this->id,
+                        [],
+                        null,
+                        null,
+                        null,
+                        (int)$product['id_product']
+                    )) {
+                        foreach ($servicePorducts as $servicePorduct) {
+                            if ($with_taxes) {
+                                $priceAdd = $servicePorduct['unit_price_tax_incl'];
+                            } else {
+                                $priceAdd = $servicePorduct['unit_price_tax_excl'];
+                            }
+                            if ($ps_round_type == Order::ROUND_TOTAL) {
+                                $products_total[$id_tax_rules_group.'_'.$id_address] += Tools::processPriceRounding($priceAdd, (int)$servicePorduct['quantity']);
+                            } else {
+                                $products_total[$id_tax_rules_group] += Tools::processPriceRounding($priceAdd, (int)$servicePorduct['quantity']);
+                            }
                         }
                     }
-                }
 
-            } else if (!$product['booking_product'] && Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $product['service_product_type']) {
+                } else if (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']
+                    || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+                ) {
                     $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                    if ($servicePorducts = $objRoomTypeServiceProductCartDetail->getProducts(
-                        $this->id,
-                        (int)$product['id_product'],
-                        0,
-                        isset($product['id_hotel']) ? $product['id_hotel'] : 0
-                    )) {
+                    if ($type == Cart::ONLY_ROOM_SERVICES
+                        || $type == Cart::ONLY_CONVENIENCE_FEE
+                        || $type == Cart::ONLY_ROOM_SERVICES_WITHOUT_AUTO_ADD
+                        || $type == Cart::ONLY_ROOM_SERVICES_WITHOUT_CONVENIENCE_FEE
+                        || $type == Cart::ONLY_ROOM_SERVICES_WITH_AUTO_ADD_WITHOUT_CONVENIENCE_FEE
+                    ) {
+                        $servicePorducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                            $this->id,
+                            [],
+                            0,
+                            null,
+                            null,
+                            (int)$product['id_product']
+                        );
+                    } elseif ($type == Cart::ONLY_STANDALONE_PRODUCTS) {
+                        $servicePorducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                            $this->id,
+                            [],
+                            null,
+                            0,
+                            null,
+                            (int)$product['id_product']
+                        );
+                    } else {
+                        $servicePorducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                            $this->id,
+                            [],
+                            isset($product['id_hotel']) ? $product['id_hotel'] : null,
+                            null,
+                            null,
+                            (int)$product['id_product']
+                        );
+                    }
+
+                    if ($servicePorducts) {
                         foreach ($servicePorducts as $servicePorduct) {
                             if ($with_taxes) {
                                 $priceAdd = $servicePorduct['unit_price_tax_incl'];
@@ -1800,34 +1879,34 @@ class CartCore extends ObjectModel
                             }
                         }
                     }
-            } else if (!$product['booking_product'] && Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type']) {
-                $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                if ($servicesWithRoom = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
-                    $this->id,
-                    (int)$product['id_product'],
-                    isset($product['id_hotel']) ? $product['id_hotel'] : 0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    0,
-                    null,
-                    $product['auto_add_to_cart'],
-                    null,
-                    null
-                )) {
-                    foreach ($servicesWithRoom as $service) {
-                        if ($with_taxes) {
-                            $servicePrice = $service['total_price_tax_incl'];
-                        } else {
-                            $servicePrice = $service['total_price_tax_excl'];
-                        }
+                } else if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']) {
+                    $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
+                    if ($servicesWithRoom = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                        $this->id,
+                        [],
+                        0,
+                        null,
+                        null,
+                        (int)$product['id_product'],
+                        null,
+                        null,
+                        0,
+                        (int)$product['auto_add_to_cart'],
+                        (int)$product['price_addition_type']
+                    )) {
+                        foreach ($servicesWithRoom as $service) {
+                            if ($with_taxes) {
+                                $servicePrice = $service['total_price_tax_incl'];
+                            } else {
+                                $servicePrice = $service['total_price_tax_excl'];
+                            }
 
-                        // Rounding as per configurations
-                        if ($ps_round_type == Order::ROUND_TOTAL) {
-                            $products_total[$id_tax_rules_group.'_'.$id_address] += $servicePrice;
-                        } else {
-                            $products_total[$id_tax_rules_group] += $servicePrice;
+                            // Rounding as per configurations
+                            if ($ps_round_type == Order::ROUND_TOTAL) {
+                                $products_total[$id_tax_rules_group.'_'.$id_address] += $servicePrice;
+                            } else {
+                                $products_total[$id_tax_rules_group] += $servicePrice;
+                            }
                         }
                     }
                 }
@@ -1883,7 +1962,7 @@ class CartCore extends ObjectModel
             // price of extra demands on room type in the cart
             $totalDemandsPrice += $objCartBookingData->getCartExtraDemands($this->id, $product['id_product'], 0, 0, 0, 1, 0, (int)$with_taxes);
         }
-
+        ppp($products_total);
         foreach ($products_total as $key => $price) {
             $order_total += $price;
         }
@@ -2382,19 +2461,32 @@ class CartCore extends ObjectModel
                             }
                         }
                     } else {
-                        if (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type']) {
-                            if ($selectedServiceProducts = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart($this->id, $product['id_product'], 0, 0, 0, 0, 0, 0, null, null)) {
+                        if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']
+                            || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+                        ) {
+                            // get standard products which are booked for room types
+                            // send id_hotel = 0 for standard products with room types
+                            if ($selectedServiceProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                                $this->id,
+                                [],
+                                0,
+                                null,
+                                null,
+                                $product['id_product']
+                            )) {
                                 $array = array();
                                 foreach($selectedServiceProducts as $selectedProduct) {
-                                    if (isset($array[$selectedProduct['id_hotel']])) {
-                                        $array[$selectedProduct['id_hotel']]['total_price_tax_excl'] += $selectedProduct['total_price_tax_excl'];
-                                        $array[$selectedProduct['id_hotel']]['total_price_tax_incl'] += $selectedProduct['total_price_tax_incl'];
+                                    if (isset($array[$selectedProduct['id_room_type_hotel']])) {
+                                        $array[$selectedProduct['id_room_type_hotel']]['total_price_tax_excl'] += $selectedProduct['total_price_tax_excl'];
+                                        $array[$selectedProduct['id_room_type_hotel']]['total_price_tax_incl'] += $selectedProduct['total_price_tax_incl'];
                                     } else {
-                                        $array[$selectedProduct['id_hotel']] = array(
+                                        $array[$selectedProduct['id_room_type_hotel']] = array(
                                             'quantity' => 0,
-                                            'id_hotel' => $selectedProduct['id_hotel'],
+                                            'id_hotel' => $selectedProduct['id_room_type_hotel'],
                                             'total_price_tax_excl' => $selectedProduct['total_price_tax_excl'],
                                             'total_price_tax_incl' => $selectedProduct['total_price_tax_incl'],
+                                            'id_room_type' => $selectedProduct['id_room_type'],
+                                            'id_hotel_cart_booking' => $selectedProduct['id_hotel_cart_booking'],
                                         );
                                     }
                                     if (Product::PRICE_CALCULATION_METHOD_PER_DAY == $selectedProduct['price_calculation_method']) {
@@ -2402,9 +2494,9 @@ class CartCore extends ObjectModel
                                             $selectedProduct['date_from'],
                                             $selectedProduct['date_to']
                                         );
-                                        $array[$selectedProduct['id_hotel']]['quantity'] += ($selectedProduct['quantity'] * $numDays);
+                                        $array[$selectedProduct['id_room_type_hotel']]['quantity'] += ($selectedProduct['quantity'] * $numDays);
                                     } else {
-                                        $array[$selectedProduct['id_hotel']]['quantity'] += $selectedProduct['quantity'];
+                                        $array[$selectedProduct['id_room_type_hotel']]['quantity'] += $selectedProduct['quantity'];
 
                                     }
                                 }
@@ -2413,10 +2505,14 @@ class CartCore extends ObjectModel
                                     $product['cart_quantity'] = $selectedProduct['quantity'];
                                     $product['total'] = $selectedProduct['total_price_tax_excl'];
                                     $product['total_wt'] = $selectedProduct['total_price_tax_incl'];
-                                    $product['price_wt'] = $selectedProduct['total_price_tax_incl'] / $product['cart_quantity'];
-                                    $product['price'] = $selectedProduct['total_price_tax_excl'] / $product['cart_quantity'];
+                                    $product['price_wt'] = $selectedProduct['total_price_tax_incl'] / $selectedProduct['quantity'];
+                                    $product['price'] = $selectedProduct['total_price_tax_excl'] / $selectedProduct['quantity'];
                                     $product['id_hotel'] = $selectedProduct['id_hotel'];
-                                    $orderPackage[$id_address][$selectedProduct['id_hotel']]['product_list'][] = $product;
+                                    $product['id_room_type'] = $selectedProduct['id_room_type'];
+                                    $product['id_hotel_cart_booking'] = $selectedProduct['id_hotel_cart_booking'];
+                                    $productinfo = $product;
+                                    $productinfo['selling_preference_type'] = Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
+                                    $orderPackage[$id_address][$selectedProduct['id_hotel']]['product_list'][] = $productinfo;
                                     if (!isset($orderPackage[$id_address][$selectedProduct['id_hotel']]['id_hotel'])) {
                                         $orderPackage[$id_address][$selectedProduct['id_hotel']]['id_hotel'] = $selectedProduct['id_hotel'];
                                     }
@@ -2438,7 +2534,9 @@ class CartCore extends ObjectModel
                                     }
                                 }
                             }
-                        } elseif (Product::SERVICE_PRODUCT_STANDALONE == $product['service_product_type']) {
+                        }
+
+                        if (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
                             if (!isset($standaloneProduct[$id_address])) {
                                 $standaloneProduct[$id_address] = array(
                                     'product_list' => array(),
@@ -2449,8 +2547,19 @@ class CartCore extends ObjectModel
                                 );
                             }
                             $standaloneProduct[$id_address]['product_list'][] = $product;
-                        } else {
-                            if ($selectedServiceProducts = $objRoomTypeServiceProductCartDetail->getProducts($this->id, $product['id_product'])) {
+                        }
+
+                        if (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']
+                            || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+                        ) {
+                            if ($selectedServiceProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                                $this->id,
+                                [],
+                                null,
+                                0,
+                                null,
+                                (int)$product['id_product']
+                            )) {
                                 $array = array();
                                 foreach($selectedServiceProducts as $hotelProduct) {
                                     if (isset($array[$hotelProduct['id_hotel']])) {
@@ -2463,6 +2572,8 @@ class CartCore extends ObjectModel
                                             'id_hotel' => $hotelProduct['id_hotel'],
                                             'total_price_tax_excl' => $hotelProduct['total_price_tax_excl'],
                                             'total_price_tax_incl' => $hotelProduct['total_price_tax_incl'],
+                                            'id_room_type' => $hotelProduct['id_room_type'],
+                                            'id_hotel_cart_booking' => $hotelProduct['id_hotel_cart_booking'],
                                         );
                                     }
                                 }
@@ -2472,11 +2583,15 @@ class CartCore extends ObjectModel
                                     $serviceProduct['id_hotel'] = $hotelProduct['id_hotel'];
                                     $serviceProduct['total'] = $hotelProduct['total_price_tax_excl'];
                                     $serviceProduct['total_wt'] = $hotelProduct['total_price_tax_incl'];
-                                    $serviceProduct['price'] = $hotelProduct['total_price_tax_excl'] / $product['cart_quantity'];
-                                    $serviceProduct['price_wt'] = $hotelProduct['total_price_tax_incl'] / $product['cart_quantity'];
+                                    $serviceProduct['price'] = $hotelProduct['total_price_tax_excl'] / $hotelProduct['quantity'];
+                                    $serviceProduct['price_wt'] = $hotelProduct['total_price_tax_incl'] / $hotelProduct['quantity'];
+                                    $serviceProduct['id_room_type'] = $hotelProduct['id_room_type'];
+                                    $serviceProduct['id_hotel_cart_booking'] = $hotelProduct['id_hotel_cart_booking'];
                                     // if (!empty($hotelProducts['products'])) {
                                     //     foreach($hotelProducts['products'] as $hotelProduct) {
-                                    $orderPackage[$id_address][$hotelProduct['id_hotel']]['product_list'][] = $serviceProduct;
+                                    $productinfo = $serviceProduct;
+                                    $productinfo['selling_preference_type'] = Product::SELLING_PREFERENCE_HOTEL_STANDALONE;
+                                    $orderPackage[$id_address][$hotelProduct['id_hotel']]['product_list'][] = $productinfo;
                                     if (!isset($orderPackage[$id_address][$hotelProduct['id_hotel']]['id_hotel'])) {
                                         $orderPackage[$id_address][$hotelProduct['id_hotel']]['id_hotel'] = $hotelProduct['id_hotel'];
                                     }
@@ -2506,58 +2621,18 @@ class CartCore extends ObjectModel
 
         $hotelWisePackageList = array();
         $numHotels = 0;
-
         if (!empty($standaloneProduct)) {
             foreach ($standaloneProduct as $id_address =>  $packagesByAddress) {
                 $hotelWisePackageList[$id_address][] = $packagesByAddress;
             }
         }
-        // if (!empty($serviceProducts)) {
-        //     foreach ($serviceProducts as $id_address =>  $packagesByHotels) {
-        //         foreach ($packagesByHotels as $packageByHotel) {
-        //             $hotelWisePackageList[$id_address][] = $packageByHotel;
-        //         }
-        //     }
-        // }
         foreach ($orderPackage as $id_address => $packageByAddress) {
             $numHotels += count($packageByAddress);
             foreach ($packageByAddress as $id_package => $package) {
                 $hotelWisePackageList[$id_address][] = $package;
             }
         }
-        // add sevice products as new package if there are multiple hotels in cart
-        // if ($numHotels > 1 || count($serviceProducts) > 1) {
-        //     foreach ($serviceProducts as $productsByAddress) {
-        //         if (isset($orderPackage[$id_address])) {
-        //             $hotelWisePackageList[$id_address][] = array(
-        //                 'product_list' => $productsByAddress['products'],
-        //                 'carrier_list' => $productsByAddress['carrier_list'],
-        //                 'warehouse_list' =>  $productsByAddress['warehouse_list'],
-        //                 'id_warehouse' =>  $productsByAddress['id_warehouse'],
-        //                 'id_carrier' =>  $productsByAddress['id_carrier']
 
-        //             );
-        //         }
-        //     }
-        // } else if (!empty($serviceProducts)) {
-        //     $serviceProductsIdAddress = array_keys($serviceProducts)[0];
-        //     $productsByAddress = array_shift($serviceProducts);
-        //     if (isset($hotelWisePackageList[$serviceProductsIdAddress])) {
-        //         $hotelWisePackageList[$serviceProductsIdAddress][0]['product_list'] = array_merge(
-        //             $hotelWisePackageList[$serviceProductsIdAddress][0]['product_list'],
-        //             $productsByAddress['products']
-        //         );
-        //     } else {
-        //         $hotelWisePackageList[$id_address][] = array(
-        //             'product_list' => $productsByAddress['products'],
-        //             'carrier_list' => $productsByAddress['carrier_list'],
-        //             'warehouse_list' =>  $productsByAddress['warehouse_list'],
-        //             'id_warehouse' =>  $productsByAddress['id_warehouse'],
-        //             'id_carrier' =>  $productsByAddress['id_carrier']
-
-        //         );
-        //     }
-        // }
         $final_package_list = $hotelWisePackageList;
         // END $package_list hotel wise
         $cache[$cache_key] = $final_package_list;
@@ -3090,15 +3165,49 @@ class CartCore extends ObjectModel
         return $collection;
     }
 
-    public static function getIdAddressForTaxCalculation($id_product, $id_hotel = false)
+    // Get the id_address for tax calculation of a product
+    public static function getIdAddressForTaxCalculation($id_product, $id_hotel = false, $id_product_room_type = false)
     {
+        $id_address = 0;
+        // if the product is a booking product/Room type
         if (Product::isBookingProduct($id_product)) {
-            return HotelRoomType::getHotelIdAddressByIdProduct($id_product);
-        } else if ($id_hotel) {
-            $addressInfo = HotelBranchInformation::getAddress($id_hotel);
-            return $addressInfo['id_address'];
+            $id_address = HotelRoomType::getHotelIdAddressByIdProduct($id_product);
+        } else {
+            // if the product is a standard product the get the address as per the selling preference
+            $sellingPreferenceType = Product::getSellingPreferenceType($id_product);
+
+            if ($sellingPreferenceType == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) {
+                if ($id_product_room_type) {
+                    $objRoomType = new HotelRoomType();
+                    if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product_room_type)) {
+                        if ($htlAddress = HotelBranchInformation::getAddress($roomTypeInfo['id_hotel'])) {
+                            $id_address = $htlAddress['id_address'];
+                        }
+                    }
+                }
+            } elseif ($sellingPreferenceType == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) {
+                if ($htlAddress = HotelBranchInformation::getAddress($id_hotel)) {
+                    $id_address = $htlAddress['id_address'];
+                }
+            } elseif ($sellingPreferenceType == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE) {
+                if ($htlAddress = HotelBranchInformation::getAddress($id_hotel)) {
+                    $id_address = $htlAddress['id_address'];
+                } elseif ($id_product_room_type) {
+                    $objRoomType = new HotelRoomType();
+                    if ($roomTypeInfo = $objRoomType->getRoomTypeInfoByIdProduct($id_product_room_type)) {
+                        if ($htlAddress = HotelBranchInformation::getAddress($roomTypeInfo['id_hotel'])) {
+                            $id_address = $htlAddress['id_address'];
+                        }
+                    }
+                }
+            } elseif ($sellingPreferenceType == Product::SELLING_PREFERENCE_STANDALONE) {
+                if (isset($id_customer)) {
+                    $id_address = (int)Address::getFirstCustomerAddressId($id_customer);
+                }
+            }
         }
-        return false;
+
+        return $id_address;
     }
 
     /**
@@ -3919,7 +4028,6 @@ class CartCore extends ObjectModel
             'cart_total_without_discount_ti' => $cart_total_without_discount_ti,
             'total_tax_without_discount' => $total_tax_without_discount
         );
-
         $hook = Hook::exec('actionCartSummary', $summary, null, true);
         if (is_array($hook)) {
             $summary = array_merge($summary, array_shift($hook));
diff --git a/classes/PaymentModule.php b/classes/PaymentModule.php
index 620a56ab4..1ee231a9f 100644
--- a/classes/PaymentModule.php
+++ b/classes/PaymentModule.php
@@ -295,12 +295,6 @@ abstract class PaymentModuleCore extends Module
                         $order->id_address_tax = $order->id_address_invoice;
                     }
 
-                    // $id_tax_rules_group = (int)Product::getIdTaxRulesGroupByIdProduct((int)11, $this->context);
-                    // $address = new Address($order->id_address_tax);
-                    // $tax_manager = TaxManagerFactory::getManager($address, $id_tax_rules_group);
-                    // // ddd($tax_manager);
-                    // ddd($tax_manager->getTaxCalculator());
-
                     $order->id_currency = $this->context->currency->id;
                     $order->id_lang = (int)$this->context->cart->id_lang;
                     $order->id_cart = (int)$this->context->cart->id;
@@ -601,9 +595,9 @@ abstract class PaymentModuleCore extends Module
                             }
                         }
                         if (!$product['booking_product']
-                            && (
-                                $product['service_product_type'] == Product::SERVICE_PRODUCT_STANDALONE
-                                || $product['service_product_type'] == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL
+                            && ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE
+                                || $product['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
+                                || $product['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
                             )
                         ) {
                             $cover_image_arr = $objProduct->getCover($product['id_product']);
@@ -614,7 +608,14 @@ abstract class PaymentModuleCore extends Module
                                 $cover_img = $this->context->link->getImageLink($product['link_rewrite'], $this->context->language->iso_code."-default", 'small_default');
                             }
                             $product_var_tpl['cover_img'] = $cover_img;
-                            $serviceProducts = $objRoomTypeServiceProductCartDetail->getProducts($order->id_cart, $product['id_product']);
+                            $serviceProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                                $order->id_cart,
+                                [],
+                                null,
+                                0,
+                                null,
+                                $product['id_product']
+                            );
 
                             foreach ($serviceProducts as $serviceProduct) {
                                 $orderServiceProducts[] = array_merge($product_var_tpl, $serviceProduct);
@@ -958,31 +959,28 @@ abstract class PaymentModuleCore extends Module
                             $normalProducts[] = $product;
                         }
                     }
+
                     if (!empty($normalProducts)) {
                         $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
                         foreach($normalProducts as $product) {
                             $idProduct = $product['id_product'];
-                            if (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product['service_product_type']) {
-                                if ($cartAdditialServices = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                            if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product['selling_preference_type']) {
+                                if ($roomTypeServices = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                                     $this->context->cart->id,
-                                    $product['id_product'],
-                                    isset($product['id_hotel']) ? $product['id_hotel'] : 0,
-                                    0,
-                                    0,
-                                    0,
-                                    0,
+                                    [],
                                     0,
                                     null,
-                                    null
+                                    null,
+                                    $product['id_product']
                                 )) {
-                                    $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id);
-                                    foreach ($cartAdditialServices as $additionalService) {
+                                    $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, $product['selling_preference_type']);
+                                    foreach ($roomTypeServices as $roomTypeService) {
                                         $roomBookingDetail = $objBookingDetail->getRowByIdOrderIdProductInDateRange(
                                             $order->id,
-                                            $additionalService['room_type_id_product'],
-                                            $additionalService['date_from'],
-                                            $additionalService['date_to'],
-                                            $additionalService['id_room']
+                                            $roomTypeService['id_room_type'],
+                                            $roomTypeService['date_from'],
+                                            $roomTypeService['date_to'],
+                                            $roomTypeService['id_room']
                                         );
                                         $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
                                         $objRoomTypeServiceProductOrderDetail->id_product = $idProduct;
@@ -990,28 +988,30 @@ abstract class PaymentModuleCore extends Module
                                         $objRoomTypeServiceProductOrderDetail->id_order_detail = $idOrderDetail;
                                         $objRoomTypeServiceProductOrderDetail->id_cart = $this->context->cart->id;
                                         $objRoomTypeServiceProductOrderDetail->id_htl_booking_detail = $roomBookingDetail['id'];
-                                        $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = $additionalService['unit_price_tax_excl'];
-                                        $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $additionalService['unit_price_tax_incl'];
-                                        $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $additionalService['total_price_tax_excl'];
-                                        $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = $additionalService['total_price_tax_incl'];
+                                        $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = $roomTypeService['unit_price_tax_excl'];
+                                        $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $roomTypeService['unit_price_tax_incl'];
+                                        $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $roomTypeService['total_price_tax_excl'];
+                                        $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = $roomTypeService['total_price_tax_incl'];
                                         $objRoomTypeServiceProductOrderDetail->name = $product['name'];
-                                        $objRoomTypeServiceProductOrderDetail->quantity = $additionalService['quantity'];
-                                        $objRoomTypeServiceProductOrderDetail->auto_added = $additionalService['auto_add_to_cart'];
+                                        $objRoomTypeServiceProductOrderDetail->quantity = $roomTypeService['quantity'];
+                                        $objRoomTypeServiceProductOrderDetail->auto_added = $product['auto_add_to_cart'];
                                         $objRoomTypeServiceProductOrderDetail->save();
                                     }
                                 }
-                            } elseif (Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $product['service_product_type']) {
-                                if ($hotelProducts = $objRoomTypeServiceProductCartDetail->getProducts(
+                            } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']) {
+                                if ($hotelProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                                     $this->context->cart->id,
-                                    $product['id_product'],
-                                    ProductCore::SERVICE_PRODUCT_lINKED_WITH_HOTEL,
-                                    isset($product['id_hotel']) ? $product['id_hotel'] : 0
+                                    [],
+                                    null,
+                                    0,
+                                    null,
+                                    $product['id_product']
                                 )) {
-                                    $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id);
+                                    $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, $product['selling_preference_type']);
                                     foreach ($hotelProducts as $hotelProduct) {
                                         $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
                                         $objRoomTypeServiceProductOrderDetail->id_product = $idProduct;
-                                        $objRoomTypeServiceProductOrderDetail->id_service_product_option = $hotelProduct['id_service_product_option'];
+                                        $objRoomTypeServiceProductOrderDetail->id_product_option = $hotelProduct['id_product_option'];
                                         $objRoomTypeServiceProductOrderDetail->id_order = $order->id;
                                         $objRoomTypeServiceProductOrderDetail->id_order_detail = $idOrderDetail;
                                         $objRoomTypeServiceProductOrderDetail->id_cart = $this->context->cart->id;
@@ -1027,17 +1027,20 @@ abstract class PaymentModuleCore extends Module
 
                                     }
                                 }
-                            } elseif (Product::SERVICE_PRODUCT_STANDALONE == $product['service_product_type']) {
-                                if ($standaloneProducts = $objRoomTypeServiceProductCartDetail->getProducts(
+                            } elseif (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
+                                if ($standaloneProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                                     $this->context->cart->id,
-                                    $product['id_product'],
-                                    ProductCore::SERVICE_PRODUCT_STANDALONE
+                                    [Product::SELLING_PREFERENCE_STANDALONE],
+                                    null,
+                                    null,
+                                    null,
+                                    $product['id_product']
                                 )) {
-                                    $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id);
+                                    $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, $product['selling_preference_type']);
                                     foreach ($standaloneProducts as $standaloneProduct) {
                                         $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
                                         $objRoomTypeServiceProductOrderDetail->id_product = $idProduct;
-                                        $objRoomTypeServiceProductOrderDetail->id_service_product_option = $standaloneProduct['id_service_product_option'];
+                                        $objRoomTypeServiceProductOrderDetail->id_product_option = $standaloneProduct['id_product_option'];
                                         $objRoomTypeServiceProductOrderDetail->id_order = $order->id;
                                         $objRoomTypeServiceProductOrderDetail->id_order_detail = $idOrderDetail;
                                         $objRoomTypeServiceProductOrderDetail->id_cart = $this->context->cart->id;
@@ -1052,6 +1055,57 @@ abstract class PaymentModuleCore extends Module
 
                                     }
                                 }
+                            } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']) {
+                                $idProductRoomType = null;
+                                $idProductHotel = null;
+                                if (isset($product['id_room_type']) && $product['id_room_type']) {
+                                    $idProductRoomType = $product['id_room_type'];
+                                } elseif (isset($product['id_hotel']) && $product['id_hotel']) {
+                                    $idProductHotel = $product['id_hotel'];
+                                }
+                                if ($standardProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                                    $this->context->cart->id,
+                                    [],
+                                    $idProductHotel,
+                                    null,
+                                    $idProductRoomType,
+                                    $product['id_product']
+                                )) {
+                                    foreach ($standardProducts as $standardProduct) {
+                                        if ($standardProduct['id_hotel']) {
+                                            $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, Product::SELLING_PREFERENCE_HOTEL_STANDALONE);
+                                        } else {
+                                            $idOrderDetail = $objBookingDetail->getPsOrderDetailIdByIdProduct($idProduct, $order->id, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
+                                        }
+                                        $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
+                                        $objRoomTypeServiceProductOrderDetail->id_product = $idProduct;
+                                        $objRoomTypeServiceProductOrderDetail->id_order = $order->id;
+                                        $objRoomTypeServiceProductOrderDetail->id_order_detail = $idOrderDetail;
+                                        $objRoomTypeServiceProductOrderDetail->id_cart = $this->context->cart->id;
+                                        $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl = $standardProduct['unit_price_tax_excl'];
+                                        $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl = $standardProduct['unit_price_tax_incl'];
+                                        $objRoomTypeServiceProductOrderDetail->total_price_tax_excl = $standardProduct['total_price_tax_excl'];
+                                        $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = $standardProduct['total_price_tax_incl'];
+                                        $objRoomTypeServiceProductOrderDetail->name = $product['name'];
+                                        $objRoomTypeServiceProductOrderDetail->quantity = $standardProduct['quantity'];
+                                        if ($standardProduct['id_hotel']) {
+                                            $objRoomTypeServiceProductOrderDetail->id_product_option = $standardProduct['id_product_option'];
+                                            $objRoomTypeServiceProductOrderDetail->id_hotel = $standardProduct['id_hotel'];
+                                            $objRoomTypeServiceProductOrderDetail->option_name = $standardProduct['option_name'];
+                                        } else {
+                                            $roomBookingDetail = $objBookingDetail->getRowByIdOrderIdProductInDateRange(
+                                                $order->id,
+                                                $standardProduct['id_room_type'],
+                                                $standardProduct['date_from'],
+                                                $standardProduct['date_to'],
+                                                $standardProduct['id_room']
+                                            );
+                                            $objRoomTypeServiceProductOrderDetail->id_htl_booking_detail = $roomBookingDetail['id'];
+                                            $objRoomTypeServiceProductOrderDetail->auto_added = $product['auto_add_to_cart'];
+                                        }
+                                        $objRoomTypeServiceProductOrderDetail->save();
+                                    }
+                                }
                             }
                         }
                     }
@@ -1161,24 +1215,24 @@ abstract class PaymentModuleCore extends Module
                         $normal_products_data_txt = $this->getEmailTemplateContent('service-product-data-text.tpl', Mail::TYPE_TEXT, $orderServiceProducts);
 
                         // total room price
-                        $room_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, true) + $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
-                        $room_price_tax_incl = $order->getTotalProductsWithTaxes(false, true) + $order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
+                        $room_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, true) + $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
+                        $room_price_tax_incl = $order->getTotalProductsWithTaxes(false, true) + $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
                         $room_tax = ($room_price_tax_incl - $room_price_tax_excl);
 
                         // extra services
-                        $additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0) + $cart_booking_data['total_extra_demands_te']);
-                        $additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0) + $cart_booking_data['total_extra_demands_ti']);
+                        $additional_service_price_tax_excl = ($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_te']);
+                        $additional_service_price_tax_incl = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0) + $cart_booking_data['total_extra_demands_ti']);
                         $additional_service_tax = ($additional_service_price_tax_incl - $additional_service_price_tax_excl);
 
                         // convenience fee price
-                        $total_convenience_fee_ti = $order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
-                        $total_convenience_fee_te = $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
+                        $total_convenience_fee_ti = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
+                        $total_convenience_fee_te = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
                         $total_convenience_fee_tax = $total_convenience_fee_ti - $total_convenience_fee_te;
 
                         // service products
-                        // $service_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE);
-                        // $service_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE);
-                        // $service_products_tax = ($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE) - $order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE));
+                        // $service_products_price_tax_excl = $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE);
+                        // $service_products_price_tax_incl = $order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE);
+                        // $service_products_tax = ($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE) - $order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE));
                         $total_order_tax = $room_tax + $additional_service_tax + $total_convenience_fee_tax;
 
                         $idOrderHotel = HotelBookingDetail::getIdHotelByIdOrder($order->id);
diff --git a/classes/Product.php b/classes/Product.php
index 37f005f44..fe5cc4d73 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -185,7 +185,7 @@ class ProductCore extends ObjectModel
     public $available_for_order = true;
 
     // Room type required to buy
-    public $service_product_type;
+    public $selling_preference_type;
 
     // add product to cart automatically
     public $auto_add_to_cart = false;
@@ -302,7 +302,7 @@ class ProductCore extends ObjectModel
             'cache_has_attachments' =>        array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
             'is_virtual' =>                array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
             'booking_product' =>                array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
-            'service_product_type' =>        array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
+            'selling_preference_type' =>        array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt'),
 
             /* Shop fields */
             'id_category_default' =>        array('type' => self::TYPE_INT, 'shop' => true, 'validate' => 'isUnsignedId'),
@@ -481,7 +481,7 @@ class ProductCore extends ObjectModel
         ),
         'hidden_fields' => array(
             'booking_product',
-            'service_product_type'
+            'selling_preference_type'
         ),
     );
 
@@ -550,9 +550,11 @@ class ProductCore extends ObjectModel
     const PRICE_DISPALY_COMBINE = 1;
     const PRICE_DISPALY_INDIVISUAL = 2;
 
-    const SERVICE_PRODUCT_WITH_ROOMTYPE = 1;
-    const SERVICE_PRODUCT_STANDALONE = 2;
-    const SERVICE_PRODUCT_lINKED_WITH_HOTEL = 3;
+    // Product selling preference types
+    const SELLING_PREFERENCE_WITH_ROOM_TYPE = 1; // Product to be sold with Room types
+    const SELLING_PREFERENCE_HOTEL_STANDALONE = 2; // Product to be sold Standalone with Hotels
+    const SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE = 3; // Product to be sold Standalone with Hotels and with Room types also
+    const SELLING_PREFERENCE_STANDALONE = 4; // Product to be sold standalone
 
     const PRICE_ADDITION_TYPE_WITH_ROOM = 1;
     const PRICE_ADDITION_TYPE_INDEPENDENT = 2;
@@ -932,9 +934,9 @@ class ProductCore extends ObjectModel
         ), 'id_product = '.(int)$id_product);
     }
 
-    public static function getServiceProductType($id_product) {
+    public static function getSellingPreferenceType($id_product) {
         return Db::getInstance()->getValue(
-            'SELECT p.`service_product_type`
+            'SELECT p.`selling_preference_type`
             FROM `'._DB_PREFIX_.'product` p '.Shop::addSqlAssociation('product', 'p').'
             WHERE p.`id_product` = '.(int)$id_product
         );
@@ -1404,7 +1406,7 @@ class ProductCore extends ObjectModel
                     ('.
                         '(`element_type` = '.RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE.' AND `id_element` = '.(int)$this->id.')
                     )
-                    AND p.`service_product_type` = '.(int)self::SERVICE_PRODUCT_WITH_ROOMTYPE. '
+                    AND (p.`selling_preference_type` = '.(int)self::SELLING_PREFERENCE_WITH_ROOM_TYPE. '|| p.`selling_preference_type` = '.(int)self::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE.')'. '
                     AND product_shop.`id_shop` = '.(int)$context->shop->id
                 .($sub_category? ' AND product_shop.`id_category_default` = '.(int)$sub_category : '')
                 .($front ? ' AND product_shop.`show_at_front` = 1':'')
@@ -1448,7 +1450,7 @@ class ProductCore extends ObjectModel
                     ('.
                         '(`element_type` = '.RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE.' AND `id_element` = '.(int)$this->id.')
                     )
-                    AND p.`service_product_type` = '.(int)self::SERVICE_PRODUCT_WITH_ROOMTYPE. '
+                    AND (p.`selling_preference_type` = '.(int)self::SELLING_PREFERENCE_WITH_ROOM_TYPE. '|| p.`selling_preference_type` = '.(int)self::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE.')'. '
                     AND product_shop.`id_shop` = '.(int)$context->shop->id
                     .($sub_category? ' AND product_shop.`id_category_default` = '.(int)$sub_category : '')
                     .($front ? ' AND product_shop.`show_at_front` = 1':'')
@@ -1494,7 +1496,7 @@ class ProductCore extends ObjectModel
                     ('.
                         '(`element_type` = '.RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE.' AND `id_element` = '.(int)$this->id.')
                     )
-                    AND p.`service_product_type` = '.(int)self::SERVICE_PRODUCT_WITH_ROOMTYPE. '
+                    AND p.`selling_preference_type` = '.(int)self::SELLING_PREFERENCE_WITH_ROOM_TYPE. '
                     AND product_shop.`id_shop` = '.(int)$context->shop->id
                     .($front ? ' AND product_shop.`auto_add_to_cart` = 0 AND product_shop.`show_at_front` = 1':'')
                     .($active ? ' AND product_shop.`active` = 1' : '');
@@ -1520,7 +1522,7 @@ class ProductCore extends ObjectModel
         LEFT JOIN `'._DB_PREFIX_.'image_lang` il ON (il.`id_image` = i.`id_image` AND il.`id_lang` = '.(int) $idLang.')
         WHERE p.`booking_product` = 0'.
         (!is_null($active) ? ' AND p.`active` = '.(int) $active : '').
-        ($serviceProductType ? ' AND p.`service_product_type` = '.(int) $serviceProductType : '');
+        ($serviceProductType ? ' AND p.`selling_preference_type` = '.(int) $serviceProductType : '');
 
         if (Validate::isOrderBy($orderBy) && Validate::isOrderBy($orderWay)) {
             $sql .= ' ORDER BY '.$orderBy.' '.$orderWay;
@@ -3052,7 +3054,7 @@ class ProductCore extends ObjectModel
     public static function getPriceStatic($id_product, $usetax = true, $id_product_attribute = null, $decimals = 6, $divisor = null,
         $only_reduc = false, $usereduc = true, $quantity = 1, $force_associated_tax = false, $id_customer = null, $id_cart = null,
         $id_address = null, &$specific_price_output = null, $with_ecotax = true, $use_group_reduction = true, Context $context = null,
-        $use_customer_price = true, $id_product_roomtype = false)
+        $use_customer_price = true, $id_hotel = false, $id_product_room_type = false)
     {
         if (!$context) {
             $context = Context::getContext();
@@ -3121,34 +3123,17 @@ class ProductCore extends ObjectModel
         $zipcode = 0;
 
         if (!$id_address) {
-            if (!Product::isBookingProduct($id_product)) {
-                if ($id_product_roomtype) {
-                    // if room type is provided with product then we know that the service product price should be calculated accroding to roomt type
-                    $id_address = Cart::getIdAddressForTaxCalculation($id_product_roomtype);
-                } else {
-                    if (Product::getServiceProductType($id_product) == ProductCore::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
-
-                    } else {
-                        if (isset($id_customer)) {
-                            $id_address = (int)Address::getFirstCustomerAddressId($id_customer);
-                        }
-                    }
-                }
-            } else {
-                $id_address = Cart::getIdAddressForTaxCalculation($id_product);
-            }
+            $id_address = Cart::getIdAddressForTaxCalculation($id_product, $id_hotel, $id_product_room_type);
         }
 
-        if (!$id_address) {
-            if ($primaryHotel = ConfigurationCore::get('WK_PRIMARY_HOTEL')) {
-                if ($address = HotelBranchInformation::getAddress($primaryHotel)) {
-                    $address_infos['id_country'] = $address['id_country'];
-                    $address_infos['id_state'] = $address['id_state'];
-                    $address_infos['postcode'] = $address['postcode'];
-                }
-            }
-        } elseif ($id_address) {
+        if ($id_address) {
             $address_infos = Address::getCountryAndState($id_address);
+        } elseif ($primaryHotel = ConfigurationCore::get('WK_PRIMARY_HOTEL')) {
+            if ($address = HotelBranchInformation::getAddress($primaryHotel)) {
+                $address_infos['id_country'] = $address['id_country'];
+                $address_infos['id_state'] = $address['id_state'];
+                $address_infos['postcode'] = $address['postcode'];
+            }
         }
 
         if (isset($address_infos['id_country']) && $address_infos['id_country']) {
@@ -3182,7 +3167,8 @@ class ProductCore extends ObjectModel
             $use_customer_price,
             $id_cart,
             $cart_quantity,
-            $id_product_roomtype
+            $id_hotel,
+            $id_product_room_type
         );
 
         return $return;
@@ -3216,7 +3202,7 @@ class ProductCore extends ObjectModel
      **/
     public static function priceCalculation($id_shop, $id_product, $id_product_attribute, $id_country, $id_state, $zipcode, $id_currency,
         $id_group, $quantity, $use_tax, $decimals, $only_reduc, $use_reduc, $with_ecotax, &$specific_price, $use_group_reduction,
-        $id_customer = 0, $use_customer_price = true, $id_cart = 0, $real_quantity = 0, $id_product_roomtype = false)
+        $id_customer = 0, $use_customer_price = true, $id_cart = 0, $real_quantity = 0, $id_hotel = false, $id_product_room_type = false)
     {
         static $address = null;
         static $context = null;
@@ -3238,10 +3224,10 @@ class ProductCore extends ObjectModel
         }
 
         if ($id_product_attribute) {
-            $id_service_product_option = $id_product_attribute;
+            $id_product_option = $id_product_attribute;
             $id_product_attribute = null;
         } else {
-            $id_service_product_option = null;
+            $id_product_option = null;
         }
 
         if ($id_product_attribute === null) {
@@ -3251,7 +3237,7 @@ class ProductCore extends ObjectModel
         $cache_id = (int)$id_product.'-'.(int)$id_shop.'-'.(int)$id_currency.'-'.(int)$id_country.'-'.$id_state.'-'.$zipcode.'-'.(int)$id_group.
             '-'.(int)$quantity.'-'.(int)$id_product_attribute.
             '-'.(int)$with_ecotax.'-'.(int)$id_customer.'-'.(int)$use_group_reduction.'-'.(int)$id_cart.'-'.(int)$real_quantity.
-            '-'.($only_reduc?'1':'0').'-'.($use_reduc?'1':'0').'-'.($use_tax?'1':'0').'-'.(int)$decimals.'-'.($id_product_roomtype?(int)$id_product_roomtype:'0').'-'.($id_service_product_option?(int)$id_service_product_option:'0');
+            '-'.($only_reduc?'1':'0').'-'.($use_reduc?'1':'0').'-'.($use_tax?'1':'0').'-'.(int)$decimals.'-'.($id_hotel?(int)$id_hotel:'0').'-'.($id_product_option?(int)$id_product_option:'0'.'-'.($id_product_room_type?(int)$id_product_room_type:'0'));
 
         // reference parameter is filled before any returns
         $specific_price = SpecificPrice::getSpecificPrice(
@@ -3277,8 +3263,8 @@ class ProductCore extends ObjectModel
 
         // fetch price & attribute price
         $cache_id_2 = $id_product.'-'.$id_shop;
-        if ($id_service_product_option) {
-            $cache_id_2 .= '-'.$id_service_product_option;
+        if ($id_product_option) {
+            $cache_id_2 .= '-'.$id_product_option;
         }
         if (!isset(self::$_pricesLevel2[$cache_id_2])) {
             $sql = new DbQuery();
@@ -3294,12 +3280,12 @@ class ProductCore extends ObjectModel
             }
 
             if (ServiceProductOption::productHasOptions($id_product)) {
-                $sql->select('service_product_option.id_service_product_option, service_product_option.price_impact as option_impact_price');
+                $sql->select('product_option.id_product_option, product_option.price_impact as option_impact_price');
 
-                if ($id_service_product_option) {
-                    $sql->leftJoin('service_product_option', 'service_product_option', '(service_product_option.id_product = p.id_product AND service_product_option.id_service_product_option = '.(int)$id_service_product_option.')');
+                if ($id_product_option) {
+                    $sql->leftJoin('product_option', 'product_option', '(product_option.id_product = p.id_product AND product_option.id_product_option = '.(int)$id_product_option.')');
                 } else {
-                    $sql->leftJoin('service_product_option', 'service_product_option', '(service_product_option.id_product = p.id_product)');
+                    $sql->leftJoin('product_option', 'product_option', '(product_option.id_product = p.id_product)');
                 }
             }
             $res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
@@ -3313,7 +3299,7 @@ class ProductCore extends ObjectModel
                     );
                     if (isset($row['option_impact_price'])) {
                         $array_tmp['option_impact_price'] = $row['option_impact_price'];
-                        $array_tmp['id_service_product_option'] = $row['id_service_product_option'];
+                        $array_tmp['id_product_option'] = $row['id_product_option'];
                     }
 
                     self::$_pricesLevel2[$cache_id_2][(int)$row['id_product_attribute']] = $array_tmp;
@@ -3321,7 +3307,7 @@ class ProductCore extends ObjectModel
                     if (isset($row['default_on']) && $row['default_on'] == 1) {
                         self::$_pricesLevel2[$cache_id_2][0] = $array_tmp;
                     }
-                    if (isset($row['option_impact_price']) && !$id_service_product_option) {
+                    if (isset($row['option_impact_price']) && !$id_product_option) {
                         break;
                     }
                 }
@@ -3335,10 +3321,10 @@ class ProductCore extends ObjectModel
         $result = self::$_pricesLevel2[$cache_id_2][(int)$id_product_attribute];
 
         // get price per room type
-        if ($id_product_roomtype) {
+        if ($id_product_room_type) {
             $priceForRoomInfo = RoomTypeServiceProductPrice::getProductRoomTypePriceAndTax(
                 $id_product,
-                $id_product_roomtype,
+                $id_product_room_type,
                 RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE
             );
         }
@@ -4123,7 +4109,7 @@ class ProductCore extends ObjectModel
     * @param string $query Search query
     * @return array Matching products
     */
-    public static function searchByName($id_lang, $query, $booking_product = null, $service_product_type = null, $id_hotel = false, Context $context = null)
+    public static function searchByName($id_lang, $query, $booking_product = null, $selling_preference_type = null, $id_hotel = false, Context $context = null)
     {
         if (!$context) {
             $context = Context::getContext();
@@ -4147,7 +4133,7 @@ class ProductCore extends ObjectModel
                 );
             }
         } else {
-            if (Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $service_product_type && $id_hotel) {
+            if (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $selling_preference_type && $id_hotel) {
                 $sql->innerJoin(
                     'htl_room_type_service_product',
                     'hrtsp',
@@ -6814,4 +6800,67 @@ class ProductCore extends ObjectModel
 
         return true;
     }
+
+    public static function getTotalStandardProductPrice(
+        $idProduct,
+        $idProductOption = 0,
+        $idHotel = false,
+        $idProductRoomType = false,
+        $useTax = null,
+        $quantity = 1,
+        $dateFrom = null,
+        $dateTo = null,
+        $idCart = false,
+        $idAddress = null,
+        $useReduc = 1
+    ) {
+        if ($useTax === null) {
+            $useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
+        }
+
+        $price = Product::getPriceStatic(
+            (int)$idProduct,
+            $useTax,
+            $idProductOption,
+            6,
+            null,
+            false,
+            $useReduc,
+            (int)$quantity,
+            false,
+            null,
+            $idCart,
+            $idAddress,
+            $specificPrice,
+            true,
+            true,
+            null,
+            true,
+            (int)$idHotel,
+            (int)$idProductRoomType
+        );
+
+        Hook::exec('actionStandardProductPricePriceModifier',
+            array(
+                'price' => &$price,
+                'id_product' => $idProduct,
+                'id_product_option' => $idProductOption,
+                'id_hotel' => $idHotel,
+                'id_product_room_type' => $idProductRoomType,
+                'date_from' => $dateFrom,
+                'date_to' => $dateTo,
+                'use_tax' => $useTax,
+                'id_cart' => $idCart,
+                'use_reduc' => $useReduc
+            )
+        );
+
+        if (Product::getProductPriceCalculation($idProduct) == Product::PRICE_CALCULATION_METHOD_PER_DAY
+            && $dateFrom && $dateTo
+        ) {
+            $price = $price * HotelHelper::getNumberOfDays($dateFrom, $dateTo);
+        }
+
+        return $price * (int)$quantity;
+    }
 }
diff --git a/classes/order/Order.php b/classes/order/Order.php
index 48d88aa19..1f5a67ca4 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -600,12 +600,12 @@ class OrderCore extends ObjectModel
 
     public function getProductsDetail(
         $is_booking = null,
-        $product_service_type = null,
+        $selling_preference_type = null,
         $product_auto_add = null,
         $product_price_addition_type = null,
         $ids_order_detail = []
     ) {
-        $sql = 'SELECT *
+        $sql = 'SELECT *, od.`selling_preference_type` as selling_preference_type
             FROM `'._DB_PREFIX_.'order_detail` od
             LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.id_product = od.product_id)
             LEFT JOIN `'._DB_PREFIX_.'product_shop` ps ON (ps.id_product = p.id_product AND ps.id_shop = od.id_shop)
@@ -617,13 +617,13 @@ class OrderCore extends ObjectModel
 
         if ($is_booking !== null) {
             $sql .= ' AND od.`is_booking_product` = '. (int)$is_booking;
-            if (!$is_booking && $product_service_type !== null) {
-                $sql .= ' AND od.`product_service_type` = '. (int)$product_service_type;
+            if (!$is_booking && $selling_preference_type !== null) {
+                $sql .= ' AND od.`selling_preference_type` = '. (int)$selling_preference_type;
             }
-            if (!$is_booking && $product_service_type == Product::SERVICE_PRODUCT_WITH_ROOMTYPE && $product_auto_add !== null) {
+            if (!$is_booking && $selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE && $product_auto_add !== null) {
                 $sql .= ' AND od.`product_auto_add` = '. (int)$product_auto_add;
             }
-            if (!$is_booking && $product_service_type == Product::SERVICE_PRODUCT_WITH_ROOMTYPE && $product_auto_add == 1 && $product_price_addition_type !== null) {
+            if (!$is_booking && $selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE && $product_auto_add == 1 && $product_price_addition_type !== null) {
                 $sql .= ' AND od.`product_price_addition_type` = '. (int)$product_price_addition_type;
             }
         }
@@ -1110,14 +1110,14 @@ class OrderCore extends ObjectModel
     public function getTotalProductsWithoutTaxes(
         $products = false,
         $bookingProducts = null,
-        $product_service_type = null,
+        $selling_preference_type = null,
         $product_auto_add = null,
         $product_price_addition_type = null,
         $ids_order_detail = []
     ) {
         // update
         if (!$products) {
-            $products = $this->getProductsDetail($bookingProducts, $product_service_type, $product_auto_add, $product_price_addition_type, $ids_order_detail);
+            $products = $this->getProductsDetail($bookingProducts, $selling_preference_type, $product_auto_add, $product_price_addition_type, $ids_order_detail);
         }
 
         $return = 0;
@@ -1136,14 +1136,14 @@ class OrderCore extends ObjectModel
     public function getTotalProductsWithTaxes(
         $products = false,
         $bookingProducts = null,
-        $product_service_type = null,
+        $selling_preference_type = null,
         $product_auto_add = null,
         $product_price_addition_type = null,
         $ids_order_detail = []
     ) {
         /* Retro-compatibility (now set directly on the validateOrder() method) */
         if (!$products) {
-            $products = $this->getProductsDetail($bookingProducts, $product_service_type, $product_auto_add, $product_price_addition_type, $ids_order_detail);
+            $products = $this->getProductsDetail($bookingProducts, $selling_preference_type, $product_auto_add, $product_price_addition_type, $ids_order_detail);
         }
 
         $return = 0;
@@ -2451,7 +2451,7 @@ class OrderCore extends ObjectModel
      * @param $limitToOrderDetails Optional array of OrderDetails to take into account. False by default to take all OrderDetails from the current Order.
      * @return array A list of tax rows applied to the given OrderDetails (or all OrderDetails linked to the current Order).
      */
-    public function getProductTaxesDetails($limitToOrderDetails = false, $bookingProducts = null, $product_service_type = null)
+    public function getProductTaxesDetails($limitToOrderDetails = false, $bookingProducts = null, $selling_preference_type = null)
     {
         $round_type = $this->round_type;
         if ($round_type == 0) {
@@ -2471,7 +2471,7 @@ class OrderCore extends ObjectModel
         $expected_total_base = (float)$this->getTotalProductsWithoutTaxes(
             $limitToOrderDetails,
             $bookingProducts,
-            $product_service_type
+            $selling_preference_type
         );
 
         foreach ($this->getCartRules() as $order_cart_rule) {
@@ -2659,11 +2659,11 @@ class OrderCore extends ObjectModel
 
         // check hotel linked products
         $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
-        if ($hotelProducts = $objRoomTypeServiceProductOrderDetail->getProducts($this->id, 0, 0, Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL)) {
+        if ($hotelProducts = $objRoomTypeServiceProductOrderDetail->getProducts($this->id, 0, 0, Product::SELLING_PREFERENCE_HOTEL_STANDALONE)) {
             $res = $res && $this->checkList($hotelProducts, $action, false);
         }
 
-        if ($standaloneProducts = $objRoomTypeServiceProductOrderDetail->getProducts($this->id, 0, 0, Product::SERVICE_PRODUCT_STANDALONE)) {
+        if ($standaloneProducts = $objRoomTypeServiceProductOrderDetail->getProducts($this->id, 0, 0, Product::SELLING_PREFERENCE_STANDALONE)) {
             $res = $res && $this->checkList($standaloneProducts, $action, false);
         }
 
diff --git a/classes/order/OrderDetail.php b/classes/order/OrderDetail.php
index b245bc599..da521fffc 100644
--- a/classes/order/OrderDetail.php
+++ b/classes/order/OrderDetail.php
@@ -102,7 +102,7 @@ class OrderDetailCore extends ObjectModel
     public $is_booking_product;
 
     /** @var int */
-    public $product_service_type;
+    public $selling_preference_type;
 
     /** @var bool */
     public $product_allow_multiple_quantity;
@@ -197,7 +197,7 @@ class OrderDetailCore extends ObjectModel
             'group_reduction' =>            array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
             'product_quantity_discount' =>    array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
             'is_booking_product' =>                array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
-            'product_service_type' =>        array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+            'selling_preference_type' =>        array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'product_auto_add' =>            array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'product_price_addition_type' =>    array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'product_allow_multiple_quantity' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
@@ -647,7 +647,7 @@ class OrderDetailCore extends ObjectModel
             $product_quantity : (int)$product['cart_quantity'];
 
         $this->is_booking_product = $product['booking_product'];
-        $this->product_service_type = $product['service_product_type'];
+        $this->selling_preference_type = $product['selling_preference_type'];
         $this->product_auto_add = $product['auto_add_to_cart'];
         $this->product_price_addition_type = $product['price_addition_type'];
         $this->product_allow_multiple_quantity = $product['allow_multiple_quantity'];
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 2e579a9a5..37d47038f 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -417,7 +417,7 @@ class OrderInvoiceCore extends ObjectModel
         $order_detail = array_filter($order_detail, function($v) {
             return ($v['is_booking_product']
                 || ($v['product_auto_add']
-                    && $v['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE
+                    && $v['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE
                     && $v['product_price_addition_type'] == ProductCore::PRICE_ADDITION_TYPE_WITH_ROOM)
             );
         });
@@ -484,9 +484,9 @@ class OrderInvoiceCore extends ObjectModel
         $breakdown = array();
         $order_detail = $this->getProducts();
         $order_detail = array_filter($order_detail, function($v) {
-            return (!$v['is_booking_product'] && !$v['product_auto_add'] && $v['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE);
+            return (!$v['is_booking_product'] && !$v['product_auto_add'] && $v['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
         });
-        $details = $order->getProductTaxesDetails($order_detail, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE);
+        $details = $order->getProductTaxesDetails($order_detail, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
 
         if ($sum_composite_taxes) {
             $grouped_details = array();
@@ -550,12 +550,12 @@ class OrderInvoiceCore extends ObjectModel
         $order_detail = array_filter($order_detail, function($v) {
             return (!$v['is_booking_product']
                 && $v['product_auto_add']
-                && $v['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE
+                && $v['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE
                 && $v['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT
             );
         });
 
-        $details = $order->getProductTaxesDetails($order_detail, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE);
+        $details = $order->getProductTaxesDetails($order_detail, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
 
         if ($sum_composite_taxes) {
             $grouped_details = array();
@@ -619,8 +619,8 @@ class OrderInvoiceCore extends ObjectModel
         $order_detail = $this->getProducts();
         $order_detail = array_filter($order_detail, function($v) {
             return (!$v['is_booking_product'] && (
-                $v['product_service_type'] == Product::SERVICE_PRODUCT_STANDALONE
-                || $v['product_service_type'] == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL
+                $v['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE
+                || $v['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
             ));
         });
 
diff --git a/classes/pdf/HTMLTemplateInvoice.php b/classes/pdf/HTMLTemplateInvoice.php
index 4e6c3cac4..17a3af40d 100644
--- a/classes/pdf/HTMLTemplateInvoice.php
+++ b/classes/pdf/HTMLTemplateInvoice.php
@@ -541,8 +541,8 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
                         foreach ($cart_htl_data[$type_key]['date_diff'] as $key => &$value) {
                             $value['avg_paid_unit_price_tax_excl'] = Tools::ps_round($value['avg_paid_unit_price_tax_excl'] / $value['num_rm'], 6);
                         }
-                    } else if (Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $type_value['product_service_type']
-                        || Product::SERVICE_PRODUCT_STANDALONE == $type_value['product_service_type']
+                    } else if (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $type_value['selling_preference_type']
+                        || Product::SELLING_PREFERENCE_STANDALONE == $type_value['selling_preference_type']
                     ) {
                         $serviceProducts = $objRoomTypeServiceProductOrderDetail->getProducts($order_obj->id, $type_value['id_order_detail'], $type_value['product_id']);
                         if ($taxes = OrderDetail::getTaxListStatic($type_value['id_order_detail'])) {
@@ -581,14 +581,14 @@ class HTMLTemplateInvoiceCore extends HTMLTemplate
         $footer['total_convenience_fee_te'] = 0;
         $footer['total_convenience_fee_ti'] = 0;
         if ($idsOrderDetail = array_column($order_details, 'id_order_detail')) {
-            $footer['room_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
-            $footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
-            $footer['service_products_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL, false, false, $idsOrderDetail);
-            $footer['service_products_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL, false, false, $idsOrderDetail);
-            $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTE;
-            $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTI;
-            $footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
-            $footer['total_convenience_fee_ti'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
+            $footer['room_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
+            $footer['room_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, true, null, null, null, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM, $idsOrderDetail);
+            $footer['service_products_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail);
+            $footer['service_products_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE, false, false, $idsOrderDetail) + $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE, false, false, $idsOrderDetail);
+            $footer['additional_service_price_tax_excl'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTE;
+            $footer['additional_service_price_tax_incl'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0, null, $idsOrderDetail) + $totalDemandsPriceTI;
+            $footer['total_convenience_fee_te'] = $this->order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
+            $footer['total_convenience_fee_ti'] = $this->order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT, $idsOrderDetail);
         }
 
         $footer['total_paid_real'] = $this->order_invoice->getTotalPaid();
diff --git a/classes/pdf/HTMLTemplateOrderSlip.php b/classes/pdf/HTMLTemplateOrderSlip.php
index 8e4a027ce..45ed6cafa 100644
--- a/classes/pdf/HTMLTemplateOrderSlip.php
+++ b/classes/pdf/HTMLTemplateOrderSlip.php
@@ -285,7 +285,7 @@ class HTMLTemplateOrderSlipCore extends HTMLTemplateInvoice
         $order_detail = array_filter($this->order->products, function($v) {
             return ((isset($v['is_booking_product']) && $v['is_booking_product'])
                 || ((isset($v['product_auto_add']) && $v['product_auto_add'])
-                    && $v['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE
+                    && $v['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE
                     && $v['product_price_addition_type'] == ProductCore::PRICE_ADDITION_TYPE_WITH_ROOM)
             );
         });
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index a2e0c92da..919245e54 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -1004,7 +1004,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
                         }
                     }
 
-                    $serviceProductPrice = $objOrder->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE);
+                    $serviceProductPrice = $objOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE);
                     if ($demands = $objHotelBookingDemands->getExtraDemandsTaxesDetails($objOrder->id)) {
                         $demandsPrice = array_sum(array_column($demands, 'total_price_tax_excl'));
                         // Adding the tax
@@ -1795,7 +1795,7 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
         $objProduct->redirect_type = '404';
         $objProduct->visibility = 'none';
         $objProduct->minimal_quantity = 1;
-        $objProduct->service_product_type = Product::SERVICE_PRODUCT_WITH_ROOMTYPE;
+        $objProduct->selling_preference_type = Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
         $objProduct->allow_multiple_quantity = true;
         $objProduct->max_quantity = $quantity;
         if ($objProduct->save()) {
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 051625e54..9208fc8b2 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -1864,7 +1864,7 @@ class AdminImportControllerCore extends AdminController
                                 }
 
                                 $objServiceProduct = new Product($idServiceProduct);
-                                if (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $objServiceProduct->service_product_type) {
+                                if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $objServiceProduct->selling_preference_type) {
                                     $objRoomTypeServiceProduct->addRoomProductLink(
                                         $objServiceProduct->id,
                                         $product->id,
@@ -2236,7 +2236,7 @@ class AdminImportControllerCore extends AdminController
                         $product->price_addition_type = Product::PRICE_ADDITION_TYPE_WITH_ROOM;
                     }
 
-                    $product->service_product_type = Product::SERVICE_PRODUCT_WITH_ROOMTYPE;
+                    $product->selling_preference_type = Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
                     if (!$serviceProductExists) {
                         if (isset($product->date_add) && $product->date_add != '') {
                             $res = $product->add(false);
@@ -2292,7 +2292,7 @@ class AdminImportControllerCore extends AdminController
                     $info['shop'] = explode($this->multiple_value_separator, $info['shop']);
 
                     RoomTypeServiceProduct::deleteRoomProductLink($product->id);
-                    if (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product->service_product_type) {
+                    if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product->selling_preference_type) {
                         $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
                         if (isset($info['id_room_types']) && $info['id_room_types']) {
                             $objRoomTypeServiceProduct->addRoomProductLink(
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index 39f788550..d2f245d8a 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -209,7 +209,7 @@ class AdminNormalProductsControllerCore extends AdminController
 
         // show the list of the product according to the booking or service products
         $this->_where .= ' AND a.`booking_product` = 0';
-        $this->_where .= ' AND a.`service_product_type` = '.(int)ProductCore::SERVICE_PRODUCT_WITH_ROOMTYPE;
+        // $this->_where .= ' AND a.`selling_preference_type` = '.(int)Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
 
         $this->_group = 'GROUP BY a.`id_product`';
 
@@ -293,14 +293,14 @@ class AdminNormalProductsControllerCore extends AdminController
             'optional' => true,
         );
         // $serviceProductType = array(
-        //     Product::SERVICE_PRODUCT_WITH_ROOMTYPE => $this->l('Bought with room type'),
-            // Product::SERVICE_PRODUCT_STANDALONE => $this->l('Bought without room type')
+        //     Product::SELLING_PREFERENCE_WITH_ROOM_TYPE => $this->l('Bought with room type'),
+            // Product::SELLING_PREFERENCE_STANDALONE => $this->l('Bought without room type')
         // );
-        // $this->fields_list['service_product_type'] = array(
+        // $this->fields_list['selling_preference_type'] = array(
         //     'type' => 'select',
         //     'list' => $serviceProductType,
         //     'title' => $this->l('Buying option'),
-        //     'filter_key' => 'a!service_product_type',
+        //     'filter_key' => 'a!selling_preference_type',
         //     'callback' => 'getBuyingOption'
         // );
         if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP) {
@@ -357,11 +357,11 @@ class AdminNormalProductsControllerCore extends AdminController
         }
     }
 
-    public function getBuyingOption($service_product_type, $row)
+    public function getBuyingOption($selling_preference_type, $row)
     {
-        if ($service_product_type == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) {
+        if ($selling_preference_type == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) {
             return $this->l('With room type');
-        } else if ($service_product_type == Product::SERVICE_PRODUCT_STANDALONE) {
+        } else if ($selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE) {
             return $this->l('Without room type');
         }
 
@@ -1825,7 +1825,7 @@ class AdminNormalProductsControllerCore extends AdminController
             $_POST['allow_multiple_quantity'] = 0;
         }
 
-        $_POST['service_product_type'] = Product::SERVICE_PRODUCT_WITH_ROOMTYPE;
+        $_POST['selling_preference_type'] = Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
         $this->copyFromPost($this->object, $this->table);
 
 
@@ -1970,7 +1970,7 @@ class AdminNormalProductsControllerCore extends AdminController
             if (Validate::isLoadedObject($object)) {
                 $this->_removeTaxFromEcotax();
                 $product_type_before = $object->getType();
-                $_POST['service_product_type'] = Product::SERVICE_PRODUCT_WITH_ROOMTYPE;
+                // $_POST['selling_preference_type'] = Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
                 $this->copyFromPost($object, $this->table);
                 $object->indexed = 0;
 
@@ -2883,7 +2883,7 @@ class AdminNormalProductsControllerCore extends AdminController
         if (Validate::isLoadedObject($product)) {
             $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
             $allAssociations = $objRoomTypeServiceProduct->getAssociatedHotelsAndRoomType($product->id);
-            if (Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product->service_product_type) {
+            if (Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product->selling_preference_type) {
                 $associatedRoomTypes = $allAssociations['room_type'];
                 $selectedRoomTypes = Tools::getValue('room_type_box');
 
@@ -2924,7 +2924,7 @@ class AdminNormalProductsControllerCore extends AdminController
                     $product->id,
                     RoomTypeServiceProduct::WK_ELEMENT_TYPE_HOTEL
                 );
-            } elseif (Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $product->service_product_type) {
+            } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product->selling_preference_type) {
                 $associatedHotels = $allAssociations['hotel'];
                 $selectedHotel = Tools::getValue('hotel_box');
                 // Generate list of new associations
@@ -2964,6 +2964,80 @@ class AdminNormalProductsControllerCore extends AdminController
                     $product->id,
                     RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE
                 );
+            } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product->selling_preference_type) {
+                // Add room types linking
+                $associatedRoomTypes = $allAssociations['room_type'];
+                $selectedRoomTypes = Tools::getValue('room_type_box');
+                // Generate list of new associations
+                $newRoomTypes = array();
+                foreach ($selectedRoomTypes as $selectedRoomType) {
+                    if (!in_array($selectedRoomType, $associatedRoomTypes)) {
+                        $newRoomTypes[] = $selectedRoomType;
+                    }
+                }
+
+                // Generate list of associations to remove
+                $removedRoomTypes = array();
+                foreach ($associatedRoomTypes as $associatedRoomType) {
+                    if (!in_array($associatedRoomType, $selectedRoomTypes)) {
+                        $removedRoomTypes[] = $associatedRoomType;
+                    }
+                }
+
+                // Remove old associations
+                foreach ($removedRoomTypes as $removedRoomType) {
+                    RoomTypeServiceProduct::deleteRoomProductLink(
+                        $product->id,
+                        RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE,
+                        $removedRoomType
+                    );
+                }
+
+                // Save new associations
+                if ($newRoomTypes) {
+                    $objRoomTypeServiceProduct->addRoomProductLink(
+                        $product->id,
+                        $newRoomTypes,
+                        RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE
+                    );
+                }
+
+                // Add hotels linking
+                $associatedHotels = $allAssociations['hotel'];
+                $selectedHotel = Tools::getValue('hotel_box');
+                // Generate list of new associations
+                $newHotels = array();
+                foreach ($selectedHotel as $selectedRoomType) {
+                    if (!in_array($selectedRoomType, $associatedHotels)) {
+                        $newHotels[] = $selectedRoomType;
+                    }
+                }
+
+                // Generate list of associations to remove
+                $removedHotels = array();
+                foreach ($associatedHotels as $associatedRoomType) {
+                    if (!in_array($associatedRoomType, $selectedHotel)) {
+                        $removedHotels[] = $associatedRoomType;
+                    }
+                }
+
+                // Remove old associations
+                foreach ($removedHotels as $removedHotel) {
+                    RoomTypeServiceProduct::deleteRoomProductLink(
+                        $product->id,
+                        RoomTypeServiceProduct::WK_ELEMENT_TYPE_HOTEL,
+                        $removedHotel
+                    );
+                }
+
+                // Save new associations
+                if ($newHotels) {
+                    $objRoomTypeServiceProduct->addRoomProductLink(
+                        $product->id,
+                        $newHotels,
+                        RoomTypeServiceProduct::WK_ELEMENT_TYPE_HOTEL
+                    );
+                }
             } else {
                 // Remove associations
                 RoomTypeServiceProduct::deleteRoomProductLink(
@@ -3700,13 +3774,14 @@ class AdminNormalProductsControllerCore extends AdminController
         }
 
         $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
-        $selectedElements = $objRoomTypeServiceProduct->getAssociatedHotelsAndRoomType($product->id);
+        $selectetRoomTypes = $objRoomTypeServiceProduct->getAssociatedHotelsAndRoomType($product->id, RoomTypeServiceProduct::WK_ELEMENT_TYPE_ROOM_TYPE);
+        $selectetHotels = $objRoomTypeServiceProduct->getAssociatedHotelsAndRoomType($product->id, RoomTypeServiceProduct::WK_ELEMENT_TYPE_HOTEL);
 
         $tree = new HelperTree('hotels-room-tree');
         $tree->setData(HotelHelper::generateTreeData([
                 'rootNode' => HotelHelper::NODE_HOTEL,
                 'leafNode' => HotelHelper::NODE_ROOM_TYPE,
-                'selectedElements' => $selectedElements
+                'selectedElements' => $selectetRoomTypes
             ]))
             ->setUseCheckBox(true)
             ->setAutoSelectChildren(true)
@@ -3718,7 +3793,7 @@ class AdminNormalProductsControllerCore extends AdminController
         $tree->setData(HotelHelper::generateTreeData([
                 'rootNode' => HotelHelper::NODE_HOTEL,
                 'leafNode' => HotelHelper::NODE_HOTEL,
-                'selectedElements' => $selectedElements
+                'selectedElements' => $selectetHotels
             ]))
             ->setUseCheckBox(true)
             ->setAutoSelectChildren(true)
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index b34ed1d8e..81650523a 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -400,7 +400,7 @@ class AdminOrdersControllerCore extends AdminController
                     }
                     $this->context->smarty->assign('cart_detail_data', $cart_detail_data);
                 }
-                if ($cartHotelProduct = $objRoomTypeServiceProductCartDetail->getProducts($this->context->cart->id)) {
+                if ($cartHotelProduct = $objRoomTypeServiceProductCartDetail->getCartStandardProducts($this->context->cart->id)) {
                     $this->context->smarty->assign('cart_hotel_product_data', $cartHotelProduct);
                 }
 
@@ -1038,14 +1038,14 @@ class AdminOrdersControllerCore extends AdminController
                 }
             }
             $refundReqProducts = $objOrderReturn->getOrderRefundRequestedProducts($objOrder->id, 0, 1, 0, 1);
-            $hotelProducts = $objRoomTypeServiceProductOrderDetail->getProducts($objOrder->id, 0, 0, Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL);
+            $hotelProducts = $objRoomTypeServiceProductOrderDetail->getProducts($objOrder->id, 0, 0, [Product::SELLING_PREFERENCE_HOTEL_STANDALONE]);
             foreach($hotelProducts as $key => $product) {
                 if ((in_array($product['id_room_type_service_product_order_detail'], $refundReqProducts)) || $product['is_refunded']) {
                     unset($hotelProducts[$key]);
                 }
             }
 
-            $standaloneProducts = $objRoomTypeServiceProductOrderDetail->getProducts($objOrder->id, 0, 0, Product::SERVICE_PRODUCT_STANDALONE);
+            $standaloneProducts = $objRoomTypeServiceProductOrderDetail->getProducts($objOrder->id, 0, 0, [Product::SELLING_PREFERENCE_STANDALONE]);
             foreach($standaloneProducts as $key => $product) {
                 if ((in_array($product['id_room_type_service_product_order_detail'], $refundReqProducts)) || $product['is_refunded']) {
                     unset($standaloneProducts[$key]);
@@ -1140,7 +1140,7 @@ class AdminOrdersControllerCore extends AdminController
                 $smartyVars['RoomTypeServiceProductOrderDetail'] = $objRoomTypeServiceProductOrderDetail;
                 $response['data'] = array(
                     'id_product' => $objRoomTypeServiceProductOrderDetail->id_product,
-                    'id_service_product_option' => $objRoomTypeServiceProductOrderDetail->id_service_product_option,
+                    'id_product_option' => $objRoomTypeServiceProductOrderDetail->id_product_option,
                     'name' => $objRoomTypeServiceProductOrderDetail->name,
                     'option_name' => $objRoomTypeServiceProductOrderDetail->option_name,
                     'unit_price_tax_excl' => $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl,
@@ -2930,13 +2930,13 @@ class AdminOrdersControllerCore extends AdminController
                 $product['warehouse_name'] = '--';
                 $product['warehouse_location'] = false;
             }
-            if ($product['product_service_type'] == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+            if ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) {
                 $hotelProducts = $objRoomTypeServiceProductOrderDetail->getProducts($order->id, $product['id_order_detail'], $product['product_id']);
                 foreach ($hotelProducts as $hotelProduct) {
                     $orderHotelServiceProducts[] = array_merge($product, $hotelProduct);
                 }
             }
-            if ($product['product_service_type'] == Product::SERVICE_PRODUCT_STANDALONE) {
+            if ($product['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE) {
                 $standaloneProducts = $objRoomTypeServiceProductOrderDetail->getProducts($order->id, $product['id_order_detail'], $product['product_id']);
                 foreach ($standaloneProducts as $standaloneProduct) {
                     $orderStandaloneServiceProducts[] = array_merge($product, $standaloneProduct);
@@ -3670,7 +3670,7 @@ class AdminOrdersControllerCore extends AdminController
                     (int)$this->context->language->id,
                     pSQL(Tools::getValue('product_search')),
                     0,
-                    Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL
+                    Product::SELLING_PREFERENCE_HOTEL_STANDALONE
                 )) {
                     $objServiceProductOption = new ServiceProductOption();
                     foreach ($products as $key => &$product) {
@@ -3690,7 +3690,7 @@ class AdminOrdersControllerCore extends AdminController
                     (int)$this->context->language->id,
                     pSQL(Tools::getValue('product_search')),
                     0,
-                    Product::SERVICE_PRODUCT_STANDALONE
+                    Product::SELLING_PREFERENCE_STANDALONE
                 )) {
                     $objServiceProductOption = new ServiceProductOption();
                     foreach ($products as $key => &$product) {
@@ -3828,7 +3828,7 @@ class AdminOrdersControllerCore extends AdminController
             }
         }
 
-        if ($product->booking_product || Product::SERVICE_PRODUCT_WITH_ROOMTYPE == $product->service_product_type) {
+        if ($product->booking_product || Product::SELLING_PREFERENCE_WITH_ROOM_TYPE == $product->selling_preference_type) {
             die(Tools::jsonEncode(array(
                 'result' => false,
                 'error' => Tools::displayError('The product cannot be added through this method.')
@@ -5085,7 +5085,7 @@ class AdminOrdersControllerCore extends AdminController
 
         $this->sendChangedNotification($order);
 
-        $serviceProducts = $objRoomTypeServiceProductCartDetail->getProducts(
+        $serviceProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
             $this->context->cart->id,
             $idProduct,
             0,
@@ -5094,7 +5094,7 @@ class AdminOrdersControllerCore extends AdminController
         foreach ($serviceProducts as $serviceProduct) {
             $objRoomTypeServiceProductOrderDetail = new RoomTypeServiceProductOrderDetail();
             $objRoomTypeServiceProductOrderDetail->id_product = $idProduct;
-            $objRoomTypeServiceProductOrderDetail->id_service_product_option = $serviceProduct['id_service_product_option'];
+            $objRoomTypeServiceProductOrderDetail->id_product_option = $serviceProduct['id_product_option'];
             $objRoomTypeServiceProductOrderDetail->id_order = $order->id;
             $objRoomTypeServiceProductOrderDetail->id_order_detail = $order_detail->id;
             $objRoomTypeServiceProductOrderDetail->id_cart = $this->context->cart->id;
diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index c1ca937d0..316d62a7d 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -179,8 +179,8 @@ class CartControllerCore extends FrontController
                 $this->context->cookie->avail_rooms = $total_available_rooms;
             }
         } else {
-            $idServiceProductOption = Tools::getValue('id_service_product_option', null);
-            if ($product->service_product_type == Product::SERVICE_PRODUCT_STANDALONE) {
+            $idProductOption = Tools::getValue('id_product_option', null);
+            if ($product->selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE) {
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
                 $result = $objRoomTypeServiceProductCartDetail->removeCartServiceProduct(
                     $this->context->cart->id,
@@ -188,10 +188,12 @@ class CartControllerCore extends FrontController
                     false,
                     false,
                     false,
-                    $idServiceProductOption
+                    $idProductOption
                 );
 
-            } elseif ($product->service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+            } elseif ($product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
+                || $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
+            ) {
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
                 $result = $objRoomTypeServiceProductCartDetail->removeCartServiceProduct(
                     $this->context->cart->id,
@@ -199,7 +201,7 @@ class CartControllerCore extends FrontController
                     false,
                     $this->id_hotel,
                     false,
-                    $idServiceProductOption
+                    $idProductOption
                 );
             }
         }
@@ -456,7 +458,7 @@ class CartControllerCore extends FrontController
             }
         } else {
             $objHotelCartBookingData = new HotelCartBookingData();
-            if ($product->service_product_type == Product::SERVICE_PRODUCT_STANDALONE) {
+            if ($product->selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE) {
                 // if can be added without room type then we can directly add product in cart.
                 if ($operator == 'up') {
                     if ($product->allow_multiple_quantity) {
@@ -481,25 +483,29 @@ class CartControllerCore extends FrontController
                         }
                     }
                     if (ServiceProductOption::productHasOptions($this->id_product)) {
-                        if (!$idServiceProductOption = Tools::getValue('id_service_product_option')) {
+                        if (!$idProductOption = Tools::getValue('id_product_option')) {
                             $this->errors[] = Tools::displayError('Cannot add service without a option.');
                         } else {
-                            if (!ServiceProductOption::productHasOptions($this->id_product, $idServiceProductOption)) {
+                            if (!ServiceProductOption::productHasOptions($this->id_product, $idProductOption)) {
                                 $this->errors[] = Tools::displayError('The selected option is not available.');
                             }
                         }
                     }
                 }
-            } elseif ($product->service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+            } elseif ($product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
+                || $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
+            ) {
                 $id_hotel = Tools::getValue('id_hotel');
                 if ($operator == 'up') {
                     if ($id_hotel) {
                         $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                        if ($cartDetail = $objRoomTypeServiceProductCartDetail->getProducts(
+                        if ($cartDetail = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                             $id_cart,
-                            $this->id_product,
-                            ProductCore::SERVICE_PRODUCT_lINKED_WITH_HOTEL,
-                            $id_hotel
+                            [$product->selling_preference_type],
+                            $id_hotel,
+                            null,
+                            null,
+                            $this->id_product
                         )) {
                             $productCartDetail = array_shift($cartDetail);
                         }
@@ -517,10 +523,10 @@ class CartControllerCore extends FrontController
                             }
                         }
                         if (ServiceProductOption::productHasOptions($this->id_product)) {
-                            if (!$idServiceProductOption = Tools::getValue('id_service_product_option')) {
+                            if (!$idProductOption = Tools::getValue('id_product_option')) {
                                 $this->errors[] = Tools::displayError('Cannot add service without a option.');
                             } else {
-                                if (!ServiceProductOption::productHasOptions($this->id_product, $idServiceProductOption)) {
+                                if (!ServiceProductOption::productHasOptions($this->id_product, $idProductOption)) {
                                     $this->errors[] = Tools::displayError('The selected option is not available.');
                                 }
                             }
@@ -629,7 +635,9 @@ class CartControllerCore extends FrontController
                         $this->availQty = $total_available_rooms + $req_rm;
                     }
                     $this->context->cookie->avail_rooms = $this->availQty;
-                } elseif ($product->service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                } elseif ($product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
+                    || $product->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
+                ) {
                     $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
                     $update_quantity = $objRoomTypeServiceProductCartDetail->updateCartServiceProduct(
                         $this->context->cart->id,
@@ -638,17 +646,17 @@ class CartControllerCore extends FrontController
                         $this->qty,
                         $id_hotel,
                         false,
-                        isset($idServiceProductOption) ? $idServiceProductOption : null
+                        isset($idProductOption) ? $idProductOption : null
                     );
                     if ($operator == 'up') {
                         $this->context->cookie->currentAddedProduct = json_encode(array(
                             'id_product' => $this->id_product,
                             'id_hotel' => $id_hotel,
                             'qty' => $this->qty,
-                            'id_service_product_option' => isset($idServiceProductOption) ? $idServiceProductOption : null
+                            'id_product_option' => isset($idProductOption) ? $idProductOption : null
                         ));
                     }
-                } elseif ($product->service_product_type == Product::SERVICE_PRODUCT_STANDALONE) {
+                } elseif ($product->selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE) {
                     $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
                     $update_quantity = $objRoomTypeServiceProductCartDetail->updateCartServiceProduct(
                         $this->context->cart->id,
@@ -657,13 +665,13 @@ class CartControllerCore extends FrontController
                         $this->qty,
                         false,
                         false,
-                        isset($idServiceProductOption) ? $idServiceProductOption : null
+                        isset($idProductOption) ? $idProductOption : null
                     );
                     if ($operator == 'up') {
                         $this->context->cookie->currentAddedProduct = json_encode(array(
                             'id_product' => $this->id_product,
                             'qty' => $this->qty,
-                            'id_service_product_option' => isset($idServiceProductOption) ? $idServiceProductOption : null
+                            'id_product_option' => isset($idProductOption) ? $idProductOption : null
                         ));
                     }
                 }
diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php
index 03fdcda72..1c328eb13 100644
--- a/controllers/front/GuestTrackingController.php
+++ b/controllers/front/GuestTrackingController.php
@@ -487,7 +487,7 @@ class GuestTrackingControllerCore extends FrontController
                                     $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6));
                                     $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6));
                                 }
-                            } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) {
+                            } else if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) {
                                 if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) {
                                     $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
                                         $idOrder,
@@ -516,7 +516,7 @@ class GuestTrackingControllerCore extends FrontController
                                 }
                             } else {
                                 // get all products that are independent.
-                                if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_STANDALONE) {
+                                if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE) {
                                     $product = new Product($type_value['product_id'], false, $this->context->language->id);
                                     $cover_image_arr = $product->getCover($type_value['product_id']);
 
diff --git a/controllers/front/OrderConfirmationController.php b/controllers/front/OrderConfirmationController.php
index 235bbc092..3bd78095e 100644
--- a/controllers/front/OrderConfirmationController.php
+++ b/controllers/front/OrderConfirmationController.php
@@ -120,8 +120,8 @@ class OrderConfirmationControllerCore extends FrontController
             $orderTotalInfo['total_products_ti'] = 0;
             $orderTotalInfo['total_rooms_te'] = 0;
             $orderTotalInfo['total_rooms_ti'] = 0;
-            $orderTotalInfo['total_service_products_te'] = 0;
-            $orderTotalInfo['total_service_products_ti'] = 0;
+            $orderTotalInfo['total_standalone_products_te'] = 0;
+            $orderTotalInfo['total_standalone_products_ti'] = 0;
             $orderTotalInfo['total_auto_add_services_te'] = 0;
             $orderTotalInfo['total_auto_add_services_ti'] = 0;
             $orderTotalInfo['total_services_te'] = 0;
@@ -150,16 +150,14 @@ class OrderConfirmationControllerCore extends FrontController
                 $cart_hotel_service_products = array();
                 $cart_htl_data = array();
                 foreach ($cartOrders as $cartOrder) {
+
                     $idOrder = $cartOrder['id_order'];
                     $objCartOrder = new Order($idOrder);
                     $orderProducts = $objCartOrder->getProducts();
 
                     if (!empty($orderProducts)) {
                         foreach ($orderProducts as $type_key => $type_value) {
-
-
                             $product = new Product($type_value['product_id'], false, $this->context->language->id);
-
                             $cover_image_arr = $product->getCover($type_value['product_id']);
 
                             if (!empty($cover_image_arr)) {
@@ -358,7 +356,7 @@ class OrderConfirmationControllerCore extends FrontController
 
                                     $totalRoomsBooked += 1;
                                 }
-                            } else if ($product->service_product_type == ProductCore::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                            } else if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) {
                                 $cover_image_arr = $product->getCover($type_value['product_id']);
 
                                 if (!empty($cover_image_arr)) {
@@ -372,11 +370,11 @@ class OrderConfirmationControllerCore extends FrontController
                                     $type_value['total_price_tax_incl'] = $serviceProduct['total_price_tax_incl'];
                                     $type_value['product_quantity'] = $serviceProduct['quantity'];
                                     $type_value['option_name'] = $serviceProduct['option_name'];
-                                    $orderTotalInfo['total_service_products_te'] += $type_value['total_price_tax_excl'];
-                                    $orderTotalInfo['total_service_products_ti'] += $type_value['total_price_tax_incl'];
+                                    $orderTotalInfo['total_standalone_products_te'] += $type_value['total_price_tax_excl'];
+                                    $orderTotalInfo['total_standalone_products_ti'] += $type_value['total_price_tax_incl'];
                                     $cart_hotel_service_products[] = $type_value;
                                 }
-                            } else if ($product->service_product_type == Product::SERVICE_PRODUCT_STANDALONE) {
+                            } else if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE) {
                                 $cover_image_arr = $product->getCover($type_value['product_id']);
 
                                 if (!empty($cover_image_arr)) {
@@ -390,8 +388,8 @@ class OrderConfirmationControllerCore extends FrontController
                                     $type_value['total_price_tax_incl'] = $serviceProduct['total_price_tax_incl'];
                                     $type_value['product_quantity'] = $serviceProduct['quantity'];
                                     $type_value['option_name'] = $serviceProduct['option_name'];
-                                    $orderTotalInfo['total_service_products_te'] += $type_value['total_price_tax_excl'];
-                                    $orderTotalInfo['total_service_products_ti'] += $type_value['total_price_tax_incl'];
+                                    $orderTotalInfo['total_standalone_products_te'] += $type_value['total_price_tax_excl'];
+                                    $orderTotalInfo['total_standalone_products_ti'] += $type_value['total_price_tax_incl'];
                                     $cart_standalone_service_products[] = $type_value;
                                 }
                             }
@@ -409,14 +407,14 @@ class OrderConfirmationControllerCore extends FrontController
                     $orderTotalInfo['total_wrapping'] += $objCartOrder->total_wrapping;
                     $orderTotalInfo['total_rooms_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, true);
                     $orderTotalInfo['total_rooms_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, true);
-                    $orderTotalInfo['total_auto_add_services_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
-                    $orderTotalInfo['total_auto_add_services_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
-                    $orderTotalInfo['total_services_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0);
-                    $orderTotalInfo['total_services_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 0);
-                    $orderTotalInfo['total_convenience_fee_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
-                    $orderTotalInfo['total_convenience_fee_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
-                    // $orderTotalInfo['total_service_products_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE);
-                    // $orderTotalInfo['total_service_products_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_STANDALONE);
+                    $orderTotalInfo['total_auto_add_services_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
+                    $orderTotalInfo['total_auto_add_services_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_WITH_ROOM);
+                    $orderTotalInfo['total_services_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0);
+                    $orderTotalInfo['total_services_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 0);
+                    $orderTotalInfo['total_convenience_fee_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
+                    $orderTotalInfo['total_convenience_fee_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE, 1, Product::PRICE_ADDITION_TYPE_INDEPENDENT);
+                    $orderTotalInfo['total_standalone_products_te'] += $objCartOrder->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE);
+                    $orderTotalInfo['total_standalone_products_ti'] += $objCartOrder->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE);
                     $orderTotalInfo['total_discounts'] += $objCartOrder->total_discounts;
                     $orderTotalInfo['total_discounts_te'] += $objCartOrder->total_discounts_tax_excl;
                     $orderTotalInfo['total_tax'] += $objCartOrder->total_paid_tax_incl - $objCartOrder->total_paid_tax_excl;
@@ -424,8 +422,10 @@ class OrderConfirmationControllerCore extends FrontController
                     $orderTotalInfo['total_paid_real'] += $objCartOrder->total_paid_real;
                 }
 
-                $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_demands_price_ti'];
-                $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_demands_price_te'];
+                $totalTaxIncl = $orderTotalInfo['total_rooms_ti'] + $orderTotalInfo['total_services_ti'] + $orderTotalInfo['total_convenience_fee_ti'] + $orderTotalInfo['total_auto_add_services_ti'] + $orderTotalInfo['total_demands_price_ti'] + $orderTotalInfo['total_standalone_products_ti'];
+
+                $totalTaxExcl = $orderTotalInfo['total_rooms_te'] + $orderTotalInfo['total_services_te'] + $orderTotalInfo['total_convenience_fee_te'] + $orderTotalInfo['total_auto_add_services_te'] + $orderTotalInfo['total_demands_price_te'] + $orderTotalInfo['total_standalone_products_te'];
+
                 $orderTotalInfo['total_tax_without_discount'] = $totalTaxIncl - $totalTaxExcl;
             }
 
diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php
index c20f5f615..eb7da2668 100644
--- a/controllers/front/OrderDetailController.php
+++ b/controllers/front/OrderDetailController.php
@@ -352,7 +352,7 @@ class OrderDetailControllerCore extends FrontController
                                 $value['avg_price_diff_tax_excl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_excl'] - $value['product_price_tax_excl'], 6));
                                 $value['avg_price_diff_tax_incl'] = abs(Tools::ps_round($value['avg_paid_unit_price_tax_incl'] - $value['product_price_tax_incl'], 6));
                             }
-                        } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_WITH_ROOMTYPE) {
+                        } else if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) {
                             if ($type_value['product_auto_add'] && $type_value['product_price_addition_type'] == Product::PRICE_ADDITION_TYPE_INDEPENDENT) {
                                 $total_convenience_fee_ti += $objRoomTypeServiceProductOrderDetail->getroomTypeServiceProducts(
                                     $id_order,
@@ -379,7 +379,7 @@ class OrderDetailControllerCore extends FrontController
                                     1
                                 );
                             }
-                        } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                        } else if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) {
                             $hotelProducts = $objRoomTypeServiceProductOrderDetail->getProducts($id_order, $type_value['id_order_detail'], $type_value['product_id']);
                             foreach ($hotelProducts as $hotelProduct) {
                                 $hotelServiceProducts[] = array_merge($type_value, $hotelProduct);
@@ -392,7 +392,7 @@ class OrderDetailControllerCore extends FrontController
                                 }
                                 $serviceProductsFormatted[$hotelProduct['id_product']]['options'][] = $hotelProduct;
                             }
-                        } else if ($type_value['product_service_type'] == Product::SERVICE_PRODUCT_STANDALONE) {
+                        } else if ($type_value['selling_preference_type'] == Product::SELLING_PREFERENCE_STANDALONE) {
                             $standaloneProducts = $objRoomTypeServiceProductOrderDetail->getProducts($id_order, $type_value['id_order_detail'], $type_value['product_id']);
                             foreach ($standaloneProducts as $standaloneProduct) {
                                 $standaloneServiceProducts[] = array_merge($type_value, $standaloneProduct);
@@ -415,7 +415,7 @@ class OrderDetailControllerCore extends FrontController
 
                 $objHotelBookingDetail = new HotelBookingDetail();
                 $htlBookingDetail = $objHotelBookingDetail->getOrderCurrentDataByOrderId($order->id);
-                // ddd($serviceProductsFormatted);
+
                 $this->context->smarty->assign(
                     array(
                         'id_cms_refund_policy' => Configuration::get('WK_GLOBAL_REFUND_POLICY_CMS'),
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 326c83556..8b1578be6 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -982,18 +982,26 @@ class OrderOpcControllerCore extends ParentOrderController
                 $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
                 $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
                 $roomTypeServiceProducts = $objRoomTypeServiceProduct->getServiceProductsData($idProduct, 1, 0, true, 1);
-                $cartRooms = $objCartBookingData->getHotelCartRoomsInfoByRoomType($this->context->cart->id, $idProduct,$dateFrom, $dateTo);
-                foreach($cartRooms as &$room) {
-                    $room['selected_service'] = $objRoomTypeServiceProductCartDetail->getRoomServiceProducts(
-                        $room['id'],
+                $cartBookings = $objCartBookingData->getHotelCartRoomsInfoByRoomType($this->context->cart->id, $idProduct,$dateFrom, $dateTo);
+                foreach($cartBookings as &$cartBookingData) {
+                    $cartBookingData['selected_service'] = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                        $cartBookingData['id_cart'],
+                        [],
+                        null,
+                        $cartBookingData['id'],
+                        null,
+                        null,
+                        null,
+                        null,
+                        0,
                         0,
                         null,
-                        null
+                        1
                     );
                 }
                 $this->context->smarty->assign(array(
                     'roomTypeServiceProducts' => $roomTypeServiceProducts,
-                    'cartRooms' => $cartRooms
+                    'cartRooms' => $cartBookings
                 ));
             }
         }
diff --git a/controllers/front/ParentOrderController.php b/controllers/front/ParentOrderController.php
index eedf7ff3d..12de5b8c3 100644
--- a/controllers/front/ParentOrderController.php
+++ b/controllers/front/ParentOrderController.php
@@ -316,26 +316,27 @@ class ParentOrderControllerCore extends FrontController
                 $this->context->smarty->assign('cart_htl_data', $cartBookingInfo);
             }
             $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-            if ($hotelProducts = $objRoomTypeServiceProductCartDetail->getProducts(
+            if ($hotelProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                 $this->context->cart->id,
-                0,
-                Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL,
-                0,
-                0,
-                null,
-                0,
+                [Product::SELLING_PREFERENCE_HOTEL_STANDALONE, Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE],
+                $idHotel = null,
                 0,
                 null,
                 null,
-                true
+                null,
+                null,
+                0,
+                null,
+                0,
+                null,
+                1
             )) {
                 $this->context->smarty->assign('hotel_products', $hotelProducts);
             }
 
-            $standaloneProducts = $objRoomTypeServiceProductCartDetail->getProducts(
+            $standaloneProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                 $this->context->cart->id,
-                0,
-                ProductCore::SERVICE_PRODUCT_STANDALONE
+                [Product::SELLING_PREFERENCE_STANDALONE]
             );
 
             if (count($standaloneProducts)) {
@@ -473,10 +474,9 @@ class ParentOrderControllerCore extends FrontController
             Tools::redirect('');
         } elseif (!Customer::getAddressesTotalById($this->context->customer->id)) {
             $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-            if (count($objRoomTypeServiceProductCartDetail->getProducts(
+            if (count($objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                 $this->context->cart->id,
-                0,
-                Product::SERVICE_PRODUCT_STANDALONE
+                [Product::SELLING_PREFERENCE_STANDALONE]
             ))) {
                 $multi = (int)Tools::getValue('multi-shipping');
                 Tools::redirect('index.php?controller=address&back='.urlencode('order.php?step=1'.($multi ? '&multi-shipping='.$multi : '')));
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 070469568..fda90f060 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -805,12 +805,14 @@ class ProductControllerCore extends FrontController
     }
 
     public function assignServiceProductVars(
-        $idServiceProductOption = false,
-        $quantity = false,
+        $idProductOption = false,
+        $quantity = 1,
         $idHotel = false
     ) {
         $smartyVars = array();
-        if (Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $this->product->service_product_type) {
+        if (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $this->product->selling_preference_type
+            || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $this->product->selling_preference_type
+        ) {
             $objRoomTypeServiceProduct = new RoomTypeServiceProduct();
 
             if ($associatedHotels = $objRoomTypeServiceProduct->getAssociatedHotelsAndRoomType($this->product->id)['hotel']) {
@@ -832,32 +834,32 @@ class ProductControllerCore extends FrontController
         $objServiceProductOption = new ServiceProductOption();
         if ($serviceProductOptions = $objServiceProductOption->getProductOptions($this->product->id)) {
             foreach ($serviceProductOptions as &$serviceProductOption) {
-                if ($idServiceProductOption == null) {
-                    $idServiceProductOption = $serviceProductOption['id_service_product_option'];
+                if ($idProductOption == null) {
+                    $idProductOption = $serviceProductOption['id_product_option'];
                 }
                 $serviceProductOption['price'] = RoomTypeServiceProductPrice::getPrice(
                     $this->product->id,
                     $idHotel,
-                    $serviceProductOption['id_service_product_option'],
+                    $serviceProductOption['id_product_option'],
                     $useTax,
                     $quantity
                 );
             }
 
         }
-        $smartyVars['service_product_option'] = $serviceProductOptions;
+        $smartyVars['product_option'] = $serviceProductOptions;
         $smartyVars['service_price']  = RoomTypeServiceProductPrice::getPrice(
             $this->product->id,
             $idHotel,
-            $idServiceProductOption,
+            $idProductOption,
             $useTax,
             $quantity
         );
         if ($quantity) {
             $smartyVars['quantity']  = $quantity;
         }
-        if ($idServiceProductOption) {
-            $smartyVars['id_service_product_option']  = $idServiceProductOption;
+        if ($idProductOption) {
+            $smartyVars['id_product_option']  = $idProductOption;
         }
 
         $this->context->smarty->assign($smartyVars);
@@ -1360,10 +1362,10 @@ class ProductControllerCore extends FrontController
             }
         } else {
             $idHotel = Tools::getValue('service_id_hotel');
-            $id_service_product_option = Tools::getValue('id_service_product_option');
+            $id_product_option = Tools::getValue('id_product_option');
             $quantity = Tools::getValue('service_product_qty');
             $this->assignServiceProductVars(
-                $id_service_product_option,
+                $id_product_option,
                 $quantity,
                 $idHotel
             );
diff --git a/install/data/db_structure.sql b/install/data/db_structure.sql
index 9f5490bc2..98d21ba09 100644
--- a/install/data/db_structure.sql
+++ b/install/data/db_structure.sql
@@ -1250,7 +1250,7 @@ CREATE TABLE `PREFIX_order_detail` (
   `group_reduction` DECIMAL(10, 2) NOT NULL DEFAULT '0.000000',
   `product_quantity_discount` decimal(20,6) NOT NULL DEFAULT '0.000000',
   `is_booking_product` tinyint(1) NOT NULL DEFAULT '0',
-  `product_service_type` tinyint(1) NOT NULL DEFAULT '1',
+  `selling_preference_type` tinyint(1) NOT NULL DEFAULT '1',
   `product_auto_add` tinyint(1) NOT NULL DEFAULT '0',
   `product_price_addition_type` tinyint(1) NOT NULL DEFAULT '0',
   `product_allow_multiple_quantity` tinyint(1) unsigned NOT NULL DEFAULT '1',
@@ -1549,7 +1549,7 @@ CREATE TABLE `PREFIX_product` (
   `auto_add_to_cart` tinyint(1) NOT NULL DEFAULT '0',
   `price_addition_type` tinyint(1) NOT NULL DEFAULT '1',
   `show_at_front` tinyint(1) NOT NULL DEFAULT '1',
-  `service_product_type` tinyint(1) NOT NULL DEFAULT '1',
+  `selling_preference_type` tinyint(1) NOT NULL DEFAULT '1',
   `price_display_method` tinyint(1) NOT NULL DEFAULT '1',
   `available_date` date NOT NULL DEFAULT '0000-00-00',
   `condition` ENUM('new', 'used', 'refurbished') NOT NULL DEFAULT 'new',
diff --git a/install/upgrade/sql/1.6.0.0.sql b/install/upgrade/sql/1.6.0.0.sql
index 8a0b2fd29..5ea572bf3 100644
--- a/install/upgrade/sql/1.6.0.0.sql
+++ b/install/upgrade/sql/1.6.0.0.sql
@@ -41,8 +41,8 @@ set `id_address_tax` = `id_address_invoice`;
 
 ALTER TABLE `PREFIX_order_detail`
 ADD `is_booking_product` tinyint(1) NOT NULL DEFAULT '0' AFTER `product_quantity_discount`,
-ADD `product_service_type` tinyint(1) NOT NULL DEFAULT '1' AFTER `is_booking_product`,
-ADD `product_auto_add` tinyint(1) NOT NULL DEFAULT '0' AFTER `product_service_type`,
+ADD `selling_preference_type` tinyint(1) NOT NULL DEFAULT '1' AFTER `is_booking_product`,
+ADD `product_auto_add` tinyint(1) NOT NULL DEFAULT '0' AFTER `selling_preference_type`,
 ADD `product_price_addition_type` tinyint(1) NOT NULL DEFAULT '0' AFTER `product_auto_add`,
 ADD `product_allow_multiple_quantity` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `product_price_addition_type`,
 ADD `product_price_calculation_method` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `product_allow_multiple_quantity`;
@@ -86,8 +86,8 @@ ADD `price_calculation_method` tinyint(1) unsigned NOT NULL DEFAULT '1' AFTER `m
 ADD `auto_add_to_cart` tinyint(1) NOT NULL DEFAULT '0' AFTER `available_for_order`,
 ADD `price_addition_type` tinyint(1) NOT NULL DEFAULT '1' AFTER `auto_add_to_cart`,
 ADD `show_at_front` tinyint(1) NOT NULL DEFAULT '1' AFTER `price_addition_type`,
-ADD `service_product_type` tinyint(1) NOT NULL DEFAULT '1' AFTER `show_at_front`,
-ADD `price_display_method` tinyint(1) NOT NULL DEFAULT '1' AFTER `service_product_type`,
+ADD `selling_preference_type` tinyint(1) NOT NULL DEFAULT '1' AFTER `show_at_front`,
+ADD `price_display_method` tinyint(1) NOT NULL DEFAULT '1' AFTER `selling_preference_type`,
 ADD `booking_product` tinyint(1) NOT NULL DEFAULT '1' AFTER `is_virtual`;
 
 ALTER TABLE `PREFIX_product_shop`
diff --git a/js/admin/normal_products.js b/js/admin/normal_products.js
index 72ee0184b..0bbe533ac 100644
--- a/js/admin/normal_products.js
+++ b/js/admin/normal_products.js
@@ -550,8 +550,8 @@ product_tabs['Informations'] = new function(){
 
 	this.switchProductType = function(){
 
-		$('#service_product_type').on('change',function(){
-			if (parseInt($(this).val()) == SERVICE_PRODUCT_WITH_ROOMTYPE) {
+		$('#selling_preference_type').on('change',function(){
+			if (parseInt($(this).val()) == SELLING_PREFERENCE_WITH_ROOM_TYPE) {
 				$('#associated_hotel_tree').hide('fast').find('input').each(function() {
 					$(this).attr('data-name', $(this).attr('name'));
 					$(this).removeAttr('name');
@@ -563,7 +563,31 @@ product_tabs['Informations'] = new function(){
 				$('#auto_add_to_cart_container').show('fast');
 				$('#show_at_front_container').show('fast');
 				$('#product_options').show('fast');
-			} else if (parseInt($(this).val()) == SERVICE_PRODUCT_STANDALONE) {
+			} else if (parseInt($(this).val()) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
+				$('#associated_hotel_rooms_tree').hide('fast').find('input').each(function() {
+					$(this).attr('data-name', $(this).attr('name'));
+					$(this).removeAttr('name');
+				});
+				$('#associated_hotel_tree').show('fast').find('input').each(function() {
+					$(this).attr('name', $(this).attr('data-name'));
+					$(this).removeAttr('data-name');
+				});
+				$('#auto_add_to_cart_container').hide('fast');
+				$('#show_at_front_container').show('fast');
+				$('#product_options').show('fast');
+            } else if (parseInt($(this).val()) == SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE) {
+				$('#associated_hotel_rooms_tree').show('fast').find('input').each(function() {
+					$(this).attr('name', $(this).attr('data-name'));
+					$(this).removeAttr('data-name');
+				});
+				$('#associated_hotel_tree').show('fast').find('input').each(function() {
+					$(this).attr('name', $(this).attr('data-name'));
+					$(this).removeAttr('data-name');
+				});
+				$('#auto_add_to_cart_container').hide('fast');
+				$('#show_at_front_container').show('fast');
+				$('#product_options').show('fast');
+            } else if (parseInt($(this).val()) == SELLING_PREFERENCE_STANDALONE) {
 				$('#associated_hotel_rooms_tree').hide('fast').find('input').each(function() {
 					$(this).attr('data-name', $(this).attr('name'));
 					$(this).removeAttr('name');
@@ -575,21 +599,9 @@ product_tabs['Informations'] = new function(){
 				$('#auto_add_to_cart_container').hide('fast');
 				$('#show_at_front_container').show('fast');
 				$('#product_options').show('fast');
-			} else if (parseInt($(this).val()) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
-				$('#associated_hotel_rooms_tree').hide('fast').find('input').each(function() {
-					$(this).attr('data-name', $(this).attr('name'));
-					$(this).removeAttr('name');
-				});
-				$('#associated_hotel_tree').show('fast').show('fast').find('input').each(function() {
-					$(this).attr('name', $(this).attr('data-name'));
-					$(this).removeAttr('data-name');
-				});
-				$('#auto_add_to_cart_container').hide('fast');
-				$('#show_at_front_container').show('fast');
-				$('#product_options').show('fast');
 			}
 		});
-		$('#service_product_type').trigger('change');
+		$('#selling_preference_type').trigger('change');
 		$('#simple_product').attr('checked', true);
 
 		$('input[name="type_product"]').on('click', function(e)
diff --git a/js/admin/orders.js b/js/admin/orders.js
index 37a41fa1e..8c2590937 100644
--- a/js/admin/orders.js
+++ b/js/admin/orders.js
@@ -3010,7 +3010,7 @@ const AddProductModal = {
                                 if (data.options) {
                                     $('#new_product .form-group.productOptions').show();
                                     $.each(data.options, function() {
-                                        $('<option/>').val(this.id_service_product_option).text(this.name).appendTo('#new_product #add_product_product_option');
+                                        $('<option/>').val(this.id_product_option).text(this.name).appendTo('#new_product #add_product_product_option');
                                     });
                                     AddProductModal.initOptionsChange();
                                 }
diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index c3516e755..4e4e8613f 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -856,7 +856,7 @@ var ajaxCart = {
         $(jsonData.products).each(function(key, value) {
             //fix ie6 bug (one more item 'undefined' in IE6)
             if (this.id != undefined) {
-                if (!this.booking_product && this.service_product_type != 2) {
+                if (!this.booking_product && this.selling_preference_type != 2) {
                     return;
                 }
                 //create a container for listing the products and hide the 'no product in the cart' message (only if the cart was empty)
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index ee1e9c835..338f86130 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -72,7 +72,16 @@ class Blockcart extends Module
         }
 
         $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-        $serviceProducts = $objRoomTypeServiceProductCartDetail->getProducts($params['cart']->id);
+        $serviceProducts = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+            $params['cart']->id,
+            [
+                Product::SELLING_PREFERENCE_STANDALONE,
+                Product::SELLING_PREFERENCE_HOTEL_STANDALONE,
+                Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
+            ],
+            null,
+            0
+        );
 
         $priceDisplayMethod = Product::getTaxCalculationMethod((int)$this->context->cookie->id_customer);
         $nbTotalProducts = 0;
@@ -119,7 +128,7 @@ class Blockcart extends Module
 
             if (!$product['booking_product']) {
                 $product['hasOptions'] = ServiceProductOption::productHasOptions($product['id_product']);
-                if (Product::SERVICE_PRODUCT_STANDALONE == $product['service_product_type']) {
+                if (Product::SELLING_PREFERENCE_STANDALONE == $product['selling_preference_type']) {
                     $nbTotalProducts += (int) $product['cart_quantity'];
                     $product['total_price_tax_incl'] = 0;
                     $product['total_price_tax_excl'] = 0;
@@ -133,10 +142,12 @@ class Blockcart extends Module
                             $product['amount'] += $useTax ? $serviceProduct['total_price_tax_incl'] : $serviceProduct['total_price_tax_excl'];
                         }
                     }
-                } elseif (Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL == $product['service_product_type']) {
-                    $nbTotalProducts += (int) $product['cart_quantity'];
+                } elseif (Product::SELLING_PREFERENCE_HOTEL_STANDALONE == $product['selling_preference_type']
+                    || Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE == $product['selling_preference_type']
+                ) {
                     foreach ($serviceProducts as $key => $serviceProduct) {
-                        if ($serviceProduct['id_product'] == $product['id_product']) {
+                        if ($serviceProduct['id_hotel']) {
+                            $nbTotalProducts += (int) $serviceProduct['quantity'];
                             if (!isset($product['hotel_wise_data'][$serviceProduct['id_hotel']])) {
                                 $product['hotel_wise_data'][$serviceProduct['id_hotel']] = array(
                                     'id_hotel' => $serviceProduct['id_hotel'],
@@ -293,20 +304,22 @@ class Blockcart extends Module
                 $addedProduct['date_from'] = Tools::displayDate($addedProduct['date_from'], null, $fullDate);
                 $addedProduct['date_to'] = Tools::displayDate($addedProduct['date_to'], null, $fullDate);
             } else {
-                if ($objProduct->service_product_type == Product::SERVICE_PRODUCT_STANDALONE) {
+                if ($objProduct->selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE) {
                     $addedProduct['unit_price'] = RoomTypeServiceProductPrice::getPrice(
                         $objProduct->id,
                         0,
-                        isset($addedProduct['id_service_product_option']) ? $addedProduct['id_service_product_option'] : null,
+                        isset($addedProduct['id_product_option']) ? $addedProduct['id_product_option'] : null,
                         $useTax,
                         $addedProduct['qty']
                     );
 
-                } elseif ($objProduct->service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                } elseif ($objProduct->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE
+                    || $objProduct->selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE
+                ) {
                     $addedProduct['unit_price'] = RoomTypeServiceProductPrice::getPrice(
                         $objProduct->id,
                         $addedProduct['id_hotel'],
-                        isset($addedProduct['id_service_product_option']) ? $addedProduct['id_service_product_option'] : null,
+                        isset($addedProduct['id_product_option']) ? $addedProduct['id_product_option'] : null,
                         $useTax,
                         $addedProduct['qty']
                     );
diff --git a/modules/blockcart/blockcart.tpl b/modules/blockcart/blockcart.tpl
index e430635c0..48146d799 100644
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -63,7 +63,7 @@
 											<dl class="products">
 												{foreach from=$products key=data_k item='product' name='myLoop'}
 												{* only show products that are booking or global without room *}
-													{if $product.booking_product || ($product.service_product_type == Product::SERVICE_PRODUCT_STANDALONE)}
+													{if $product.booking_product || ($product.selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE)}
 														{assign var='productId' value=$product.id_product}
 														{assign var='productAttributeId' value=$product.id_product_attribute}
 														<dt data-id="cart_block_product_{$product.id_product|intval}_{if $product.id_product_attribute}{$product.id_product_attribute|intval}{else}0{/if}_{if $product.id_address_delivery}{$product.id_address_delivery|intval}{else}0{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
diff --git a/modules/hotelreservationsystem/classes/HotelBookingDetail.php b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
index 97f037fcd..fd775d2a1 100644
--- a/modules/hotelreservationsystem/classes/HotelBookingDetail.php
+++ b/modules/hotelreservationsystem/classes/HotelBookingDetail.php
@@ -2578,9 +2578,14 @@ class HotelBookingDetail extends ObjectModel
      * @param [int] $id_order   [Id of the order]
      * @return [int|false] [If found id_order_detail else returns false]
      */
-    public function getPsOrderDetailIdByIdProduct($id_product, $id_order)
+    public function getPsOrderDetailIdByIdProduct($id_product, $id_order, $selling_preference_type = 0)
     {
         $sql = 'SELECT `id_order_detail` FROM `'._DB_PREFIX_.'order_detail` WHERE `id_order`='.(int)$id_order.' AND `product_id`='.(int)$id_product;
+
+        if ($selling_preference_type) {
+            $sql .= ' AND `selling_preference_type`='.(int)$selling_preference_type;
+        }
+
         return Db::getInstance()->getvalue($sql);
     }
 
diff --git a/modules/hotelreservationsystem/classes/HotelCartBookingData.php b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
index f1a93d729..297e6f4c0 100644
--- a/modules/hotelreservationsystem/classes/HotelCartBookingData.php
+++ b/modules/hotelreservationsystem/classes/HotelCartBookingData.php
@@ -1169,7 +1169,6 @@ class HotelCartBookingData extends ObjectModel
                     0,
                     false
                 );
-
                 $cart_detail_data[$key]['additional_service'] = $objRoomTypeServiceProduct->getServiceProductsData(
                     $value['id_product'],
                     1,
@@ -1546,16 +1545,19 @@ class HotelCartBookingData extends ObjectModel
                                     $data_v['date_to'],
                                     1
                                 );
-                                $serviceProductPrice = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                                $serviceProductPrice = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
                                     $context->cart->id,
-                                    0,
-                                    $data_v['id_hotel'],
-                                    $data_v['id_product'],
-                                    $data_v['date_from'],
-                                    $data_v['date_to'],
+                                    [],
+                                    null,
                                     $data_v['id'],
-                                    1
+                                    null,
+                                    null,
+                                    null,
+                                    null,
+                                    1,
+                                    0
                                 );
+
                                 $totalAdditionalServicePrice = $demandPrice + $serviceProductPrice;
 
                                 if (isset($cartHotelData[$prodKey]['date_diff'][$dateJoin])) {
diff --git a/modules/hotelreservationsystem/classes/HotelHelper.php b/modules/hotelreservationsystem/classes/HotelHelper.php
index 137697e46..40ea3f8f5 100644
--- a/modules/hotelreservationsystem/classes/HotelHelper.php
+++ b/modules/hotelreservationsystem/classes/HotelHelper.php
@@ -2223,7 +2223,7 @@ class HotelHelper
             $objProduct->active = 1;
             $objProduct->quantity = 999999999;
             $objProduct->booking_product = 0;
-            $objProduct->service_product_type = Product::SERVICE_PRODUCT_WITH_ROOMTYPE;
+            $objProduct->selling_preference_type = Product::SELLING_PREFERENCE_WITH_ROOM_TYPE;
             $objProduct->auto_add_to_cart = $serviceProduct['auto_add_to_cart'];
             $objProduct->show_at_front = $serviceProduct['show_at_front'];
             $objProduct->available_for_order = 1;
diff --git a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
index 6464d16fb..d0a4846e5 100644
--- a/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
+++ b/modules/hotelreservationsystem/classes/HotelReservationSystemDb.php
@@ -383,20 +383,20 @@ class HotelReservationSystemDb
                 KEY `id_product` (`id_product`)
             ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;",
 
-            "CREATE TABLE `"._DB_PREFIX_."service_product_option` (
-                `id_service_product_option` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+            "CREATE TABLE `"._DB_PREFIX_."product_option` (
+                `id_product_option` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
                 `id_product` int(11) UNSIGNED NOT NULL,
                 `price_impact` decimal(20,6) NOT NULL DEFAULT '0.000000',
                 `date_add` datetime NOT NULL,
                 `date_upd` datetime NOT NULL,
-                PRIMARY KEY (`id_service_product_option`),
+                PRIMARY KEY (`id_product_option`),
             ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;",
 
-            "CREATE TABLE `"._DB_PREFIX_."service_product_option_lang` (
-                `id_service_product_option` int(10) unsigned NOT NULL,
+            "CREATE TABLE `"._DB_PREFIX_."product_option_lang` (
+                `id_product_option` int(10) unsigned NOT NULL,
                 `id_lang` int(10) unsigned NOT NULL,
                 `name` varchar(255) character set utf8 NOT NULL,
-                PRIMARY KEY (`id_service_product_option`, `id_lang`)
+                PRIMARY KEY (`id_product_option`, `id_lang`)
             ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8;",
 
             "CREATE TABLE `"._DB_PREFIX_."htl_room_type_service_product_cart_detail` (
@@ -406,7 +406,7 @@ class HotelReservationSystemDb
                 `id_cart` int(11) unsigned NOT NULL,
                 `id_hotel` int(11) UNSIGNED NOT NULL,
                 `htl_cart_booking_id` int(11) unsigned NOT NULL,
-                `id_service_product_option` int(11) UNSIGNED NOT NULL,
+                `id_product_option` int(11) UNSIGNED NOT NULL,
                 PRIMARY KEY (`id_room_type_service_product_cart_detail`),
                 KEY `id_product` (`id_product`)
             ) ENGINE="._MYSQL_ENGINE_." DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;",
@@ -419,7 +419,7 @@ class HotelReservationSystemDb
                 `id_cart` int(11) NOT NULL,
                 `id_hotel` int(11) NOT NULL,
                 `id_htl_booking_detail` int(11) NOT NULL,
-                `id_service_product_option` int(11) NOT NULL,
+                `id_product_option` int(11) NOT NULL,
                 `unit_price_tax_excl` decimal(20,6) NOT NULL,
                 `unit_price_tax_incl` decimal(20,6) NOT NULL,
                 `total_price_tax_excl` decimal(20,6) NOT NULL,
diff --git a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
index fd1ef9d93..82d82df06 100644
--- a/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
+++ b/modules/hotelreservationsystem/classes/HotelRoomTypeFeaturePricing.php
@@ -733,26 +733,34 @@ class HotelRoomTypeFeaturePricing extends ObjectModel
         );
         if ($with_auto_room_services) {
             if ($id_cart && $id_room) {
-                $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
-                if ($roomServicesServices = $objRoomTypeServiceProductCartDetail->getServiceProductsInCart(
+                $objHotelCartBookingData = new HotelCartBookingData();
+                if ($roomHtlCartInfo = $objHotelCartBookingData->getRoomRowByIdProductIdRoomInDateRange(
                     $id_cart,
-                    0,
-                    0,
                     $id_product,
                     $date_from,
                     $date_to,
-                    0,
-                    0,
-                    null,
-                    1,
-                    null,
-                    Product::PRICE_ADDITION_TYPE_WITH_ROOM,
                     $id_room
                 )) {
-                    $selectedServices = array_shift($roomServicesServices);
-                    $totalPrice['total_price_tax_incl'] += $selectedServices['total_price_tax_incl'];
-                    $totalPrice['total_price_tax_excl'] += $selectedServices['total_price_tax_excl'];
+                    $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail();
+                    if ($roomServicesServices = $objRoomTypeServiceProductCartDetail->getCartStandardProducts(
+                        $id_cart,
+                        [],
+                        null,
+                        $roomHtlCartInfo['id'],
+                        null,
+                        null,
+                        null,
+                        null,
+                        0,
+                        1,
+                        Product::PRICE_ADDITION_TYPE_WITH_ROOM
+                    )) {
+                        $selectedServices = array_shift($roomServicesServices);
+                        $totalPrice['total_price_tax_incl'] += $selectedServices['total_price_tax_incl'];
+                        $totalPrice['total_price_tax_excl'] += $selectedServices['total_price_tax_excl'];
+                    }
                 }
+
             } else {
                 if ($servicesWithTax = RoomTypeServiceProduct::getAutoAddServices(
                     $id_product,
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
index 7c80b17e1..e8b284f5d 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProduct.php
@@ -100,10 +100,10 @@ class RoomTypeServiceProduct extends ObjectModel
         return Db::getInstance()->insert($this->def['table'], $rowData);
     }
 
-    public function getAssociatedHotelsAndRoomType($idProduct, $formated = true) {
+    public function getAssociatedHotelsAndRoomType($idProduct, $elementType = 0, $formated = true) {
         $rows = Db::getInstance()->executeS(
             'SELECT * FROM `'._DB_PREFIX_.'htl_room_type_service_product` AS rsp
-            WHERE `id_product` = '.(int)$idProduct
+            WHERE `id_product` = '.(int)$idProduct . ($elementType ? ' AND rsp.`element_type` = ' . (int)$elementType : "")
         );
 
         if ($formated) {
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php
index c55f19854..9368a1289 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductCartDetail.php
@@ -20,23 +20,23 @@
 
 class RoomTypeServiceProductCartDetail extends ObjectModel
 {
-    public $id_product;
-    public $quantity;
     public $id_cart;
+    public $id_product;
+    public $id_product_option;
     public $id_hotel;
     public $htl_cart_booking_id;
-    public $id_service_product_option;
+    public $quantity;
 
     public static $definition = array(
         'table' => 'htl_room_type_service_product_cart_detail',
         'primary' => 'id_room_type_service_product_cart_detail',
         'fields' => array(
-            'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
-            'quantity' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
             'id_cart' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+            'id_product' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+            'id_product_option' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'id_hotel' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'htl_cart_booking_id' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
-            'id_service_product_option' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+            'quantity' => array('type' => self::TYPE_INT, 'validate' => 'isInt'),
         ),
     );
 
@@ -45,7 +45,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         $idProduct,
         $idHtlCartData = false,
         $idHotel = false,
-        $idServiceProductOption = false
+        $idProductOption = false
     ) {
 
         $sql = 'SELECT `id_room_type_service_product_cart_detail` FROM `'._DB_PREFIX_.'htl_room_type_service_product_cart_detail`
@@ -57,8 +57,8 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         if ($idHtlCartData) {
             $sql .= ' AND `htl_cart_booking_id` = '.(int)$idHtlCartData;
         }
-        if ($idServiceProductOption) {
-            $sql .= ' AND `id_service_product_option` = '.(int)$idServiceProductOption;
+        if ($idProductOption) {
+            $sql .= ' AND `id_product_option` = '.(int)$idProductOption;
         }
 
         return Db::getInstance()->getValue($sql);
@@ -121,35 +121,6 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
     /**
      * @deprecated since 1.6.1 use getServiceProductsInCart() instead
     */
-    public function getServiceProductsTotalInCart(
-        $idCart,
-        $idProduct = 0,
-        $idHotel = 0,
-        $roomTypeIdProduct = 0,
-        $dateFrom = 0,
-        $dateTo = 0,
-        $htlCartBookingId = 0,
-        $useTax = null,
-        $autoAddToCart = 0,
-        $id_address = null,
-        $priceAdditionType = null
-    ) {
-        return $this->getServiceProductsInCart(
-            $idCart,
-            $idProduct,
-            $idHotel,
-            $roomTypeIdProduct,
-            $dateFrom,
-            $dateTo,
-            $htlCartBookingId,
-            1,
-            $useTax,
-            $autoAddToCart,
-            $id_address,
-            $priceAdditionType
-        );
-    }
-
     public function getRoomServiceProducts(
         $htlCartBookingId,
         $idLang = 0,
@@ -185,7 +156,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
     public function getServiceProductsInCart(
         $idCart,
         $idProduct = 0,
-        $idHotel = 0,
+        $idHotel = null,
         $roomTypeIdProduct = 0,
         $dateFrom = 0,
         $dateTo = 0,
@@ -203,7 +174,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         $idLang = Context::getContext()->language->id;
 
         $sql = 'SELECT rscd.`id_product`, rscd.`quantity`, cbd.`id_cart`, cbd.`id` as `htl_cart_booking_id` ,
-            cbd.`id_product` as `room_type_id_product`, cbd.`adults`, cbd.`children`, cbd.`date_from`, cbd.`date_to`';
+            cbd.`id_product` as `id_room_type`, cbd.`adults`, cbd.`children`, cbd.`date_from`, cbd.`date_to`';
         if (!$getTotalPrice) {
             $sql .= ', pl.`name`, cbd.`id_guest`, cbd.`id_customer`, p.`auto_add_to_cart`, p.`price_addition_type`,
                 p.`price_calculation_method`, cbd.`id_hotel`, cbd.`id_room`, cbd.`date_from`, cbd.`date_to`,
@@ -232,7 +203,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         if ($idProduct) {
             $sql .= ' AND rscd.`id_product`='.(int) $idProduct;
         }
-        if ($idHotel) {
+        if (!is_null($idHotel)) {
             $sql .= ' AND cbd.`id_hotel`='.(int) $idHotel;
         }
         if ($roomTypeIdProduct) {
@@ -267,7 +238,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                 if ($getTotalPrice) {
                     $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice(
                         (int)$product['id_product'],
-                        (int)$product['room_type_id_product'],
+                        (int)$product['id_room_type'],
                         1,
                         $product['date_from'],
                         $product['date_to'],
@@ -284,7 +255,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                         } else {
                             $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice(
                                 (int)$product['id_product'],
-                                (int)$product['room_type_id_product'],
+                                (int)$product['id_room_type'],
                                 1,
                                 $product['date_from'],
                                 $product['date_to'],
@@ -295,7 +266,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
 
                             $servicePriceTE = $objRoomTypeServiceProductPrice->getServicePrice(
                                 (int)$product['id_product'],
-                                (int)$product['room_type_id_product'],
+                                (int)$product['id_room_type'],
                                 1,
                                 $product['date_from'],
                                 $product['date_to'],
@@ -306,7 +277,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
 
                             $servicePriceTI = $objRoomTypeServiceProductPrice->getServicePrice(
                                 (int)$product['id_product'],
-                                (int)$product['room_type_id_product'],
+                                (int)$product['id_room_type'],
                                 1,
                                 $product['date_from'],
                                 $product['date_to'],
@@ -324,7 +295,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                                 'price_calculation_method' => $product['price_calculation_method'],
                                 'unit_price_tax_excl' => ($objRoomTypeServiceProductPrice->getServicePrice(
                                     (int)$product['id_product'],
-                                    (int)$product['room_type_id_product'],
+                                    (int)$product['id_room_type'],
                                     1,
                                     $product['date_from'],
                                     $product['date_to'],
@@ -334,7 +305,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                                 ) / $numdays),
                                 'unit_price_tax_incl' => ($objRoomTypeServiceProductPrice->getServicePrice(
                                     (int)$product['id_product'],
-                                    (int)$product['room_type_id_product'],
+                                    (int)$product['id_room_type'],
                                     1,
                                     $product['date_from'],
                                     $product['date_to'],
@@ -354,7 +325,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                     } else {
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['htl_cart_booking_id'] = $product['htl_cart_booking_id'];
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['id_cart'] = $product['id_cart'];
-                        $selectedServiceProducts[$product['htl_cart_booking_id']]['room_type_id_product'] = $product['room_type_id_product'];
+                        $selectedServiceProducts[$product['htl_cart_booking_id']]['id_room_type'] = $product['id_room_type'];
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['id_guest'] = $product['id_guest'];
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['id_customer'] = $product['id_customer'];
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['id_hotel'] = $product['id_hotel'];
@@ -366,7 +337,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                         $selectedServiceProducts[$product['htl_cart_booking_id']]['children'] = $product['children'];
                         $servicePrice = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
-                            (int)$product['room_type_id_product'],
+                            (int)$product['id_room_type'],
                             1,
                             $product['date_from'],
                             $product['date_to'],
@@ -377,7 +348,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
 
                         $servicePriceTE = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
-                            (int)$product['room_type_id_product'],
+                            (int)$product['id_room_type'],
                             1,
                             $product['date_from'],
                             $product['date_to'],
@@ -388,7 +359,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
 
                         $servicePriceTI = $objRoomTypeServiceProductPrice->getServicePrice(
                             (int)$product['id_product'],
-                            (int)$product['room_type_id_product'],
+                            (int)$product['id_room_type'],
                             1,
                             $product['date_from'],
                             $product['date_to'],
@@ -406,7 +377,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                             $selectedServiceProducts[$product['htl_cart_booking_id']]['price_calculation_method'] = $product['price_calculation_method'];
                             $selectedServiceProducts[$product['htl_cart_booking_id']]['unit_price_tax_excl'] = $objRoomTypeServiceProductPrice->getServicePrice(
                                 (int)$product['id_product'],
-                                (int)$product['room_type_id_product'],
+                                (int)$product['id_room_type'],
                                 1,
                                 $product['date_from'],
                                 $product['date_to'],
@@ -416,7 +387,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                             ) / $numdays;
                             $selectedServiceProducts[$product['htl_cart_booking_id']]['unit_price_tax_incl'] = $objRoomTypeServiceProductPrice->getServicePrice(
                                 (int)$product['id_product'],
-                                (int)$product['room_type_id_product'],
+                                (int)$product['id_room_type'],
                                 1,
                                 $product['date_from'],
                                 $product['date_to'],
@@ -438,7 +409,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                                 'price_calculation_method' => $product['price_calculation_method'],
                                 'unit_price_tax_excl' => ($objRoomTypeServiceProductPrice->getServicePrice(
                                     (int)$product['id_product'],
-                                    (int)$product['room_type_id_product'],
+                                    (int)$product['id_room_type'],
                                     1,
                                     null,
                                     null,
@@ -448,7 +419,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                                 ) / $numdays),
                                 'unit_price_tax_incl' => ($objRoomTypeServiceProductPrice->getServicePrice(
                                     (int)$product['id_product'],
-                                    (int)$product['room_type_id_product'],
+                                    (int)$product['id_room_type'],
                                     1,
                                     null,
                                     null,
@@ -478,18 +449,35 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         return $selectedServiceProducts;
     }
 
-    public function getProducts(
+    /**
+     * To get standard products in cart as per sent parameters
+     * @param [type] $idCart
+     * @param integer $idHotel : send id_hotel for products for specific hotel
+     * @param integer $idHotelCartBooking: send htl_cart_booking_id for products for specific hotel room booking
+     * @param integer $sellingPreferenceTypes: Send selling preference type whcih products to be fetched
+     * @param integer $idProduct
+     * @param [type] $idProductOption
+     * @param [type] $useTax
+     * @param integer $getTotalPrice
+     * @param [type] $idLang
+     * @return void
+     */
+    // public function getProducts(
+    public function getCartStandardProducts(
         $idCart,
-        $idProduct = 0,
-        $serviceProductType = 0,
-        $idHotel = 0,
-        $htlCartBookingId = 0,
-        $idServiceProductOption = null,
-        $roomTypeIdProduct = 0,
-        $getTotalPrice = 0,
+        $sellingPreferenceTypes = [],
+        $idHotel = null,
+        $idHotelCartBooking = null,
+        $idProductRoomType = null,
+        $idProduct = null,
+        $idProductOption = null,
         $useTax = null,
-        $idLang = null,
-        $full = false
+        $getTotalPrice = 0,
+        $autoAddToCart = null,
+        $priceAdditionType = null,
+        $groupByProductId = 0,
+        $detailedInfo = 0,
+        $idLang = 0
     ) {
         if ($useTax === null) {
             $useTax = Product::$_taxCalculationMethod == PS_TAX_EXC ? false : true;
@@ -501,33 +489,49 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
             $language = new Language($idLang);
         }
 
-        $sql = 'SELECT spc.`id_room_type_service_product_cart_detail`, p.`service_product_type`, spc.`id_cart`, spc.`id_product`, spc.`quantity`, spc.`id_hotel`,
-            spc.`id_service_product_option`';
+        $sql = 'SELECT spc.*, p.`selling_preference_type`, p.`price_calculation_method`';
         if (!$getTotalPrice) {
             $sql .= ', hbil.`hotel_name` ';
         }
         $sql .= ' FROM `'._DB_PREFIX_.'htl_room_type_service_product_cart_detail` spc';
         $sql .= ' LEFT JOIN `'._DB_PREFIX_.'product` p ON (p.`id_product` = spc.`id_product`)';
+
+        if (!is_null($idProductRoomType)) {
+            $sql .= ' LEFT JOIN `'._DB_PREFIX_.'htl_cart_booking_data` hcbd ON (hcbd.`id` = spc.`htl_cart_booking_id`)';
+        }
         if (!$getTotalPrice) {
             $sql .= ' LEFT JOIN `'._DB_PREFIX_.'htl_branch_info_lang` hbil ON (hbil.`id` = spc.`id_hotel` AND hbil.`id_lang` = '. $language->id.')';
-            // $sql .= ' INNER JOIN `'._DB_PREFIX_.'address` a ON (a.`id_hotel` = spc.`id_hotel`)';
         }
+
         $sql .= ' WHERE spc.`id_cart`='.(int) $idCart;
-        if ($idServiceProductOption) {
-            $sql .= ' AND spc.`id_service_product_option` = '.(int)$idServiceProductOption;
+
+        if (!is_null($idProductRoomType)) {
+            $sql .= ' AND hcbd.`id_product`='.(int) $idProductRoomType;
         }
-        if ($serviceProductType) {
-            $sql .= ' AND p.`service_product_type` = '.(int)$serviceProductType;
+
+        if (!is_null($autoAddToCart)) {
+            $sql .= ' AND p.`auto_add_to_cart` = '. (int)$autoAddToCart;
+            if ($autoAddToCart == 1 && !is_null($priceAdditionType)) {
+                $sql .= ' AND p.`price_addition_type` = '.$priceAdditionType;
+            }
         }
-        if ($idProduct) {
-            $sql .= ' AND spc.`id_product`='.(int) $idProduct;
+
+        if ($sellingPreferenceTypes) {
+            $sql .= ' AND p.`selling_preference_type` IN ('.implode(',', $sellingPreferenceTypes).')';
         }
-        if ($idHotel) {
+        if (!is_null($idHotelCartBooking)) {
+            $sql .= ' AND spc.`htl_cart_booking_id`='.(int) $idHotelCartBooking;
+        }
+        if (!is_null($idHotel)) {
             $sql .= ' AND spc.`id_hotel`='.(int) $idHotel;
         }
-        if ($idServiceProductOption) {
-            $sql .= ' AND spc.`id_service_product_option` = '.(int)$idServiceProductOption;
+        if (!is_null($idProduct)) {
+            $sql .= ' AND spc.`id_product`='.(int) $idProduct;
         }
+        if (!is_null($idProductOption)) {
+            $sql .= ' AND spc.`id_product_option`='.(int) $idProductOption;
+        }
+
         if ($getTotalPrice) {
             $totalPrice = 0;
         }
@@ -535,39 +539,40 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         $selectedProducts = array();
         $objServiceProductOption = new ServiceProductOption();
         if ($serviceProducts = Db::getInstance()->executeS($sql)) {
-        foreach ($serviceProducts as $product) {
+            foreach ($serviceProducts as $product) {
                 $objProduct = new Product($product['id_product'], false, $language->id);
                 if (!$objProduct->booking_product) {
                     if ($getTotalPrice) {
                         $qty = $product['quantity'] ? (int)$product['quantity'] : 1;
-                        $totalPrice += RoomTypeServiceProductPrice::getPrice(
+                        $totalPrice += Product::getTotalStandardProductPrice(
                             $objProduct->id,
+                            $product['id_product_option'],
                             $product['id_hotel'],
-                            $product['id_service_product_option'],
+                            false,
                             $useTax,
                             $qty
                         );
                     } else {
                         $context = Context::getContext();
-                        $priceTaxIncl = RoomTypeServiceProductPrice::getPrice(
+                        $priceTaxIncl = Product::getTotalStandardProductPrice(
                             $objProduct->id,
+                            $product['id_product_option'],
                             $product['id_hotel'],
-                            $product['id_service_product_option'],
-                            true,
-                            $product['quantity']
-                        );
-                        $priceTaxExcl = RoomTypeServiceProductPrice::getPrice(
-                            $objProduct->id,
-                            $product['id_hotel'],
-                            $product['id_service_product_option'],
                             false,
-                            $product['quantity']
+                            true
+                        );
+                        $priceTaxExcl = Product::getTotalStandardProductPrice(
+                            $objProduct->id,
+                            $product['id_product_option'],
+                            $product['id_hotel'],
+                            false,
+                            false
                         );
                         $optionDetails = false;
                         if (ServiceProductOption::productHasOptions($product['id_product'])) {
                             $optionDetails = $objServiceProductOption->getProductOptions(
                                 $objProduct->id,
-                                $product['id_service_product_option']
+                                $product['id_product_option']
                             );
                         }
                         $coverImageArr = $objProduct->getCover($product['id_product']);
@@ -588,10 +593,11 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                             'id_room_type_service_product_cart_detail' => $product['id_room_type_service_product_cart_detail'],
                             'id_cart' => $product['id_cart'],
                             'id_hotel' => $product['id_hotel'],
+                            'id_hotel_cart_booking' => $product['htl_cart_booking_id'],
                             'hotel_name' => $product['hotel_name'],
                             'id_product' =>$objProduct->id,
-                            'service_product_type' => $product['service_product_type'],
-                            'id_service_product_option' => $product['id_service_product_option'],
+                            'selling_preference_type' => $product['selling_preference_type'],
+                            'id_product_option' => $product['id_product_option'],
                             'name' => $objProduct->name,
                             'option_name' => isset($optionDetails['name']) ? $optionDetails['name'] : false,
                             'minimal_quantity' => $objProduct->minimal_quantity,
@@ -602,9 +608,26 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                             'quantity' => $product['quantity'],
                             'total_price_tax_incl' => $priceTaxIncl * (int)$product['quantity'],
                             'total_price_tax_excl' => $priceTaxExcl * (int)$product['quantity'],
-                            'cover_img' => $coverImg
+                            'cover_img' => $coverImg,
+                            'price_calculation_method' => $product['price_calculation_method'],
                         );
-                        if ($full) {
+
+                        if ($product['htl_cart_booking_id']) {
+                            $objHotelCartBooking = new HotelCartBookingData($product['htl_cart_booking_id']);
+                            $productInfo['date_from'] = $objHotelCartBooking->date_from;
+                            $productInfo['date_to'] = $objHotelCartBooking->date_to;
+                            $productInfo['id_room_type_hotel'] = $objHotelCartBooking->id_hotel;
+                            $productInfo['id_room_type'] = $objHotelCartBooking->id_hotel;
+                            $productInfo['id_room'] = $objHotelCartBooking->id_room;
+                        } else {
+                            $productInfo['date_from'] = $product['date_from'] = '';
+                            $productInfo['date_to'] = $product['date_to'] = '';
+                            $productInfo['id_room_type_hotel'] = 0;
+                            $productInfo['id_room_type'] = 0;
+                            $productInfo['id_room'] = 0;
+                        }
+
+                        if ($detailedInfo) {
                             $objHotelBranchInformation = new HotelBranchInformation();
                             $hotelInfo = $objHotelBranchInformation->hotelBranchesInfo($language->id, 2, 1, $product['id_hotel']);
                             $hotelInfo['location'] = $hotelInfo['hotel_name'].', '.$hotelInfo['city'].
@@ -612,15 +635,21 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                                 $hotelInfo['country_name'].', '.$hotelInfo['postcode'];
                             $productInfo['hotel_info'] = $hotelInfo;
                         }
-                        $selectedProducts[] = $productInfo;
+
+                        if ($groupByProductId) {
+                            $selectedProducts[$objProduct->id] = $productInfo;
+                        } else {
+                            $selectedProducts[] = $productInfo;
+                        }
                     }
                 }
             }
-
         }
+
         if ($getTotalPrice) {
             return $totalPrice;
         }
+
         return $selectedProducts;
     }
 
@@ -632,7 +661,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         $quantity = false,
         $idHotel = false,
         $idHtlCartData = false,
-        $idServiceProductOption = null
+        $idProductOption = null
     ) {
         if ($operator == 'up') {
             return $this->addServiceProductInCart(
@@ -641,7 +670,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                 $quantity,
                 $idHotel,
                 $idHtlCartData,
-                $idServiceProductOption
+                $idProductOption
             );
         } else {
             return $this->removeCartServiceProduct(
@@ -650,7 +679,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                 $quantity,
                 $idHotel,
                 $idHtlCartData,
-                $idServiceProductOption
+                $idProductOption
             );
         }
         return false;
@@ -662,7 +691,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         $quantity,
         $idHotel = false,
         $idHtlCartData = false,
-        $idServiceProductOption = null
+        $idProductOption = null
     ) {
         if ($quantity <= 0) {
             $quantity = 1;
@@ -672,7 +701,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
             $idProduct,
             $idHtlCartData,
             $idHotel,
-            $idServiceProductOption
+            $idProductOption
         )) {
             $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail($id_room_type_service_product_cart_detail);
         } else {
@@ -682,7 +711,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
             $objRoomTypeServiceProductCartDetail->id_hotel = $idHotel;
             $objRoomTypeServiceProductCartDetail->htl_cart_booking_id = $idHtlCartData;
             $objRoomTypeServiceProductCartDetail->id_cart = $idCart;
-            $objRoomTypeServiceProductCartDetail->id_service_product_option = $idServiceProductOption;
+            $objRoomTypeServiceProductCartDetail->id_product_option = $idProductOption;
         }
 
         if ($idHtlCartData && Product::getProductPriceCalculation($idProduct) == Product::PRICE_CALCULATION_METHOD_PER_DAY) {
@@ -708,7 +737,7 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
         $quantity = false,
         $idHotel = false,
         $idHtlCartData = false,
-        $idServiceProductOption = null
+        $idProductOption = null
     ) {
         $updateQunatity = false;
         $res = true;
@@ -761,7 +790,15 @@ class RoomTypeServiceProductCartDetail extends ObjectModel
                 return true;
             }
         } else {
-            if ($products = $this->getProducts($idCart, $idProduct, 0, $idHotel, 0, $idServiceProductOption, 0, 0, $idHtlCartData)) {
+            if ($products = $this->getCartStandardProducts(
+                $idCart,
+                [],
+                $idHotel,
+                $idHtlCartData,
+                null,
+                $idProduct,
+                $idProductOption
+            )) {
                 foreach ($products as $product) {
                     $objRoomTypeServiceProductCartDetail = new RoomTypeServiceProductCartDetail($product['id_room_type_service_product_cart_detail']);
                     if ($quantity) {
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php
index ea5a5df67..3c7ee8e13 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductOrderDetail.php
@@ -27,7 +27,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
     public $id_cart;
     public $id_hotel;
     public $id_htl_booking_detail;
-    public $id_service_product_option;
+    public $id_product_option;
     public $unit_price_tax_excl;
     public $unit_price_tax_incl;
     public $total_price_tax_excl;
@@ -51,7 +51,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
             'id_cart' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
             'id_hotel' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'id_htl_booking_detail' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
-            'id_service_product_option' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
+            'id_product_option' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
             'unit_price_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'required' => true),
             'unit_price_tax_incl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'required' => true),
             'total_price_tax_excl' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'required' => true),
@@ -88,7 +88,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
 
         $sql = 'SELECT rsod.*';
         if (!$getTotalPrice) {
-            $sql .= ', hbd.`id_product` as `room_type_id_product`, od.`product_allow_multiple_quantity`, od.`product_price_calculation_method`, hbd.`id_room`, hbd.`adults`, hbd.`children`';
+            $sql .= ', hbd.`id_product` as `id_room_type`, od.`product_allow_multiple_quantity`, od.`product_price_calculation_method`, hbd.`id_room`, hbd.`adults`, hbd.`children`';
         }
         $sql .= ' FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
             LEFT JOIN `'._DB_PREFIX_.'htl_room_type_service_product_order_detail` rsod ON(rsod.`id_htl_booking_detail` = hbd.`id`)';
@@ -174,7 +174,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
                         $selectedAdditionalServices[$product['id_htl_booking_detail']]['children'] = $product['children'];
                         $selectedAdditionalServices[$product['id_htl_booking_detail']]['total_price_tax_excl'] = $product['total_price_tax_excl'];
                         $selectedAdditionalServices[$product['id_htl_booking_detail']]['total_price_tax_incl'] = $product['total_price_tax_incl'];
-                        $selectedAdditionalServices[$product['id_htl_booking_detail']]['room_type_id_product'] = $product['room_type_id_product'];
+                        $selectedAdditionalServices[$product['id_htl_booking_detail']]['id_room_type'] = $product['id_room_type'];
                         $selectedAdditionalServices[$product['id_htl_booking_detail']]['id_room'] = $product['id_room'];
 
 
@@ -218,7 +218,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
 
         $sql = 'SELECT rsod.*';
         if (!$getTotalPrice) {
-            $sql .= ', hbd.`id_product` as `room_type_id_product`, hbd.`id_room`, od.`product_allow_multiple_quantity`, p.`max_quantity`,
+            $sql .= ', hbd.`id_product` as `id_room_type`, hbd.`id_room`, od.`product_allow_multiple_quantity`, p.`max_quantity`,
                 od.`product_auto_add`, od.`product_price_calculation_method`, od.`product_price_addition_type`';
         }
         $sql .= ' FROM `'._DB_PREFIX_.'htl_booking_detail` hbd
@@ -274,7 +274,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
                         $selectedAdditionalServices['id_htl_booking_detail'] = $product['id_htl_booking_detail'];
                         $selectedAdditionalServices['total_price_tax_excl'] = $product['total_price_tax_excl'];
                         $selectedAdditionalServices['total_price_tax_incl'] = $product['total_price_tax_incl'];
-                        $selectedAdditionalServices['room_type_id_product'] = $product['room_type_id_product'];
+                        $selectedAdditionalServices['id_room_type'] = $product['id_room_type'];
                         $selectedAdditionalServices['id_room'] = $product['id_room'];
                         $selectedAdditionalServices['additional_services'] = array(
                             array(
@@ -338,7 +338,7 @@ class RoomTypeServiceProductOrderDetail extends ObjectModel
         }
 
         if ($serviceProductType) {
-            $sql .= ' AND od.`product_service_type` = '.(int)$serviceProductType;
+            $sql .= ' AND od.`selling_preference_type` = '.(int)$serviceProductType;
         }
 
         $products = Db::getInstance()->executeS($sql);
diff --git a/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php b/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
index 9e0667466..de9c6a480 100644
--- a/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
+++ b/modules/hotelreservationsystem/classes/RoomTypeServiceProductPrice.php
@@ -104,7 +104,7 @@ class RoomTypeServiceProductPrice extends ObjectModel
     public static function getPrice(
         $idProduct,
         $idHotel,
-        $idServiceProductOption = null,
+        $idProductOption = null,
         $useTax = null,
         $quantity = 1
     ) {
@@ -112,7 +112,7 @@ class RoomTypeServiceProductPrice extends ObjectModel
         $price =  ProductCore::getPriceStatic(
             $idProduct,
             $useTax,
-            $idServiceProductOption,
+            $idProductOption,
             6,
             null,
             false,
@@ -124,7 +124,7 @@ class RoomTypeServiceProductPrice extends ObjectModel
             $idHotelAddress,
         );
 
-        return $price;
+        return $price * (int)$quantity;
     }
 
     public function getServicePrice(
diff --git a/modules/hotelreservationsystem/classes/ServiceProductOption.php b/modules/hotelreservationsystem/classes/ServiceProductOption.php
index 959ef0a3e..7a3ca6abd 100644
--- a/modules/hotelreservationsystem/classes/ServiceProductOption.php
+++ b/modules/hotelreservationsystem/classes/ServiceProductOption.php
@@ -24,7 +24,7 @@
 
 class ServiceProductOption extends ObjectModel
 {
-    public $id_service_product_option;
+    public $id_product_option;
     public $id_product;
     public $name;
     public $price_impact;
@@ -32,8 +32,8 @@ class ServiceProductOption extends ObjectModel
     public $date_upd;
 
     public static $definition = array(
-        'table' => 'service_product_option',
-        'primary' => 'id_service_product_option',
+        'table' => 'product_option',
+        'primary' => 'id_product_option',
         'multilang' => true,
         'fields' => array(
             'id_product' =>     array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
@@ -57,32 +57,32 @@ class ServiceProductOption extends ObjectModel
         $objServiceProductOption->save();
     }
 
-    public static function productHasOptions($idProduct, $idServiceProductOption = false)
+    public static function productHasOptions($idProduct, $idProductOption = false)
     {
 
-        $sql = 'SELECT po.`id_service_product_option`
-            FROM `'._DB_PREFIX_.'service_product_option` po
+        $sql = 'SELECT po.`id_product_option`
+            FROM `'._DB_PREFIX_.'product_option` po
             WHERE po.`id_product` = '.(int)$idProduct;
-        if ($idServiceProductOption) {
-            $sql .= ' AND po.`id_service_product_option` = '.(int)$idServiceProductOption;
+        if ($idProductOption) {
+            $sql .= ' AND po.`id_product_option` = '.(int)$idProductOption;
         }
         return (bool)Db::getInstance()->getValue($sql);
     }
 
-    public function  getProductOptions($idProduct, $idServiceProductOption = false, $idLang = false)
+    public function  getProductOptions($idProduct, $idProductOption = false, $idLang = false)
     {
         if (!$idLang) {
             $idLang = Context::getContext()->language->id;
         }
 
-        $sql = 'SELECT po.`id_service_product_option`, po.`id_product`, pol.`id_lang`, pol.`name`, po.`price_impact`
-            FROM `'._DB_PREFIX_.'service_product_option` po
-            INNER JOIN `'._DB_PREFIX_.'service_product_option_lang` pol
-            ON (po.`id_service_product_option` = pol.`id_service_product_option`)
+        $sql = 'SELECT po.`id_product_option`, po.`id_product`, pol.`id_lang`, pol.`name`, po.`price_impact`
+            FROM `'._DB_PREFIX_.'product_option` po
+            INNER JOIN `'._DB_PREFIX_.'product_option_lang` pol
+            ON (po.`id_product_option` = pol.`id_product_option`)
             WHERE po.`id_product` = '.(int)$idProduct.' AND pol.`id_lang` = '.(int)$idLang;
 
-        if ($idServiceProductOption) {
-            $sql .= ' AND po.`id_service_product_option` = '.(int)$idServiceProductOption;
+        if ($idProductOption) {
+            $sql .= ' AND po.`id_product_option` = '.(int)$idProductOption;
             return Db::getInstance()->getRow($sql);
         } else {
             return Db::getInstance()->executeS($sql);
diff --git a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
index c86558abe..14ceb5f6b 100644
--- a/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
+++ b/modules/hotelreservationsystem/controllers/admin/AdminHotelRoomsBookingController.php
@@ -408,7 +408,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
             )) {
                 $smartyVars['cart_bdata'] = $cart_bdata;
             }
-            if ($normalCartProduct = $objRoomTypeServiceProductCartDetail->getProducts($this->context->cart->id)) {
+            if ($normalCartProduct = $objRoomTypeServiceProductCartDetail->getCartStandardProducts($this->context->cart->id)) {
                 $smartyVars['cart_normal_data'] = $normalCartProduct;
             }
         }
@@ -615,7 +615,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
             if (!$product->id || !$product->active) {
                 $this->errors[] = $this->l('This product is no longer available.');
             }
-            if ($product->booking_product || ($product->service_product_type != Product::SERVICE_PRODUCT_STANDALONE)) {
+            if ($product->booking_product || ($product->selling_preference_type != Product::SELLING_PREFERENCE_STANDALONE)) {
                 // cannot be added without room type or is a booking product.
                 $this->errors[] = $this->l('This product is either a room type or additional service and cannot be added thorugh this method.');
             } elseif (!$product->allow_multiple_quantity) {
@@ -787,7 +787,7 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
     public function assignServiceProductsForm()
     {
         $objProduct = new Product();
-        $serviceProducts = $objProduct->getServiceProducts(null, Product::SERVICE_PRODUCT_STANDALONE);
+        $serviceProducts = $objProduct->getServiceProducts(null, Product::SELLING_PREFERENCE_STANDALONE);
         $hotelAddressInfo = HotelBranchInformation::getAddress($this->id_hotel);
         $serviceProducts = Product::getProductsProperties($this->context->language->id, $serviceProducts);
         $this->context->smarty->assign(array(
@@ -962,8 +962,8 @@ class AdminHotelRoomsBookingController extends ModuleAdminController
             'currency_blank' => $currency->blank,
             'ALLOTMENT_AUTO' => HotelBookingDetail::ALLOTMENT_AUTO,
             'ALLOTMENT_MANUAL' => HotelBookingDetail::ALLOTMENT_MANUAL,
-            'SERVICE_PRODUCT_WITH_ROOMTYPE' => Product::SERVICE_PRODUCT_WITH_ROOMTYPE,
-            'SERVICE_PRODUCT_STANDALONE' => Product::SERVICE_PRODUCT_STANDALONE,
+            'SELLING_PREFERENCE_WITH_ROOM_TYPE' => Product::SELLING_PREFERENCE_WITH_ROOM_TYPE,
+            'SELLING_PREFERENCE_STANDALONE' => Product::SELLING_PREFERENCE_STANDALONE,
             'max_child_age' => Configuration::get('WK_GLOBAL_CHILD_MAX_AGE'),
             'max_child_in_room' => Configuration::get('WK_GLOBAL_MAX_CHILD_IN_ROOM'),
             'occupancy_required_for_booking' => $occupancyRequiredForBooking,
diff --git a/themes/hotel-reservation-theme/_partials/booking-form.tpl b/themes/hotel-reservation-theme/_partials/booking-form.tpl
index 7401b83b6..3dd39b2bb 100644
--- a/themes/hotel-reservation-theme/_partials/booking-form.tpl
+++ b/themes/hotel-reservation-theme/_partials/booking-form.tpl
@@ -226,14 +226,14 @@
                                 </div>
                             {/if}
                         {/block}
-                        {block name='booking_form_service_product_option'}
-                            {if isset($service_product_option) && $service_product_option}
+                        {block name='booking_form_product_option'}
+                            {if isset($product_option) && $product_option}
                                 <label class="control-label">{l s='Variants'}</label>
                                 <div class="product-options-block">
-                                    {foreach $service_product_option as $option}
+                                    {foreach $product_option as $option}
                                         <div class="form-group">
-                                            <label for="id_service_product_option{$option['id_service_product_option']}" class="top">
-                                                <input type="radio" name="id_service_product_option" id="id_service_product_option{$option['id_service_product_option']}" value="{$option['id_service_product_option']}" {if isset($id_service_product_option) && $id_service_product_option == $option['id_service_product_option']}checked="checked"{else if $option@first}checked="checked"{/if}/>
+                                            <label for="id_product_option{$option['id_product_option']}" class="top">
+                                                <input type="radio" name="id_product_option" id="id_product_option{$option['id_product_option']}" value="{$option['id_product_option']}" {if isset($id_product_option) && $id_product_option == $option['id_product_option']}checked="checked"{else if $option@first}checked="checked"{/if}/>
                                                 {$option['name']}
                                                 <span class="pull-right">{convertPrice price=$option['price']}</span>
                                             </label>
diff --git a/themes/hotel-reservation-theme/css/global.css b/themes/hotel-reservation-theme/css/global.css
index e76cf61d1..5f6e24ecf 100644
--- a/themes/hotel-reservation-theme/css/global.css
+++ b/themes/hotel-reservation-theme/css/global.css
@@ -9014,6 +9014,7 @@ a.open_rooms_extra_services_panel {
   margin-bottom: 18px;} */
 
 #rooms_extra_services .room_demand_block {
+  margin-bottom: 10px;
   color: #333;
   font-size: 14px;}
 #rooms_extra_services .checkbox {
diff --git a/themes/hotel-reservation-theme/js/cart-summary.js b/themes/hotel-reservation-theme/js/cart-summary.js
index 0475309be..cdd1083d7 100644
--- a/themes/hotel-reservation-theme/js/cart-summary.js
+++ b/themes/hotel-reservation-theme/js/cart-summary.js
@@ -405,12 +405,12 @@ function updateQty(val, cart, el)
 		var input = $(prefix + 'input[name=' + id + ']').val();
 		var QtyToUp = parseInt(input) - parseInt(hidden);
 
-		var [productId, id_service_product_option, id_hotel] = getRequestData(id.replace('quantity_', ''));
+		var [productId, id_product_option, id_hotel] = getRequestData(id.replace('quantity_', ''));
 
 		if (parseInt(QtyToUp) > 0)
-			updateQuantityRequest(productId, 'up', id_service_product_option, id_hotel, QtyToUp)
+			updateQuantityRequest(productId, 'up', id_product_option, id_hotel, QtyToUp)
 		else if(parseInt(QtyToUp) < 0)
-			updateQuantityRequest(productId, 'down', id_service_product_option, id_hotel, QtyToUp)
+			updateQuantityRequest(productId, 'down', id_product_option, id_hotel, QtyToUp)
 		}
 	else
 		$(prefix + 'input[name=' + id + ']').val($(prefix + 'input[name=' + id + '_hidden]').val());
@@ -435,10 +435,10 @@ function deleteProductFromSummary(id)
 	if (typeof(ids[3]) !== 'undefined')
 		id_address_delivery = parseInt(ids[3]);
 
-	var id_service_product_option = 0;
+	var id_product_option = 0;
 	var id_hotel = 0;
 
-	var [productId, id_service_product_option, id_hotel] = getRequestData(id);
+	var [productId, id_product_option, id_hotel] = getRequestData(id);
 	if (ajax_pre_check_var) {
 		ajax_pre_check_var.abort();
 	}
@@ -452,7 +452,7 @@ function deleteProductFromSummary(id)
 		data: 'controller=cart'
 			+ '&ajax=true&delete=true&summary=true'
 			+ '&id_product='+productId
-			+ '&id_service_product_option=' + id_service_product_option
+			+ '&id_product_option=' + id_product_option
 			+ '&id_hotel=' + id_hotel
 			+ '&ipa='+productAttributeId
 			+ '&id_address_delivery='+id_address_delivery
@@ -686,7 +686,7 @@ function debounce(func, delay) {
 	// };
   }
 
-function updateQuantityRequest(productId, op, id_service_product_option, id_hotel, qty)
+function updateQuantityRequest(productId, op, id_product_option, id_hotel, qty)
 {
 	if (ajax_pre_check_var) {
 		ajax_pre_check_var.abort();
@@ -704,7 +704,7 @@ function updateQuantityRequest(productId, op, id_service_product_option, id_hote
 			+ '&getproductprice=true'
 			+ '&summary=true'
 			+ '&id_product=' + productId
-			+ '&id_service_product_option=' + id_service_product_option
+			+ '&id_product_option=' + id_product_option
 			+ '&id_hotel=' + id_hotel
 			+ '&qty=' + qty
 			+ '&op=' + op
@@ -779,14 +779,14 @@ function getRequestData(id)
 	var ids = 0;
 	ids = id.split('_');
 	productId = parseInt(ids[0]);
-	id_service_product_option = 0;
+	id_product_option = 0;
 	id_hotel = 0;
 	if (typeof(ids[1]) !== 'undefined')
-		id_service_product_option = parseInt(ids[1]);
+		id_product_option = parseInt(ids[1]);
 	if (typeof(ids[2]) !== 'undefined' && ids[2] !== 'nocustom')
 		id_hotel = parseInt(ids[2]);
 
-	return [productId, id_service_product_option, id_hotel];
+	return [productId, id_product_option, id_hotel];
 }
 
 function upQuantity(id, qty)
@@ -794,15 +794,15 @@ function upQuantity(id, qty)
 	if (typeof(qty) == 'undefined' || !qty)
 		qty = 1;
 	var productId = 0;
-	var id_service_product_option = 0;
+	var id_product_option = 0;
 	var id_hotel = 0;
 
-	var [productId, id_service_product_option, id_hotel] = getRequestData(id);
+	var [productId, id_product_option, id_hotel] = getRequestData(id);
 	if (typeof(cart) == 'undefined' || cart)
 		prefix = '.order-detail-content ';
 	else
 		prefix = '#fancybox-content ';
-	updateQuantityRequest(productId, 'up', id_service_product_option, id_hotel, qty)
+	updateQuantityRequest(productId, 'up', id_product_option, id_hotel, qty)
 	$(prefix + 'input[name=quantity_' + id + ']').val(parseInt($(prefix + 'input[name=quantity_' + id + ']').val()) + parseInt(qty));
 	$(prefix + 'input[name=quantity_' + id + '_hidden]').val(parseInt($(prefix + 'input[name=quantity_' + id + ']').val()) + parseInt(qty));
 }
@@ -820,9 +820,9 @@ function downQuantity(id, qty)
 		qty = -qty;
 
 	var productId = 0;
-	var id_service_product_option = 0;
+	var id_product_option = 0;
 	var id_hotel = 0;
-	var [productId, id_service_product_option, id_hotel] = getRequestData(id);
+	var [productId, id_product_option, id_hotel] = getRequestData(id);
 
 	if (typeof(cart) == 'undefined' || cart)
 		prefix = '.order-detail-content ';
@@ -831,7 +831,7 @@ function downQuantity(id, qty)
 
 	if (newVal > 0 || $('#product_' + id + '_gift').length)
 	{
-		updateQuantityRequest(productId, 'down', id_service_product_option, id_hotel, qty)
+		updateQuantityRequest(productId, 'down', id_product_option, id_hotel, qty)
 		$(prefix + 'input[name=quantity_' + id + ']').val(newVal);
 		$(prefix + 'input[name=quantity_' + id + '_hidden]').val(newVal);
 		// if (ajax_pre_check_var) {
diff --git a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js
index 2a055ba8a..21bc27a95 100644
--- a/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js
+++ b/themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js
@@ -160,7 +160,7 @@ var ajaxCart = {
                 var occupancy = getBookingOccupancyDetails($(this).closest('.booking_room_fields'), parseInt(booking_product));
 
                 if (occupancy) {
-                    ajaxCart.add($('#product_page_product_id').val(), id_hotel, $('[name="id_service_product_option"]:checked').val(), true, null, occupancy, null, date_from, date_to, booking_product);
+                    ajaxCart.add($('#product_page_product_id').val(), id_hotel, $('[name="id_product_option"]:checked').val(), true, null, occupancy, null, date_from, date_to, booking_product);
                 }
 
             });
@@ -189,8 +189,8 @@ var ajaxCart = {
             e.preventDefault();
             var id_product = $(this).attr('id_product');
             var id_hotel = $(this).attr('id_hotel');
-            var id_service_product_option = $(this).attr('id_service_product_option');
-            ajaxCart.remove(id_product, id_hotel, id_service_product_option);
+            var id_product_option = $(this).attr('id_product_option');
+            ajaxCart.remove(id_product, id_hotel, id_product_option);
         });
 
         //for 'delete' buttons in the cart block...
@@ -387,7 +387,7 @@ var ajaxCart = {
         req.append('token', static_token);
         req.append('id_customization', ((typeof customizationId !== 'undefined') ? customizationId : 0));
         if (parseInt(idCombination) && idCombination != null){
-            req.append('id_service_product_option', parseInt(idCombination));
+            req.append('id_product_option', parseInt(idCombination));
         }
         req.append('id_hotel', idHotel);
 
@@ -412,7 +412,7 @@ var ajaxCart = {
         } else {
             req.append('qty', ((occupancy && occupancy != null) ? occupancy : '1'));
             // if (parseInt(idCombination) && idCombination != null){
-            //     req.append('id_service_product_option', parseInt(idCombination));
+            //     req.append('id_product_option', parseInt(idCombination));
             // }
         }
 
@@ -696,7 +696,7 @@ var ajaxCart = {
             async: true,
             cache: false,
             dataType: "json",
-            data: 'controller=cart&delete=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&id_product=' + idProduct + '&id_hotel=' + idHotel + '&id_service_product_option=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&id_address_delivery=' + idAddressDelivery + '&token=' + static_token + '&ajax=true',
+            data: 'controller=cart&delete=1&dateFrom=' + dateFrom + '&dateTo=' + dateTo + '&id_product=' + idProduct + '&id_hotel=' + idHotel + '&id_product_option=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&id_address_delivery=' + idAddressDelivery + '&token=' + static_token + '&ajax=true',
             success: function(jsonData) {
                 if (pagename == 'product') {
                     disableRoomTypeDemands(0);
@@ -773,7 +773,7 @@ var ajaxCart = {
                 for (aProduct in jsonData.products) {
                     //we've called the variable aProduct because IE6 bug if this variable is called product
                     //if product has attributes
-                    if (parseInt(jsonData.products[aProduct]['service_product_type']) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                    if (parseInt(jsonData.products[aProduct]['selling_preference_type']) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
                         $.each(jsonData.products[aProduct]['hotel_wise_data'], function() {
                             if (!ids[3] || (ids[3] == this.id_hotel)) {
                                 stayInTheCart = true;
@@ -899,7 +899,7 @@ var ajaxCart = {
         $(jsonData.products).each(function(key, value) {
             //fix ie6 bug (one more item 'undefined' in IE6)
             if (this.id != undefined) {
-                if (!this.booking_product && parseInt(this.service_product_type) == SERVICE_PRODUCT_WITH_ROOMTYPE) {
+                if (!this.booking_product && parseInt(this.selling_preference_type) == SELLING_PREFERENCE_WITH_ROOM_TYPE) {
                     return;
                 }
                 //create a container for listing the products and hide the 'no product in the cart' message (only if the cart was empty)
@@ -907,7 +907,7 @@ var ajaxCart = {
                     $('.cart_block_no_products').before('<dl class="products"></dl>');
                     $('.cart_block_no_products').hide();
                 }
-                if (parseInt(this.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                if (parseInt(this.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
 					$(value.hotel_wise_data).each(function(i, val) {
                         ajaxCart.addProductRow(value, val);
                     });
@@ -935,7 +935,7 @@ var ajaxCart = {
             content += '<div class="product-name">';
             content += '<a href="' + product.link + '" title="' + product.name + '" class="cart_block_product_name">' + name + '</a>';
             content += '</div>';
-            if (parseInt(product.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+            if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
                 content += '<div class="hotel-name">' + hotel_wise_data.hotel_name + '</div>';
             }
 
@@ -948,7 +948,7 @@ var ajaxCart = {
                 content += '<span class="price product_info_data">&nbsp;';
                 if (product.booking_product) {
                     content += formatCurrency(parseFloat(product.bookingData.total_room_type_amount), currency_format, currency_sign, currency_blank);
-                }else if (parseInt(product.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                }else if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
                     content += formatCurrency(parseFloat(hotel_wise_data.amount), currency_format, currency_sign, currency_blank);
                 } else {
                     content += formatCurrency(parseFloat(product.amount), currency_format, currency_sign, currency_blank);
@@ -1021,11 +1021,11 @@ var ajaxCart = {
                 content += '<th>' + price_txt + '</th>';
                 content += '<th>&nbsp;</th>';
                 content += '</tr>';
-                if (parseInt(product.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
                     if (hotel_wise_data.options !== 'undefined') {
                         var options = hotel_wise_data.options;
                     }
-                } else if (parseInt(product.service_product_type) == SERVICE_PRODUCT_STANDALONE) {
+                } else if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_STANDALONE) {
                     if (product.options !== 'undefined') {
                         var options = product.options;
                     }
@@ -1036,7 +1036,7 @@ var ajaxCart = {
                         content += '<td>' + data_v.option_name + '</td>';
                         content += '<td>' + data_v.quantity + '</td>';
                         content += '<td>' + formatCurrency(parseFloat(data_v.total_price_tax_excl), currency_format, currency_sign, currency_blank) + '</td>';
-                        content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_service_product_option="' + data_v.id_service_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
+                        content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_product_option="' + data_v.id_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
                         content += '</tr>';
                     });
                 }
@@ -1084,11 +1084,11 @@ var ajaxCart = {
             } else if (product.hasOptions) {
                 $('dt[data-id="cart_block_product_' + domIdProduct + '"] .cart_prod_cont tr.product_option_row').remove();
                 var product_options_content = '';
-                if (parseInt(product.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
                     if (hotel_wise_data.options !== 'undefined') {
                         var options = hotel_wise_data.options;
                     }
-                } else if (parseInt(product.service_product_type) == SERVICE_PRODUCT_STANDALONE) {
+                } else if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_STANDALONE) {
                     if (product.options !== 'undefined') {
                         var options = product.options;
                     }
@@ -1099,7 +1099,7 @@ var ajaxCart = {
                         product_options_content += '<td>' + data_v.option_name + '</td>';
                         product_options_content += '<td>' + data_v.quantity + '</td>';
                         product_options_content += '<td>' + formatCurrency(parseFloat(data_v.total_price_tax_excl), currency_format, currency_sign, currency_blank) + '</td>';
-                        product_options_content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_service_product_option="' + data_v.id_service_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
+                        product_options_content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_product_option="' + data_v.id_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
                         product_options_content += '</tr>';
                     });
                 }
@@ -1114,7 +1114,7 @@ var ajaxCart = {
                 if (!product.is_gift) {
                     if (product.booking_product) {
                         $('dt[data-id="cart_block_product_' + domIdProduct + '"] .price').text(formatCurrency(parseFloat(product.bookingData.total_room_type_amount), currency_format, currency_sign, currency_blank));
-                    } else if (parseInt(product.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL) {
+                    } else if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE) {
                         $('dt[data-id="cart_block_product_' + domIdProduct + '"] .price').text(formatCurrency(parseFloat(hotel_wise_data.amount), currency_format, currency_sign, currency_blank));
                     } else {
                         $('dt[data-id="cart_block_product_' + domIdProduct + '"] .price').text(formatCurrency(parseFloat(product.amount), currency_format, currency_sign, currency_blank));
@@ -1125,7 +1125,7 @@ var ajaxCart = {
                 //cart_booking_data[key].total_num_rooms argument sent to update num of rooms instead of quantity
                 if (product.booking_product) {
                     ajaxCart.updateProductQuantity(jsonProduct, product.bookingData.total_num_rooms);
-                } else if (parseInt(product.service_product_type) == SERVICE_PRODUCT_lINKED_WITH_HOTEL && hotel_wise_data && hotel_wise_data.total_qty) {
+                } else if (parseInt(product.selling_preference_type) == SELLING_PREFERENCE_HOTEL_STANDALONE && hotel_wise_data && hotel_wise_data.total_qty) {
                     ajaxCart.updateProductQuantity(jsonProduct, hotel_wise_data.total_qty);
                 } else {
                     ajaxCart.updateProductQuantity(jsonProduct, jsonProduct.cart_quantity);
diff --git a/themes/hotel-reservation-theme/js/order-opc.js b/themes/hotel-reservation-theme/js/order-opc.js
index ce9902875..49eeafe19 100644
--- a/themes/hotel-reservation-theme/js/order-opc.js
+++ b/themes/hotel-reservation-theme/js/order-opc.js
@@ -597,14 +597,14 @@ $(document).ready(function()
 		var id_product = $(element).val();
 		var id_cart_booking = $(element).data('id_cart_booking');
 		var qty = $(element).closest('.room_demand_block').find('input.qty');
-		if (typeof(qty) == 'undefined') {
-			qty = 1;
-		}
-		var qty_hidden = $(element).closest('.room_demand_block').find('input.qty_hidden');
-		var update_qty = parseInt($(qty).val()) - parseInt($(qty_hidden).val());
-		var checked = $(element).is(':checked');
 
-		console.log(checked);
+		if (qty.length == 0) {
+			update_qty = 1;
+		} else {
+            var qty_hidden = $(element).closest('.room_demand_block').find('input.qty_hidden');
+            var update_qty = parseInt($(qty).val()) - parseInt($(qty_hidden).val());
+        }
+		var checked = $(element).is(':checked');
 
 		if (checked) {
 			if (update_qty > 0) {
diff --git a/themes/hotel-reservation-theme/js/product.js b/themes/hotel-reservation-theme/js/product.js
index e1d89a6b1..a6d4c7fdf 100644
--- a/themes/hotel-reservation-theme/js/product.js
+++ b/themes/hotel-reservation-theme/js/product.js
@@ -1235,7 +1235,7 @@ $(document).ready(function() {
         }, 500);
     });
 
-    $(document).on('change', 'input[name="id_service_product_option"]', function(e) {
+    $(document).on('change', 'input[name="id_product_option"]', function(e) {
         BookingForm.refresh()
     });
 
diff --git a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
index 4b2c35c30..95f9da023 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/blockcart.tpl
@@ -63,8 +63,8 @@
 											<dl class="products">
 												{foreach from=$products key=data_k item='product' name='myLoop'}
 												{* only show products that are booking or global without room *}
-													{if $product.booking_product || ($product.service_product_type == Product::SERVICE_PRODUCT_STANDALONE)|| ($product.service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL)}
-														{if $product.service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}
+													{if $product.booking_product || ($product.selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE)|| ($product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE) || ($product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE)}
+														{if $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE || $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}
 															{foreach $product.hotel_wise_data as $hotel_wise_data}
 																{include file="./cartrow.tpl" hotel_wise_data=$hotel_wise_data}
 															{/foreach}
@@ -400,9 +400,9 @@
 		{addJsDef generated_date=$smarty.now|intval}
 		{addJsDef ajax_allowed=$ajax_allowed|boolval}
 		{addJsDef hasDeliveryAddress=(isset($cart->id_address_delivery) && $cart->id_address_delivery)}
-		{addJsDef SERVICE_PRODUCT_WITH_ROOMTYPE=Product::SERVICE_PRODUCT_WITH_ROOMTYPE}
-		{addJsDef SERVICE_PRODUCT_STANDALONE=Product::SERVICE_PRODUCT_STANDALONE}
-		{addJsDef SERVICE_PRODUCT_lINKED_WITH_HOTEL=Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}
+		{addJsDef SELLING_PREFERENCE_WITH_ROOM_TYPE=Product::SELLING_PREFERENCE_WITH_ROOM_TYPE}
+		{addJsDef SELLING_PREFERENCE_STANDALONE=Product::SELLING_PREFERENCE_STANDALONE}
+		{addJsDef SELLING_PREFERENCE_HOTEL_STANDALONE=Product::SELLING_PREFERENCE_HOTEL_STANDALONE}
 
 		{addJsDefL name=customizationIdMessage}{l s='Customization #' mod='blockcart' js=1}{/addJsDefL}
 		{addJsDefL name=removingLinkText}{l s='remove this product from my cart' mod='blockcart' js=1}{/addJsDefL}
diff --git a/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl b/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl
index 54cfce404..2e0e5ac52 100644
--- a/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl
+++ b/themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl
@@ -11,7 +11,7 @@
             </div>
         {/block}
         {block name='blockcart_shopping_cart_hotel_name'}
-            {if $product.service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}
+            {if $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE || $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}
                 <div class="hotel-name">
                     {$hotel_wise_data.hotel_name|escape:'html':'UTF-8'}
                 </div>
@@ -29,7 +29,7 @@
                     {if !isset($product.is_gift) || !$product.is_gift}
                         {if $product.booking_product}
                             {displayWtPrice p="`$product.bookingData.total_room_type_amount`"}
-                        {else if $product.service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}
+                        {else if $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE || $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}
                             {if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$hotel_wise_data.total_price_tax_excl`"}{else}{displayWtPrice p="`$hotel_wise_data.total_price_tax_incl`"}{/if}
                         {else}
                             {if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total_price_tax_excl`"}{else}{displayWtPrice p="`$product.total_price_tax_incl`"}{/if}
@@ -53,9 +53,9 @@
                     {if $product.booking_product}
                         <span class="quantity product_info_data">{$product.bookingData['total_num_rooms']}</span>
                     {else}
-                        {if $product.service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}
+                        {if $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE || $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}
                             <span class="quantity product_info_data">{$hotel_wise_data.total_qty}</span>
-                        {elseif $product.service_product_type == Product::SERVICE_PRODUCT_STANDALONE}
+                        {elseif $product.selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE}
                             <span class="quantity product_info_data">{$product.cart_quantity}</span>
                         {/if}
                     {/if}
@@ -99,9 +99,9 @@
         {/block}
     {else if $product.hasOptions}
         {block name='blockcart_shopping_cart_options'}
-            {if $product.service_product_type == Product::SERVICE_PRODUCT_lINKED_WITH_HOTEL}
+            {if $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE || $product.selling_preference_type == Product::SELLING_PREFERENCE_HOTEL_STANDALONE_AND_WITH_ROOM_TYPE}
                 {assign var='options' value=$hotel_wise_data.options}
-            {else if $product.service_product_type == Product::SERVICE_PRODUCT_STANDALONE}
+            {else if $product.selling_preference_type == Product::SELLING_PREFERENCE_STANDALONE}
                 {assign var='options' value=$product.options}
             {/if}
             <div class="table-responsive cart_prod_cont">
@@ -118,7 +118,7 @@
                                 <td>{$data_v.option_name}</td>
                                 <td>{$data_v['quantity']}</td>
                                 <td>{convertPrice price=($data_v['total_price_tax_excl'])}</td>
-                                <td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="{$product.id_product|intval}" id_hotel="{$data_v.id_hotel|intval}" id_service_product_option="{$data_v.id_service_product_option|intval}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a></td>
+                                <td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="{$product.id_product|intval}" id_hotel="{$data_v.id_hotel|intval}" id_product_option="{$data_v.id_product_option|intval}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a></td>
                             </tr>
                         {/foreach}
                     </tbody>
diff --git a/themes/hotel-reservation-theme/order-confirmation.tpl b/themes/hotel-reservation-theme/order-confirmation.tpl
index a5501acb5..a8fc84078 100644
--- a/themes/hotel-reservation-theme/order-confirmation.tpl
+++ b/themes/hotel-reservation-theme/order-confirmation.tpl
@@ -443,7 +443,7 @@
 																		<strong>{l s='Total products cost'} {if $use_tax}{l s='(tax incl.)'}{/if} </strong>
 																	</td>
 																	<td class="text-right">
-																		<span>{displayWtPriceWithCurrency price=$orderTotalInfo['total_service_products_ti'] currency=$objOrderCurrency}</span>
+																		<span>{displayWtPriceWithCurrency price=$orderTotalInfo['total_standalone_products_ti'] currency=$objOrderCurrency}</span>
 																	</td>
 																</tr>
 															{/if}
diff --git a/themes/hotel-reservation-theme/order-detail.tpl b/themes/hotel-reservation-theme/order-detail.tpl
index d73f0a2f4..563b7259f 100644
--- a/themes/hotel-reservation-theme/order-detail.tpl
+++ b/themes/hotel-reservation-theme/order-detail.tpl
@@ -340,21 +340,21 @@
                                     <tbody>
                                         {assign var=room_price_tax_excl value=$order->getTotalProductsWithoutTaxes(false, true)}
                                         {assign var=room_price_tax_incl value=$order->getTotalProductsWithTaxes(false, true)}
-                                        {assign var=additional_service_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_te)}
-                                        {assign var=additional_service_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_ti)}
-                                        {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($additional_service_price_tax_incl - $additional_service_price_tax_excl ))}
+                                        {assign var=room_services_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) + $total_demands_price_te)}
+                                        {assign var=room_services_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) + $total_demands_price_ti)}
+                                        {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($room_services_price_tax_incl - $room_services_price_tax_excl ))}
                                         {if $priceDisplay && $use_tax && $room_price_tax_excl}
                                             <tr>
                                                 <td>{l s='Total rooms cost (tax excl.)'}</td>
                                                 <td class="text-right">
-                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $additional_service_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
+                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
                                                 </td>
                                             </tr>
                                         {else}
                                             <tr>
                                                 <td>{l s='Total Rooms Cost'} {if $use_tax}{l s='(tax incl.)'}{/if} </td>
                                                 <td class="text-right">
-                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_incl + $additional_service_price_tax_incl - $total_convenience_fee_ti) currency=$currency}</span>
+                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_incl + $room_services_price_tax_incl - $total_convenience_fee_ti) currency=$currency}</span>
                                                 </td>
                                             </tr>
                                         {/if}
@@ -738,21 +738,30 @@
                                     <tbody>
                                         {assign var=room_price_tax_excl value=$order->getTotalProductsWithoutTaxes(false, true)}
                                         {assign var=room_price_tax_incl value=$order->getTotalProductsWithTaxes(false, true)}
-                                        {assign var=additional_service_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_te)}
-                                        {assign var=additional_service_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SERVICE_PRODUCT_WITH_ROOMTYPE) + $total_demands_price_ti)}
-                                        {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($additional_service_price_tax_incl - $additional_service_price_tax_excl ))}
+
+                                        {assign var=room_services_price_tax_excl value=($order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) + $total_demands_price_te)}
+                                        {assign var=room_services_price_tax_incl value=($order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_WITH_ROOM_TYPE) + $total_demands_price_ti)}
+
+                                        {assign var=hotel_products_price_tax_excl value=$order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE)}
+                                        {assign var=hotel_products_price_tax_incl value=$order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_HOTEL_STANDALONE)}
+
+                                        {assign var=standalone_products_price_tax_excl value=$order->getTotalProductsWithoutTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE)}
+                                        {assign var=standalone_products_price_tax_incl value=$order->getTotalProductsWithTaxes(false, false, Product::SELLING_PREFERENCE_STANDALONE)}
+
+                                        {assign var=total_tax_without_discount value=(($room_price_tax_incl - $room_price_tax_excl) + ($room_services_price_tax_incl - $room_services_price_tax_excl) + ($standalone_products_price_tax_excl - $standalone_products_price_tax_excl) + ($hotel_products_price_tax_incl - $hotel_products_price_tax_excl))}
+
                                         {if $priceDisplay && $use_tax && $room_price_tax_excl}
                                             <tr>
                                                 <td>{l s='Total rooms cost (tax excl.)'}</td>
                                                 <td class="text-right">
-                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $additional_service_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
+                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_excl + $room_services_price_tax_excl - $total_convenience_fee_te) currency=$currency}</span>
                                                 </td>
                                             </tr>
                                         {else}
                                             <tr>
                                                 <td>{l s='Total Rooms Cost'} {if $use_tax}{l s='(tax incl.)'}{/if} </td>
                                                 <td class="text-right">
-                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_incl + $additional_service_price_tax_incl - $total_convenience_fee_ti) currency=$currency}</span>
+                                                    <span class="price">{displayWtPriceWithCurrency price=($room_price_tax_incl + $room_services_price_tax_incl - $total_convenience_fee_ti) currency=$currency}</span>
                                                 </td>
                                             </tr>
                                         {/if}
diff --git a/themes/hotel-reservation-theme/shopping-cart-detail.tpl b/themes/hotel-reservation-theme/shopping-cart-detail.tpl
index 0e5e0dd88..68bad0017 100644
--- a/themes/hotel-reservation-theme/shopping-cart-detail.tpl
+++ b/themes/hotel-reservation-theme/shopping-cart-detail.tpl
@@ -199,7 +199,7 @@
                     </p>
 
                     <p class="product_remove_block">
-                        <a id="{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" class="cart_quantity_delete" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Delete'}">
+                        <a id="{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" class="cart_quantity_delete" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Delete'}">
                             <i class="icon-trash"></i> &nbsp;{l s='Remove'}
                         </a>
                         {* <a href="{$rm_v['link']}"><i class="icon-trash"></i> &nbsp;{l s='Remove'}</a> *}
@@ -251,16 +251,16 @@
                         </div>
                         <div class="col-sm-3 col-xs-5">
                             <div class="quantity_cont">
-                                <input type="hidden" value="{$product.quantity}" name="quantity_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}_hidden" />
-                                <input size="2" type="text" autocomplete="off" class="cart_quantity_input grey" value="{$product.quantity}"  name="quantity_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" />
+                                <input type="hidden" value="{$product.quantity}" name="quantity_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}_hidden" />
+                                <input size="2" type="text" autocomplete="off" class="cart_quantity_input grey" value="{$product.quantity}"  name="quantity_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" />
                                 <div class="cart_quantity_button">
-                                    <a rel="nofollow" class="cart_quantity_up btn btn-default" id="cart_quantity_up_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery=0&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
+                                    <a rel="nofollow" class="cart_quantity_up btn btn-default" id="cart_quantity_up_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery=0&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
                                     {if $product.minimal_quantity < ($product.quantity)}
-                                        <a rel="nofollow" class="cart_quantity_down btn btn-default" id="cart_quantity_down_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery=0&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Subtract'}">
+                                        <a rel="nofollow" class="cart_quantity_down btn btn-default" id="cart_quantity_down_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery=0&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Subtract'}">
                                             <span><i class="icon-minus"></i></span>
                                         </a>
                                     {else}
-                                        <a class="cart_quantity_down btn btn-default disabled" href="#" id="cart_quantity_down_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" title="{l s='You must purchase a minimum of %d of this product.' sprintf=1}">
+                                        <a class="cart_quantity_down btn btn-default disabled" href="#" id="cart_quantity_down_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_{if $product.id_hotel}{$product.id_hotel}{else}0{/if}" title="{l s='You must purchase a minimum of %d of this product.' sprintf=1}">
                                             <span><i class="icon-minus"></i></span>
                                         </a>
                                     {/if}
@@ -307,7 +307,7 @@
                     </p>
 
                     <p class="product_remove_block">
-                        <a id="{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_0" class="cart_quantity_delete" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Delete'}">
+                        <a id="{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_0" class="cart_quantity_delete" href="{$link->getPageLink('cart', true, NULL, "delete=1&amp;id_product={$product.id_product|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" rel="nofollow" title="{l s='Delete'}">
                             <i class="icon-trash"></i> &nbsp;{l s='Remove'}
                         </a>
                         {* <a href="{$rm_v['link']}"><i class="icon-trash"></i> &nbsp;{l s='Remove'}</a> *}
@@ -351,16 +351,16 @@
                         </div>
                         <div class="col-sm-3  col-xs-5">
                             <div class="quantity_cont">
-                                <input type="hidden" value="{$product.quantity}" name="quantity_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_0_hidden" />
-                                <input size="2" type="text" autocomplete="off" class="cart_quantity_input grey" value="{$product.quantity}"  name="quantity_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_0" />
+                                <input type="hidden" value="{$product.quantity}" name="quantity_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_0_hidden" />
+                                <input size="2" type="text" autocomplete="off" class="cart_quantity_input grey" value="{$product.quantity}"  name="quantity_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_0" />
                                 <div class="cart_quantity_button">
-                                    <a rel="nofollow" class="cart_quantity_up btn btn-default" id="cart_quantity_up_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_0" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
+                                    <a rel="nofollow" class="cart_quantity_up btn btn-default" id="cart_quantity_up_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_0" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Add'}"><span><i class="icon-plus"></i></span></a>
                                     {if $product.minimal_quantity < ($product.quantity)}
-                                        <a rel="nofollow" class="cart_quantity_down btn btn-default" id="cart_quantity_down_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_0" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Subtract'}">
+                                        <a rel="nofollow" class="cart_quantity_down btn btn-default" id="cart_quantity_down_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_0" href="{$link->getPageLink('cart', true, NULL, "add=1&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_address_delivery={$product.id_address_delivery|intval}&amp;op=down&amp;token={$token_cart}")|escape:'html':'UTF-8'}" title="{l s='Subtract'}">
                                             <span><i class="icon-minus"></i></span>
                                         </a>
                                     {else}
-                                        <a class="cart_quantity_down btn btn-default disabled" href="#" id="cart_quantity_down_{$product.id_product}_{if $product.id_service_product_option}{$product.id_service_product_option}{else}0{/if}_0" title="{l s='You must purchase a minimum of %d of this product.' sprintf=$product.minimal_quantity}">
+                                        <a class="cart_quantity_down btn btn-default disabled" href="#" id="cart_quantity_down_{$product.id_product}_{if $product.id_product_option}{$product.id_product_option}{else}0{/if}_0" title="{l s='You must purchase a minimum of %d of this product.' sprintf=$product.minimal_quantity}">
                                             <span><i class="icon-minus"></i></span>
                                         </a>
                                     {/if}