Merge pull request #1538 from vishal-singh-webkul/gli-2775

Removed:  The edit button from the canceled service products in the order detail page in the back office.
This commit is contained in:
Rohit Jain
2025-07-03 19:57:22 +05:30
committed by GitHub
3 changed files with 55 additions and 37 deletions

View File

@@ -108,27 +108,34 @@
</td>
<td class="product_action">
{* edit/delete controls *}
<div class="btn-group">
{* <button type="button" class="btn btn-default delete_product_line">
{if isset($refundReqProducts) && $refundReqProducts && $product.id_service_product_order_detail|in_array:$refundReqProducts && $product.is_cancelled}
<button href="#" class="btn btn-default delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</button> *}
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
<i class="icon-pencil"></i>
{l s='Edit'}
</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
<a href="#" class="delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</a>
</li>
</ul>
</div>
{else}
<div class="btn-group">
{* <button type="button" class="btn btn-default delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</button> *}
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
<i class="icon-pencil"></i>
{l s='Edit'}
</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
<a href="#" class="delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</a>
</li>
</ul>
</div>
{/if}
{* Update controls *}
{* <button type="button" class="btn btn-default submitProductChange" style="display: none;">
<i class="icon-ok"></i>

View File

@@ -108,27 +108,34 @@
</td>
<td class="product_action">
{* edit/delete controls *}
<div class="btn-group">
{* <button type="button" class="btn btn-default delete_product_line">
{if isset($refundReqProducts) && $refundReqProducts && $product.id_service_product_order_detail|in_array:$refundReqProducts && $product.is_cancelled}
<button href="#" class="btn btn-default delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</button> *}
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
<i class="icon-pencil"></i>
{l s='Edit'}
</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
<a href="#" class="delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</a>
</li>
</ul>
</div>
{else}
<div class="btn-group">
{* <button type="button" class="btn btn-default delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</button> *}
<button type="button" class="btn btn-default edit_product_change_link" data-product_line_data="{$product|json_encode|escape}">
<i class="icon-pencil"></i>
{l s='Edit'}
</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
<a href="#" class="delete_product_line">
<i class="icon-trash"></i>
{l s='Delete'}
</a>
</li>
</ul>
</div>
{/if}
{* Update controls *}
{* <button type="button" class="btn btn-default submitProductChange" style="display: none;">
<i class="icon-ok"></i>

View File

@@ -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);