From 65bc355cf456b577d973d2feb423bc38728ff2ae Mon Sep 17 00:00:00 2001 From: lakshya chauhan Date: Tue, 26 Apr 2022 19:16:22 +0530 Subject: [PATCH 1/2] invoice issue resolved --- controllers/admin/AdminOrdersController.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 15157bf43..0b4346aa2 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -3355,6 +3355,16 @@ public function ajaxProcessEditRoomExtraDemands() $objBookingDemand->total_price_tax_excl = $objBookingDemand->unit_price_tax_excl * $qty; $objBookingDemand->total_price_tax_incl = $objBookingDemand->unit_price_tax_incl * $qty; + $order_detail = new OrderDetail($objBookingDetail->id_order_detail); + // Update OrderInvoice of this OrderDetail + if ($order_detail->id_order_invoice != 0) { + // values changes as values are calculated accoding to the quantity of the product by webkul + $order_invoice = new OrderInvoice($order_detail->id_order_invoice); + $order_invoice->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl; + $order_invoice->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl; + $res &= $order_invoice->update(); + } + // change order total $order->total_paid_tax_excl += $objBookingDemand->total_price_tax_excl; $order->total_paid_tax_incl += $objBookingDemand->total_price_tax_incl; @@ -3399,6 +3409,16 @@ public function ajaxProcessDeleteRoomExtraDemand() $order->total_paid_tax_incl -= $objBookingDemand->total_price_tax_incl; $order->total_paid -= $objBookingDemand->total_price_tax_incl; $order->save(); + + $order_detail = new OrderDetail($objBookingDetail->id_order_detail); + // Update OrderInvoice of this OrderDetail + if ($order_detail->id_order_invoice != 0) { + // values changes as values are calculated accoding to the quantity of the product by webkul + $order_invoice = new OrderInvoice($order_detail->id_order_invoice); + $order_invoice->total_paid_tax_excl -= $objBookingDemand->total_price_tax_excl; + $order_invoice->total_paid_tax_incl -= $objBookingDemand->total_price_tax_incl; + $res &= $order_invoice->update(); + } } die('1'); } From 99f55e449c8092227501d64196616235e1fbb2f3 Mon Sep 17 00:00:00 2001 From: lakshya chauhan Date: Wed, 27 Apr 2022 19:31:47 +0530 Subject: [PATCH 2/2] Invoice issue resolved during date range update --- controllers/admin/AdminOrdersController.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 0b4346aa2..bb221d021 100644 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -2355,6 +2355,7 @@ public function ajaxProcessEditProductOnOrder() $product_quantity = (int) $obj_booking_detail->getNumberOfDays($new_date_from, $new_date_to); $old_product_quantity = (int) $obj_booking_detail->getNumberOfDays($old_date_from, $old_date_to); $qty_diff = $product_quantity - $old_product_quantity; + /*By webkul to validate fields before deleting the cart and order data form the tables*/ if ($id_hotel == '') { die(json_encode(array( @@ -2638,6 +2639,19 @@ public function ajaxProcessEditProductOnOrder() } } } + + if (isset($order_invoice)) { + // Apply changes on OrderInvoice + $order_invoice->total_paid_tax_excl = $objOrder->total_paid_tax_excl; + $order_invoice->total_paid_tax_incl = $objOrder->total_paid_tax_incl; + } + + + // Save order invoice + if (isset($order_invoice)) { + $res &= $order_invoice->update(); + } + // change order total save $objOrder->save(); }