cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,933 Commits 175 Branches 0 Tags
d1f319582a1df0c16506e1bcf9d0dfda9a8ca629
Commit Graph

255 Commits

Author SHA1 Message Date
Jia Sheng d1f319582a alipay service 2024-07-13 14:12:54 +08:00
edmondlang 726d06871b 1688 changes 2024-07-08 19:07:06 +08:00
edmondlang 66c2bb0cca 1688 fields changes 2024-07-03 14:54:47 +08:00
JiaSheng ff88dcecf4 -check group total not tally with bill group total due to transfer fee not being included 
-include the transfer fee calculation
-script to update the bill group to include the transfer fee calculation
 2024-06-09 14:44:06 +08:00
edmondlang 400a5f6bf9 fix refund remarks 2024-05-23 10:28:27 +08:00
edmondlang 6fd7b2f610 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-update 2024-05-22 23:37:47 +08:00
edmondlang 7feb05d784 make refund remarks required 2024-05-22 22:23:59 +08:00
edmondlang 000c418315 make refund remarks required 2024-05-22 21:17:11 +08:00
JiaSheng 5425c37e52 -request multiple refund 
-show remark for refund in dashboard
-show refund remark in export page
 2024-05-22 19:28:42 +08:00
edmondlang 16b67c2ea3 Merge branch 'export-currency-vendor-order-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2024-05-21 11:16:50 +08:00
edmondlang e5cc4481fe update RefundConfirmationComponent display text 2024-05-20 11:47:29 +08:00
edmondlang 3f5c735a43 update export currency vendor order 2024-05-20 11:41:21 +08:00
edmondlang e6eee4aa93 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-18 11:25:57 +08:00
edmondlang e88cdf75f6 code review - correct indentation & add tooltip 2024-05-18 11:25:40 +08:00
Omair Saleh 4ecebdd977 Merge remote-tracking branch 'origin/master' 2024-05-17 13:43:11 +08:00
Omair Saleh 1ce6b895cc hide the estimate for when the recipient will receive the payment 2024-05-17 13:42:54 +08:00
Aqqil Azman 6686bf43ee feat: realign and changed icons 2024-05-16 19:17:10 +08:00
edmondlang 0797f26fe1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module 2024-05-16 17:58:47 +08:00
Aqqil Azman b49a44c99b feat: invoice export 2024-05-16 12:25:53 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 1c8d135074 feat: pdf export 2024-05-15 17:38:57 +08:00
Aqqil Azman 79178698cb refactor: Export Buttons to top row 2024-05-13 09:59:04 +08:00
edmondlang 8fa956e0d7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-05-10 00:17:08 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng b8d741f57c fix edit transfer fee bug 2024-05-08 20:07:06 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
JiaSheng 7655853a6d -open refund function for all admin (ignore whether the booking has invoice or not) 
-when refund is before the whiteform, auto approve the transaction
 2024-04-29 21:19:34 +08:00
JiaSheng 3deba3468a -Approve refund - only super admin 
-If invoice generated - only super admin can request refund
 2024-03-25 15:06:46 +08:00
JiaSheng c95c274db7 update 2024-03-25 00:47:52 +08:00
JiaSheng daa422d41a -auto update booking fix amount once refund approve 2024-03-18 22:13:05 +08:00
edmondlang 0a12bca442 check if have refund in progress 2024-03-17 15:03:46 +08:00
JiaSheng c498aec61d -fix purchase order section state issue when refund request is approved on booking page 
-fix supplier bill group dashboard payment issue
 2024-03-16 09:44:56 +08:00
JiaSheng a1bbc69ec5 -update payment amount under payment history section on booking page 
-export approved refund payment
 2024-03-11 22:13:01 +08:00
JiaSheng b3f97c0ed8 Merge branch 'fix-export-pending-order' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-03-11 21:09:43 +08:00
Omair Saleh 7030041246 fix payment history display transfer status 2024-03-07 11:46:46 +08:00
Omair Saleh 32224f6803 fix payment history display transfer status 2024-03-07 11:43:19 +08:00
Omair Saleh df7f9531e8 fix payment history display transfer status 2024-03-07 11:38:03 +08:00
JiaSheng 73819e967e open partial refund, categorize refunds section in dashboard 2024-03-06 20:56:24 +08:00
JiaSheng 5fd2f6ef7f -complete supplier bill group when oustanding is 0 
-create refund and supplier refund if the request refund order is in white form
 2024-02-28 01:34:39 +08:00
JiaSheng 767d6c84fe update to bill refund for 1688 supplier 2024-02-25 20:43:01 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
Sai0224 ec0ebe3812 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-21 21:14:51 +08:00
edmondlang 609b71f549 code upfate for refund booking 2024-02-19 00:57:42 +08:00
edmondlang f083434390 update refund ui and logic 2024-02-16 14:59:11 +08:00
edmondlang ddcad4969e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-02-06 12:02:06 +08:00
Dillon Ngo 17785cd08f Merge branch 'dillon/41-voucherify-phase-2b' into 'master' 
Voucherify minor interface update to allow user easily select and apply available voucher on checkout

See merge request CIEFWorldwideSdnBhd/exchange-2.0!151
 2024-01-25 14:00:54 +00:00
JiaSheng c8cabee97b update 2024-01-15 23:41:12 +08:00
JiaSheng e5a96e179c add refund transaction under booking payment history, update on admin currency order dashboard to show the correct amount after refunded 2024-01-13 13:27:24 +08:00
JiaSheng 8a05620edf update 2024-01-08 22:41:59 +08:00
JiaSheng a28c695aab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-booking 2024-01-08 21:54:23 +08:00