Fixed: text and display issues in the front office

modules/bankwire/views/templates/front/payment_execution.tpl

@@ -53,7 +53,7 @@
             <p>
                 - {l s='The total amount of your order is' mod='bankwire'}
                 <span id="amount" class="price">{displayPrice price=$total}</span>
-                {if $use_taxes == 1}
+                {if $use_taxes == 1 && $display_tax_label}
                     {l s='(tax incl.)' mod='bankwire'}
                 {/if}
             </p>

modules/blockcart/ajax-cart.js

@@ -969,7 +969,9 @@ var ajaxCart = {
                 content += '<table class="table">';
                 content += '<tbody>';
                 content += '<tr>';
-                content += '<th>' + variant_txt + '</th>';
+                if (product.allow_multiple_quantity) {
+                    content += '<th>' + variant_txt + '</th>';
+                }
                 content += '<th>' + qty_txt + '.</th>';
                 content += '<th>' + price_txt + '</th>';
                 content += '<th>&nbsp;</th>';
@@ -989,7 +991,9 @@ var ajaxCart = {
                     $.each(options, function(data_k, data_v) {
                         content += '<tr class="product_option_row">';
                         content += '<td>' + data_v.option_name + '</td>';
-                        content += '<td>' + data_v.quantity + '</td>';
+                        if (product.allow_multiple_quantity) {
+                            content += '<td>' + data_v.quantity + '</td>';
+                        }
                         content += '<td>' + formatCurrency(parseFloat(data_v.total_price_tax_excl), currency_format, currency_sign, currency_blank) + '</td>';
                         content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_product_option="' + data_v.id_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
                         content += '</tr>';
@@ -1054,7 +1058,9 @@ var ajaxCart = {
                     $.each(options, function(data_k, data_v) {
                         product_options_content += '<tr class="product_option_row">';
                         product_options_content += '<td>' + data_v.option_name + '</td>';
-                        product_options_content += '<td>' + data_v.quantity + '</td>';
+                        if (product.allow_multiple_quantity) {
+                            product_options_content += '<td>' + data_v.quantity + '</td>';
+                        }
                         product_options_content += '<td>' + formatCurrency(parseFloat(data_v.total_price_tax_excl), currency_format, currency_sign, currency_blank) + '</td>';
                         product_options_content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_product_option="' + data_v.id_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
                         product_options_content += '</tr>';

modules/blockcart/cartrow.tpl

@@ -109,14 +109,18 @@
                     <tbody>
                         <tr>
                             <th>{l s='Variant' mod='blockcart'}</th>
-                            <th>{l s='Qty.' mod='blockcart'}</th>
+                            {if $product.allow_multiple_quantity}
+                                <th>{l s='Qty.' mod='blockcart'}</th>
+                            {/if}
                             <th>{l s='Price' mod='blockcart'}</th>
                             <th>&nbsp;</th>
                         </tr>
                         {foreach from=$options item=data_v}
                             <tr class="product_option_row">
                                 <td>{$data_v.option_name}</td>
-                                <td>{$data_v['quantity']}</td>
+                                {if $product.allow_multiple_quantity}
+                                    <td>{$data_v['quantity']}</td>
+                                {/if}
                                 <td>{convertPrice price=($data_v['total_price_tax_excl'])}</td>
                                 <td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="{$product.id_product|intval}" id_hotel="{$data_v.id_hotel|intval}" id_product_option="{$data_v.id_product_option|intval}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a></td>
                             </tr>

modules/cheque/views/templates/front/payment_execution.tpl

@@ -46,7 +46,7 @@
 			<p>
 				- {l s='The total amount of your order comes to:' mod='cheque'}
 				<span id="amount" class="price">{displayPrice price=$total}</span>
-				{if $use_taxes == 1}
+				{if $use_taxes == 1 && $display_tax_label}
 					{l s='(tax incl.)' mod='cheque'}
 				{/if}
 			</p>

themes/hotel-reservation-theme/css/order-opc.css

@@ -260,6 +260,7 @@
 }
 .order-detail-content .room_price_detail_block .plus-sign{
 	display: flex;
+	justify-content: space-between;
 }
 .product_price_detail_block .product_quantity_block, .product_price_detail_block .price_block {
 	display: inline-block;

themes/hotel-reservation-theme/js/modules/blockcart/ajax-cart.js

@@ -969,7 +969,9 @@ var ajaxCart = {
                 content += '<table class="table">';
                 content += '<tbody>';
                 content += '<tr>';
-                content += '<th>' + variant_txt + '</th>';
+                if (product.allow_multiple_quantity) {
+                    content += '<th>' + variant_txt + '</th>';
+                }
                 content += '<th>' + qty_txt + '.</th>';
                 content += '<th>' + price_txt + '</th>';
                 content += '<th>&nbsp;</th>';
@@ -989,7 +991,9 @@ var ajaxCart = {
                     $.each(options, function(data_k, data_v) {
                         content += '<tr class="product_option_row">';
                         content += '<td>' + data_v.option_name + '</td>';
-                        content += '<td>' + data_v.quantity + '</td>';
+                        if (product.allow_multiple_quantity) {
+                            content += '<td>' + data_v.quantity + '</td>';
+                        }
                         content += '<td>' + formatCurrency(parseFloat(data_v.total_price_tax_excl), currency_format, currency_sign, currency_blank) + '</td>';
                         content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_product_option="' + data_v.id_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
                         content += '</tr>';
@@ -1054,7 +1058,9 @@ var ajaxCart = {
                     $.each(options, function(data_k, data_v) {
                         product_options_content += '<tr class="product_option_row">';
                         product_options_content += '<td>' + data_v.option_name + '</td>';
-                        product_options_content += '<td>' + data_v.quantity + '</td>';
+                        if (product.allow_multiple_quantity) {
+                            product_options_content += '<td>' + data_v.quantity + '</td>';
+                        }
                         product_options_content += '<td>' + formatCurrency(parseFloat(data_v.total_price_tax_excl), currency_format, currency_sign, currency_blank) + '</td>';
                         product_options_content += '<td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="' + product.id_product + '" id_hotel="' + data_v.id_hotel + '" id_product_option="' + data_v.id_product_option + '" title="' + remove_rm_title + '">&nbsp;</a></td>';
                         product_options_content += '</tr>';

themes/hotel-reservation-theme/modules/bankwire/views/templates/front/payment_execution.tpl

@@ -53,7 +53,7 @@
             <p>
                 - {l s='The total amount of your order is' mod='bankwire'}
                 <span id="amount" class="price">{displayPrice price=$total}</span>
-                {if $use_taxes == 1}
+                {if $use_taxes == 1 && $display_tax_label}
                     {l s='(tax incl.)' mod='bankwire'}
                 {/if}
             </p>

themes/hotel-reservation-theme/modules/blockcart/cartrow.tpl

@@ -109,14 +109,18 @@
                     <tbody>
                         <tr>
                             <th>{l s='Variant' mod='blockcart'}</th>
-                            <th>{l s='Qty.' mod='blockcart'}</th>
+                            {if $product.allow_multiple_quantity}
+                                <th>{l s='Qty.' mod='blockcart'}</th>
+                            {/if}
                             <th>{l s='Price' mod='blockcart'}</th>
                             <th>&nbsp;</th>
                         </tr>
                         {foreach from=$options item=data_v}
                             <tr class="product_option_row">
                                 <td>{$data_v.option_name}</td>
-                                <td>{$data_v['quantity']}</td>
+                                {if $product.allow_multiple_quantity}
+                                    <td>{$data_v['quantity']}</td>
+                                {/if}
                                 <td>{convertPrice price=($data_v['total_price_tax_excl'])}</td>
                                 <td class="text-right"><a class="ajax_remove_product_option" href="#" id_product="{$product.id_product|intval}" id_hotel="{$data_v.id_hotel|intval}" id_product_option="{$data_v.id_product_option|intval}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a></td>
                             </tr>

themes/hotel-reservation-theme/modules/cheque/views/templates/front/payment_execution.tpl

@@ -46,7 +46,7 @@
 			<p>
 				- {l s='The total amount of your order comes to:' mod='cheque'}
 				<span id="amount" class="price">{displayPrice price=$total}</span>
-				{if $use_taxes == 1}
+				{if $use_taxes == 1 && $display_tax_label}
 					{l s='(tax incl.)' mod='cheque'}
 				{/if}
 			</p>