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
|
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
|
0079d745ba
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2023-03-26 22:48:42 +08:00 |
|
edmondlang
|
0d0e147647
|
update dummy data seeder generate and approve invoice
|
2023-03-26 22:48:12 +08:00 |
|
edmondlang
|
efba270ea5
|
update dummy seeder data - postcode
|
2023-03-26 21:50:14 +08:00 |
|
edmondlang
|
69da484b72
|
update dummy seeder data - state charges, so the invoice total wont be in 0
|
2023-03-26 21:37:54 +08: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 |
|
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 |
|
Martin Maina Kiragu
|
e19ba1c9f3
|
Merge branch 'feature/TDD' into 'development'
Feature/tdd
See merge request CIEFWorldwideSdnBhd/shipping-portal!140
|
2023-03-01 03:54:54 +00:00 |
|
Martin Kiragu
|
79d29d9c7b
|
Authentication TDD
|
2023-01-19 09:39:15 +03:00 |
|
edmondlang
|
70fb35e37c
|
api and web route logs
|
2023-01-02 17:41:00 +08:00 |
|
edmondlang
|
1a30877ca9
|
activity route log dev
|
2022-12-31 11:53:41 +08:00 |
|
WAKOYA_KUMSA\waqo1
|
569a22c0db
|
route activity log
|
2022-12-28 13:15:15 +03:00 |
|
Omair Saleh
|
634a97f3b4
|
minor changes to dummy data seeder comments
|
2022-11-15 19:56:03 +08:00 |
|
Omair Saleh
|
58e9e80fd9
|
dummy data seed
|
2022-11-10 20:32:14 +08:00 |
|
edmondlang
|
b01e2022dc
|
import debtor
|
2022-09-29 19:11:59 +08:00 |
|
omair saleh
|
3b449fc812
|
change transactions receiver and issuer relationship from companies to company_modules
|
2022-09-22 13:18:57 +08:00 |
|
omair saleh
|
9783c76be3
|
billing fix up
|
2022-09-21 09:02:41 +08:00 |
|
omair saleh
|
3658991c43
|
billing fix up
|
2022-09-21 09:01:48 +08:00 |
|
omair saleh
|
6558ce20d9
|
billing fix up
|
2022-09-20 09:01:26 +08:00 |
|
omair saleh
|
ce4e88fcdc
|
billing fix up
|
2022-09-20 08:44:59 +08:00 |
|
omair saleh
|
968ff5c02a
|
Merge branch 'connetction-segment-integration' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
# Conflicts:
# app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php
# app/Http/Resources/OrderResource.php
# app/Http/Resources/PackingListResource.php
# resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
# resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
|
2022-09-20 02:47:47 +08:00 |
|
omair saleh
|
d045e0401d
|
billing segment
|
2022-09-03 15:03:17 +08:00 |
|
edmondlang
|
e7f8b62116
|
update seeder for segment constant
|
2022-08-06 01:57:34 +08:00 |
|
omair saleh
|
c018fa9050
|
rename addon table
|
2022-08-01 02:56:15 +08:00 |
|
omair saleh
|
61eae220d1
|
rename addon table
|
2022-08-01 02:55:22 +08:00 |
|
omair saleh
|
e4aa8fdd57
|
rename addon table
|
2022-08-01 02:51:59 +08:00 |
|
omair saleh
|
8b41056129
|
rename addon table
|
2022-08-01 02:50:11 +08:00 |
|
omair saleh
|
df69ff6fec
|
disable addon migration temp
|
2022-08-01 02:49:01 +08:00 |
|
omair saleh
|
894799a801
|
disable addon migration temp
|
2022-08-01 02:47:56 +08:00 |
|
marjuqi@ad
|
6932b3291c
|
implementing new data structure for segment_constant table
|
2022-05-25 10:28:51 +07:00 |
|
omair saleh
|
056342308e
|
fix addons table migration
|
2022-05-07 16:37:48 +08:00 |
|
omair saleh
|
f7ca8558f5
|
fix addons table migration
|
2022-05-07 16:32:02 +08:00 |
|
edmondlang
|
f17bfea250
|
fix generate invoice api and database seeder for segment constant
|
2022-05-05 21:05:45 +08:00 |
|
edmondlang
|
8795f1c203
|
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
|
2022-04-19 11:00:57 +08:00 |
|
omair saleh
|
639ccd3927
|
fix login error handler & add new modern warehouse
|
2022-04-18 23:40:08 +08:00 |
|
omair saleh
|
5651ed7010
|
fix LMD to HWT
|
2022-04-18 15:47:25 +08:00 |
|
edmondlang
|
762e9b8dca
|
update segment migration files
|
2022-04-17 23:54:44 +08:00 |
|
omair saleh
|
5dabc88fa9
|
update final touch up for last delivery integration
|
2022-04-07 22:40:01 +08:00 |
|
omair saleh
|
f96fef94fe
|
finalize last mile delivery
|
2022-04-04 19:40:54 +08:00 |
|
omair saleh
|
c69c043576
|
fix the user ui, create delivery order, delivery customer dashboard
|
2022-04-03 19:10:06 +08:00 |
|
glovetleong
|
19c8f1e658
|
transaction detail over weight
|
2022-03-18 20:46:40 +08:00 |
|
glovetleong
|
7ec109eb3e
|
soft delete user
|
2022-03-14 13:42:48 +08:00 |
|
glovetleong
|
f8a985035e
|
notification
|
2022-02-18 21:57:25 +08:00 |
|
glovetleong
|
556c9352c8
|
shipping invoice
|
2022-02-12 11:35:12 +08:00 |
|
glovetleong
|
d97357f33a
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into transaction-invoice
|
2022-02-11 14:38:57 +08:00 |
|