Skip to content

Commit 6670ff6

Browse files
vishal-singh-webkulvishal-singh-webkul
committed
Merge branch 'develop' into gli-version_upgrade
2 parents bb626f9 + 6a5a12c commit 6670ff6

2,434 files changed

Lines changed: 1561 additions & 192388 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎admin/themes/default/sass/partials/_forms.sass‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[ty
157157

158158
.form-group
159159
@media (max-width: $screen-lg)
160-
input[type="text"],input[type="search"],input[type="password"], textarea, select
160+
input[type="text"],input[type="search"],input[type="password"], textarea, select, input[type="number"]
161161
margin: 4px 0
162162
.input-group
163163
margin: 4px 0

‎admin/themes/default/template/controllers/carts/helpers/view/view.tpl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</div>
5050
<div class="form-group">
5151
<label class="col-lg-3 control-label">{l s='Total spent since registration:'}</label>
52-
<div class="col-lg-3"><p class="form-control-static">{displayWtPriceWithCurrency price=$customer_stats.total_orders currency=$currency}</p></div>
52+
<div class="col-lg-3"><p class="form-control-static">{displayWtPriceWithCurrency price=Tools::convertPrice($customer_stats.total_orders|floatval, $currency) currency=$currency}</p></div>
5353
</div>
5454
</div>
5555
{else}
@@ -168,9 +168,9 @@
168168
<div class="col-xs-6">
169169
<p><span class="pull-right extra_demand_option_price">
170170
{if isset($roomDemand['adv_option']) && $roomDemand['adv_option']}
171-
{convertPrice price = $roomDemand['adv_option'][$demand['id_option']]['price']|escape:'html':'UTF-8'}
171+
{convertPrice price = $roomDemand['adv_option'][$demand['id_option']]['price_tax_excl']|escape:'html':'UTF-8'}
172172
{else}
173-
{convertPrice price = $roomDemand['price']|escape:'html':'UTF-8'}
173+
{convertPrice price = $roomDemand['price_tax_excl']|escape:'html':'UTF-8'}
174174
{/if}
175175
</span></p>
176176
</div>
@@ -216,7 +216,7 @@
216216
{/if}
217217
</div>
218218
<div class="col-xs-4">
219-
<span class="pull-right">{convertPrice price=$service.total_price}</span>
219+
<span class="pull-right">{convertPrice price=$service.total_price_tax_excl}</span>
220220
</div>
221221
</div>
222222
<p></p>
@@ -239,7 +239,7 @@
239239
</tbody>
240240
<tfoot>
241241
<tr>
242-
<td colspan="7">{l s='Total cost of room types:'}</td>
242+
<td colspan="7">{l s='Total cost:'}</td>
243243
<td class="text-right">{displayWtPriceWithCurrency price=$total_products currency=$currency}</td>
244244
</tr>
245245
{if $total_discounts != 0}

‎admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,34 @@
108108
</td>
109109
<td class="product_action">
110110
{* edit/delete controls *}
111-
<div class="btn-group">
112-
{* <button type="button" class="btn btn-default delete_product_line">
111+
{if isset($refundReqProducts) && $refundReqProducts && $product.id_service_product_order_detail|in_array:$refundReqProducts && $product.is_cancelled}
112+
<button href="#" class="btn btn-default delete_product_line">
113113
<i class="icon-trash"></i>
114114
{l s='Delete'}
115-
</button> *}
116-
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
117-
<i class="icon-pencil"></i>
118-
{l s='Edit'}
119115
</button>
120-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
121-
<span class="caret"></span>
122-
</button>
123-
<ul class="dropdown-menu" role="menu">
124-
<li>
125-
<a href="#" class="delete_product_line">
126-
<i class="icon-trash"></i>
127-
{l s='Delete'}
128-
</a>
129-
</li>
130-
</ul>
131-
</div>
116+
{else}
117+
<div class="btn-group">
118+
{* <button type="button" class="btn btn-default delete_product_line">
119+
<i class="icon-trash"></i>
120+
{l s='Delete'}
121+
</button> *}
122+
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
123+
<i class="icon-pencil"></i>
124+
{l s='Edit'}
125+
</button>
126+
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
127+
<span class="caret"></span>
128+
</button>
129+
<ul class="dropdown-menu" role="menu">
130+
<li>
131+
<a href="#" class="delete_product_line">
132+
<i class="icon-trash"></i>
133+
{l s='Delete'}
134+
</a>
135+
</li>
136+
</ul>
137+
</div>
138+
{/if}
132139
{* Update controls *}
133140
{* <button type="button" class="btn btn-default submitProductChange" style="display: none;">
134141
<i class="icon-ok"></i>

‎admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -108,27 +108,34 @@
108108
</td>
109109
<td class="product_action">
110110
{* edit/delete controls *}
111-
<div class="btn-group">
112-
{* <button type="button" class="btn btn-default delete_product_line">
111+
{if isset($refundReqProducts) && $refundReqProducts && $product.id_service_product_order_detail|in_array:$refundReqProducts && $product.is_cancelled}
112+
<button href="#" class="btn btn-default delete_product_line">
113113
<i class="icon-trash"></i>
114114
{l s='Delete'}
115-
</button> *}
116-
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
117-
<i class="icon-pencil"></i>
118-
{l s='Edit'}
119115
</button>
120-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
121-
<span class="caret"></span>
122-
</button>
123-
<ul class="dropdown-menu" role="menu">
124-
<li>
125-
<a href="#" class="delete_product_line">
126-
<i class="icon-trash"></i>
127-
{l s='Delete'}
128-
</a>
129-
</li>
130-
</ul>
131-
</div>
116+
{else}
117+
<div class="btn-group">
118+
{* <button type="button" class="btn btn-default delete_product_line">
119+
<i class="icon-trash"></i>
120+
{l s='Delete'}
121+
</button> *}
122+
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
123+
<i class="icon-pencil"></i>
124+
{l s='Edit'}
125+
</button>
126+
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
127+
<span class="caret"></span>
128+
</button>
129+
<ul class="dropdown-menu" role="menu">
130+
<li>
131+
<a href="#" class="delete_product_line">
132+
<i class="icon-trash"></i>
133+
{l s='Delete'}
134+
</a>
135+
</li>
136+
</ul>
137+
</div>
138+
{/if}
132139
{* Update controls *}
133140
{* <button type="button" class="btn btn-default submitProductChange" style="display: none;">
134141
<i class="icon-ok"></i>

‎admin/themes/default/template/controllers/orders/form.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,7 @@
699699
success : function(response) {
700700
updateCartLine(response.curr_booking_info, cart_row);
701701
updateCartSummaryData(response.cart_info);
702+
updateCartVouchers(response.cart_info.summary.discounts);
702703
}
703704
});
704705
}

‎admin/themes/default/template/controllers/orders/helpers/view/view.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@
595595

596596
<dd><b><i class="icon-calendar"></i> &nbsp; {$customer->date_add|date_format:"%d %b, %Y"}</b> ({l s='Member since'})</dd>
597597
<dd><b><i class="icon-list"></i> &nbsp; {$customerStats['nb_orders']|intval}</b> ({l s='Total valid order placed'})</dd>
598-
<dd><b><i class="icon-credit-card"></i> &nbsp; {displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_spent']|floatval, $currency), 2) currency=$currency->id}</b> ({l s='Total spent since registration'})</dd>
598+
<dd><b><i class="icon-credit-card"></i> &nbsp; {displayPrice price=Tools::ps_round(Tools::convertPrice($customerStats['total_spent']|floatval, $currency), _PS_PRICE_DISPLAY_PRECISION_) currency=$currency->id}</b> ({l s='Total spent since registration'})</dd>
599599
{if Configuration::get('PS_B2B_ENABLE')}
600600
<dd><b>{$customer->siret}</b> ({l s='Siret'})</dd>
601601
<dd><b>{$customer->ape|date_format:"%d %b, %Y"}</b> ({l s='APE'})</dd>

‎admin/themes/default/template/controllers/orders/modals/_add_order_extra_services_tab_content.tpl‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,18 @@
4444
</thead>
4545
<tbody>
4646
{foreach $serviceProducts as $product}
47+
{if isset($selectedRoomServiceProduct['selected_service']) && $selectedRoomServiceProduct['selected_service'] && ($product['id_product']|array_key_exists:$selectedRoomServiceProduct['selected_service'])}
48+
{assign var='serviceSelected' value=true}
49+
{$product.price_tax_incl = $selectedRoomServiceProduct['selected_service'][$product['id_product']]['unit_price_tax_incl']}
50+
{$product.price_tax_exc = $selectedRoomServiceProduct['selected_service'][$product['id_product']]['unit_price_tax_excl']}
51+
{else}
52+
{assign var='serviceSelected' value=false}
53+
{/if}
4754
<tr class="room_demand_block">
4855
<td>
49-
<input data-id_cart_booking="{$selectedRoomServiceProduct['id']}" value="{$product['id_product']|escape:'html':'UTF-8'}" type="checkbox" class="change_room_type_service_product" {if isset($selectedRoomServiceProduct['selected_service']) && $selectedRoomServiceProduct['selected_service'] && ($product['id_product']|array_key_exists:$selectedRoomServiceProduct['selected_service'])}checked{/if}/>
56+
<input data-id_cart_booking="{$selectedRoomServiceProduct['id']}" value="{$product['id_product']|escape:'html':'UTF-8'}" type="checkbox" class="change_room_type_service_product" {if $serviceSelected}checked{/if}/>
5057

51-
<input id="selected_service_product_{$product['id_product']}" type="hidden" value="{if isset($selectedRoomServiceProduct['selected_service']) && $selectedRoomServiceProduct['selected_service'] && ($product['id_product']|array_key_exists:$selectedRoomServiceProduct['selected_service'])}1{else}0{/if}" name="selected_service_product[{$product.id_product}]"/>
58+
<input id="selected_service_product_{$product['id_product']}" type="hidden" value="{if $serviceSelected}1{else}0{/if}" name="selected_service_product[{$product.id_product}]"/>
5259
</td>
5360
<td>
5461
<p>{$product['name']|escape:'html':'UTF-8'}</p>
@@ -64,9 +71,9 @@
6471
<td>
6572
{if $product.allow_multiple_quantity}
6673
<div class="qty_container">
67-
<input type="number" class="form-control room_type_service_product_qty qty" id="qty_{$product.id_product}" name="service_qty[{$product.id_product}]" data-id-product="{$product.id_product}" min="1" data-max-quantity="{$product.max_quantity}" value="{if isset($selectedRoomServiceProduct['selected_service']) && $selectedRoomServiceProduct['selected_service'] && ($product['id_product']|array_key_exists:$selectedRoomServiceProduct['selected_service'])}{$selectedRoomServiceProduct['selected_service'][$product['id_product']]['quantity']}{else}1{/if}" name="service_qty[{$product['id_product']|escape:'html':'UTF-8'}]">
74+
<input type="number" class="form-control room_type_service_product_qty qty" id="qty_{$product.id_product}" name="service_qty[{$product.id_product}]" data-id-product="{$product.id_product}" min="1" data-max-quantity="{$product.max_quantity}" value="{if $serviceSelected}{$selectedRoomServiceProduct['selected_service'][$product['id_product']]['quantity']}{else}1{/if}" name="service_qty[{$product['id_product']|escape:'html':'UTF-8'}]">
6875

69-
<p style="display:{if isset($selectedRoomServiceProduct['selected_service']) && $selectedRoomServiceProduct['selected_service'] && ($product['id_product']|array_key_exists:$selectedRoomServiceProduct['selected_service']) && $selectedRoomServiceProduct['selected_service'][$product['id_product']]['quantity'] > $product.max_quantity}block{else}none{/if}; margin-top: 4px;">
76+
<p style="display:{if $serviceSelected && $selectedRoomServiceProduct['selected_service'][$product['id_product']]['quantity'] > $product.max_quantity}block{else}none{/if}; margin-top: 4px;">
7077
<span class="label label-warning">{l s='Maximum allowed quantity: %s' sprintf=$product.max_quantity}</span>
7178
</p>
7279
</div>

0 commit comments

Comments
 (0)