b731226f18
Merge conflict saved
2018-07-03 16:53:34 +08:00
457f0de312
changed booking supplier date format
2018-07-03 11:32:39 +08:00
48f9a56230
Commit before pull
2018-07-03 10:43:29 +08:00
4da5cfd7be
added relationship between marking and user
...
added billing_amount and salestax_amount to supplierbooking table
2018-07-03 09:58:06 +08:00
647c42a30e
renamed booking supplier book_id to booking_id
...
updated bookingSupplier to supplierBooking
updated get supplier api in supplier report
added download button to download report
2018-07-02 21:26:12 +08:00
7aba4e2b05
fix edit supplier booking
...
fix done supplier booking report button loading
2018-06-29 15:48:26 +08:00
105b61eab3
fixed retrive po path in booking controller
...
updated chinabankslip error message to be more clear
fixed supplier booking report loading button
updated upload invoice frontend to show user po image
2018-06-28 15:07:41 +08:00
d054703170
fix wrong status for user after book supplier
2018-06-28 12:13:09 +08:00
390862a8be
removed multiple booking on supplier booking controller
...
WIP supplier booking report in image file
WIP edit report page
WIP upload chinabankslip
2018-06-27 15:32:01 +08:00
6e8c81f285
added logic if supplierbooking already exist prevent user from creating
2018-06-27 14:21:55 +08:00
d1ce576109
changed model from bookingsupplier to supplier booking
...
fix supplier booking controller
make payment method nullable for supplier booking
2018-06-27 12:01:49 +08:00
b3cf440c4b
updated supplier booking controller
2018-06-27 10:46:15 +08:00
544d414dee
remove destroy function for bookingsupplier
2018-06-27 10:30:56 +08:00
b7f258f6a9
refactor BookingsupplierController
...
fix booking supplier model
updated fields for bookg supplier frontend
2018-06-27 10:30:01 +08:00
5f053577df
removed viewCustomerBookingDetails, it was done in bookingController
2018-06-27 10:12:35 +08:00
299597ed16
update book supplier routes to admin routes
2018-06-27 09:58:09 +08:00
acfd8eeb48
supplier booking (multiple booking removed)
2018-06-26 18:17:38 +08:00
32bf2f4375
fix discussion 2
2018-06-20 12:15:33 +08:00
a5633b7754
supplier booking
2018-06-19 17:26:37 +08:00
Mouhamed Lamine
Jack Goh
Nazri Hamzah