diff --git a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl
index 2e5cba468..34bc7e065 100644
--- a/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl
+++ b/admin/themes/default/template/controllers/orders/_hotel_service_products_table.tpl
@@ -108,27 +108,34 @@
{* edit/delete controls *}
-
- {*
+ {else}
+
+ {*
+
+ {l s='Delete'}
+ *}
+
+
+ {l s='Edit'}
+
+
+
+
+
+
+ {/if}
{* Update controls *}
{*
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
index a5e60cf80..868f8ee0c 100644
--- a/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl
+++ b/admin/themes/default/template/controllers/orders/_standalone_service_products_table.tpl
@@ -108,27 +108,34 @@
|
{* edit/delete controls *}
-
- {*
+ {if isset($refundReqProducts) && $refundReqProducts && $product.id_service_product_order_detail|in_array:$refundReqProducts && $product.is_cancelled}
+
{l s='Delete'}
- *}
-
-
- {l s='Edit'}
-
-
-
-
-
+ {else}
+
+ {*
+
+ {l s='Delete'}
+ *}
+
+
+ {l s='Edit'}
+
+
+
+
+
+
+ {/if}
{* Update controls *}
{*
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 7c9fd4aef..ec36f8391 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1224,6 +1224,10 @@ class AdminOrdersControllerCore extends AdminController
)) {
$smartyVars['ServiceProductOrderDetail'] = $objServiceProductOrderDetail;
$smartyVars['objProduct'] = new Product($objServiceProductOrderDetail->id_product);
+ $taxRate = 1;
+ if ($objServiceProductOrderDetail->total_price_tax_excl > 0) {
+ $taxRate = (($objServiceProductOrderDetail->total_price_tax_incl * 100)/ $objServiceProductOrderDetail->total_price_tax_excl)-100;
+ }
$response['data'] = array(
'id_product' => $objServiceProductOrderDetail->id_product,
'id_product_option' => $objServiceProductOrderDetail->id_product_option,
@@ -1233,7 +1237,7 @@ class AdminOrdersControllerCore extends AdminController
'unit_price_tax_incl' => $objServiceProductOrderDetail->unit_price_tax_incl,
'total_price_tax_excl' => $objServiceProductOrderDetail->total_price_tax_excl,
'total_price_tax_incl' => $objServiceProductOrderDetail->total_price_tax_incl,
- 'tax_rate' => (($objServiceProductOrderDetail->total_price_tax_incl * 100)/ $objServiceProductOrderDetail->total_price_tax_excl)-100
+ 'tax_rate' => $taxRate
);
$objCurrency = new Currency($objOrder->id_currency);
|