 edmondlang
|
c70596e6bb
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into dev
|
2023-06-29 14:47:25 +08:00 |
|
 Omair Saleh
|
096e039ffb
|
create a public api for mappable transactions
|
2023-06-21 16:31:52 +08:00 |
|
|
Omair Saleh
|
2319393758
|
create a public api for mappable transactions
|
2023-06-21 16:30:30 +08:00 |
|
|
Omair Saleh
|
626dff6137
|
create a public api for mappable transactions
|
2023-06-21 15:19:45 +08:00 |
|
|
Omair Saleh
|
99efce22db
|
add owner type column to transaction resource to help with bank mapping function in exchange
|
2023-06-21 13:25:56 +08:00 |
|
|
Omair Saleh
|
1cdd511f67
|
fix bug with invoice showing that doesn't belong to the order
|
2023-05-25 15:35:56 +08:00 |
|
|
Omair Saleh
|
f7d0fe117e
|
fix bug with invoice showing that doesn't belong to the order
|
2023-05-25 15:35:11 +08:00 |
|
|
Omair Saleh
|
4dede50156
|
fix bug with invoice showing that doesn't belong to the order
|
2023-05-25 15:34:19 +08:00 |
|
|
Omair Saleh
|
0d555eedc9
|
fix bug with invoice showing that doesn't belong to the order
|
2023-05-25 15:32:19 +08:00 |
|
 Martin Kiragu
|
893d10c7f6
|
fix conflict issue
|
2023-05-16 17:47:05 +03:00 |
|
|
edmondlang
|
07a7901844
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-05-10 23:01:50 +08:00 |
|
|
edmondlang
|
40c4a39927
|
revert order resource for debug
|
2023-05-10 13:47:29 +08:00 |
|
|
edmondlang
|
91fcb76863
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-05-10 13:39:27 +08:00 |
|
|
edmondlang
|
b34d909a09
|
fix order resource returning incorrect invoice
|
2023-05-10 13:24:10 +08:00 |
|
|
edmondlang
|
26b3e968e9
|
fix order resource returning incorrect invoice
|
2023-05-10 13:22:44 +08:00 |
|
|
edmondlang
|
7b127b2cba
|
fix order resource returning incorrect invoice
|
2023-05-10 13:15:57 +08:00 |
|
|
edmondlang
|
cac02b8ebe
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-05-10 13:13:32 +08:00 |
|
|
edmondlang
|
7488313a0e
|
fix order resource returning incorrect invoice
|
2023-05-10 13:12:56 +08:00 |
|
 Dillon
|
3497de9727
|
Merge branch 'dillon/crisp-help-menu' into development
|
2023-05-04 15:23:54 +08:00 |
|
|
Dillon
|
5b00b7b45f
|
Help Menu prototype v0.1
|
2023-05-04 15:19:04 +08:00 |
|
|
edmondlang
|
965dfb3098
|
Merge branch 'multi-payment-final' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/web.php
|
2023-04-28 18:26:33 +08:00 |
|
|
edmondlang
|
e7c0e17ee4
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into multi-payment-final
# Conflicts:
# app/Classes/Modules/Segments/ControllersLogic/UpdateConstantPostcodeLogic.php
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/api.php
# routes/web.php
|
2023-04-28 18:20:42 +08:00 |
|
|
Martin Kiragu
|
c4d421db76
|
add a todo to delete the BookingResource not used anywhere
|
2023-04-24 14:01:36 +03:00 |
|
|
Martin Kiragu
|
2816e80bee
|
Bank Account Transformer
|
2023-04-24 13:56:00 +03:00 |
|
|
Martin Kiragu
|
466e90a0af
|
Build a AnnouncementTransformer for uniformity and future relationships updates
|
2023-04-24 13:50:20 +03:00 |
|
|
edmondlang
|
3378d37ffb
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-04-19 12:53:50 +08:00 |
|
|
edmondlang
|
77f7e86a5f
|
fix bug date error in update announcement function in settings page
|
2023-04-19 12:52:46 +08:00 |
|
|
edmondlang
|
abb7bc2e4c
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-04-05 23:50:22 +08:00 |
|
 DESKTOP-5I7S92L\nicho
|
70fc8285f8
|
order v2
|
2023-04-05 16:21:53 +08:00 |
|
|
edmondlang
|
395b15af90
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# routes/api.php
|
2023-03-31 00:32:46 +08:00 |
|
|
edmondlang
|
46f1368a92
|
ui and api to update warehouse contact
|
2023-03-31 00:29:15 +08:00 |
|
|
edmondlang
|
4c433f74f1
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-30 12:53:00 +08:00 |
|
|
DESKTOP-5I7S92L\nicho
|
bfd490854d
|
change admin role type
|
2023-03-30 11:53:54 +08:00 |
|
|
edmondlang
|
acee1a7884
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-28 16:17:14 +08:00 |
|
|
DESKTOP-5I7S92L\nicho
|
cd93deac26
|
change company type
|
2023-03-28 15:35:13 +08:00 |
|
|
edmondlang
|
08b2ba1c63
|
multi invoice payment
|
2023-03-27 19:37:31 +08:00 |
|
|
Martin Maina Kiragu
|
2421640c0a
|
Merge branch 'feature/dashboard_optimization' into 'development'
Feature/dashboard optimization
See merge request CIEFWorldwideSdnBhd/shipping-portal!156
|
2023-03-24 03:48:40 +00:00 |
|
|
Martin Kiragu
|
f3df5fbe9f
|
fix ide-autospace formatting
|
2023-03-24 06:13:35 +03:00 |
|
|
Martin Kiragu
|
362e47aaa0
|
fix ide-autospace formatting
|
2023-03-24 06:04:28 +03:00 |
|
|
Martin Kiragu
|
ba26cda598
|
switched the Modal resources to Transformers for /document/lists endpoint
|
2023-03-24 05:51:32 +03:00 |
|
|
edmondlang
|
e0d0dccb4c
|
multi payment final
|
2023-03-21 14:11:42 +08:00 |
|
|
Martin Kiragu
|
a4891aa0de
|
added a debugber optional paramenter for addational resource on ListDocument resource
|
2023-03-19 06:31:44 +03:00 |
|
|
edmondlang
|
eea8708b76
|
migrate wallets and create function for regenerates invoice
|
2023-03-11 16:48:54 +08:00 |
|
|
edmondlang
|
2300d237d3
|
Merge branch 'change-company-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal
|
2023-02-06 22:43:24 +08:00 |
|
|
edmondlang
|
a62e5d95fb
|
add debtor in company resource folder
|
2023-02-06 22:33:57 +08:00 |
|
|
Dillon
|
2248e76bd4
|
Allow admin to search a customer by email address to open in new window
|
2023-01-11 22:44:04 +08:00 |
|
|
Omair Saleh
|
d7d9a065fd
|
show reference number for package
|
2023-01-04 11:23:16 +08:00 |
|
|
omair saleh
|
235b04e395
|
Merge branch 'master' into 'import-debtor'
# Conflicts:
# routes/web.php
|
2022-10-17 05:00:42 +00:00 |
|
|
Omair Saleh
|
c8d621057b
|
fix invoice date
|
2022-10-10 17:49:14 +08:00 |
|
|
Omair Saleh
|
6ecfa8e031
|
fix invoice date
|
2022-10-10 17:43:32 +08:00 |
|