From f0f80aec4f7a857f96ca7bb2ae403fdb7003c857 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Fri, 14 Feb 2025 17:33:47 +0530
Subject: [PATCH 1/4] Fixed:Should not allow the admin to select the tax rule
 for the auto added service product

---
 .../controllers/products/serviceproduct.tpl   | 149 +++++++++++-------
 1 file changed, 88 insertions(+), 61 deletions(-)

diff --git a/admin/themes/default/template/controllers/products/serviceproduct.tpl b/admin/themes/default/template/controllers/products/serviceproduct.tpl
index ac93c1ed9b..c16eab0eae 100644
--- a/admin/themes/default/template/controllers/products/serviceproduct.tpl
+++ b/admin/themes/default/template/controllers/products/serviceproduct.tpl
@@ -1,7 +1,7 @@
 {if isset($product->id)}
     <div id="product-configuration" class="panel product-tab">
-		<input type="hidden" name="submitted_tabs[]" value="ServiceProduct" />
-		<h3 class="tab"> <i class="icon-AdminAdmin"></i> {l s='Service Products'}</h3>
+        <input type="hidden" name="submitted_tabs[]" value="ServiceProduct" />
+        <h3 class="tab"> <i class="icon-AdminAdmin"></i> {l s='Service Products'}</h3>
 
         {if (isset($associated_service_products) && $associated_service_products) || (isset($unassociated_service_products) && $unassociated_service_products)}
             <div class="from-group table-responsive-row clearfix">
@@ -33,7 +33,10 @@
                     </thead>
                     <tbody>
                         {foreach from=$associated_service_products item=service_product}
-                            <tr id='room_type_service_product_{$service_product.id_product|escape:'html':'UTF-8'}' position="{$service_product.association_info.position|escape:'html':'UTF-8'}" id_product='{$service_product.id_product|escape:'html':'UTF-8'}' id_element="{$product->id}" data-roomtype_url="{$link->getAdminLink('AdminProducts', true)|addslashes}">
+                            <tr id='room_type_service_product_{$service_product.id_product|escape:'html':'UTF-8'}'
+                                position="{$service_product.association_info.position|escape:'html':'UTF-8'}"
+                                id_product='{$service_product.id_product|escape:'html':'UTF-8'}' id_element="{$product->id}"
+                                data-roomtype_url="{$link->getAdminLink('AdminProducts', true)|addslashes}">
                                 {assign var=inputs_prefix value="service_product_`$service_product.id_product`_"}
                                 <input type="hidden" name="available_service_products[]" value="{$service_product.id_product}">
 
@@ -42,13 +45,14 @@
                                 </td>
                                 <td class="col-sm-1">
                                     {$service_product.id_product|escape:'html':'UTF-8'}
-                                    <a target="blank" href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct">
+                                    <a target="blank"
+                                        href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct">
                                         <i class="icon-external-link-sign"></i>
                                     </a>
                                 </td>
                                 <td>{$service_product.name}</td>
                                 <td class="text-center">
-                                    <span {if $service_product.auto_add_to_cart}class="badge badge-success"{/if}>
+                                    <span {if $service_product.auto_add_to_cart}class="badge badge-success" {/if}>
                                         {if $service_product.auto_add_to_cart}{l s='Yes'}{else}{l s='No'}{/if}
                                     </span>
                                 </td>
@@ -73,7 +77,8 @@
                                                     {assign var=price_value value=$service_product.association_info.default_price}
                                                 {/if}
                                             {/if}
-                                            <input type="text" name="{$inputs_prefix}price" value="{$price_value}" data-id_product="{$service_product.id_product}">
+                                            <input type="text" name="{$inputs_prefix}price" value="{$price_value}"
+                                                data-id_product="{$service_product.id_product}">
                                         </div>
                                     </div>
                                     <div class="help-block">
@@ -85,16 +90,21 @@
                                         {l s='-'}
                                     {else}
                                         <div class="fixed-width-xl">
-                                            <select class="service_product_id_tax_rules_group" name="{$inputs_prefix}id_tax_rules_group">
+                                            <select class="service_product_id_tax_rules_group"
+                                                name="{$inputs_prefix}id_tax_rules_group">
                                                 <option value="0">{l s='No Tax'}</option>
                                                 {foreach from=$tax_rules_groups item=tax_rules_group}
-                                                    <option value="{$tax_rules_group.id_tax_rules_group}" {if $service_product.association_info.id_tax_rules_group == $tax_rules_group.id_tax_rules_group}selected="selected"{/if} >
+                                                    <option value="{$tax_rules_group.id_tax_rules_group}"
+                                                        {if $service_product.association_info.id_tax_rules_group == $tax_rules_group.id_tax_rules_group}selected="selected"
+                                                        {/if}>
                                                         {$tax_rules_group['name']|htmlentitiesUTF8}
                                                     </option>
                                                 {/foreach}
                                             </select>
                                         </div>
-                                        <div class="help-block">{l s='Default tax rule: %s' sprintf=$service_product.association_info.default_tax_rules_group_name}</div>
+                                        <div class="help-block">
+                                            {l s='Default tax rule: %s' sprintf=$service_product.association_info.default_tax_rules_group_name}
+                                        </div>
                                     {/if}
                                 </td>
                             </tr>
@@ -106,59 +116,76 @@
                                 <input type="hidden" name="available_service_products[]" value="{$service_product.id_product}">
 
                                 <td class="text-center">
-                                    <input type="checkbox" name="{$inputs_prefix}associated" class="is-associated" {if isset($smarty.post["{$inputs_prefix}associated"]) && in_array($smarty.post["{$inputs_prefix}associated"], array('on', 'true', '1'))}checked{/if}>
+                                    <input type="checkbox" name="{$inputs_prefix}associated" class="is-associated"
+                                        {if isset($smarty.post["{$inputs_prefix}associated"]) &&
+                                            in_array($smarty.post["{$inputs_prefix}associated"], array('on', 'true' , '1'
+                                        ))}checked{/if}>
                                 </td>
-                                <td class="col-sm-1">{$service_product.id_product|escape:'html':'UTF-8'} <a target="blank" href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct"><i class="icon-external-link-sign"></i></a></td>
+                                <td class="col-sm-1">{$service_product.id_product|escape:'html':'UTF-8'} <a target="blank"
+                                        href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct"><i
+                                            class="icon-external-link-sign"></i></a></td>
                                 <td>{$service_product.name}</td>
-                                <td class="text-center"><span {if $service_product.auto_add_to_cart}class="badge badge-success"{/if}>{if $service_product.auto_add_to_cart}{l s='Yes'}{else}{l s='No'}{/if}</span></td>
-                                <td>{l s='--'}</td>
-                                <td>
-                                    <div class="fixed-width-xl">
-                                        <div class="input-group">
-                                            <span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
-                                            <input type="text" name="{$inputs_prefix}price" data-id_product="{$service_product.id_product|escape:'html':'UTF-8'}" value="{if isset($smarty.post["{$inputs_prefix}price"]) && $smarty.post["{$inputs_prefix}price"]}{$smarty.post["{$inputs_prefix}price"]}{else}{$service_product.price}{/if}">
+                                <td class="text-center"><span {if $service_product.auto_add_to_cart}class="badge badge-success"
+                                            {/if}>{if $service_product.auto_add_to_cart}{l s='Yes'}{else}{l s='No'}{/if}</span></td>
+                                    <td>{l s='--'}</td>
+                                    <td>
+                                        <div class="fixed-width-xl">
+                                            <div class="input-group">
+                                                <span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
+                                                <input type="text" name="{$inputs_prefix}price"
+                                                    data-id_product="{$service_product.id_product|escape:'html':'UTF-8'}"
+                                                    value="{if isset($smarty.post["{$inputs_prefix}price" ]) &&
+                                    $smarty.post["{$inputs_prefix}price"]}{$smarty.post["{$inputs_prefix}price"]}{else}{$service_product.price}{/if}">
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="help-block">
-                                        {l s='Default price: %s' sprintf={displayPrice price=$service_product.price currency=$currency->id}}
-                                    </div>
-                                </td>
-                                <td>
-                                    <div class="fixed-width-xl">
-                                        <select class="service_product_id_tax_rules_group" name="{$inputs_prefix}id_tax_rules_group">
-                                            <option value="0">{l s='No Tax'}</option>
-                                            {foreach from=$tax_rules_groups item=tax_rules_group}
-                                                <option value="{$tax_rules_group.id_tax_rules_group}" {if isset($smarty.post["{$inputs_prefix}id_tax_rules_group"])}{if $tax_rules_group.id_tax_rules_group == $smarty.post["{$inputs_prefix}id_tax_rules_group"]}{/if}{elseif $tax_rules_group.id_tax_rules_group == $service_product.id_tax_rules_group}selected{/if}>
-                                                    {$tax_rules_group['name']|htmlentitiesUTF8}
-                                                </option>
-                                            {/foreach}
-                                        </select>
-                                    </div>
-                                    <div class="help-block">{l s='Default tax rule: %s' sprintf=$service_product.tax_rules_group_name}</div>
-                                </td>
-                            </tr>
-                        {/foreach}
-                    </tbody>
-                </table>
-            </div>
-            <div class="panel-footer">
-                <a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default">
-                    <i class="process-icon-cancel"></i>
-                    {l s='Cancel'}
-                </a>
-                <button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled">
-                    <i class="process-icon-loading"></i>
-                    {l s='Save'}
-                </button>
-                <button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right"  disabled="disabled">
-                    <i class="process-icon-loading"></i>
+                                        <div class="help-block">
+                                            {l s='Default price: %s' sprintf={displayPrice price=$service_product.price currency=$currency->id}}
+                                        </div>
+                                    </td>
+                                    <td>
+                                        {if $service_product.auto_add_to_cart&&$service_product.price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
+                                            {l s='-'}
+                                        {else}
+                                            <div class="fixed-width-xl">
+                                                <select class="service_product_id_tax_rules_group"
+                                                    name="{$inputs_prefix}id_tax_rules_group">
+                                                    <option value="0">{l s='No Tax'}</option>
+                                                    {foreach from=$tax_rules_groups item=tax_rules_group}
+                                                        <option value="{$tax_rules_group.id_tax_rules_group}"
+                                                            {if isset($smarty.post["{$inputs_prefix}id_tax_rules_group"])}{if $tax_rules_group.id_tax_rules_group == $smarty.post["{$inputs_prefix}id_tax_rules_group"]}{/if}{elseif $tax_rules_group.id_tax_rules_group == $service_product.id_tax_rules_group}selected{/if}>
+                                                            {$tax_rules_group['name']|htmlentitiesUTF8}
+                                                        </option>
+                                                    {/foreach}
+                                                </select>
+                                            </div>
+                                            <div class="help-block">
+                                                {l s='Default tax rule: %s' sprintf=$service_product.tax_rules_group_name}</div>
+                                        {/if}
+                                    </td>
+                                </tr>
+                            {/foreach}
+                        </tbody>
+                    </table>
+                </div>
+                <div class="panel-footer">
+                    <a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}"
+                        class="btn btn-default">
+                        <i class="process-icon-cancel"></i>
+                        {l s='Cancel'}
+                    </a>
+                    <button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled">
+                        <i class="process-icon-loading"></i>
+                        {l s='Save'}
+                    </button>
+                    <button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right" disabled="disabled">
+                        <i class="process-icon-loading"></i>
                         {l s='Save and stay'}
-                </button>
-            </div>
-        {else}
-            <div class="alert alert-info">
-                {l s='No services are attached with this room type'}
-            </div>
-        {/if}
-    </div>
-{/if}
\ No newline at end of file
+                    </button>
+                </div>
+            {else}
+                <div class="alert alert-info">
+                    {l s='No services are attached with this room type'}
+                </div>
+            {/if}
+        </div>
+    {/if}
\ No newline at end of file

From 3c328c281e9c620e0339cfb327a77ff248f78677 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Fri, 14 Feb 2025 17:58:45 +0530
Subject: [PATCH 2/4] Fixed:Should not allow the admin to select the tax rule
 for the auto added product

---
 .../controllers/products/serviceproduct.tpl   | 151 ++++++++----------
 1 file changed, 64 insertions(+), 87 deletions(-)

diff --git a/admin/themes/default/template/controllers/products/serviceproduct.tpl b/admin/themes/default/template/controllers/products/serviceproduct.tpl
index c16eab0eae..4d62dfea74 100644
--- a/admin/themes/default/template/controllers/products/serviceproduct.tpl
+++ b/admin/themes/default/template/controllers/products/serviceproduct.tpl
@@ -1,7 +1,7 @@
 {if isset($product->id)}
     <div id="product-configuration" class="panel product-tab">
-        <input type="hidden" name="submitted_tabs[]" value="ServiceProduct" />
-        <h3 class="tab"> <i class="icon-AdminAdmin"></i> {l s='Service Products'}</h3>
+		<input type="hidden" name="submitted_tabs[]" value="ServiceProduct" />
+		<h3 class="tab"> <i class="icon-AdminAdmin"></i> {l s='Service Products'}</h3>
 
         {if (isset($associated_service_products) && $associated_service_products) || (isset($unassociated_service_products) && $unassociated_service_products)}
             <div class="from-group table-responsive-row clearfix">
@@ -33,10 +33,7 @@
                     </thead>
                     <tbody>
                         {foreach from=$associated_service_products item=service_product}
-                            <tr id='room_type_service_product_{$service_product.id_product|escape:'html':'UTF-8'}'
-                                position="{$service_product.association_info.position|escape:'html':'UTF-8'}"
-                                id_product='{$service_product.id_product|escape:'html':'UTF-8'}' id_element="{$product->id}"
-                                data-roomtype_url="{$link->getAdminLink('AdminProducts', true)|addslashes}">
+                            <tr id='room_type_service_product_{$service_product.id_product|escape:'html':'UTF-8'}' position="{$service_product.association_info.position|escape:'html':'UTF-8'}" id_product='{$service_product.id_product|escape:'html':'UTF-8'}' id_element="{$product->id}" data-roomtype_url="{$link->getAdminLink('AdminProducts', true)|addslashes}">
                                 {assign var=inputs_prefix value="service_product_`$service_product.id_product`_"}
                                 <input type="hidden" name="available_service_products[]" value="{$service_product.id_product}">
 
@@ -45,14 +42,13 @@
                                 </td>
                                 <td class="col-sm-1">
                                     {$service_product.id_product|escape:'html':'UTF-8'}
-                                    <a target="blank"
-                                        href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct">
+                                    <a target="blank" href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct">
                                         <i class="icon-external-link-sign"></i>
                                     </a>
                                 </td>
                                 <td>{$service_product.name}</td>
                                 <td class="text-center">
-                                    <span {if $service_product.auto_add_to_cart}class="badge badge-success" {/if}>
+                                    <span {if $service_product.auto_add_to_cart}class="badge badge-success"{/if}>
                                         {if $service_product.auto_add_to_cart}{l s='Yes'}{else}{l s='No'}{/if}
                                     </span>
                                 </td>
@@ -77,8 +73,7 @@
                                                     {assign var=price_value value=$service_product.association_info.default_price}
                                                 {/if}
                                             {/if}
-                                            <input type="text" name="{$inputs_prefix}price" value="{$price_value}"
-                                                data-id_product="{$service_product.id_product}">
+                                            <input type="text" name="{$inputs_prefix}price" value="{$price_value}" data-id_product="{$service_product.id_product}">
                                         </div>
                                     </div>
                                     <div class="help-block">
@@ -90,21 +85,16 @@
                                         {l s='-'}
                                     {else}
                                         <div class="fixed-width-xl">
-                                            <select class="service_product_id_tax_rules_group"
-                                                name="{$inputs_prefix}id_tax_rules_group">
+                                            <select class="service_product_id_tax_rules_group" name="{$inputs_prefix}id_tax_rules_group">
                                                 <option value="0">{l s='No Tax'}</option>
                                                 {foreach from=$tax_rules_groups item=tax_rules_group}
-                                                    <option value="{$tax_rules_group.id_tax_rules_group}"
-                                                        {if $service_product.association_info.id_tax_rules_group == $tax_rules_group.id_tax_rules_group}selected="selected"
-                                                        {/if}>
+                                                    <option value="{$tax_rules_group.id_tax_rules_group}" {if $service_product.association_info.id_tax_rules_group == $tax_rules_group.id_tax_rules_group}selected="selected"{/if} >
                                                         {$tax_rules_group['name']|htmlentitiesUTF8}
                                                     </option>
                                                 {/foreach}
                                             </select>
                                         </div>
-                                        <div class="help-block">
-                                            {l s='Default tax rule: %s' sprintf=$service_product.association_info.default_tax_rules_group_name}
-                                        </div>
+                                        <div class="help-block">{l s='Default tax rule: %s' sprintf=$service_product.association_info.default_tax_rules_group_name}</div>
                                     {/if}
                                 </td>
                             </tr>
@@ -116,76 +106,63 @@
                                 <input type="hidden" name="available_service_products[]" value="{$service_product.id_product}">
 
                                 <td class="text-center">
-                                    <input type="checkbox" name="{$inputs_prefix}associated" class="is-associated"
-                                        {if isset($smarty.post["{$inputs_prefix}associated"]) &&
-                                            in_array($smarty.post["{$inputs_prefix}associated"], array('on', 'true' , '1'
-                                        ))}checked{/if}>
+                                    <input type="checkbox" name="{$inputs_prefix}associated" class="is-associated" {if isset($smarty.post["{$inputs_prefix}associated"]) && in_array($smarty.post["{$inputs_prefix}associated"], array('on', 'true', '1'))}checked{/if}>
                                 </td>
-                                <td class="col-sm-1">{$service_product.id_product|escape:'html':'UTF-8'} <a target="blank"
-                                        href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct"><i
-                                            class="icon-external-link-sign"></i></a></td>
+                                <td class="col-sm-1">{$service_product.id_product|escape:'html':'UTF-8'} <a target="blank" href="{$link->getAdminLink('AdminNormalProducts')|escape:'html':'UTF-8'}&amp;id_product={$service_product.id_product|escape:'html':'UTF-8'}&amp;updateproduct"><i class="icon-external-link-sign"></i></a></td>
                                 <td>{$service_product.name}</td>
-                                <td class="text-center"><span {if $service_product.auto_add_to_cart}class="badge badge-success"
-                                            {/if}>{if $service_product.auto_add_to_cart}{l s='Yes'}{else}{l s='No'}{/if}</span></td>
-                                    <td>{l s='--'}</td>
-                                    <td>
-                                        <div class="fixed-width-xl">
-                                            <div class="input-group">
-                                                <span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
-                                                <input type="text" name="{$inputs_prefix}price"
-                                                    data-id_product="{$service_product.id_product|escape:'html':'UTF-8'}"
-                                                    value="{if isset($smarty.post["{$inputs_prefix}price" ]) &&
-                                    $smarty.post["{$inputs_prefix}price"]}{$smarty.post["{$inputs_prefix}price"]}{else}{$service_product.price}{/if}">
-                                            </div>
+                                <td class="text-center"><span {if $service_product.auto_add_to_cart}class="badge badge-success"{/if}>{if $service_product.auto_add_to_cart}{l s='Yes'}{else}{l s='No'}{/if}</span></td>
+                                <td>{l s='--'}</td>
+                                <td>
+                                    <div class="fixed-width-xl">
+                                        <div class="input-group">
+                                            <span class="input-group-addon">{$currency->prefix}{$currency->suffix}</span>
+                                            <input type="text" name="{$inputs_prefix}price" data-id_product="{$service_product.id_product|escape:'html':'UTF-8'}" value="{if isset($smarty.post["{$inputs_prefix}price"]) && $smarty.post["{$inputs_prefix}price"]}{$smarty.post["{$inputs_prefix}price"]}{else}{$service_product.price}{/if}">
                                         </div>
-                                        <div class="help-block">
-                                            {l s='Default price: %s' sprintf={displayPrice price=$service_product.price currency=$currency->id}}
+                                    </div>
+                                    <div class="help-block">
+                                        {l s='Default price: %s' sprintf={displayPrice price=$service_product.price currency=$currency->id}}
+                                    </div>
+                                </td>
+                                <td>
+                                    {if $service_product.auto_add_to_cart}
+                                        {l s='-'}
+                                    {else}
+                                        <div class="fixed-width-xl">
+                                            <select class="service_product_id_tax_rules_group" name="{$inputs_prefix}id_tax_rules_group">
+                                                <option value="0">{l s='No Tax'}</option>
+                                                {foreach from=$tax_rules_groups item=tax_rules_group}
+                                                    <option value="{$tax_rules_group.id_tax_rules_group}" {if isset($smarty.post["{$inputs_prefix}id_tax_rules_group"])}{if $tax_rules_group.id_tax_rules_group == $smarty.post["{$inputs_prefix}id_tax_rules_group"]}{/if}{elseif $tax_rules_group.id_tax_rules_group == $service_product.id_tax_rules_group}selected{/if}>
+                                                        {$tax_rules_group['name']|htmlentitiesUTF8}
+                                                    </option>
+                                                {/foreach}
+                                            </select>
                                         </div>
-                                    </td>
-                                    <td>
-                                        {if $service_product.auto_add_to_cart&&$service_product.price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
-                                            {l s='-'}
-                                        {else}
-                                            <div class="fixed-width-xl">
-                                                <select class="service_product_id_tax_rules_group"
-                                                    name="{$inputs_prefix}id_tax_rules_group">
-                                                    <option value="0">{l s='No Tax'}</option>
-                                                    {foreach from=$tax_rules_groups item=tax_rules_group}
-                                                        <option value="{$tax_rules_group.id_tax_rules_group}"
-                                                            {if isset($smarty.post["{$inputs_prefix}id_tax_rules_group"])}{if $tax_rules_group.id_tax_rules_group == $smarty.post["{$inputs_prefix}id_tax_rules_group"]}{/if}{elseif $tax_rules_group.id_tax_rules_group == $service_product.id_tax_rules_group}selected{/if}>
-                                                            {$tax_rules_group['name']|htmlentitiesUTF8}
-                                                        </option>
-                                                    {/foreach}
-                                                </select>
-                                            </div>
-                                            <div class="help-block">
-                                                {l s='Default tax rule: %s' sprintf=$service_product.tax_rules_group_name}</div>
-                                        {/if}
-                                    </td>
-                                </tr>
-                            {/foreach}
-                        </tbody>
-                    </table>
-                </div>
-                <div class="panel-footer">
-                    <a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}"
-                        class="btn btn-default">
-                        <i class="process-icon-cancel"></i>
-                        {l s='Cancel'}
-                    </a>
-                    <button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled">
-                        <i class="process-icon-loading"></i>
-                        {l s='Save'}
-                    </button>
-                    <button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right" disabled="disabled">
-                        <i class="process-icon-loading"></i>
+                                        <div class="help-block">{l s='Default tax rule: %s' sprintf=$service_product.tax_rules_group_name}</div>
+                                    {/if}           
+                                </td>
+                            </tr>
+                        {/foreach}
+                    </tbody>
+                </table>
+            </div>
+            <div class="panel-footer">
+                <a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}{if isset($smarty.request.page) && $smarty.request.page > 1}&amp;submitFilterproduct={$smarty.request.page|intval}{/if}" class="btn btn-default">
+                    <i class="process-icon-cancel"></i>
+                    {l s='Cancel'}
+                </a>
+                <button type="submit" name="submitAddproduct" class="btn btn-default pull-right" disabled="disabled">
+                    <i class="process-icon-loading"></i>
+                    {l s='Save'}
+                </button>
+                <button type="submit" name="submitAddproductAndStay" class="btn btn-default pull-right"  disabled="disabled">
+                    <i class="process-icon-loading"></i>
                         {l s='Save and stay'}
-                    </button>
-                </div>
-            {else}
-                <div class="alert alert-info">
-                    {l s='No services are attached with this room type'}
-                </div>
-            {/if}
-        </div>
-    {/if}
\ No newline at end of file
+                </button>
+            </div>
+        {else}
+            <div class="alert alert-info">
+                {l s='No services are attached with this room type'}
+            </div>
+        {/if}
+    </div>
+{/if}
\ No newline at end of file

From e942f46475013c4101a36adc1c1e2fce647ea710 Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Fri, 14 Feb 2025 18:02:13 +0530
Subject: [PATCH 3/4] price addition type condition added

---
 .../default/template/controllers/products/serviceproduct.tpl    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/themes/default/template/controllers/products/serviceproduct.tpl b/admin/themes/default/template/controllers/products/serviceproduct.tpl
index 4d62dfea74..501fdf54cf 100644
--- a/admin/themes/default/template/controllers/products/serviceproduct.tpl
+++ b/admin/themes/default/template/controllers/products/serviceproduct.tpl
@@ -124,7 +124,7 @@
                                     </div>
                                 </td>
                                 <td>
-                                    {if $service_product.auto_add_to_cart}
+                                    {if $service_product.auto_add_to_cart&& $service_product.association_info.price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
                                         {l s='-'}
                                     {else}
                                         <div class="fixed-width-xl">

From e7aafa4c8e4d076ce120fabe311ab950819c576c Mon Sep 17 00:00:00 2001
From: azhar bhat <azharbhat.qlo098@webkul.in>
Date: Thu, 20 Feb 2025 15:15:56 +0530
Subject: [PATCH 4/4] condition modified

---
 .../default/template/controllers/products/serviceproduct.tpl    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/themes/default/template/controllers/products/serviceproduct.tpl b/admin/themes/default/template/controllers/products/serviceproduct.tpl
index 501fdf54cf..15b7d51d04 100644
--- a/admin/themes/default/template/controllers/products/serviceproduct.tpl
+++ b/admin/themes/default/template/controllers/products/serviceproduct.tpl
@@ -124,7 +124,7 @@
                                     </div>
                                 </td>
                                 <td>
-                                    {if $service_product.auto_add_to_cart&& $service_product.association_info.price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
+                                    {if $service_product.auto_add_to_cart&& $service_product.price_addition_type == Product::PRICE_ADDITION_TYPE_WITH_ROOM}
                                         {l s='-'}
                                     {else}
                                         <div class="fixed-width-xl">