 lonetrinity
|
31653556f5
|
lingges/featureSorting
|
2018-08-25 13:04:48 +08:00 |
|
|
lonetrinity
|
3972bf2f63
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into cancelBooking
|
2018-08-24 16:07:23 +08:00 |
|
|
lonetrinity
|
a88fdb62ae
|
merge
|
2018-08-24 16:07:09 +08:00 |
|
 Jack Goh
|
da55ae0c3d
|
Merge branch 'fix/admin-status-button' into 'master'
fixed the View status button on admin completed order
See merge request CIEFWorldwideSdnBhd/exchange!127
|
2018-08-23 10:06:58 +00:00 |
|
|
Jack Goh
|
19ba992608
|
added bank name label to active bank setting dropdown list
|
2018-08-23 10:11:56 +08:00 |
|
 Mohd Arief
|
c3cd1d70ea
|
fixed the View status button on admin completed order
|
2018-08-21 12:02:35 +08:00 |
|
|
Mohd Arief
|
9740392d4c
|
fixed conflict
|
2018-08-17 11:26:14 +08:00 |
|
|
Mohd Arief
|
16e7efa108
|
updated the refresh button function
|
2018-08-17 11:21:41 +08:00 |
|
|
Mohd Arief
|
d6eb6576d3
|
updated refresh button
|
2018-08-17 11:13:17 +08:00 |
|
|
Mohd Arief
|
df068d8c71
|
Revert "fixed the refresh button for completed order"
This reverts commit 424097e035.
|
2018-08-17 11:07:26 +08:00 |
|
|
Mohd Arief
|
424097e035
|
fixed the refresh button for completed order
|
2018-08-17 11:00:35 +08:00 |
|
|
Jack Goh
|
37a22322f4
|
updated pusher to use environtment key
|
2018-08-17 09:36:08 +08:00 |
|
|
Jack Goh
|
57331363c0
|
update realtime rate on user home page
|
2018-08-16 17:11:39 +08:00 |
|
|
Jack Goh
|
d295b5d9b4
|
removed some .env-example duplication config
updated rate updated event
added listener to user home page
|
2018-08-16 17:08:15 +08:00 |
|
|
Jack Goh
|
5bc4f5929d
|
removed all notifications code
|
2018-08-16 10:23:03 +08:00 |
|
|
Jack Goh
|
bc43a2ee1e
|
removed "please key in the data in chinese" label
|
2018-08-15 17:10:18 +08:00 |
|
|
Jack Goh
|
6e9f2b2d10
|
removed "please key in the data in chinese" label in footer
|
2018-08-15 17:07:25 +08:00 |
|
|
Jack Goh
|
0e5ed8f7f6
|
removed v-validate
updated some required field to non required field
|
2018-08-15 17:06:31 +08:00 |
|
|
Jack Goh
|
1d41c651b9
|
removed some required field on malaysia bank field
|
2018-08-15 17:02:19 +08:00 |
|
|
Jack Goh
|
53ce807aec
|
remove v-validate from admin malaysia bank setting
|
2018-08-15 16:58:34 +08:00 |
|
|
Jack Goh
|
7b1541a57f
|
fix typo
|
2018-08-15 16:36:41 +08:00 |
|
|
Jack Goh
|
1ee5b6952f
|
added bank name to bank setting select label
|
2018-08-15 15:21:55 +08:00 |
|
|
Jack Goh
|
f35bb1c43c
|
Merge branch 'fix/slice-error' into 'master'
fix slice error in user transfer page
See merge request CIEFWorldwideSdnBhd/exchange!113
|
2018-08-13 06:52:14 +00:00 |
|
|
Jack Goh
|
0c7cd0b201
|
fix slice error in user transfer page
|
2018-08-13 14:46:23 +08:00 |
|
|
Jack Goh
|
a938aab8fe
|
Merge branch 'fix/frontend-marking' into 'master'
fix marking bug - when typing chinese
See merge request CIEFWorldwideSdnBhd/exchange!112
|
2018-08-13 06:09:28 +00:00 |
|
|
Jack Goh
|
b5c8688a56
|
fix unknow column when testing
|
2018-08-13 12:40:08 +08:00 |
|
|
Jack Goh
|
356b1e5267
|
remove complete order nav from admin
updated name of the tab
|
2018-08-13 12:27:55 +08:00 |
|
|
Jack Goh
|
796e8bf6df
|
fix marking bug - when typing chinese
|
2018-08-13 12:07:15 +08:00 |
|
|
Jack Goh
|
91c0bec289
|
added bank name and bank branch to booking calcualation
|
2018-08-13 11:36:26 +08:00 |
|
|
lonetrinity
|
326ef7dd5f
|
fix/mergeConflicts
|
2018-08-11 10:30:16 +08:00 |
|
|
lonetrinity
|
98db669a64
|
fix/discussionResolved
|
2018-08-11 10:23:15 +08:00 |
|
|
lonetrinity
|
385cd33211
|
resolved discussion
|
2018-08-10 18:15:55 +08:00 |
|
|
lonetrinity
|
3f38fef845
|
fixPaginationAdmin_and_user
|
2018-08-10 17:45:01 +08:00 |
|
|
Jack Goh
|
6442a58746
|
remove remember me because it does nothing
|
2018-08-10 17:41:23 +08:00 |
|
|
Jack Goh
|
144b57bc52
|
fix upload user bankslip page bug
|
2018-08-10 09:49:34 +08:00 |
|
|
Jack Goh
|
6fe1fc4257
|
fix password reset link not found bug
|
2018-08-09 17:37:01 +08:00 |
|
|
Mohd Arief
|
615dff66fc
|
fixed the marking bug
|
2018-08-09 16:47:04 +08:00 |
|
|
Jack Goh
|
a9b30e2bb9
|
added supplier booking report to complete page at admin side
|
2018-08-09 12:08:03 +08:00 |
|
|
Jack Goh
|
5eb1771ae1
|
added supplier booking report to upload china bankslip at admin side
|
2018-08-09 11:30:31 +08:00 |
|
|
Jack Goh
|
45391317ef
|
added supplier booking report to upload invoice at admin side
|
2018-08-09 11:24:15 +08:00 |
|
|
Jack Goh
|
e67dabfb5b
|
fix user track status bug
|
2018-08-09 10:55:05 +08:00 |
|
|
Jack Goh
|
5d3ab327ca
|
fix progress track bug for admin side
|
2018-08-09 10:50:59 +08:00 |
|
|
Jack Goh
|
2f3b9baf9b
|
added x2 progress track
|
2018-08-09 10:44:21 +08:00 |
|
|
Jack Goh
|
594c6a74fe
|
fix admin x2 status track
|
2018-08-08 17:11:08 +08:00 |
|
|
Jack Goh
|
06bacfcaf9
|
fixed x2 status for user side
|
2018-08-08 16:31:35 +08:00 |
|
|
lonetrinity
|
97f7041459
|
fix/adminBookingTableComplete
|
2018-08-08 11:55:14 +08:00 |
|
|
lonetrinity
|
63f8584455
|
fix/adminbookingcompletetable
|
2018-08-08 11:48:03 +08:00 |
|
|
Jack Goh
|
ae081ddddf
|
fix booking internal server error due to db not accepting null value
fixed copy right on booking form
update notification seeder
|
2018-08-08 10:41:29 +08:00 |
|
|
lonetrinity
|
80d90d680b
|
fix display booking complete table
|
2018-08-07 19:14:25 +08:00 |
|
|
Jack Goh
|
1061adc094
|
remove composer.lock
fixed navbar error
|
2018-08-07 12:43:21 +08:00 |
|