534ad41fd3
fix conflict
2018-06-27 17:25:11 +08:00
32b0eda067
fix merge conflict
2018-06-27 16:54:40 +08:00
73000a9818
update route for admin top nav content
2018-06-27 16:33:41 +08:00
5e62b3e90d
complete the top nav content
2018-06-27 15:42:16 +08:00
781c78b942
Merge branch 'integration/book-supplier' into 'master'
...
Integration/book supplier
See merge request CIEFWorldwideSdnBhd/exchange!36
2018-06-27 07:32:36 +00: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
3ce9fdf9db
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/book-supplier
...
# Conflicts:
# resources/assets/js/pages/admin/booking/supplierBooking.vue
2018-06-27 14:24:48 +08:00
aa528cfa39
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!35
2018-06-27 06:23:36 +00:00
298da7d24b
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# resources/assets/js/pages/admin/booking/supplierBooking.vue
2018-06-27 14:23:19 +08:00
6e8c81f285
added logic if supplierbooking already exist prevent user from creating
2018-06-27 14:21:55 +08:00
fb6f3e398e
update rate function done
2018-06-27 12:34:19 +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
5dfc6ddeb2
Merge branch 'nazri/userbankslip' into 'master'
...
supplier booking
See merge request CIEFWorldwideSdnBhd/exchange!21
2018-06-27 02:55:44 +00:00
5e63be02a9
erge branch 'nazri/userbankslip' of gitlab.com:CIEFWorldwideSdnBhd/exchange into nazri/userbankslip
2018-06-27 10:46:53 +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
f078be408d
fix migration errors
2018-06-27 10:09:06 +08:00
299597ed16
update book supplier routes to admin routes
2018-06-27 09:58:09 +08:00
fdb474ccc7
fix conflict booking controller
2018-06-27 09:58:04 +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
2b4f1c6ddc
rge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
2018-06-27 09:29:35 +08:00
b802a91e18
Merge branch 'too/validatefilesize' into 'master'
...
Too/validatefilesize
See merge request CIEFWorldwideSdnBhd/exchange!33
2018-06-26 14:32:18 +00:00
819da14684
revert back changes during debug
2018-06-26 22:24:47 +08: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
2ed9f51ffd
update top nav only admin can see
2018-06-26 18:30:41 +08:00
a17a692549
fix conflict
2018-06-26 18:23:00 +08:00
1f91cddda5
show top navigation only if user already login
2018-06-26 18:21:40 +08:00
acfd8eeb48
supplier booking (multiple booking removed)
2018-06-26 18:17:38 +08:00
e1c931efed
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
2018-06-26 18:09:27 +08:00
f108d7ee51
updated axios booking supplier form
2018-06-26 18:09:11 +08:00
21338401c4
update supplierbooking frontend
2018-06-26 17:56:51 +08:00
f262830b1b
Merge branch 'arief/admin-settings-content' into 'master'
...
completed the setting content
See merge request CIEFWorldwideSdnBhd/exchange!32
2018-06-26 09:42:24 +00:00
fd03f5b248
updated approvebankslip booking not found
...
updated update status upon userbankslip approved
updated update status upon userbankslip rejected
updated supplier index to display value and label for input select
updated supplierBooking frontend
completed booking accept and reject integration
2018-06-26 17:40:44 +08:00
045c137dab
update dialog name
2018-06-26 17:28:22 +08:00
2bf0df8b62
Merge branch 'arief/admin-setting-frontend' into 'master'
...
Arief/admin setting frontend
See merge request CIEFWorldwideSdnBhd/exchange!29
2018-06-26 09:08:15 +00:00
c8ff54f79a
completed the setting content
2018-06-26 16:55:31 +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
ee59dc69d5
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
2018-06-26 14:41:45 +08:00
5366353484
updated loading button param
2018-06-26 14:41:37 +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
366f91352b
Merge branch 'too/timelimit' into 'master'
...
get_time_limit
See merge request CIEFWorldwideSdnBhd/exchange!30
2018-06-26 06:31:53 +00:00
dec9ba9405
fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller
2018-06-26 12:28:17 +08:00
852c64f35b
completed display user bankslip in verification frontend
2018-06-26 12:27:09 +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
Mohd Arief
Jack Goh
Nazri Hamzah
Too