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

Merge pull request #294 from shreesh-webkul/gli-628

Browse Source 
Resolve order edit issues, also added hooks in the order edit process
This commit is contained in:
Rohit Jain
2022-01-31 16:35:26 +05:30
committed by GitHub
parent 76f559ad96 6cec6a7056
commit b9752f4d0f
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/admin/AdminOrdersController.php
View File

@@ -2232,11 +2232,14 @@ class AdminOrdersControllerCore extends AdminController
$objHtlBkDtl->booking_type = $obj_cart_bk_data->booking_type;
$objHtlBkDtl->id_status = 1;
$objHtlBkDtl->comment = $obj_cart_bk_data->comment;
$objHtlBkDtl->room_type_name = Product::getProductName($idProduct, null, $order->id_lang);
$objHtlBkDtl->date_from = $obj_cart_bk_data->date_from;
$objHtlBkDtl->date_to = $obj_cart_bk_data->date_to;
$total_price = HotelRoomTypeFeaturePricing::getRoomTypeTotalPrice($idProduct, $obj_cart_bk_data->date_from, $obj_cart_bk_data->date_to);
$objHtlBkDtl->total_price_tax_excl = $total_price['total_price_tax_excl'];
$objHtlBkDtl->total_price_tax_incl = $total_price['total_price_tax_incl'];
$objHtlBkDtl->total_paid_amount = Tools::ps_round($total_price['total_price_tax_incl'], 5);
// Save hotel information/location/contact
if (Validate::isLoadedObject($objRoom = new HotelRoomInformation($obj_cart_bk_data->id_room))) {
@@ -2661,6 +2664,7 @@ class AdminOrdersControllerCore extends AdminController
/*END*/
$this->doDeleteProductLineValidation($order_detail, $order);
Hook::exec('actionOrderProductLineDeleteBefore', array('order' => $order));
$bookingInfo = $obj_booking_detail->getRowByIdOrderIdProductInDateRange($id_order, $id_product, $date_from, $date_to, $id_room);
$idHotelBooking = $bookingInfo['id'];

18
modules/hotelreservationsystem/classes/HotelBookingDetail.php
View File

@@ -1031,6 +1031,15 @@ class HotelBookingDetail extends ObjectModel
$data['room_num'] = $room_num;
}
if ($result2 = Db::getInstance()->update($table2, $data, $where)) {
Hook::exec(
'actionRoomReAllocateAfter',
array(
'room_id' => $current_room_id,
'realloc_room_id' => $swapped_room_id,
'date_from' => $date_from,
'date_to' => $date_to,
)
);
return true;
}
return false;
@@ -1086,6 +1095,15 @@ class HotelBookingDetail extends ObjectModel
if ($result = Db::getInstance()->execute($sql)) {
$result2 = Db::getInstance()->execute($sql1);
if ($result2) {
Hook::exec(
'actionRoomSwapAfter',
array(
'room_id' => $current_room_id,
'swapped_room_id' => $swapped_room_id,
'date_from' => $date_from,
'date_to' => $date_to,
)
);
return true;
}
return false;