 Too
|
fdcaa31ffe
|
Add upload file maxsize checking in booking controller
|
2018-06-26 21:39:24 +08:00 |
|
 Jack Goh
|
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 |
|
 Mohd Arief
|
045c137dab
|
update dialog name
|
2018-06-26 17:28:22 +08:00 |
|
|
Jack Goh
|
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 |
|
|
Mohd Arief
|
c8ff54f79a
|
completed the setting content
|
2018-06-26 16:55:31 +08:00 |
|
|
Jack Goh
|
41a265e1a0
|
Merge branch 'too/ETA' into 'master'
Too/eta
See merge request CIEFWorldwideSdnBhd/exchange!31
|
2018-06-26 06:32:48 +00:00 |
|
|
Jack Goh
|
366f91352b
|
Merge branch 'too/timelimit' into 'master'
get_time_limit
See merge request CIEFWorldwideSdnBhd/exchange!30
|
2018-06-26 06:31:53 +00:00 |
|
|
Too
|
dec9ba9405
|
fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller
|
2018-06-26 12:28:17 +08:00 |
|
|
Too
|
a498d370cf
|
remove eta from booking
|
2018-06-26 12:21:53 +08:00 |
|
|
Too
|
428660a91d
|
Merge branch 'too/ETA' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/ETA
|
2018-06-26 12:19:52 +08:00 |
|
|
Too
|
c6ef6219a3
|
fix conflit
|
2018-06-26 12:19:08 +08:00 |
|
|
Too
|
0a6bd2c405
|
Add eta
|
2018-06-26 12:17:12 +08:00 |
|
|
Too
|
f31f39caec
|
Add seeder and test for setting_credit
|
2018-06-26 11:47:48 +08:00 |
|
|
Too
|
ec6db69373
|
Add ETA for booking table
|
2018-06-26 11:28:53 +08:00 |
|
|
Mohd Arief
|
6f510c93cc
|
solved merge conflict
|
2018-06-26 10:40:35 +08:00 |
|
|
Mohd Arief
|
3a7edc8401
|
update admin setting
|
2018-06-26 10:30:57 +08:00 |
|
|
Too
|
3129da5df4
|
get_time_limit
|
2018-06-25 18:16:20 +08:00 |
|
|
Jack Goh
|
a3d8eff9e0
|
Merge branch 'feature/admin-home-frontend' into 'master'
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!28
|
2018-06-25 08:57:41 +00:00 |
|
|
Jack Goh
|
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 |
|
|
Mohd Arief
|
069883deeb
|
complete the admin setting navbar
|
2018-06-25 16:57:18 +08:00 |
|
|
Jack Goh
|
b715663d47
|
updated adminshow function
|
2018-06-25 16:56:36 +08:00 |
|
|
Jack Goh
|
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 |
|
|
Jack Goh
|
0db893d07b
|
Merge branch 'too/creditlimit' into 'master'
add handle for exceed credit limit
See merge request CIEFWorldwideSdnBhd/exchange!27
|
2018-06-25 08:32:22 +00:00 |
|
|
Too
|
9aea239c52
|
add handle for exceed credit limit
|
2018-06-25 16:03:24 +08:00 |
|
|
Jack Goh
|
1e7f076335
|
updated booking status on upload user bankslip
revert back the correct routes for user
update user path names
|
2018-06-25 15:45:02 +08:00 |
|
|
Jack Goh
|
bf40262994
|
added admin booking list controller
|
2018-06-23 00:40:50 +08:00 |
|
|
Mohd Arief
|
620e496f0e
|
update route.js
|
2018-06-22 16:53:14 +08:00 |
|
|
Mohd Arief
|
72f9aee7c8
|
solved conflict
|
2018-06-22 16:31:56 +08:00 |
|
|
Jack Goh
|
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 |
|
|
Mohd Arief
|
1f757fc7b1
|
make changes in route.js
|
2018-06-22 11:33:07 +08:00 |
|
|
Jack Goh
|
47b2c34bf9
|
update booking status redirection
|
2018-06-21 21:55:38 +08:00 |
|
|
Jack Goh
|
8ff5abcc2b
|
updated routes name
|
2018-06-21 19:12:17 +08:00 |
|
|
Jack Goh
|
401b016fe0
|
updated routes
|
2018-06-21 19:07:21 +08:00 |
|
|
Jack Goh
|
81a8505fb1
|
added nessasary files for the admin pages
|
2018-06-21 18:02:08 +08:00 |
|
|
Jack Goh
|
ee66f7614f
|
added admin progress track component
|
2018-06-21 17:51:47 +08:00 |
|
|
Jack Goh
|
b9c0bc53fd
|
added booking table to admin home
integrate booking list to admin home
|
2018-06-21 17:35:08 +08:00 |
|
|
Jack Goh
|
b5d8fd4e72
|
added bookingtable
|
2018-06-21 16:38:59 +08:00 |
|
|
Jack Goh
|
9acf2a773e
|
fix admin routes on vuejs
|
2018-06-21 16:35:09 +08:00 |
|
|
Jack Goh
|
efb5f21567
|
Merge branch 'feature/user-uploadpo-frontend' into 'master'
removed amount from uploadpo
See merge request CIEFWorldwideSdnBhd/exchange!26
|
2018-06-21 07:49:10 +00:00 |
|
|
Jack Goh
|
aaf0decd97
|
removed amount from uploadpo
added confirmpo after user upload their po
completed uploadpo integration
|
2018-06-21 15:48:24 +08:00 |
|
|
Jack Goh
|
c4e85d0e6d
|
Merge branch 'bug/bookinglist-timeout-countdown' into 'master'
Bug/bookinglist timeout countdown
See merge request CIEFWorldwideSdnBhd/exchange!25
|
2018-06-21 07:05:48 +00:00 |
|
|
Jack Goh
|
1e6d38646e
|
update ignore file
|
2018-06-21 15:05:16 +08:00 |
|
|
Jack Goh
|
de7161369c
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown
|
2018-06-21 14:48:48 +08:00 |
|
|
Jack Goh
|
46873c7107
|
added handlecountdowned function
|
2018-06-21 14:48:17 +08:00 |
|
|
Jack Goh
|
b405f05369
|
Merge branch 'too/uploadinvoice' into 'master'
Too/uploadinvoice
See merge request CIEFWorldwideSdnBhd/exchange!24
|
2018-06-21 06:40:54 +00:00 |
|
|
Too
|
453852c7ea
|
rename image_url to image_path in user_bank_slip,invoice,purchase_order
|
2018-06-21 14:36:33 +08:00 |
|
|
Jack Goh
|
3c263b56ea
|
fix 404 not found for upload user bankslip
added display term on booking table
|
2018-06-21 14:31:53 +08:00 |
|
|
Too
|
de45782ae3
|
fix conflit with master
|
2018-06-21 13:26:18 +08:00 |
|
|
Too
|
db7e30ea95
|
add upload invoice and test
|
2018-06-21 13:15:36 +08:00 |
|
|
Jack Goh
|
23b024c2fb
|
fixed status description not found
removed timeout on home page
added timeout handling in upload user bankslip
|
2018-06-21 12:45:05 +08:00 |
|