diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index 328855629..0be76ed75 100644
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -6267,8 +6267,8 @@ class AdminOrdersControllerCore extends AdminController
$objOrderDetail->product_quantity += $quantityDiff;
$objOrderDetail->total_price_tax_excl += $priceDiffTaxExcl;
$objOrderDetail->total_price_tax_incl += $priceDiffTaxIncl;
- $objOrderDetail->unit_price_tax_excl = ($objOrderDetail->total_price_tax_excl / $objOrderDetail->product_quantity);
- $objOrderDetail->unit_price_tax_incl = ($objOrderDetail->total_price_tax_incl / $objOrderDetail->product_quantity);
+ $objOrderDetail->unit_price_tax_excl = Tools::ps_round(($objOrderDetail->total_price_tax_excl / $objOrderDetail->product_quantity), 6);
+ $objOrderDetail->unit_price_tax_incl = Tools::ps_round(($objOrderDetail->total_price_tax_incl / $objOrderDetail->product_quantity), 6);
$res &= $objOrderDetail->updateTaxAmount($order);
$res &= $objOrderDetail->update();
diff --git a/js/admin/orders.js b/js/admin/orders.js
index b9474e193..c463a853e 100644
--- a/js/admin/orders.js
+++ b/js/admin/orders.js
@@ -1660,11 +1660,9 @@ $(document).ready(function() {
// open date picker for the date input of check-in checkout dates
$(document).on('focus', '.room_status_date', function() {
var dateFrom = $(this).closest('.room_status_info_form').find('[name="date_from"]').val();
- dateFrom = dateFrom.split("-");
minDate = new Date(dateFrom+'T00:00:00');
var dateTo = $(this).closest('.room_status_info_form').find('[name="date_to"]').val();
- dateTo = dateTo.split("-");
maxDate = new Date(dateTo+'T23:59:59');
$(this).datetimepicker({
@@ -2449,6 +2447,7 @@ const AddRoomBookingModal = {
$('#new_product').find("input.add_room_date_to").val(date_out);
//End
+ // initialize datepickers
AddRoomBookingModal.initDatePickers();
addRoomRefreshTotal();
@@ -2484,12 +2483,14 @@ const AddRoomBookingModal = {
}
});
- $('.add_room_date_to').datepicker({
+ $(".add_room_date_to").datepicker(
+ {
showOtherMonths: true,
dateFormat: 'dd-mm-yy',
beforeShow : function () {
var date_from = $.datepicker.parseDate('dd-mm-yy', $(this).closest('.bookingDuration').find('.add_room_date_from').val());
date_from.setDate(date_from.getDate() + 1);
+
$(this).datepicker("option", "minDate", date_from);
}
});
@@ -2541,37 +2542,8 @@ const EditRoomBookingModal = {
$('#edit_product .edit_product_date_to_actual').attr('value', jsonProductLineData.date_to);
$('#edit_product .room_unit_price').val(parseFloat(jsonProductLineData.paid_unit_price_tax_excl));
- //@todo: Putting below datepicker js outside this not working
- $('#edit_product .edit_product_date_from').datepicker({
- showOtherMonths: true,
- dateFormat: 'dd-mm-yy',
- altField: '#edit_product .edit_product_date_from_actual',
- onSelect: function(selectedDate) {
- let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
- objDateToMin.setDate(objDateToMin.getDate() + 1);
-
- $('#edit_product .edit_product_date_to').datepicker('option', 'minDate', objDateToMin);
- },
- beforeShow : function () {
- if(allowBackdateOrder) {
- var minDate = null;
- } else {
- var minDate = new Date(Math.min($.datepicker.parseDate('dd-mm-yy', $(this).data('min_date')), new Date()));
- }
- $(this).datepicker("option", "minDate", minDate);
- }
- });
-
- $('#edit_product .edit_product_date_to').datepicker({
- showOtherMonths: true,
- dateFormat: 'dd-mm-yy',
- altField: '#edit_product .edit_product_date_to_actual',
- beforeShow : function () {
- var date_from = $.datepicker.parseDate('dd-mm-yy', $(this).closest('.form-group').find('.edit_product_date_from').val());
- date_from.setDate(date_from.getDate() + 1);
- $(this).datepicker("option", "minDate", date_from);
- }
- });
+ // initialize datepickers
+ EditRoomBookingModal.initDatePickers();
$('#edit_product .extra-services-container #id_htl_booking').val(jsonProductLineData.id);
$('#edit-room-booking-modal').modal('show');
@@ -2580,6 +2552,38 @@ const EditRoomBookingModal = {
}
}
});
+ },
+ initDatePickers: function() {
+ $('#edit_product .edit_product_date_from').datepicker({
+ showOtherMonths: true,
+ dateFormat: 'dd-mm-yy',
+ altField: '#edit_product .edit_product_date_from_actual',
+ onSelect: function(selectedDate) {
+ let objDateToMin = $.datepicker.parseDate('dd-mm-yy', selectedDate);
+ objDateToMin.setDate(objDateToMin.getDate() + 1);
+
+ $('#edit_product .edit_product_date_to').datepicker('option', 'minDate', objDateToMin);
+ },
+ beforeShow : function () {
+ if(allowBackdateOrder) {
+ var minDate = null;
+ } else {
+ var minDate = new Date(Math.min($.datepicker.parseDate('dd-mm-yy', $(this).data('min_date')), new Date()));
+ }
+ $(this).datepicker("option", "minDate", minDate);
+ }
+ });
+
+ $('#edit_product .edit_product_date_to').datepicker({
+ showOtherMonths: true,
+ dateFormat: 'dd-mm-yy',
+ altField: '#edit_product .edit_product_date_to_actual',
+ beforeShow : function () {
+ var date_from = $.datepicker.parseDate('dd-mm-yy', $(this).closest('.form-group').find('.edit_product_date_from').val());
+ date_from.setDate(date_from.getDate() + 1);
+ $(this).datepicker("option", "minDate", date_from);
+ }
+ });
}
};