 glovetleong
|
992e5b0008
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into order-contact-remark
# Conflicts:
# routes/web.php
|
2021-12-09 16:01:17 +08:00 |
|
 omair saleh
|
3620e4c4b5
|
debug loaded container job
|
2021-12-07 12:30:39 +08:00 |
|
 edmondlang
|
cc5b39e457
|
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
|
2021-11-27 17:06:59 +08:00 |
|
|
omair saleh
|
634d4b8b7d
|
Merge branch 'master' into 'remark-create-api'
# Conflicts:
# app/Models/Container.php
# app/Models/PackingList.php
# routes/order.php
# routes/packing_list.php
|
2021-11-26 07:23:35 +00:00 |
|
|
omair saleh
|
90c1c037ca
|
Merge branch 'development' into 'update-id-number'
# Conflicts:
# resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
|
2021-11-26 07:10:09 +00:00 |
|
|
omair saleh
|
20289c7f1e
|
Merge branch 'order-remark-backend' into 'development'
Order remark backend
See merge request CIEFWorldwideSdnBhd/shipping-portal!83
|
2021-11-26 02:34:25 +00:00 |
|
|
omair saleh
|
ac1fc3103b
|
add customer to new warehouse list
|
2021-11-26 10:11:13 +08:00 |
|
|
omair saleh
|
fa88ffca49
|
add marking to new warehouse special list
|
2021-11-25 03:18:12 +08:00 |
|
|
omair saleh
|
c67ee25654
|
add new yd Guangzhou warehouse
|
2021-11-25 03:08:32 +08:00 |
|
|
edmondlang
|
5e7cfd4da0
|
tidy up the order remark backend api
|
2021-10-31 15:43:57 +08:00 |
|
|
edmondlang
|
6444f471e8
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into order-remark-backend
# Conflicts:
# app/Classes/Modules/PackingLists/ControllersLogic/Containers/CreateContainerRemarkLogic.php
# app/Models/Order.php
|
2021-10-28 00:31:48 +08:00 |
|
|
edmondlang
|
a846028919
|
wip
|
2021-10-25 22:49:42 +08:00 |
|
|
edmondlang
|
39771a42b6
|
Merge branch 'update-id-number' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into update-id-number
|
2021-10-20 22:14:37 +08:00 |
|
 Fairuz
|
63aae14b28
|
Shipping Cost Calculations
|
2021-10-18 10:04:33 +08:00 |
|
|
glovetleong
|
b36313e24c
|
remark for order, container, packing list
|
2021-10-10 15:22:49 +08:00 |
|
|
omair saleh
|
3dfceeaf37
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# app/Http/Resources/OrderResource.php
# resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue
|
2021-10-04 16:21:44 +08:00 |
|
|
omair saleh
|
509f14c790
|
improve load speed by cleaning the resources to reduce the number of queries submitted per request
|
2021-10-04 16:17:10 +08:00 |
|
 Haziq Danial
|
61a75a4ee1
|
update order reference id
|
2021-09-28 18:51:43 +08:00 |
|
|
glovetleong
|
05ee6b3e98
|
create warehouse packing list
create shipping packing list
|
2021-09-15 21:30:49 +08:00 |
|
|
omair saleh
|
1939f64cdf
|
change order address
|
2021-09-09 22:57:02 +08:00 |
|
 LEE WC
|
c6865bb5f6
|
Merge branch '319_order_address_change_ui' into '293_order_address_change'
# Conflicts:
# app/Http/Resources/OrderResource.php
|
2021-09-07 06:01:11 +00:00 |
|
|
omair saleh
|
bea3836df8
|
update packinglists from vt portal jobs and schedule
|
2021-08-29 19:33:04 +08:00 |
|
|
omair saleh
|
276e12679d
|
update packinglists from vt portal
|
2021-08-23 08:39:59 +08:00 |
|
|
weichien00
|
5a043e89a0
|
feat: API to approve order address change.
|
2021-08-19 01:33:16 +08:00 |
|
|
weichien00
|
3c20386875
|
feat: API to request change order address
|
2021-08-19 01:31:27 +08:00 |
|
|
omair saleh
|
14cbcfd6f5
|
large commit
|
2021-08-18 06:02:14 +08:00 |
|
|
omair saleh
|
d8c767c670
|
Large commit
|
2021-08-16 08:59:43 +08:00 |
|
|
omair saleh
|
8c4bac81e6
|
General fixes to table design, added state and district seeder for china, made changes to create order process, and ui and vue js components changes for registration, dashboard and registration
|
2021-08-14 09:28:36 +08:00 |
|
|
weichien00
|
decb6265eb
|
add: list order api.
|
2021-08-02 23:42:51 +08:00 |
|
|
Fairuz
|
1fe25476ce
|
WIP - Order steps & remaining APIs
|
2021-07-23 15:07:05 +08:00 |
|
|
Fairuz
|
95660069c9
|
Order APIs & Unity services
|
2021-07-17 18:44:22 +08:00 |
|
|
Fairuz
|
9c0772bf65
|
Orders APIs WIP
|
2021-07-15 17:30:12 +08:00 |
|
|
Fairuz
|
562ea1ff7b
|
Orders APIs WIP
|
2021-07-14 15:18:25 +08:00 |
|
|
Fairuz
|
ddbf83465e
|
Orders APIs WIP
|
2021-07-13 11:58:03 +08:00 |
|