Commit Graph

217 Commits

Author SHA1 Message Date
Omair Saleh 30a0fac89d clean up all unnecessary files 2019-03-18 13:23:07 +08:00
Omair Saleh 187e3a4ff9 clean up all unnecessary files 2019-03-18 13:18:13 +08:00
Omair Saleh 6e5416e34a clean up all unnecessary files 2019-03-18 10:12:16 +08:00
Omair Saleh cf3e19ac29 cancel bookings 2018-12-31 10:37:31 +08:00
Omair Saleh 3a34519ffa admin user bookings 2018-12-20 18:06:17 +08:00
Omair Saleh 85e2d1f244 fix reset password email 2018-12-20 17:54:01 +08:00
Omair Saleh 344c854792 fix step no 4, and add filter for the bookings list 2018-12-07 16:12:48 +08:00
lonetrinity 21793252b5 changeImageUploader 2018-10-25 16:43:23 +08:00
lonetrinity b188de0747 fix/serviceCharge 2018-10-11 15:37:13 +08:00
lonetrinity 3cd7ed8226 fix/serviceCharges 2018-10-11 14:40:13 +08:00
lonetrinity ad7a74a901 serviceChargeCorrection 2018-10-10 12:31:05 +08:00
lonetrinity 94b08cb04d fix/uploadPoandMinorBugs 2018-10-08 16:18:56 +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 76d06372b6 savechanges 2018-09-12 22:01:17 +08:00
lonetrinity 85217451f7 fixNpmError2 2018-09-12 20:41:03 +08:00
lonetrinity a999d92b05 npmError 2018-09-12 20:35:28 +08:00
lonetrinity 245e722ae5 fixMergeConflicts3 2018-09-12 15:51:02 +08:00
lonetrinity d8c993ab31 fixMergeConflicts 2018-09-12 15:45:09 +08:00
lonetrinity ced8c02203 fixBankInSlip 2018-09-12 15:36:49 +08:00
lonetrinity 81112e4080 cancelationBooking 2018-08-25 11:55:01 +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 98732a6d62 fix all user's booking in booking table to specifc user only 2018-08-23 10:55:14 +08:00
Jack Goh 068cdb18e7 added back service charge
updated change log
2018-08-20 17:56:10 +08:00
Jack Goh b26727e5e6 fixed admin and user normal booking table with completed booking bug 2018-08-20 17:18:39 +08:00
lonetrinity a85b8eb41e fixBookingTable 2018-08-17 14:57:33 +08:00
lonetrinity 249894d5b2 fixAdminCommit 2018-08-17 11:12:15 +08:00
lonetrinity 7d1155651b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into admin_Completed_Order 2018-08-17 11:04:51 +08:00
lonetrinity 5db9908a57 prepare to merge 2018-08-17 11:04:44 +08:00
Jack Goh f7c0fdc690 fix test 2018-08-16 17:52:37 +08:00
Jack Goh 2fff081268 remove notification 2018-08-16 10:23:52 +08:00
Jack Goh e03dc2e562 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/notification 2018-08-16 10:12:20 +08:00
Jack Goh f6bd74ed5e removed unused code 2018-08-16 10:12:05 +08:00
Jack Goh 5671d1ceeb Merge branch 'fix/importer-notification' into 'master'
fixed the notification bug on importer side

See merge request CIEFWorldwideSdnBhd/exchange!120
2018-08-16 02:09:25 +00:00
Mohd Arief 117f2cdaee fixed the notification bug on importer side 2018-08-16 10:01:44 +08:00
Jack Goh 7bbe69638c fix unauthorized booking access 2018-08-16 09:52:40 +08:00
Jack Goh 232edde8e4 fix unauthorized booking access 2018-08-16 09:40:54 +08:00
Jack Goh 84358ce452 updated with no service charge 2018-08-15 16:38:03 +08:00
lonetrinity 3a39f7407c lingges fix_Status 2018-08-15 14:35:26 +08:00
Jack Goh 0e5293327d update x2 complete booking status 2018-08-14 10:48:13 +08:00
Jack Goh e86ce45689 Merge branch 'fix/slice-error' into 'master'
Fix/slice error

See merge request CIEFWorldwideSdnBhd/exchange!117
2018-08-13 08:40:27 +00:00
Jack Goh 0bf62c00dc fix admin index table dont show completed 2018-08-13 16:33:33 +08:00
Jack Goh 5821ec80b2 Merge branch 'fix/slice-error' into 'master'
Fix/slice error

See merge request CIEFWorldwideSdnBhd/exchange!115
2018-08-13 07:39:16 +00:00
Jack Goh ff9db8e6ff fix user completed table 2018-08-13 15:12:31 +08:00
Jack Goh 35cfdfeaa9 Merge branch 'fix/slice-error' into 'master'
fix booking not found bug

See merge request CIEFWorldwideSdnBhd/exchange!114
2018-08-13 07:10:26 +00:00
Jack Goh a68095f203 fix booking not found bug 2018-08-13 15:04:36 +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 92fe8d99f7 fix bankslip aprrove bug 2018-08-13 12:22:26 +08:00
Jack Goh 91c0bec289 added bank name and bank branch to booking calcualation 2018-08-13 11:36:26 +08:00