cief/portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/portal.git synced 2026-08-19 20:44:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,274 Commits 5 Branches 0 Tags
9a1562386fca8b2794de7691f699cdbbba951daa
Commit Graph

120 Commits

Author SHA1 Message Date
glovetleong 7ec109eb3e soft delete user 2022-03-14 13:42:48 +08:00
Leong Chee Siong eabfeb6724 Merge branch 'transaction-invoice' into 'development' 
payment transaction

See merge request CIEFWorldwideSdnBhd/shipping-portal!109
 2022-03-14 03:10:20 +00:00
omair saleh ac41229f8b notifiable 2022-03-12 17:20:32 +08:00
edmondlang 83091caa46 create company module remark and ui 2022-03-09 18:51:23 +08:00
glovetleong de56c21734 payment transaction 2022-03-08 16:55:31 +08:00
glovetleong ab12494ba5 pdf generate 2022-03-06 14:44:49 +08:00
glovetleong 499837b135 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into transaction-invoice 2022-03-06 10:21:45 +08:00
omair saleh eb905e7176 fix active customer list 2022-03-05 17:59:02 +08:00
edmondlang 0496851286 update settings add state charges TAB 2022-02-21 16:11:39 +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
omair saleh 36289a3694 minor clean up 2022-01-26 13:44:38 +08:00
omair saleh 611adf96e7 update replica packages logic and over weight price announcement 2022-01-21 16:46:27 +08:00
omair saleh d4f1184779 update replica packages logic and over weight price announcement 2022-01-21 16:42:42 +08:00
omair saleh 45acd797da update replica packages logic and over weight price announcement 2022-01-21 16:31:13 +08:00
omair saleh 4b411ddaf4 update replica packages logic and over weight price announcement 2022-01-21 16:29:15 +08:00
omair saleh 412f4cc4b6 update replica packages logic and over weight price announcement 2022-01-21 16:26:15 +08:00
omair saleh 8487c6adf3 update replica packages logic and over weight price announcement 2022-01-21 16:00:53 +08:00
omair saleh 2bb8adf175 update replica packages logic and over weight price announcement 2022-01-21 15:59:52 +08:00
omair saleh d0a873e065 update replica packages logic and over weight price announcement 2022-01-21 14:39:46 +08:00
omair saleh e6eb05739c update replica packages logic and over weight price announcement 2022-01-21 14:25:44 +08:00
omair saleh 40c5692276 fix order status count 2022-01-03 15:40:38 +08:00
omair saleh 47eb9262ad add packing list replica 2021-12-28 01:19:26 +08:00
omair saleh 12a51722b3 Merge branch 'announcement-backend' into 'development' 
Announcement backend

See merge request CIEFWorldwideSdnBhd/shipping-portal!92
 2021-12-19 05:19:09 +00:00
omair saleh bec9f121ab add packing list relationship in packing list model 2021-12-17 12:02:01 +08:00
omair saleh 1d479f6f79 Merge branch 'copy_packinglists' into 'development' 
Duplicate packing list for admin CIEF reference

See merge request CIEFWorldwideSdnBhd/shipping-portal!89
 2021-12-17 02:26:38 +00:00
Fairuz 3aec23525c Duplicate packing list for admin CIEF reference 2021-12-13 11:45:48 +08:00
omair saleh 32465e2170 add contact and remark to address 2021-11-28 21:03:04 +08:00
omair saleh 5d9782d1c9 package tracking page 2021-11-28 20:19:09 +08:00
omair saleh 2cc0465165 package tracking page 2021-11-28 19:19:18 +08:00
edmondlang 92c086a5bc clear merge bug dupplicated code 2021-11-27 17:24:30 +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 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 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 2b6a2810e5 clean up company module un used dependencies 2021-11-25 03:11:20 +08:00
edmondlang e0a78cc126 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into order-remark-backend 2021-10-31 15:45:55 +08:00
edmondlang 5e7cfd4da0 tidy up the order remark backend api 2021-10-31 15:43:57 +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
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
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