Commit Graph

322 Commits

Author SHA1 Message Date
Jia Sheng f2f12a6eb4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 19:16:07 +08:00
Jia Sheng cb7c38a50d 1688 order reference 2024-07-14 19:15:43 +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
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 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
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
Dodowingster 332a12008c initial commit 2024-04-24 15:18:28 +08:00
JiaSheng b7505e4501 Merge branch '1688-integration' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-03-31 22:21:40 +08:00
JiaSheng 9c08805d32 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into 1688-integration
# Conflicts:
#	routes/api.php
2024-03-31 22:21:01 +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
Dillon Ngo f8230990f4 Revert "Merge branch 'revert-b9668bb6' into 'master'"
This reverts merge request !157
2024-02-11 10:28:05 +00:00
Dillon Ngo ea4795e5c8 Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'"
This reverts merge request !152
2024-02-11 09:53:09 +00:00
Dillon Ngo b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
2024-02-11 09:16:08 +00:00
Dillon Ngo dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-02-11 16:15:06 +08:00
JiaSheng 94596baf13 1688 integration 2024-01-25 16:52:06 +08:00
Dillon Ngo 18df0e256b Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor 2023-12-30 01:15:27 +08:00
Steve Ng ca07fc161e add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:49:36 +08:00
Steve Ng 5d0052a671 add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:47:12 +08:00
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +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 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
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
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
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
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 aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
Steve Ng 84d5af39f5 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:50:59 +08:00
Steve Ng d8a4510fc4 fix bug in import invoices and unknow tabs for status not in rejected 2023-11-12 11:49:51 +08:00
edmondlang 1990a843d5 Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-05 17:35:25 +08:00
edmondlang 46f802109e update template 2023-11-05 17:35:06 +08:00
edmondlang 29ca393a7f update template 2023-11-05 17:07:36 +08:00
edmondlang b7a800dee7 update template 2023-11-05 16:58:13 +08:00
edmondlang 4d23e0cb9c Merge branch 'account-statement-pagination' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-11-04 23:18:03 +08:00
JiaSheng 7d94776543 fix bcmath function bug 2023-11-04 22:28:16 +08:00
Steve Ng b3a6a9cdcc fix bug unmapped invoice 2023-11-04 10:48:11 +08:00
Steve Ng db88edabfe fix bug unmapped invoice 2023-11-04 10:45:41 +08:00
JiaSheng c11f6dab7a fix account statement transaction not tally issue 2023-11-04 09:59:16 +08:00