 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 |
|
|
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 |
|
|
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 |
|
|
edmondlang
|
9fe49d8658
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into update-admin-role-type
|
2023-03-30 12:16:04 +08:00 |
|
|
edmondlang
|
f90818dbca
|
updates user name and admin type api
|
2023-03-30 12:06:33 +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 |
|
|
edmondlang
|
27190868b4
|
change company type
|
2023-03-28 16:15:07 +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
|
75039466ab
|
fix ide-autospace formatting
|
2023-03-24 06:28:53 +03: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
|
5d5892ce07
|
Merge branch 'multi-payment-final' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# routes/transaction.php
|
2023-03-21 14:13:20 +08: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 |
|
|
Martin Kiragu
|
c292bfd1e0
|
extract repeated queries on MonthlyReport Controller and Add a global Library helper.php file
|
2023-03-13 09:21:51 +03:00 |
|
|
edmondlang
|
d69896f807
|
Merge branch 'multi-payment-final' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-12 23:13:58 +08:00 |
|
|
edmondlang
|
eea8708b76
|
migrate wallets and create function for regenerates invoice
|
2023-03-11 16:48:54 +08:00 |
|
|
edmondlang
|
8e7970a925
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-02 16:16:23 +08:00 |
|
|
edmondlang
|
2421f6dcf0
|
allow user to edit billing address
|
2023-03-02 16:15:51 +08:00 |
|
|
edmondlang
|
ad7e77c169
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-21 15:01:09 +08:00 |
|
|
edmondlang
|
7f4fdf0191
|
update export-customer-order
|
2023-02-20 20:31:52 +08:00 |
|
|
edmondlang
|
1c4d9520f9
|
update export-customer-order
|
2023-02-20 20:23:02 +08:00 |
|
|
edmondlang
|
6c7685dac2
|
update export-customer-order
|
2023-02-20 20:17:48 +08:00 |
|
|
edmondlang
|
e95c41bd3e
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-02-20 19:51:11 +08:00 |
|
|
edmondlang
|
4653e8403b
|
export-customer-order
|
2023-02-20 19:50:53 +08:00 |
|
|
edmondlang
|
4120a50559
|
commented on the web routes and api routes to test on the crm
|
2023-02-18 23:09:24 +08:00 |
|