diff --git a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php index 6d0b60bc..4def81f7 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/UpdateBookingAmountWithPOLogic.php @@ -77,7 +77,7 @@ class UpdateBookingAmountWithPOLogic extends AbstractControllerLogic $bookingAttribute = $booking->attributesKVP()->where('key', "BOOKING_AMOUNT_UPDATE")->first(); - /* cief todo: 90 - BEFORE REVERT + // cief todo: 90 - BEFORE REVERT $refundAmount = $this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id); $paidAmount = floatval($this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id)) - floatval($refundAmount); @@ -86,14 +86,14 @@ class UpdateBookingAmountWithPOLogic extends AbstractControllerLogic throw new MalformedRequestException('Purchase Order at this point can only be edited after editing the booking amount'); } } - */ + // // cief todo: 90 - REVERTED STARTS - $paidAmount = floatval($this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id)) - floatval($this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id)); + // $paidAmount = floatval($this->calculatesBookingPayableAmount->execute($booking, $booking->fix_currency_id)) - floatval($this->calculatesBookingRefundAmount->execute($booking, $booking->fix_currency_id)); - if($paidAmount > 0 && $outstandingAmount > 0 && !$bookingAttribute){ - throw new MalformedRequestException('Purchase Order at this point can only be edited after editing the booking amount'); - } + // if($paidAmount > 0 && $outstandingAmount > 0 && !$bookingAttribute){ + // throw new MalformedRequestException('Purchase Order at this point can only be edited after editing the booking amount'); + // } // cief todo: 90 - REVERTED ENDS if($bookingAttribute){ diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php index 63de0018..0a29023d 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php @@ -126,9 +126,9 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic } // cief todo: 90 - REVERTED STARTS (commented before revert) - $request['fix_amount'] = $booking->fix_amount - $refundTransaction->original_amount; - $request->route()->setParameter('id', $booking->id); - $this->updateBookingAmountLogic->execute($request); + // $request['fix_amount'] = $booking->fix_amount - $refundTransaction->original_amount; + // $request->route()->setParameter('id', $booking->id); + // $this->updateBookingAmountLogic->execute($request); // cief todo: 90 - REVERTED ENDS (commented before revert) } diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue index ad07a927..7dd9adc0 100644 --- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue +++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue @@ -132,7 +132,7 @@