+
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/_service_product_line.tpl b/admin/themes/default/template/controllers/orders/_service_product_line.tpl
deleted file mode 100644
index 3943a127e..000000000
--- a/admin/themes/default/template/controllers/orders/_service_product_line.tpl
+++ /dev/null
@@ -1,139 +0,0 @@
-{if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
- {assign var=product_price value=($product['unit_price_tax_excl'] + $product['ecotax'])}
-{else}
- {assign var=product_price value=$product['unit_price_tax_incl']}
-{/if}
-
+
+
+
+
+| {l s='Image'} | +{l s='Name'} | +{l s='Quantity'} | +{l s='Price (Tax excl.)'} | +{l s='Total Tax'} | +{l s='Total Price (Tax incl.)'} | + {if isset($refundReqProducts) && $refundReqProducts} +{l s='Refund State'} | +{l s='Refunded amount'} | + {/if} + {if $can_edit} +{l s='Actions'} | + {/if} +
|---|---|---|---|---|---|---|---|---|
|
+ {if isset($product.image_link) && $product.image_link}
+ |
+
+
+ {$product['name']}{if isset($product['option_name']) && $product['option_name']} : {$product['option_name']}{/if} + + |
+ + {(int)$product['quantity']} + | +
+ {displayPrice price=$product.total_price_tax_excl currency=$currency->id} +{l s='Unit price'} : {displayPrice price=$product.unit_price_tax_excl currency=$currency->id} + |
+ + {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} + | ++ {displayPrice price=$product.total_price_tax_incl currency=$currency->id} + | + {if (isset($refundReqProducts) && $refundReqProducts)} ++ {if $product.id_service_product_order_detail|in_array:$refundReqProducts} + {if $product.is_cancelled} + {l s='Cancelled'} + {elseif isset($product.refund_info) && (!$product.refund_info.refunded || $product.refund_info.id_customization)} + {$product.refund_info.name|escape:'html':'UTF-8'} + {else} + -- + {/if} + {else} + -- + {/if} + | ++ {if $product.is_refunded && isset($product.refund_info) && $product.refund_info} + {convertPriceWithCurrency price=$product.refund_info.refunded_amount currency=$currency->id} + {else} + -- + {/if} + | + {/if} + {if ($can_edit && !$order->hasBeenDelivered())} + +
+ {* edit/delete controls *}
+
+ {* *}
+
+
+
+
+ {* Update controls *}
+ {*
+ *}
+ |
+ {/if}
+
- {if $product.product_reference}{l s='Reference number:'} {$product.product_reference}
{/if} - {if $product.product_supplier_reference}{l s='Supplier reference:'} {$product.product_supplier_reference}{/if} - - {* *} -
--
- {else} - - {/if} -
- {* *}
-
-
-
-
- {* Update controls *}
-
-
-
-
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl b/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl
new file mode 100644
index 000000000..4dc181ef9
--- /dev/null
+++ b/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl
@@ -0,0 +1,165 @@
+{*
+* Since 2010 Webkul.
+*
+* NOTICE OF LICENSE
+*
+* All right is reserved,
+* Please go through this link for complete license : https://store.webkul.com/license.html
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade this module to newer
+* versions in the future. If you wish to customize this module for your
+* needs please refer to https://store.webkul.com/customisation-guidelines/ for more information.
+*
+* @author Webkul IN
-
-
-
-
-| {l s='Room No.'} | *} -{l s='Image'} | -{l s='Name'} | -{l s='Unit Price (Tax excl.)'} | -{l s='Quantity'} | -{l s='Total Price (Tax incl.)'} | - {* {if isset($refundReqBookings) && $refundReqBookings} -{l s='Refund State'} | -{l s='Refunded amount'} | - {/if} *} - {*{l s='Reallocate Room'} | *} - {if ($can_edit && !$order->hasBeenDelivered())} -{l s='Edit Order'} | - {/if} -
|---|---|---|---|---|---|---|---|---|---|
| {l s='No Data Found.'} | -
+
\ No newline at end of file
diff --git a/admin/themes/default/template/controllers/orders/form.tpl b/admin/themes/default/template/controllers/orders/form.tpl
index edf6c8cd4..67e7ed00b 100644
--- a/admin/themes/default/template/controllers/orders/form.tpl
+++ b/admin/themes/default/template/controllers/orders/form.tpl
@@ -283,6 +283,27 @@
};
updateProductPrice(params, cart_row);
})
+ $(document).on('change', '.product_quantity', function(e) {
+ var cart_row = $(this).closest('tr');
+ var qty = parseInt($(this).val());
+ var qtyhidden= parseInt($(this).siblings('.product_quantity_hidden').val());
+ var qty_to_update = qty - qtyhidden;
+ if ((qty_to_update) > 0) {
+ var opt = 'up';
+ } else {
+ var opt = 'down';
+ }
+
+ var params = {
+ id_product: parseInt($(cart_row).attr('data-id-product')),
+ qty: qty_to_update,
+ opt: opt,
+ id_cart: id_cart
+ };
+
+ updateQuantity(params, cart_row);
+ $(this).siblings('.product_quantity_hidden').val($(this).val())
+ });
$('#order_message').live('change', function(e) {
e.preventDefault();
$.ajax({
@@ -700,6 +721,26 @@
});
}
+ function updateQuantity(params, cart_row)
+ {
+ $.ajax({
+ type:"POST",
+ url: "{$link->getAdminLink('AdminCarts')|addslashes}",
+ async: true,
+ dataType: "JSON",
+ data: {
+ ajax: "1",
+ token: "{getAdminToken tab='AdminCarts'}",
+ tab: "AdminCarts",
+ action: "updateProductQuantity",
+ params: params,
+ },
+ success : function(response) {
+ // updateCartLine(response.curr_booking_info, cart_row);
+ // updateCartSummaryData(response.cart_info);
+ }
+ });
+ }
function updateCartLine(data, cart_row) {
$(cart_row).find('.cart_line_total_rooms_price').html(data.amt_with_qty);
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 eff61f2de..ae4377486 100644
--- a/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
+++ b/admin/themes/default/template/controllers/orders/helpers/view/view.tpl
@@ -88,89 +88,90 @@
+
+
+
+
+| {l s='Image'} | +{l s='Name'} | +{l s='Quantity'} | +{l s='Price (Tax excl.)'} | +{l s='Total Tax'} | +{l s='Total Price (Tax incl.)'} | + {if isset($refundReqProducts) && $refundReqProducts} +{l s='Refund State'} | +{l s='Refunded amount'} | + {/if} + {if ($can_edit)} +{l s='Actions'} | + {/if} +
|---|---|---|---|---|---|---|---|---|
|
+ {if isset($product.image_link) && $product.image_link}
+ |
+
+
+ {$product['name']}{if $product['option_name']} : {$product['option_name']}{/if} + + |
+ + {(int)$product['quantity']} + | +
+ {displayPrice price=$product.total_price_tax_excl currency=$currency->id} +{l s='Unit price'} : {displayPrice price=$product.unit_price_tax_excl currency=$currency->id} + |
+ + {displayPrice price=($product.total_price_tax_incl - $product.total_price_tax_excl) currency=$currency->id} + | ++ {displayPrice price=$product.total_price_tax_incl currency=$currency->id} + | + {if (isset($refundReqProducts) && $refundReqProducts)} ++ {if $product.id_service_product_order_detail|in_array:$refundReqProducts} + {if $product.is_cancelled} + {l s='Cancelled'} + {elseif isset($product.refund_info) && (!$product.refund_info.refunded || $product.refund_info.id_customization)} + {$product.refund_info.name|escape:'html':'UTF-8'} + {else} + -- + {/if} + {else} + -- + {/if} + | ++ {if $product.is_refunded && isset($product.refund_info) && $product.refund_info} + {convertPriceWithCurrency price=$product.refund_info.refunded_amount currency=$currency->id} + {else} + -- + {/if} + | + {/if} + {if ($can_edit && !$order->hasBeenDelivered())} + +
+ {* edit/delete controls *}
+
+ {* *}
+
+
+
+
+ {* Update controls *}
+ {*
+ *}
+ |
+ {/if}
+
-
-
+ {/if}
-
-
- {l s='Rooms Status'}
-
-
-
-
-
{l s='Order'}
@@ -786,31 +787,33 @@
{/if}
-
@@ -822,26 +825,66 @@
-
- {l s='Cancellation Policies'}
-
-
- {if is_array($applicable_refund_policies) && count($applicable_refund_policies)}
-
-
- {foreach from=$applicable_refund_policies item=$applicable_refund_policy}
-
- - - {$applicable_refund_policy.name|escape:'html':'UTF-8'} - - - {/foreach} -
-
+ {/if}
{hook h="displayAdminOrderRight" id_order=$order->id}
-
- {l s='No cancellation policies applicable.'}
+ {if is_array($applicable_refund_policies) && count($applicable_refund_policies)}
+
-
+
+ {l s='Cancellation Policies'}
+
+
+ {if is_array($applicable_refund_policies) && count($applicable_refund_policies)}
+
- {/if}
+ {/if}
+ -
+ {foreach from=$applicable_refund_policies item=$applicable_refund_policy}
+
- + + {$applicable_refund_policy.name|escape:'html':'UTF-8'} + + + {/foreach} +
+
-
+
+ {l s='No cancellation policies applicable.'}
+
-
- {l s='Rooms Booking Detail'} {$order_detail_data|@count}
- {if $can_edit && (!$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED'))}
-
+ {if $hotel_booking}
+
- {include file='controllers/orders/_service_products_table.tpl'} - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - - {else} - + {if $hotel_service_products || $hotelStandaloneProducts || $standaloneProducts} +
+ {else}
+ {if $standalone_service_products || $standaloneProducts}
+
+
- {* by webkul this code is added for showing rooms information on the order detail page *}
- {include file='controllers/orders/_rooms_informaion_table.tpl'}
-
+ {l s='Rooms Booking Detail'} {$order_detail_data|@count}
+ {if $can_edit && (!$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED'))}
+
+ {/if}
+
+ {* by webkul this code is added for showing rooms information on the order detail page *}
+ {include file='controllers/orders/_rooms_informaion_table.tpl'}
+
+ {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+
+ {else}
+
{/if}
- {include file='controllers/orders/_service_products_table.tpl'} - {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)} - - {else} - + {if $hotel_service_products || $hotelStandaloneProducts || $standaloneProducts} +
+
{/if}
-
+ {l s='Products Detail'} {$hotel_service_products|count}
+ {if $can_edit && (!$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED'))}
+
+ {/if}
+
+ {include file='controllers/orders/_hotel_service_products_table.tpl'}
+
+ {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+
+ {else}
+
+ {/if}
+
+
+ {/if}
+ {/if}
+ {l s='Products Detail'} {$standalone_service_products|count}
+ {if $can_edit && (!$order->hasBeenDelivered() && $currentState->id != Configuration::get('PS_OS_REFUND') && $currentState->id != Configuration::get('PS_OS_CANCELED'))}
+
+ {/if}
+
+ {include file='controllers/orders/_standalone_service_products_table.tpl'}
+
+ {if ($order->getTaxCalculationMethod() == $smarty.const.PS_TAX_EXC)}
+
+ {else}
+
+ {/if}
+
+
diff --git a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
index 11c7f1b0e..f9aa2d1ba 100644
--- a/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_add_room_booking.tpl
@@ -18,7 +18,7 @@
*}
+
+
+
+ {if isset($loaderImg) && $loaderImg}
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ {/if}
+
-
+
-
+
{if isset($loaderImg) && $loaderImg}
diff --git a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
index a3ee9d651..00413ed13 100644
--- a/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
+++ b/admin/themes/default/template/controllers/orders/modals/_cancel_room_bookings.tpl
@@ -18,40 +18,82 @@
*}
@@ -142,7 +142,7 @@
{/if}
- {if $bookingOrderInfo|count > 0}
-