Merge pull request #1910 from amitsharma322/gli-3243
Fixed: Prevent Duplicate Hotel Display for Attached Service Products in the frontend
This commit is contained in:
@@ -255,7 +255,7 @@
|
||||
<label>
|
||||
<input type="checkbox" id="sp_standalone" name="selling_preference_type[]" value="{Product::SELLING_PREFERENCE_WITH_STANDALONE}"
|
||||
{if Product::isSellableAsStandalone($product->id) }checked="checked"{/if}>
|
||||
{l s='Sell With Standalone'}
|
||||
{l s='Sell as a Standalone'}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -619,7 +619,7 @@ abstract class PaymentModuleCore extends Module
|
||||
$serviceProducts = $objServiceProductCartDetail->getServiceProductsInCart(
|
||||
$order->id_cart,
|
||||
[],
|
||||
null,
|
||||
isset($product['id_hotel']) ? (int) $product['id_hotel'] : null,
|
||||
0,
|
||||
null,
|
||||
$product['id_product']
|
||||
|
||||
@@ -228,12 +228,6 @@
|
||||
</div> {l s='Buy Standalone.'}
|
||||
</label>
|
||||
</div>
|
||||
<label class="control-label">{l s='Select Property'}</label>
|
||||
<select class="chosen input-hotel" name="id_hotel" id="service_id_hotel">
|
||||
{foreach $associated_hotels as $hotel}
|
||||
<option value="{$hotel.id_hotel}" {if isset($service_id_hotel) && $service_id_hotel == $hotel['id_hotel']}selected{elseif $hotel@first}selected{/if}>{$hotel.name}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
{/if}
|
||||
{/block}
|
||||
@@ -241,7 +235,7 @@
|
||||
<div id="hotel_selection_block" {if isset($buying_option) && $buying_option == '2'}style="display: none;"{/if}>
|
||||
{if isset($associated_hotels) && $associated_hotels}
|
||||
<div class="form-group">
|
||||
<label class="control-label">{l s='Select Hotel'}</label>
|
||||
<label class="control-label">{l s='Select Property'}</label>
|
||||
<select class="chosen input-hotel" name="id_hotel" id="service_id_hotel">
|
||||
{foreach $associated_hotels as $hotel}
|
||||
<option value="{$hotel.id_hotel}" {if isset($service_id_hotel) && $service_id_hotel == $hotel['id_hotel']}selected{elseif $hotel@first}selected{/if}>{$hotel.name}</option>
|
||||
|
||||
Reference in New Issue
Block a user