7fc0696099
fix conflit
2018-06-28 12:45:02 +08:00
2b4ddadfcb
rename book_id in po table to booking_id to perform ORM relantionship
...
added relationship between booking and po
updated settings shows for different role
added function to display po for admin
2018-06-28 10:06:26 +08:00
06974f039b
revert back changes during debug
2018-06-27 23:37:29 +08:00
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
a5ea991a8d
changed routes name for update china bankslip
2018-06-27 16:54:02 +08:00
addd89ceb8
added relantionship in chinabankslip model
...
added update chinabankslip feature
2018-06-27 16:37:48 +08:00
cea2857d0f
added booking foreign key to china bankslip
...
updated upload china bankslip routes
2018-06-27 16:16:48 +08:00
edc3dbaa35
fixed upload chinabankslip
...
removed unused code in bookingcontroller
updated upload chinabankslip frontend
moved some routes into authenticated route list
2018-06-27 16:01:52 +08:00
544d414dee
remove destroy function for bookingsupplier
2018-06-27 10:30:56 +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
a17a692549
fix conflict
2018-06-26 18:23:00 +08:00
2c6128c564
changed admin status default to 1
...
added show one booking for admin
added booking details for verification page
2018-06-25 16:41:31 +08:00
bf40262994
added admin booking list controller
2018-06-23 00:40:50 +08:00
aaf0decd97
removed amount from uploadpo
...
added confirmpo after user upload their po
completed uploadpo integration
2018-06-21 15:48:24 +08:00
de45782ae3
fix conflit with master
2018-06-21 13:26:18 +08:00
db7e30ea95
add upload invoice and test
2018-06-21 13:15:36 +08:00
385372e3dd
added rate to booking table
2018-06-20 22:54:31 +08:00
a30fd2a0b1
added booking list controller
2018-06-20 22:21:45 +08:00
bc637adcab
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange
...
# Conflicts:
# routes/api.php
2018-06-20 18:41:31 +08:00
498fafd502
added booking lists controller and routes
2018-06-20 18:39:55 +08:00
a7970e2d72
fix conflict
2018-06-20 17:17:22 +08:00
e3c104f902
Done checking marking before register user
2018-06-20 16:57:47 +08:00
b1843c0b9b
Revert back unnessary changes during debug
2018-06-20 02:04:05 +08:00
3f2d9fbfb8
Add controller and table for marking
2018-06-20 00:38:32 +08:00
a5633b7754
supplier booking
2018-06-19 17:26:37 +08:00
1b39ee8bda
Add admin auth middleware
2018-06-19 16:46:32 +08:00
a019ae2616
Fix conflit
2018-06-19 02:52:21 +08:00
e7c63bb4e9
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# routes/api.php
2018-06-18 22:42:16 +08:00
4a4e147072
fix running routes:cache error
...
fix UserBankSlip class not found
fix undefined book_id
added loading when confirm booking
added confirm booking success redirect with correct page
added error handling for upload user bankslip
completed upload user bankslip flow
2018-06-18 22:37:33 +08:00
012fef948e
Reject user bank slip with reason. Add migration for userbankslip.
2018-06-18 18:57:27 +08:00
c303fb0c5f
added update transfer amount function
...
changed bankslip_url to file for upload user bankslip
2018-06-18 18:39:30 +08:00
97062480d5
added get one booking function in controller
...
update routes with booking id pramas
fixed not found routes
fixed count down with real data
moved bookings routes into autenticated route
2018-06-18 17:34:20 +08:00
39c30065f1
Approved user bankslip
2018-06-18 14:05:08 +08:00
d10837c068
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-18 11:16:38 +08:00
8f431ed090
New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel function to bookingcontroller. Get Latest Rate for bookingController@store.
2018-06-16 14:40:39 +08:00
5eb4f46275
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
2018-06-15 23:21:37 +08:00
a449d4f30c
TBD calculation feature
...
updated bookingconfirmationTable frontend
2018-06-15 18:54:03 +08:00
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
a3cb5344ee
updated readme
2018-06-12 09:46:42 +08:00
11ccbd6a91
fix discussion
2018-05-30 12:24:30 +08:00
4210cdc19d
upload purchase order
2018-05-28 17:24:13 +08:00
5c1a4d28c4
customer booking bank slip
2018-05-28 10:58:40 +08:00
315ed64520
added booking seeder
...
updated booking controller
added test for booking
2018-05-19 12:33:48 +08:00
204af7cf5e
merge master
2018-05-15 12:35:52 +08:00
bc6f948314
added unit testing
2018-05-15 10:59:26 +08:00
47975d6de2
fix conflict
2018-05-14 10:45:15 +08:00
f56a858e18
new upload china bankslip
2018-05-08 15:24:21 +08:00
8da0cbceec
added seeder
...
added user to return role
2018-05-07 17:38:31 +08:00
3373524bc1
added entrust role based permission
2018-05-07 16:25:42 +08:00
Too
Jack Goh
Nazri Hamzah
Mohd Arief
jack