Commit Graph

423 Commits

Author SHA1 Message Date
lonetrinity e3624621ee fix/homeBookingForm 2018-10-15 12:11:23 +08:00
lonetrinity fdf253005f fix/uploaduserBankSlip 2018-10-11 16:33:26 +08:00
lonetrinity a88d84ad01 fixhomePaymentElicon 2018-10-11 11:43:22 +08:00
lonetrinity 94b08cb04d fix/uploadPoandMinorBugs 2018-10-08 16:18:56 +08:00
lonetrinity b4da087385 fix/importerBookingNameOrder 2018-10-05 16:54:51 +08:00
lonetrinity af91e85efa Fix/RegisterErrorMessage 2018-10-05 16:32:30 +08:00
lonetrinity 860dec47e9 fix/uploadPictureInCompressedMethod 2018-09-28 18:10:50 +08:00
lonetrinity 6022a8fccd fix/removeDeleteandAddBankStatus 2018-09-25 15:04:03 +08:00
lonetrinity bcf83b167c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/uploadBankSlip 2018-09-25 10:00:46 +08:00
lonetrinity 5e8d4f3631 fix/submitButtonDisabled 2018-09-19 14:28:00 +08:00
Jack Goh c368a8c5aa fix real time update rate not working 2018-09-18 11:24:38 +08:00
lonetrinity 76d06372b6 savechanges 2018-09-12 22:01:17 +08:00
lonetrinity 31febb4b49 npmErrorSolved 2018-09-12 20:59:45 +08:00
lonetrinity aab3de8246 fix/ButtonName 2018-09-12 16:29:20 +08:00
lonetrinity c639f04db4 fix/ButtonName 2018-09-12 16:24:57 +08:00
lonetrinity 8617df285f fixMergeConflicts2 2018-09-12 15:47:34 +08:00
lonetrinity d8c993ab31 fixMergeConflicts 2018-09-12 15:45:09 +08:00
lonetrinity ced8c02203 fixBankInSlip 2018-09-12 15:36:49 +08:00
Jack Goh 0a754075de Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting
# Conflicts:
#	resources/assets/js/pages/home.vue
2018-09-03 14:41:39 +08:00
Jack Goh af9967a864 remove USD sorting
fixed term sorting
2018-09-03 14:39:38 +08:00
Jack Goh 25d1dd4e9f temporary disable cancel booking button due to untested feature 2018-09-03 14:19:36 +08:00
Jack Goh 7a2f55bca5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/sorting
# Conflicts:
#	public/mix-manifest.json
2018-09-03 14:14:43 +08:00
Jack Goh 994ef1b261 temporary disabled cancel button, due to not tested 2018-09-03 14:11:32 +08:00
Jack Goh 32986788dd Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into addMarkingColumn 2018-09-03 14:09:03 +08:00
Jack Goh 37a95e6d05 added po format 2018-09-03 13:35:31 +08:00
lonetrinity fa752a087d column marking 2018-08-28 11:01:23 +08:00
lonetrinity ac9681956d addMarkingcolumnToAdmin 2018-08-27 18:00:25 +08:00
lonetrinity a31d1ddf3f lingges/featureSorting 2018-08-27 17:46:48 +08:00
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