Commit Graph

196 Commits

Author SHA1 Message Date
omair saleh 4a4b5b8127 fixing bugs 2021-05-19 12:29:29 +08:00
omair saleh 3fa5a03a0d fixing bugs 2021-05-18 17:19:07 +08:00
omair saleh 9b6fe510f5 fixing bugs 2021-05-18 17:17:21 +08:00
omair saleh 95ff2f027f fixing bugs 2021-05-18 17:14:56 +08:00
omair saleh 58d91e8d05 fixing bugs 2021-05-18 17:14:29 +08:00
omair saleh 36f0fa889f fixing bugs 2021-05-18 17:04:33 +08:00
omair saleh 325bf6bc26 fixing bugs 2021-05-18 17:04:22 +08:00
omair saleh f3841d821d fixing bugs 2021-05-18 16:56:36 +08:00
omair saleh 529bc7f505 fixing bugs 2021-05-18 14:27:14 +08:00
omair saleh 4b950fc373 fixing bugs 2021-05-18 13:59:31 +08:00
omair saleh 0db67c67cc Merge branch 'merge_existing_booking' into 'master'
Merge existing booking

See merge request CIEFWorldwideSdnBhd/exchange-2.0!38
2021-05-18 05:43:05 +00:00
Fairuz 2c70e23e8e EXCHANGE-149, EXCHANGE-156 - Hide link, disabled post merge API 2021-05-18 13:37:26 +08:00
Fairuz e5fce3c781 Merge remote-tracking branch 'origin' into merge_existing_booking 2021-05-17 19:21:39 +08:00
Fairuz c47d6ebd64 EXCHANGE-149, EXCHANGE-156 - Bug fixes, clean-up. Updated seeder to create sample transactions 2021-05-17 19:20:47 +08:00
omair saleh ccb9afa967 fixing bugs 2021-05-17 17:38:00 +08:00
Fairuz 8e5e0fee24 EXCHANGE-149, EXCHANGE-156 - Bug fixes, clean-up. Updated seeder to create sample transactions 2021-05-15 14:09:39 +08:00
Fairuz 3a867e5b62 Merge remote-tracking branch 'origin' into merge_existing_booking 2021-05-15 13:25:29 +08:00
Fairuz 9dd0a8d786 EXCHANGE-149, EXCHANGE-156 - Bug fixes, clean-up. Added seeder to create sample transactions 2021-05-15 13:23:23 +08:00
omair saleh 27e74e0b2d fixing bugs 2021-05-12 18:25:50 +08:00
omair saleh 7430d28cec fixing bugs 2021-05-12 18:11:49 +08:00
omair saleh 5739f3f3a2 fixing bugs 2021-05-12 18:10:54 +08:00
Fairuz 55717afc14 Resolve conflict 2021-05-12 17:04:51 +08:00
Fairuz 97bd0f9488 EXCHANGE-149 - Frontend bug fixes, clean-up 2021-05-12 16:54:22 +08:00
Fairuz 5a55c2c808 EXCHANGE-149 - Backend APIs bug fixes, clean-up 2021-05-12 16:54:22 +08:00
Fairuz 1682fe152a EXCHANGE-149 - Backend for process merge 2021-05-12 16:54:22 +08:00
Fairuz 095f4052bc EXCHANGE-149 - Confirmation modal for merge bookings (abit on backend for process merge) 2021-05-12 16:54:22 +08:00
Fairuz 609dd06bb8 EXCHANGE-149 - Layout, components for merge bookings (abit on backend for filter booking list) 2021-05-12 16:54:22 +08:00
omair saleh 8e363fb740 fixing bugs 2021-05-12 16:29:59 +08:00
omair saleh 80e3276193 fixing bugs 2021-05-12 12:06:38 +08:00
omair saleh 350cae9785 fixing bugs 2021-05-12 10:38:54 +08:00
omair saleh 06b659d1e2 fixing bugs 2021-05-12 10:36:36 +08:00
omair saleh 2809a2a661 fixing bugs 2021-05-12 05:41:06 +08:00
omair saleh dc1a996eee fixing bugs 2021-05-12 05:39:50 +08:00
omair saleh 366a4d87b3 fixing bugs 2021-05-12 05:19:37 +08:00
omair saleh 760a592d9f fixing bugs 2021-05-11 22:48:33 +08:00
omair saleh 9e69169daf fixing bugs 2021-05-11 22:47:16 +08:00
omair saleh c022a5eb93 fixing bugs 2021-05-11 22:27:29 +08:00
omair saleh 8f0bc3bc8a fixing bugs 2021-05-11 19:53:46 +08:00
Fairuz f1f929498a EXCHANGE-149 - Backend for process merge 2021-05-11 15:24:40 +08:00
Fairuz 94904ee373 EXCHANGE-149 - Confirmation modal for merge bookings (abit on backend for process merge) 2021-05-10 17:02:33 +08:00
Fairuz d3c670aeed EXCHANGE-149 - Layout, components for merge bookings (abit on backend for filter booking list) 2021-05-06 18:06:17 +08:00
omair saleh 21ee4333ba fixing bugs 2021-05-06 14:01:01 +08:00
omair saleh bf8e59934a Merge branch 'completed_order_improve_UI' into 'master'
style: improve booking detail UI , show booking status.

See merge request CIEFWorldwideSdnBhd/exchange-2.0!37
2021-05-05 15:15:06 +00:00
omair saleh 43eacfbe2c Merge branch 'invoice_document_amendment' into 'master'
Invoice document amendment

See merge request CIEFWorldwideSdnBhd/exchange-2.0!36
2021-05-05 15:02:33 +00:00
weichien 4274a9d34b style: improve booking detail UI , show booking status. 2021-05-05 11:47:23 +08:00
omair saleh a889a5082a fixing bugs 2021-05-04 11:23:54 +08:00
glovetleong fe98f908af Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into invoice_document_amendment 2021-05-03 14:53:18 +08:00
glovetleong 4d021cb285 add service charge and tax 2021-05-03 14:53:05 +08:00
omair saleh 716fbfaa8c Merge branch 'invoice_document_amendment' into 'master'
Invoice Document Amendment

See merge request CIEFWorldwideSdnBhd/exchange-2.0!35
2021-04-30 04:56:02 +00:00
glovetleong 590021bde9 Invoice Document Amendment 2021-04-29 00:33:25 +08:00