diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 800f6971..3a606c98 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -103,7 +103,7 @@ class BookingSupplierController extends Controller //$transfer_amount = $request->input("transfer_amount"); $supplier_id = $request->input("supplier_id"); $booking_id = $request->input("booking_id"); - //$rate = $request->input('rate'); + $rate = $request->input('rate'); // costing rate $rebate = $request->input('rebate'); $supplier = SettingSupplier::find($supplier_id); $booking = Booking::find($booking_id); @@ -120,7 +120,6 @@ class BookingSupplierController extends Controller // Update: changes in 1.1 according to new supplier booking report $transfer_amount = $booking->amount; - $rate = $booking->rate; $amount_in_myr = round($transfer_amount / $rate, 2); $amountInRMB = $transfer_amount; diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index 32042123..ad3da400 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -210,9 +210,9 @@ - + @@ -333,7 +333,7 @@ booking_id: this.$route.params.id, supplier_id: this.supplierBookingForm.supplier, rebate: this.supplierBookingForm.rebate, - //rate: this.supplierBookingForm.rate, + rate: this.supplierBookingForm.rate, //transfer_amount: this.supplierBookingForm.transfer_amount, } diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue index 12a28cb6..ff36bce7 100644 --- a/resources/assets/js/pages/booking/uploadPo.vue +++ b/resources/assets/js/pages/booking/uploadPo.vue @@ -1,64 +1,56 @@