Commit Graph

70 Commits

Author SHA1 Message Date
Dillon Ngo 8f25af3878 Merge branch 'dillon/90-e-invoice-b' into vapor/development 2025-05-10 16:51:31 +08:00
Dillon Ngo 8559332d34 E-Invoice - Initial commit main feature integration 2025-05-10 00:48:20 +08:00
Dillon Ngo 061ebfb35e Merge branch 'dillon/74-admin-workflow' into vapor/development 2024-12-04 12:33:54 +08:00
Dillon Ngo 4df4822595 Admin Workflow 2024-12-04 12:30:24 +08:00
Dillon Ngo c1bd61dfc7 Admin Workflow Initial Commit 2024-12-02 23:06:44 +08:00
Dillon Ngo c03df14827 Merge branch 'development' into vapor/development 2024-10-15 00:52:46 +08:00
edmondlang 6b2f674c17 Merge branch 'admin-1688-work-flow-aqqill' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-08-02 01:20:15 +08:00
Dillon Ngo 2a04ef5bd2 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-23 19:12:40 +08:00
Dillon Ngo 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +08:00
edmondlang 8d48f6f4eb 1688 admin work flow clean up and call api 2024-07-22 01:12:51 +08:00
Dillon Ngo 4e197d4d5d Merge branch 'development' into vapor/development 2024-06-20 17:03:59 +08:00
Dillon Ngo 9074e1ef5d Merge branch 'dillon/34.3-jenkins-vapor' into vapor/development 2024-05-17 14:57:02 +08:00
Dillon Ngo f9d7e48b58 Merge branch 'master' into dillon/34.3-jenkins-vapor 2024-05-17 14:55: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 a9414712f5 feat: added remark.php 2024-04-25 13:40:04 +08:00
Dillon Ngo d1bcda8029 Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-01 14:04:41 +08:00
Dillon Ngo eb30d41941 Second voucher (first milestone) for user upon reaching 2 completed bookings 2024-04-01 13:56:25 +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
Dillon Ngo 97c85d5aac Merge branch 'dillon/34.1-jenkins-vapor' into vapor/development 2024-03-24 18:26:45 +08:00
Dillon Ngo a200f7083b Laravel Vapor - Version 2 of Commands for 3 files + Resolved 3 TODOs 2024-03-24 18:20:24 +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 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
Dillon Ngo 2c49052338 Merge branch 'dillon/34-jenkins-vapor' into vapor/development 2023-12-16 18:10:39 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
Dillon 85664dfcce Merge branch 'dillon/jenkins-vapor-34-vue-polling' into dillon/34-jenkins-vapor 2023-10-20 22:26:59 +08:00
edmondlang 5ec7a4a61f update bulk download white form 2023-10-12 18:10:32 +08:00
edmondlang 52e6454716 deploy module download bulk invoice 2023-09-30 15:51:09 +08:00
Dillon b8210cce8a Vue Polling 2023-08-24 20:15:18 +08:00
Dillon a4b53a1173 Vue Polling 2023-08-24 19:34:43 +08:00
Dillon c6bc43640d Vue Polling 2023-08-24 19:22:20 +08:00
Dillon c7927847c4 Voucherify phase 2 2023-07-17 21:29:19 +08:00
edmondlang 32b9bfab1c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35
# Conflicts:
#	routes/api.php
2023-06-22 23:09:50 +08:00
edmondlang 77f533111f accounting mapping api files and calling api, api need to be updated 2023-06-03 23:13:26 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +08:00
Omair Saleh 93fd645bf6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
 Conflicts:
	routes/web.php
2023-05-16 12:17:43 +08:00
edmondlang d315c47bca upload-honey-trap 2023-05-10 01:41:30 +08:00
Dillon 1954cfa63c Mapping of bank statement records with exchange and shipping portal + UI to edit the details 2023-04-11 04:14:53 +08:00
omair saleh 739b9af57d update debtors import 2022-03-19 15:19:13 +08:00
ahmedsophyudden af3ff46a20 Grab service charge from setting for calculate supplier transaction 2022-02-28 22:40:16 +08:00
omair saleh 7d9fed43eb fix route namespace 2021-11-21 23:48:06 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
Fairuz e94ef44928 Wallet operations 2021-10-07 01:34:11 +08:00
ahmedsophyudden fb84e47d43 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-04 15:09:36 +08:00
ahmedsophyudden cc93b5f03e create billplz create bill api 2021-09-27 11:00:34 +08:00
weichien 40c7c6bfeb feat: add announcement route. 2021-06-08 13:36:26 +08:00