cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-21 21:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
698 Commits 5 Branches 0 Tags
bc5a8bce47f2ca2db1576de5eda0cb7f75e8ff9e
Commit Graph

82 Commits

Author SHA1 Message Date
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 6255936cd1 Merge branch 'container-profile-forms-ui' into 'master' 
Container profile forms ui

See merge request CIEFWorldwideSdnBhd/shipping-portal!86
 2021-11-26 07:14:27 +00:00
omair saleh 2b6a2810e5 clean up company module un used dependencies 2021-11-25 03:11:20 +08:00
omair saleh 908e0a49f9 Merge branch 'create-new-filter-to-order-by-arrival-dates' 
# Conflicts:
#	routes/api.php
 2021-10-30 12:23:58 +08:00
edmondlang 9252134cc4 wip update container comments(remarks) section and implement api 2021-10-29 16:20:05 +08:00
omair saleh ef1759379e disable customer order scope to temp fix pdf download issue 2021-10-25 14:54:46 +08:00
omair saleh ad9b983325 optimise order queries 2021-10-25 14:29:24 +08:00
omair saleh fc36a193e9 optimise order queries 2021-10-25 14:28:55 +08:00
omair saleh da52ddd3ac Merge branch 'cross-login' into 'master' 
Cross login

See merge request CIEFWorldwideSdnBhd/shipping-portal!75
 2021-10-25 05:54:01 +00:00
omair saleh 6cfed45ffe Merge branch 'create-deliver-packing-list-api' into 'master' 
create deliver packing list api

See merge request CIEFWorldwideSdnBhd/shipping-portal!74
 2021-10-25 05:53:33 +00:00
omair saleh a048a79ca8 Merge branch 'cbm_calc' into 'master' 
Shipping Cost Calculations

See merge request CIEFWorldwideSdnBhd/shipping-portal!70
 2021-10-25 05:49:04 +00:00
omair saleh c5183ac0a7 create container remark 2021-10-21 21:25:13 +08:00
ahmedsophyudden 3f73848c18 Create new filter to order by arrival dates 2021-10-18 11:22:56 +08:00
Fairuz 63aae14b28 Shipping Cost Calculations 2021-10-18 10:04:33 +08:00
glovetleong aae9f160e6 simplify order resource 2021-10-17 17:55:16 +08:00
glovetleong 05cb3dd35e cross login 2021-10-13 14:10:32 +08:00
omair saleh 04215916f5 add report from to filters 2021-10-12 12:25:26 +08:00
glovetleong 3d7090758d Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into cross-login 2021-10-12 08:53:57 +08:00
ahmedsophyudden e546825520 New add & delete company connection to connection segment api 2021-10-11 22:28:11 +08:00
omair saleh 7bd3ae056d temp show specific report period 2021-10-11 15:00:18 +08:00
omair saleh fdce49ea82 temp show specific report period 2021-10-11 14:56:40 +08:00
glovetleong b36313e24c remark for order, container, packing list 2021-10-10 15:22:49 +08:00
omair saleh c3b0e55271 add customer without orders list 2021-10-08 21:37:45 +08:00
glovetleong c281beb87a create deliver packing list api 2021-10-07 09:20:04 +08:00
omair saleh 5aefef5366 service report 2021-10-05 20:54:19 +08:00
omair saleh 943ec5f7f7 service report 2021-10-05 17:02:17 +08:00
omair saleh 9340d4360e update monthly report 2021-10-05 14:24:43 +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
omair saleh c66273874d marking container loading date as a timestamp in the modal 2021-10-01 17:52:28 +08:00
glovetleong 31105cfcef Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into cross-login 2021-09-28 22:09:05 +08:00
omair saleh fbfe68c1c2 exchange user table seeder 2021-09-21 02:19:41 +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
glovetleong 0554cc895f checkout 2021-09-05 12:55:11 +08:00
omair saleh 842fc52b4e fix warehouse list bugs 2021-09-02 16:51:10 +08:00
omair saleh 66c3b532cb update packinglists from vt portal jobs and schedule 2021-08-29 19:57:27 +08:00
omair saleh eac5c6d104 update packinglists from vt portal jobs and schedule 2021-08-29 19:50:35 +08:00
omair saleh 276e12679d update packinglists from vt portal 2021-08-23 08:39:59 +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
omair saleh dda0cf0b02 Merge remote-tracking branch 'origin/master' 2021-08-12 15:01:38 +08:00
omair saleh fc0786264a fix dashboard and order ui & fix address select component and added reference to addresses 2021-08-12 15:01:16 +08:00
Fairuz b0246ccfda Update relation for order steps 2021-08-12 13:41:27 +08:00
weichien00 7a2f2e87b2 update: change to save default address based on company module id 2021-08-09 02:16:24 +08:00
Fairuz 06efb4c169 Completes Order Steps on Unity 2021-08-05 10:52:26 +08:00
Fairuz 3f70ead69a Activate contract 2021-08-03 02:01:20 +08:00
Fairuz af38004595 Added contract entity, address to Orders 2021-08-03 01:17:54 +08:00
weichien00 0dc68cea5a update: return number of order when login. 2021-07-30 14:26:11 +08:00
Fairuz 805ae4ff2b WIP - Order steps & remaining APIs 2021-07-24 13:40:21 +08:00