diff --git a/classes/order/OrderReturnDetail.php b/classes/order/OrderReturnDetail.php index fbff7a45e..5251ff559 100644 --- a/classes/order/OrderReturnDetail.php +++ b/classes/order/OrderReturnDetail.php @@ -70,12 +70,13 @@ class OrderReturnDetailCore extends ObjectModel public static function deleteReturnDetailByIdBookingDetail($idOrder, $idHtlBooking) { - $objOrderReturnDetail = OrderReturnDetail::getReturnDetailByIdBookingDetail($idHtlBooking); - if ($objOrderReturnDetail->delete()) { - $objOrderReturn = new OrderReturn(); - if (empty($objOrderReturn->getOrderRefundRequestedBookings($idOrder, $objOrderReturnDetail->id_order_return, true))) { - $objOrderReturn = new OrderReturn($objOrderReturnDetail->id_order_return); - $objOrderReturn->delete(); + if (Validate::isLoadedObject($objOrderReturnDetail = OrderReturnDetail::getReturnDetailByIdBookingDetail($idHtlBooking))) { + if ($objOrderReturnDetail->delete()) { + $objOrderReturn = new OrderReturn(); + if (empty($objOrderReturn->getOrderRefundRequestedBookings($idOrder, $objOrderReturnDetail->id_order_return, true))) { + $objOrderReturn = new OrderReturn($objOrderReturnDetail->id_order_return); + $objOrderReturn->delete(); + } } } } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index e5ad50678..dc04de4d5 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -6190,11 +6190,13 @@ class AdminOrdersControllerCore extends AdminController $objHotelBookingDetail = new HotelBookingDetail($objRoomTypeServiceProductOrderDetail->id_htl_booking_detail); $res = true; if (!$response['hasError']) { - $oldPriceTaxExcl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl; - $oldPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl; + $oldUnitPriceTaxExcl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_excl; + $oldUnitPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->unit_price_tax_incl; + $oldTotalPriceTaxExcl = $objRoomTypeServiceProductOrderDetail->total_price_tax_excl; + $oldTotalPriceTaxIncl = $objRoomTypeServiceProductOrderDetail->total_price_tax_incl; $oldQuantity = $objRoomTypeServiceProductOrderDetail->quantity; if ($oldPriceTaxExcl > 0) { - $oldTaxMultiplier = $oldPriceTaxIncl / $oldPriceTaxExcl; + $oldTaxMultiplier = $oldUnitPriceTaxIncl / $oldUnitPriceTaxExcl; } else { $oldTaxMultiplier = 1; } @@ -6214,8 +6216,8 @@ class AdminOrdersControllerCore extends AdminController $objRoomTypeServiceProductOrderDetail->total_price_tax_incl = Tools::ps_round($objRoomTypeServiceProductOrderDetail->unit_price_tax_incl * $quantity, 6); if ($res &= $objRoomTypeServiceProductOrderDetail->save()) { $order = new Order($objRoomTypeServiceProductOrderDetail->id_order); - $priceDiffTaxExcl = $objRoomTypeServiceProductOrderDetail->total_price_tax_excl - $oldPriceTaxExcl; - $priceDiffTaxIncl = $objRoomTypeServiceProductOrderDetail->total_price_tax_incl - $oldPriceTaxIncl; + $priceDiffTaxExcl = $objRoomTypeServiceProductOrderDetail->total_price_tax_excl - $oldTotalPriceTaxExcl; + $priceDiffTaxIncl = $objRoomTypeServiceProductOrderDetail->total_price_tax_incl - $oldTotalPriceTaxIncl; $quantityDiff = $objRoomTypeServiceProductOrderDetail->quantity - $oldQuantity; $objOrderDetail->product_quantity += $quantityDiff; diff --git a/install/controllers/http/system.php b/install/controllers/http/system.php index 98019b64e..c046f43e3 100644 --- a/install/controllers/http/system.php +++ b/install/controllers/http/system.php @@ -94,6 +94,7 @@ class InstallControllerHttpSystem extends InstallControllerHttp 'pdo_mysql' => $this->l('PDO MySQL extension is not loaded'), 'curl' => $this->l('Curl extension is not loaded'), 'soap' => $this->l('SOAP extension is not loaded'), + 'openssl' => $this->l('OpenSSL extension is not loaded.'), 'simplexml' => $this->l('SimpleXml extension is not loaded'), 'memory_limit' => $this->l('In the PHP configuration set memory_limit to minimum 128M'), 'max_execution_time' => $this->l('In the PHP configuration set max_execution_time to minimum 500'), diff --git a/js/admin/orders.js b/js/admin/orders.js index 719c41679..9f766dab0 100644 --- a/js/admin/orders.js +++ b/js/admin/orders.js @@ -2536,7 +2536,9 @@ const EditRoomBookingModal = { const dateTo = $.datepicker.formatDate('dd-mm-yy', $.datepicker.parseDate('yy-mm-dd', jsonProductLineData.date_to)); $('#edit_product .edit_product_date_from').attr('value', dateFrom); + $('#edit_product .edit_product_date_from').attr('data-min_date', dateFrom); $('#edit_product .edit_product_date_to').attr('value', dateTo); + $('#edit_product .edit_product_date_to').attr('data-min_date', dateFrom); $('#edit_product .edit_product_date_from_actual').attr('value', jsonProductLineData.date_from); $('#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));