 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 |
|
 Martin Kiragu
|
92a38a96a0
|
updates on the customers endpoint
|
2023-05-26 19:02:46 +03: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
|
dfacae1a5d
|
services column, reduce queries and format numbers
|
2023-05-23 08:22:29 +03:00 |
|
|
Martin Kiragu
|
07d353d4bb
|
fix count error
|
2023-05-23 07:07:14 +03:00 |
|
|
Martin Kiragu
|
823958504c
|
fix error
|
2023-05-21 18:19:43 +03:00 |
|
|
Martin Kiragu
|
4cb30ad7ab
|
switch to Eager Loading and Reduce Database Queries by getting count query directly
|
2023-05-21 18:05:55 +03: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 |
|
|
Martin Maina Kiragu
|
5c109d625c
|
Merge branch 'system/transformers' into 'dev'
System/transformers
See merge request CIEFWorldwideSdnBhd/shipping-portal!163
|
2023-05-02 05:02:59 +00: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 |
|
|
edmondlang
|
351447b1fc
|
Merge branch 'list-order-v2' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-04-25 23:40:47 +08:00 |
|
|
edmondlang
|
2bc43cbc8f
|
list order v2
|
2023-04-25 23:40:27 +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
|
6970908b75
|
update generate PDF controller
|
2023-04-19 12:34:01 +08:00 |
|
|
edmondlang
|
fff3d948d0
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Orders/ControllersLogic/CreateOrderLogic.php
|
2023-04-18 23:44:36 +08:00 |
|
|
edmondlang
|
8d8c468b09
|
foshan-warehouse
|
2023-04-18 23:42:49 +08:00 |
|
 Dillon Ngo
|
fa0c97b1da
|
Merge branch 'dillon/accounting-bank-mapping' into 'master'
New route, middleware, token table, filters for query to allow third party to access api
See merge request CIEFWorldwideSdnBhd/shipping-portal!161
|
2023-04-06 15:19:15 +00:00 |
|
|
Dillon
|
20f3004e22
|
Merge branch 'dillon/accounting-bank-mapping' into development
|
2023-04-06 22:59:39 +08:00 |
|
|
Dillon
|
43cd6f35be
|
New route, middleware, token table, filters for query to allow third party to access api
|
2023-04-06 22:57:50 +08:00 |
|
|
edmondlang
|
fd4bbe5d4f
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-04-06 19:25:35 +08:00 |
|
|
edmondlang
|
697c02ac8a
|
delete packing list by package id
|
2023-04-06 19:22:40 +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
|
551119e313
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/ValueObjects/Constants/TransactionType.php
# routes/web.php
|
2023-04-02 11:41:55 +08:00 |
|
|
edmondlang
|
07998c6850
|
super admin delete invoice/transaction
|
2023-04-02 11:25:50 +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 |
|