Commit Graph

3117 Commits

Author SHA1 Message Date
edmondlang 0abebbe167 comment route_logs migration 2023-12-19 00:12:18 +08:00
edmondlang e72e037ed4 revert 2023-12-19 00:08:53 +08:00
edmondlang 84e787f05e test update 2023-12-19 00:02:10 +08:00
edmondlang ed44b09483 Merge branch 'create-index-for-tables' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 23:23:28 +08:00
edmondlang a4489215c2 create index migration for transactions table 2023-12-18 23:10:33 +08:00
JiaSheng 603f29c9d0 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 19:17:32 +08:00
JiaSheng 4d057d0f5f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
update import cief lite
2023-12-18 19:15:34 +08:00
edmondlang 5da5902ba4 Merge branch 'fix-register-issue-with-autofill-credentials' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-13 20:03:45 +08:00
edmondlang eaeb9a92fc fix register issue with autofill credentials 2023-12-13 20:03:16 +08:00
Omair Saleh 1ddf7923a5 show all active services for suppliers when not in segment 2023-12-13 13:38:54 +08:00
Omair Saleh 04da6d2107 Merge remote-tracking branch 'origin/master' 2023-12-13 13:37:13 +08:00
Omair Saleh 7aedaa3c17 show all active services for suppliers when not in segment 2023-12-13 13:36:54 +08:00
Steve Ng 44fbb14b36 change where condition for import receipts 2023-12-12 16:25:52 +08:00
Steve Ng 7ab1cd47e5 change where condition for import receipts 2023-12-12 16:24:36 +08:00
edmondlang 90d597f960 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-11 13:48:43 +08:00
edmondlang e92802659a Merge branch 'customer-page-booking-transfer-type-alignment' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-11 13:48:23 +08:00
JiaSheng ae94a03a65 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-08 19:56:14 +08:00
JiaSheng a6c4a0350d -Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into import-ambank-cief-lite-statement
-update import ambank statement logic
2023-12-08 19:53:09 +08:00
JiaSheng f7ba84acf0 fix customer page booking component transfer type alignment issue 2023-12-07 11:05:41 +08:00
edmondlang 780bbe7333 Merge branch 'import-ambank-cief-lite-statement' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-07 10:09:36 +08:00
JiaSheng cbc3fb56d4 fix pay booking by wallet bug 2023-12-07 01:05:17 +08:00
Steve Ng 7b936b2ce5 fix bug in import invoice 2023-12-06 21:54:15 +08:00
Steve Ng a1e5d11739 fix bug in import invoice 2023-12-06 21:52:09 +08:00
Dillon Ngo 120ea642c5 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-06 13:38:03 +08:00
Dillon Ngo 1212ec37b8 Fix a decimal problem reported by kexin 2023-12-06 13:37:45 +08:00
Dillon Ngo 864a0a7faf Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-04 12:59:09 +08:00
Dillon Ngo c7c7ee8c0c Fix a problem on voucher expiration date inaccurate 2023-12-04 12:58:18 +08:00
Dillon Ngo 849373e53b Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-03 23:57:09 +08:00
Dillon Ngo a6cf76ea79 Update UI based on kexin feedback 2023-12-03 23:57:00 +08:00
Dillon Ngo 75e687d269 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-03 23:34:44 +08:00
Dillon Ngo 150f6a69d6 Update UI based on kexin feedback 2023-12-03 23:34:36 +08:00
Dillon Ngo dceeb135ec Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-03 23:19:43 +08:00
Dillon Ngo 96c00ea66b Update UI based on kexin feedback 2023-12-03 23:19:31 +08:00
Dillon Ngo a65d8bdc05 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-03 23:17:20 +08:00
Dillon Ngo 19d08242d5 Update UI based on kexin feedback 2023-12-03 23:17:09 +08:00
Dillon Ngo ddce771c5d Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-12-03 23:14:16 +08:00
Dillon Ngo 52c2dade88 Update UI based on kexin feedback 2023-12-03 23:13:52 +08:00
Steve Ng cad933ed59 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:59:49 +08:00
Steve Ng 1c29e45744 add payment received date in import invoice result and fix structure export receipts to autocount 2023-12-03 18:58:55 +08:00
JiaSheng 6c0d0be3eb import ambank and cief lite statement 2023-11-30 18:04:00 +08:00
Dillon Ngo ef37185259 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-11-29 23:39:49 +08:00
Dillon Ngo 1ac2ac3102 Voucherify UI update for kexin to take a look 2023-11-29 23:39:15 +08:00
JiaSheng 7ab938ebee Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
2023-11-24 17:28:22 +08:00
JiaSheng fbd94f01b8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into centralize-izyim-exchange 2023-11-24 17:14:34 +08:00
edmondlang 0ecc74ebaa Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-24 10:11:12 +08:00
Steve Ng db4e9e6e95 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:06:37 +08:00
Steve Ng f2cc75a898 fix bug for import invoice mapping and export receipts to autocount and mapped completed report 2023-11-23 01:04:38 +08:00
JiaSheng 8f20c0e8a8 updates for dev environment 2023-11-22 16:18:02 +08:00
JiaSheng 1f057e464e updates 2023-11-19 18:05:52 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00