 edmondlang
|
d3b45c0897
|
Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
|
2025-03-11 16:33:52 +08:00 |
|
|
edmondlang
|
e31f708edd
|
fix Proforma Invoice
|
2025-03-11 16:32:14 +08:00 |
|
 Dillon Ngo
|
d0ce3ddfb1
|
Merge branch 'dillon/74-admin-workflow-2-20250228' into vapor/development
|
2025-03-10 01:26:31 +08:00 |
|
|
Dillon Ngo
|
64992e658d
|
Admin Workflow - Partial fix of version 4 reported issues
|
2025-03-10 01:25:39 +08:00 |
|
 Jia Sheng
|
42ba3929dc
|
Merge branch 'fix-invoice-refund-service-charge-issue' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
|
2025-03-09 11:24:22 +08:00 |
|
|
Jia Sheng
|
57999faf76
|
fix for multiple payments and discount order
|
2025-03-09 11:23:36 +08:00 |
|
|
Jia Sheng
|
9f385493db
|
Merge branch 'fix-invoice-refund-service-charge-issue' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
|
2025-03-08 15:44:23 +08:00 |
|
|
Jia Sheng
|
d3ac49c516
|
fix invoice amount not tally when service charge get refunded
|
2025-03-08 15:41:15 +08:00 |
|
|
edmondlang
|
30d7f429e1
|
Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
|
2025-03-07 10:28:15 +08:00 |
|
|
edmondlang
|
1b1b9da51e
|
fix bcadd(): Error: Argument #1 ($num1) is not well-formed at ListWalletTransactionsLogic.php:75
|
2025-03-07 10:27:49 +08:00 |
|
|
Dillon Ngo
|
0c4c6b30c4
|
Merge branch 'dillon/74-admin-workflow-2-20250228' into vapor/development
|
2025-03-03 15:31:45 +08:00 |
|
|
Dillon Ngo
|
5844e86d4f
|
Admin Workflow - Fix new unclear workflow requirement
|
2025-03-03 15:30:50 +08:00 |
|
|
Dillon Ngo
|
a3563f3f5b
|
Admin Workflow - Code Refactor for development branch only
|
2025-02-28 18:44:01 +08:00 |
|
|
Dillon Ngo
|
428e588d5a
|
Admin Workflow - Code Refactor for development branch only
|
2025-02-28 18:26:58 +08:00 |
|
|
Dillon Ngo
|
215c2be9f6
|
Admin Workflow - Code Refactor for development branch only
|
2025-02-28 17:48:46 +08:00 |
|
|
Dillon Ngo
|
ff9d63222f
|
Admin Workflow - Fix new unclear workflow requirement
|
2025-02-28 17:25:23 +08:00 |
|
|
Dillon Ngo
|
48205411ce
|
Merge branch 'dillon/74-admin-workflow-2-20250228' into vapor/development
|
2025-02-28 17:19:39 +08:00 |
|
|
Dillon Ngo
|
633d6b2b47
|
Admin Workflow - Fix new unclear workflow requirement
|
2025-02-28 17:19:10 +08:00 |
|
|
Dillon Ngo
|
91803bafa7
|
Merge branch 'dillon/74-admin-workflow-2-20250228' into vapor/development
|
2025-02-28 16:30:39 +08:00 |
|
|
Dillon Ngo
|
3ddff13402
|
Merge branch 'dillon/74-admin-workflow' into dillon/74-admin-workflow-2-20250228
|
2025-02-28 16:15:16 +08:00 |
|
|
Dillon Ngo
|
45b005944d
|
Merge branch 'dillon/74-admin-workflow' into dillon/74-admin-workflow-2-20250228
|
2025-02-28 16:13:01 +08:00 |
|
|
Dillon Ngo
|
9d88b27e82
|
Merge branch 'vapor/development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
|
2025-02-28 15:52:55 +08:00 |
|
|
Dillon Ngo
|
44ed726877
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-28 15:52:08 +08:00 |
|
|
Dillon Ngo
|
623fc45442
|
Admin Workflow - Fix new unclear workflow requirement
|
2025-02-28 15:51:29 +08:00 |
|
|
edmondlang
|
518e4e0baa
|
Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
|
2025-02-26 12:55:08 +08:00 |
|
|
edmondlang
|
000af925f1
|
fix bug on proforma invoice
|
2025-02-26 12:54:34 +08:00 |
|
|
Dillon Ngo
|
675da0e838
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-25 10:45:14 +08:00 |
|
|
Dillon Ngo
|
3b0f81c842
|
Admin Workflow - Fix new unclear workflow requirement
|
2025-02-25 10:44:38 +08:00 |
|
|
Dillon Ngo
|
9297f7425f
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-23 22:04:35 +08:00 |
|
|
Dillon Ngo
|
cc558b0af9
|
Admin Workflow - Code Refactoring
|
2025-02-23 22:04:15 +08:00 |
|
|
Dillon Ngo
|
79c356b69a
|
dmin Workflow - Fix Reported Issues - Automatically deduct funds from customer wallet when customer underpaid (development branch only)
|
2025-02-22 19:49:24 +08:00 |
|
|
Dillon Ngo
|
78c353647b
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-22 19:23:02 +08:00 |
|
|
Dillon Ngo
|
f2ba89d3e4
|
dmin Workflow - Fix Reported Issues - Automatically deduct funds from customer wallet when customer underpaid
|
2025-02-22 19:18:35 +08:00 |
|
|
edmondlang
|
5a8c486a98
|
fix invoice
|
2025-02-20 16:47:35 +08:00 |
|
|
edmondlang
|
d8e9e8db4a
|
fix invoice service charges
|
2025-02-20 10:47:27 +08:00 |
|
|
edmondlang
|
a80b439c25
|
Merge branch 'vapor/production' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into vapor/development
# Conflicts:
# resources/views/pages/pdfs/purchase_order_table.blade.php
# routes/web.php
|
2025-02-20 10:32:30 +08:00 |
|
|
edmondlang
|
14168b3837
|
debug invoice
|
2025-02-20 10:29:22 +08:00 |
|
|
Dillon Ngo
|
bd407108ac
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-18 17:45:31 +08:00 |
|
|
Dillon Ngo
|
0a5d9c1f95
|
Admin Workflow - Fix Reported Issues - Update UI to show more information for admin to look into issues reported
|
2025-02-18 17:45:00 +08:00 |
|
|
Dillon Ngo
|
18deb7f741
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-18 12:54:14 +08:00 |
|
|
Dillon Ngo
|
ccad145fda
|
Admin Workflow - Fix Reported Issues - download not showing all necessary data
|
2025-02-18 12:54:00 +08:00 |
|
|
Dillon Ngo
|
9836a35040
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-18 09:36:44 +08:00 |
|
|
Dillon Ngo
|
331fae8513
|
Admin Workflow - Fix Reported Issues - group tab not showing records correctly
|
2025-02-18 09:36:26 +08:00 |
|
|
Dillon Ngo
|
3f692891b7
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-17 21:17:35 +08:00 |
|
|
Dillon Ngo
|
20b62f53ed
|
Admin Workflow - Fix Reported Issues - Update UI to show more information for admin to look into issues reported
|
2025-02-17 21:17:21 +08:00 |
|
|
Dillon Ngo
|
5b8241a647
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-17 20:48:03 +08:00 |
|
|
Dillon Ngo
|
3ef5bbb0f3
|
Admin Workflow - Fix Reported Issues - Update UI to show more information for admin to look into issues reported
|
2025-02-17 20:47:47 +08:00 |
|
|
Dillon Ngo
|
95d779a979
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-17 12:51:26 +08:00 |
|
|
Dillon Ngo
|
1aad662458
|
Admin Workflow - Fix Reported Issues - More filtering user controls for admin to find issues
|
2025-02-17 12:51:07 +08:00 |
|
|
Dillon Ngo
|
97cd6eaa53
|
Merge branch 'dillon/74-admin-workflow' into vapor/development
|
2025-02-15 13:26:19 +08:00 |
|