cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 22:44:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,436 Commits 175 Branches 0 Tags
e4e2a8a9a1ead61197e093cbaa29fd4c021b5379
Commit Graph

1903 Commits

Author SHA1 Message Date
Jia Sheng 79dd0554b1 Merge branch 'change-credit-note-to-refund-note' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-04 22:08:30 +08:00
Dillon Ngo 929cb2c0a6 Test sending welcome voucher email through server 2024-07-03 19:21:50 +08:00
Dillon Ngo 508260221e Merge branch 'dillon/63-voucherify-updates' into development 2024-07-03 18:41:21 +08:00
Dillon Ngo 692789d014 Test sending welcome voucher email through server 2024-07-03 18:41:03 +08:00
Jia Sheng 92dea42a44 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-30 12:19:10 +08:00
Jia Sheng a4b09cedb1 include refund service charges for partial refund 2024-06-30 12:18:40 +08:00
Jia Sheng 9fb4ac7d63 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-24 22:45:43 +08:00
Jia Sheng c34bacccfd -fix expired booking command to ignore 1688 as 1688 may not have PO initally 
-create command to revert those fully refunded payment transaction from status EXPIRED to REFUNDED
 2024-06-24 22:45:21 +08:00
Jia Sheng 95bcf23fc1 Merge branch 'clear-booking-backlog' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-24 21:06:30 +08:00
Jia Sheng 84ff900629 comment out booking expired command in kernel 2024-06-24 21:06:05 +08:00
Jia Sheng e5bac3db51 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-18 23:27:57 +08:00
Jia Sheng 3f6dde7462 add cancel bill group function 2024-06-18 23:25:55 +08:00
Jia Sheng 204a8e6f5b Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-18 22:48:45 +08:00
Jia Sheng 4e33069574 test log 2024-06-18 22:47:53 +08:00
Jia Sheng 28472aed41 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-16 12:12:13 +08:00
JiaSheng b31d592e4a update command logic 2024-06-16 11:50:29 +08:00
JiaSheng 764b82dc1c Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-06-09 14:45:14 +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 ab4f56e4c1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
 2024-05-23 13:37:25 +08:00
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +08:00
Aqqil Azman 3b4f3281b1 Merge branch 'export-currency-vendor-order-module' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-17 10:46:54 +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
edmondlang 7f2af7adf4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-16 10:56:23 +08:00
edmondlang 531b65686f export white form transactions 2024-05-16 10:56:02 +08:00
Aqqil Azman 97a8e34f3d initial commit 2024-05-13 09:58:28 +08:00
JiaSheng cb367d0033 bug fix for update booking amount 2024-05-11 00:01:49 +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 27ee291a47 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-10 00:00:20 +08:00
edmondlang f03d91ba42 add remarks for refund 2024-05-10 00:00:01 +08:00
JiaSheng 23804ecc69 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-08 20:07:43 +08:00
JiaSheng b8d741f57c fix edit transfer fee bug 2024-05-08 20:07:06 +08:00
JiaSheng 0cd3e6fd9d add missing receiver in filters to development portal 2024-05-08 15:33:32 +08:00
JiaSheng 26f8ca87cd fix partial refund bug 2024-05-08 12:58:23 +08:00
JiaSheng 2775b21cd5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-05-06 17:20:53 +08:00
JiaSheng 76e76e077a edit transfer fee functionality for individual whiteform 2024-05-06 17:20:01 +08:00
Omair Saleh f57b1e625f update estimated delivery date for E2E 2024-04-30 17:49:30 +08:00
Omair Saleh f3e35ec31d Merge remote-tracking branch 'origin/master' 2024-04-30 17:46:42 +08:00
Omair Saleh b528ac66fc update estimated delivery date for E2E 2024-04-30 17:46:25 +08:00
JiaSheng a88e832dc5 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-29 21:21:24 +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
edmondlang f63351b715 Merge branch 'remark-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/api.php
#	routes/web.php
 2024-04-25 16:50:48 +08:00
edmondlang 29507f5120 update remark on transactions 2024-04-25 14:50:59 +08:00
Dodowingster 3383f6b138 initial commit 2024-04-25 13:39:40 +08:00
edmondlang 631282eaf5 add remarks table migration 2024-04-24 18:09:22 +08:00
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +08:00
edmondlang 94ea735211 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-16 22:52:14 +08:00
edmondlang 69e9328e74 fix bug cant approve the refund because booking amount cant be updated, error - Booking Amount cannot be less than xxxxx 2024-04-16 22:34:41 +08:00
edmondlang 4770a5be33 Merge branch 'fix-invoice-not-tally-with-voucherify' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-04-09 00:05:13 +08:00
JiaSheng 02d28f8fba fix invoice amount not tally when voucher is apply for booking 2024-04-08 21:17:37 +08:00
Dillon Ngo e25f330d3c Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-02 21:09:22 +08:00