eec356f22d
fix wrong timeout
...
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
536c67bbc6
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice
...
# Conflicts:
# database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
# database/seeds/DatabaseSeeder.php
2018-06-28 15:55:58 +08:00
265887f0d7
Merge branch 'integration/confirmation-n-transfer' into 'master'
...
update confirmation and transfer page
See merge request CIEFWorldwideSdnBhd/exchange!42
2018-06-28 07:51:03 +00:00
651f762237
update confirmation and transfer page
...
- update booking controller
2018-06-28 15:40:27 +08:00
0cf92b9936
added confirmSupplier booking
...
removed droptable due to database contraints issue
fixed rename booking foreight key in po table issue
added supplierstable seeder
updated supplierreport frontend
updated upload po frontend
2018-06-28 14:46:30 +08:00
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
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
cea2857d0f
added booking foreign key to china bankslip
...
updated upload china bankslip routes
2018-06-27 16:16:48 +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
f078be408d
fix migration errors
2018-06-27 10:09:06 +08:00
d362d947a3
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-27 09:56:35 +08:00
c59aac1e4d
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!34
2018-06-27 01:36:22 +00:00
436b284a3b
Add file size checking. Rename bankslip_url to china_bank_slip_path in chinabankslip table
2018-06-26 22:23:10 +08:00
fdcaa31ffe
Add upload file maxsize checking in booking controller
2018-06-26 21:39:24 +08:00
a17a692549
fix conflict
2018-06-26 18:23:00 +08:00
acfd8eeb48
supplier booking (multiple booking removed)
2018-06-26 18:17:38 +08:00
2023050218
fix conflict
2018-06-26 14:44:48 +08:00
66b0c14f5e
Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# database/seeds/DatabaseSeeder.php
# resources/assets/js/pages/admin/booking/verification.vue
2018-06-26 14:43:53 +08:00
41a265e1a0
Merge branch 'too/ETA' into 'master'
...
Too/eta
See merge request CIEFWorldwideSdnBhd/exchange!31
2018-06-26 06:32:48 +00:00
dec9ba9405
fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller
2018-06-26 12:28:17 +08:00
a498d370cf
remove eta from booking
2018-06-26 12:21:53 +08:00
428660a91d
Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA
2018-06-26 12:19:52 +08:00
c6ef6219a3
fix conflit
2018-06-26 12:19:08 +08:00
0a6bd2c405
Add eta
2018-06-26 12:17:12 +08:00
f31f39caec
Add seeder and test for setting_credit
2018-06-26 11:47:48 +08:00
ec6db69373
Add ETA for booking table
2018-06-26 11:28:53 +08:00
3129da5df4
get_time_limit
2018-06-25 18:16:20 +08:00
ffe1023bba
added credit limit seeder, it causes error when creating booking
2018-06-25 17:48:51 +08:00
1683f5bed5
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-25 16:57:20 +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
9aea239c52
add handle for exceed credit limit
2018-06-25 16:03:24 +08:00
bc49e39df7
added admin status to booking table
...
updated admin progress track steps
added dummy template in admin booking
2018-06-22 12:31:51 +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
453852c7ea
rename image_url to image_path in user_bank_slip,invoice,purchase_order
2018-06-21 14:36:33 +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
d06b8ac359
added status column to booking table
2018-06-21 10:49:45 +08:00
385372e3dd
added rate to booking table
2018-06-20 22:54:31 +08:00
a2dad37758
Check marking before create user
2018-06-20 15:43:04 +08:00
3f2d9fbfb8
Add controller and table for marking
2018-06-20 00:38:32 +08:00
95f4f25dd3
Add test for settingcredit and rate
2018-06-19 18:56:31 +08:00
6a025a6bac
Fix conflit of variable name with master branch.
2018-06-19 13:32:09 +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
39c30065f1
Approved user bankslip
2018-06-18 14:05:08 +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
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
Jack Goh
Mohd Arief
Too
Nazri Hamzah