Commit Graph

83 Commits

Author SHA1 Message Date
omair saleh 4b950fc373 fixing bugs 2021-05-18 13:59:31 +08: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
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 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 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 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 4d021cb285 add service charge and tax 2021-05-03 14:53:05 +08:00
glovetleong 590021bde9 Invoice Document Amendment 2021-04-29 00:33:25 +08:00
omair saleh 69eccb2d9c fixing bugs 2021-04-27 14:56:53 +08:00
omair saleh 812d4ccc66 Merge branch 'invoice_download_styling' into 'master'
Invoice download styling

See merge request CIEFWorldwideSdnBhd/exchange-2.0!34
2021-04-27 03:40:54 +00:00
omair saleh cff48c510d Merge branch 'invoice_download' into 'master'
invoice pdf design

See merge request CIEFWorldwideSdnBhd/exchange-2.0!33
2021-04-27 03:40:37 +00:00
weichien a3df023adb add cief logo 2021-04-27 03:13:02 +08:00
weichien ff72d9a0d0 fix: PDF document standard CSS styling 2021-04-27 02:34:23 +08:00
weichien a78ebbd322 update - 4 document blade files. 2021-04-27 02:07:29 +08:00
omair saleh 9d2fcda5e6 fixing bugs 2021-04-21 16:53:11 +08:00
glovetleong 865fe11bf7 invoice pdf design 2021-04-12 14:44:05 +08:00
glovetleong 1d2f10079e Booking Detail Invoice Download (Frontend & Backend) 2021-04-04 15:37:49 +08:00
omair saleh e97d2236a9 Merge branch 'Bug/128-recipients_bank_acc_duplicates' into 'master'
Bug/128 recipients bank acc duplicates

See merge request CIEFWorldwideSdnBhd/exchange-2.0!31
2021-04-03 03:52:36 +00:00
omair saleh 7511e9bdf4 Merge branch 'Bug/129-convert_amount_JS_error' into 'master'
fix: [FE] emit updateCalculation method with total -1 when amount less than...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!30
2021-04-03 03:52:10 +00:00
omair saleh 3af7c8062f Merge branch 'Bug/137-js_error_on_billing_detail' into 'master'
fix: [FE] clear the section prop and default_address vue warning.

See merge request CIEFWorldwideSdnBhd/exchange-2.0!29
2021-04-03 03:51:49 +00:00
glovetleong b353f01721 Display Only Payment Transaction
Js Error on Dashboard (Frontend)
 Document Upload Multiple (Frontend)
2021-04-03 09:28:20 +08:00
weichien ed09e8bb21 fix: [FE] clear the section prop and default_address vue warning. 2021-04-02 11:14:24 +08:00
weichien 460afc1b37 fix: [FE] emit updateCalculation method with total -1 when amount less than RM100. in-order to hide "Transfer Now" button 2021-04-02 10:16:29 +08:00
weichien 6801b6a77d fix: [FE] avoid trigger parent's updateCalculation method when amount is below RMB100 2021-04-02 01:03:03 +08:00
weichien 6f9b7c280a fix: [FE] Avoid duplicate when select recipient bank info. 2021-04-02 00:25:30 +08:00