Daniel/hotel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into gli-2486

Browse Source
This commit is contained in:
vishalsingh.qlo325
2025-05-07 11:17:15 +05:30
parent 5b6946b8a9 db9eb9686f
commit cfcd893bbd
17 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
admin/themes/default/template/controllers/orders/form.tpl
View File

@@ -1722,7 +1722,6 @@
</script>
<div class="leadin">{block name="leadin"}{/block}</div>
{include file='controllers/orders/_current_cart_details_data.tpl'}
{* If cart has errors the do not allow to proceed with this cart *}
<div class="panel form-horizontal" id="customer_part" {if isset($is_order_created) && $is_order_created}style="display:none;"{/if}>
<div class="panel-heading">
@@ -1812,6 +1811,7 @@
</div>
</div> -->*}<!-- by webkul to hide unnessesary content -->
</div>
{include file='controllers/orders/_current_cart_details_data.tpl'}
<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&amp;addorder=1&amp;cart_id={$cart->id}" method="post" style="display:none" id="cart_detail_form">
<div class="panel" id="products_part" style="display:none;">
@@ -2189,6 +2189,19 @@
{else}
{assign var=is_full_payment value=true}
{/if}
<div class="form-group">
<label class="control-label col-lg-3">{l s="Send mails"}</label>
<div class="col-lg-9">
<span class="switch prestashop-switch fixed-width-lg">
<input type="radio" name="send_mails" id="send_mails_on" value="1" checked="checked">
<label for="send_mails_on">{l s="Yes"}</label>
<input type="radio" name="send_mails" id="send_mails_off" value="0">
<label for="send_mails_off">{l s="No"}</label>
<a class="slide-button btn"></a>
</span>
<p class="help-block">{l s='If disabled, no mail related to this order will be sent during order creation.'}</p>
</div>
</div>
<div class="form-group" {if $order_total <= 0}style="display: none;"{/if}>
<label class="control-label col-lg-3">{l s="Full payment"}</label>
<div class="col-lg-9">

26
admin/themes/default/template/controllers/products/serviceproduct.tpl
View File

@@ -124,17 +124,21 @@
</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>
{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}

5
classes/Mail.php
View File

@@ -296,7 +296,10 @@ class MailCore extends ObjectModel
}
/* Create mail and attach differents parts */
$subject = '['.Configuration::get('PS_SHOP_NAME', null, null, $id_shop).'] '.$subject;
if (Configuration::get('PS_MAIL_SUBJECT_PREFIX')) {
$subject = '[' . strip_tags($configuration['PS_SHOP_NAME']) . '] ' . $subject;
}
$message->setSubject($subject);
$message->setCharset('utf-8');

21
classes/controller/AdminController.php
View File

@@ -1155,6 +1155,7 @@ class AdminControllerCore extends Controller
header('Cache-Control: no-store, no-cache');
header('Content-disposition: attachment; filename="'.$this->table.'_'.date('Y-m-d_His').'.csv"');
$fd = fopen('php://output', 'wb');
$headers = array();
foreach ($this->fields_list as $key => $datas) {
if ('PDF' === $datas['title']) {
@@ -1167,9 +1168,10 @@ class AdminControllerCore extends Controller
}
}
}
$content = array();
fputcsv($fd, $headers, ';', $text_delimiter);
foreach ($this->_list as $i => $row) {
$content[$i] = array();
$content = array();
$path_to_image = false;
foreach ($this->fields_list as $key => $params) {
$field_value = isset($row[$key]) ? Tools::htmlentitiesDecodeUTF8(Tools::nl2br($row[$key])) : '';
@@ -1189,21 +1191,16 @@ class AdminControllerCore extends Controller
$field_value = call_user_func_array(array($callback_obj, $params['callback']), array($field_value, $row));
}
}
$content[$i][] = $field_value;
$content[] = $field_value;
}
fputcsv($fd, $content, ';', $text_delimiter);
}
$this->context->smarty->assign(array(
'export_precontent' => "",
'export_headers' => $headers,
'export_content' => $content,
'text_delimiter' => $text_delimiter
)
);
$this->layout = 'layout-export.tpl';
@fclose($fd);
die;
}
/**
* Object Delete
*

8
classes/webservice/WebserviceSpecificManagementBookings.php
View File

@@ -3146,14 +3146,14 @@ class WebserviceSpecificManagementBookingsCore Extends ObjectModel implements We
$totalPriceTaxExcl = $unitPriceTaxExcl * $quantity;
$totalPriceTaxIncl = $unitPriceTaxIncl * $quantity;
if (isset($service['unit_price_without_tax'])) {
$unitPriceTaxExcl = $service['unit_price_without_tax'];
if (isset($services[$product['id_product']]['unit_price_without_tax'])) {
$unitPriceTaxExcl = $services[$product['id_product']]['unit_price_without_tax'];
$unitPriceTaxIncl = $unitPriceTaxExcl * $oldTaxMultiplier;
$totalPriceTaxExcl = $unitPriceTaxExcl * $quantity;
$totalPriceTaxIncl = $unitPriceTaxIncl * $quantity;
} else if (isset($service['total_price_without_tax'])) {
$totalPriceTaxExcl = $service['total_price_without_tax'];
} else if (isset($services[$product['id_product']]['total_price_without_tax'])) {
$totalPriceTaxExcl = $services[$product['id_product']]['total_price_without_tax'];
$totalPriceTaxIncl = $totalPriceTaxExcl * $oldTaxMultiplier;
$unitPriceTaxExcl = $totalPriceTaxExcl / $quantity;

8
controllers/admin/AdminEmailsController.php
View File

@@ -109,6 +109,12 @@ class AdminEmailsControllerCore extends AdminController
2 => $this->l('Set my own SMTP parameters (for advanced users ONLY)')
)
),
'PS_MAIL_SUBJECT_PREFIX' => array(
'title' => $this->l('Enable the website name as a prefix in the email\'s subject'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool',
),
'PS_MAIL_TYPE' => array(
'title' => '',
'validation' => 'isGenericName',
@@ -125,7 +131,7 @@ class AdminEmailsControllerCore extends AdminController
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
),
)
),
'submit' => array('title' => $this->l('Save'))
),

5
controllers/admin/AdminOrdersController.php
View File

@@ -1776,6 +1776,7 @@ class AdminOrdersControllerCore extends AdminController
$amountPaid = Tools::ps_round($amountPaid, 6);
$objEmployee = new Employee($this->context->cookie->id_employee);
$sendMails = Tools::getValue('send_mails', true);
$objPaymentModule->validateOrder(
$objCart->id,
@@ -1786,7 +1787,9 @@ class AdminOrdersControllerCore extends AdminController
$extraVars,
null,
false,
$objCart->secure_key
$objCart->secure_key,
null,
$sendMails
);
if (isset($this->context->cookie->id_cart)) {

3
install/data/xml/configuration.xml
View File

@@ -785,6 +785,9 @@
<configuration id="PS_MAIL_METHOD" name="PS_MAIL_METHOD">
<value>1</value>
</configuration>
<configuration id="PS_MAIL_SUBJECT_PREFIX" name="PS_MAIL_SUBJECT_PREFIX">
<value>1</value>
</configuration>
<configuration id="PS_SHOP_ACTIVITY" name="PS_SHOP_ACTIVITY">
<value>Animaux</value>
</configuration>

4
js/daterangepicker/qlodaterangepicker.js
View File

@@ -20,6 +20,10 @@
(function($) {
var dateRangePickerOrg = $.fn.dateRangePicker;
Object.assign($.dateRangePickerLanguages, {
zh: $.dateRangePickerLanguages.cn,
tw: $.dateRangePickerLanguages.tc
});
$.fn.dateRangePicker = function(opt) {
if(typeof opt === "object") {
let container = $(this).parent();

9
modules/hotelreservationsystem/views/js/admin/hotel_rooms_booking.js
View File

@@ -506,16 +506,14 @@ $(document).ready(function() {
opt: 0,
},
success: function(result) {
if (result) {
if (!(result.success)) {
$(".cart_booking_btn").attr('disabled', 'true');
}
if (!result.success) {
$(".cart_booking_btn").attr('disabled', 'true');
} else {
$("#htl_rooms_list").empty().append(result.data.room_tpl);
refreshCartData();
refreshStatsData();
calendar.refetchEvents();
initBookingList();
var panel_btn = $(".tab-pane tr td button[data-id-cart-book-data='" + id_cart_book_data + "']");
panel_btn.attr('data-id-cart', '');
@@ -527,7 +525,6 @@ $(document).ready(function() {
panel_btn.removeClass('part_delete_cart_data').addClass('par_add_cart');
panel_btn.removeClass('btn-danger').addClass('btn-primary').html(add_to_cart);
}
}
});

2
modules/wkroomsearchblock/views/templates/hook/searchForm.tpl
View File

@@ -85,7 +85,7 @@
<div class="dropdown">
<button class="form-control input-occupancy header-rmsearch-input {if isset($error) && $error == 1}error_border{/if}" type="button" data-toggle="dropdown" id="guest_occupancy">
<span class="pull-left">{if (isset($search_data['occupancy_adults']) && $search_data['occupancy_adults'])}{$search_data['occupancy_adults']} {if $search_data['occupancy_adults'] > 1}{l s='Adults' mod='wkroomsearchblock'}{else}{l s='Adult' mod='wkroomsearchblock'}{/if}, {if isset($search_data['occupancy_children']) && $search_data['occupancy_children']}{$search_data['occupancy_children']} {if $search_data['occupancy_children'] > 1}
{l s='Children' mod='wkroomsearchblock'}{else}{l s='Child' mod='wkroomsearchblock'}{/if}, {/if}{$search_data['occupancies']|count} {if $search_data['occupancies']|count > 1}{l s='Rooms' mod='wkroomsearchblock'}{else}{l s='Room'}{/if}{else}{l s='1 Adult, 1 Room' mod='wkroomsearchblock'}{/if}</span>
{l s='Children' mod='wkroomsearchblock'}{else}{l s='Child' mod='wkroomsearchblock'}{/if}, {/if}{$search_data['occupancies']|count} {if $search_data['occupancies']|count > 1}{l s='Rooms' mod='wkroomsearchblock'}{else}{l s='Room' mod='wkroomsearchblock'}{/if}{else}{l s='1 Adult, 1 Room' mod='wkroomsearchblock'}{/if}</span>
</button>
<div id="search_occupancy_wrapper" class="dropdown-menu">
<div id="occupancy_inner_wrapper">

3
pdf/delivery-slip.tpl
View File

@@ -81,8 +81,7 @@
</tr>
<tr>
<td colspan="2">&nbsp;</td>
<td colspan="10">
<td colspan="12">
{$HOOK_DISPLAY_PDF}
</td>
</tr>

3
pdf/invoice-b2b.tpl
View File

@@ -294,8 +294,7 @@
<div style="line-height: 1pt">&nbsp;</div>
<table style="width: 100%">
<tr>
<td style="width: 15%"></td>
<td style="width: 85%">{$HOOK_DISPLAY_PDF}</td>
<td style="width: 100%">{$HOOK_DISPLAY_PDF}</td>
</tr>
</table>
{/if}

3
pdf/invoice.tpl
View File

@@ -131,8 +131,7 @@
</tr>
<tr>
<td colspan="2">&nbsp;</td>
<td colspan="10">
<td colspan="12">
{$HOOK_DISPLAY_PDF}
</td>
</tr>

3
pdf/order-return.tpl
View File

@@ -81,8 +81,7 @@
</tr>
<tr>
<td colspan="2">&nbsp;</td>
<td colspan="10">
<td colspan="12">
{$HOOK_DISPLAY_PDF}
</td>
</tr>

3
pdf/order-slip.tpl
View File

@@ -103,8 +103,7 @@
</tr>
<tr>
<td colspan="2">&nbsp;</td>
<td colspan="10">
<td colspan="12">
{$HOOK_DISPLAY_PDF}
</td>
</tr>

4
themes/hotel-reservation-theme/modules/blockuserinfo/nav.tpl
View File

@@ -31,8 +31,8 @@
</button>
<ul class="dropdown-menu" aria-labelledby="user_info_acc">
<li><a href="{$link->getPageLink('my-account', true)|escape:'html'}" title="{l s='View my customer account' mod='blockuserinfo'}">{l s='Accounts' mod='blockuserinfo'}</a></li>
<li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='View my orders' mod='blockuserinfo'}">{l s='Orders'}</a></li>
<li><a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Logout'}</a></li>
<li><a href="{$link->getPageLink('history', true)|escape:'html'}" title="{l s='View my orders' mod='blockuserinfo'}">{l s='Orders' mod='blockuserinfo'}</a></li>
<li><a href="{$link->getPageLink('index', true, NULL, "mylogout")|escape:'html'}" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Logout' mod='blockuserinfo'}</a></li>
{block name='displayUserNavigationList'}
{hook h='displayUserNavigationList'}
{/block}