Dillon
2248e76bd4
Allow admin to search a customer by email address to open in new window
2023-01-11 22:44:04 +08:00
Omair Saleh
4c023aa393
export customer total yearly cbm
2023-01-05 10:41:38 +08:00
Omair Saleh
7922c10e2c
export customer total yearly cbm
2023-01-05 10:39:04 +08:00
Omair Saleh
742fdf307b
export customer total yearly cbm
2023-01-05 10:37:27 +08:00
Omair Saleh
df993fe491
export customer total yearly cbm
2023-01-04 12:17:44 +08:00
Omair Saleh
5f5707718f
show reference number for package
2023-01-04 11:29:40 +08:00
Omair Saleh
d7d9a065fd
show reference number for package
2023-01-04 11:23:16 +08:00
EDMOND MING
568d45808a
Merge branch 'export-top-order-pdf' into 'master'
...
export top order pdf
See merge request CIEFWorldwideSdnBhd/shipping-portal!138
2023-01-03 05:47:39 +00:00
edmondlang
715051076c
export top order pdf
2023-01-03 00:41:12 +08:00
Omair Saleh
7642f6e9d3
regenerate invoices for specific customers
2022-12-30 17:35:28 +08:00
Omair Saleh
84ad39ac11
regenerate invoices for specific customers
2022-12-30 17:35:07 +08:00
Omair Saleh
03b44cf71d
regenerate invoices for specific customers
2022-12-30 17:34:33 +08:00
Omair Saleh
0b577c22f4
regenerate invoices for specific customers
2022-12-30 17:33:29 +08:00
Omair Saleh
cabb7b7d63
regenerate invoices for specific customers
2022-12-30 17:32:34 +08:00
Omair Saleh
880d3fc8ce
regenerate invoices for specific customers
2022-12-30 17:29:00 +08:00
Omair Saleh
8d901505fe
regenerate invoices for specific customers
2022-12-30 17:28:27 +08:00
Omair Saleh
489216e7be
regenerate invoices for specific customers
2022-12-30 17:23:56 +08:00
Omair Saleh
e413dfa795
regenerate invoices for specific customers
2022-12-30 17:21:47 +08:00
Omair Saleh
4ff5c6df80
update gz warehouse notice
2022-12-26 21:21:00 +08:00
Omair Saleh
762add8e5c
fix log data for transactional tables
2022-12-18 15:14:36 +08:00
Omair Saleh
96723461e4
log transactional data
2022-12-16 13:39:19 +08:00
Omair Saleh
2c1431a813
fix over weight minimum charge
2022-12-14 20:16:52 +08:00
Omair Saleh
90ca018e81
fix over weight minimum charge
2022-12-14 20:15:02 +08:00
Omair Saleh
60c51419bb
fix over weight minimum charge
2022-12-14 20:07:31 +08:00
Omair Saleh
69f98125a0
fix over weight minimum charge
2022-12-14 20:05:50 +08:00
Omair Saleh
f56bfb0309
fix over weight minimum charge
2022-12-14 20:04:02 +08:00
Omair Saleh
aedd836211
fix over weight minimum charge
2022-12-14 20:03:11 +08:00
Omair Saleh
abfb0ea47b
fix over weight minimum charge
2022-12-14 19:57:10 +08:00
Omair Saleh
09461e5bef
fix over weight minimum charge
2022-12-14 19:56:21 +08:00
Omair Saleh
d5b16f288a
fix over weight minimum charge
2022-12-14 19:55:55 +08:00
Omair Saleh
7c1a77089b
fix over weight minimum charge
2022-12-14 19:54:19 +08:00
Omair Saleh
505d924eec
fix over weight minimum charge
2022-12-14 19:48:39 +08:00
Omair Saleh
d0dd802693
fix over weight minimum charge
2022-12-14 19:47:56 +08:00
Omair Saleh
3113cc9fc0
fix over weight minimum charge
2022-12-14 19:47:00 +08:00
Omair Saleh
840e1147c8
fix over weight minimum charge
2022-12-14 19:42:16 +08:00
Omair Saleh
5c89471e14
fix over weight minimum charge
2022-12-14 11:45:28 +08:00
Omair Saleh
fbc73e040f
fix billplz bill status
2022-12-13 11:03:48 +08:00
Omair Saleh
414f22ab05
fix billplz bill status
2022-12-13 10:56:36 +08:00
Omair Saleh
d7328bafdc
fix billplz bill status
2022-12-13 10:54:46 +08:00
Omair Saleh
5c5505174a
fix billplz bill status
2022-12-13 10:52:51 +08:00
Omair Saleh
6b73d13c33
fix billplz bill status
2022-12-09 12:01:47 +08:00
Omair Saleh
8a62807356
fix billplz bill status
2022-12-09 11:54:16 +08:00
Omair Saleh
acca5192b6
estimate container shipping cost
2022-12-07 17:30:48 +08:00
Omair Saleh
dfbf22951b
estimate container shipping cost
2022-12-02 11:23:40 +08:00
Omair Saleh
cc26e67340
estimate container shipping cost
2022-12-02 11:22:47 +08:00
Omair Saleh
15db2715f5
estimate container shipping cost
2022-12-02 11:15:50 +08:00
Omair Saleh
2fc54f796a
estimate container shipping cost
2022-12-02 11:01:33 +08:00
Omair Saleh
91b14b3820
estimate container shipping cost
2022-12-02 10:14:37 +08:00
Omair Saleh
7dc549ab2e
estimate container shipping cost
2022-12-01 19:08:43 +08:00
Omair Saleh
5480a55edc
estimate container shipping cost
2022-12-01 18:44:04 +08:00
Omair Saleh
0cb3bd6ce3
estimate container shipping cost
2022-12-01 18:41:17 +08:00
Omair Saleh
f2cc45303c
estimate container shipping cost
2022-12-01 18:40:36 +08:00
Omair Saleh
e0db537931
estimate container shipping cost
2022-12-01 18:37:50 +08:00
Omair Saleh
53b4af2b5c
estimate container shipping cost
2022-12-01 18:35:24 +08:00
Omair Saleh
c9d2041653
estimate container shipping cost
2022-12-01 18:31:43 +08:00
Omair Saleh
53e9fcaeb8
debug minimum charge
2022-11-29 15:14:34 +08:00
Omair Saleh
7e007e7d78
debug minimum charge
2022-11-29 15:07:32 +08:00
Omair Saleh
7c879c8633
add bcc to invoice notification email for testing
2022-11-25 11:42:20 +08:00
Omair Saleh
9f255664ac
show add/edit billing address to admin
2022-11-24 09:52:12 +08:00
Omair Saleh
63918b4eb0
update china on hold list
2022-11-22 12:10:24 +08:00
Omair Saleh
ae36513635
round up cbm to 3 decimals
2022-11-16 16:52:01 +08:00
Omair Saleh
7ac66080ec
update export invoice
2022-11-16 16:45:33 +08:00
Omair Saleh
4b699345b8
update export invoice
2022-11-16 16:32:45 +08:00
Omair Saleh
634a97f3b4
minor changes to dummy data seeder comments
2022-11-15 19:56:03 +08:00
Omair Saleh
8a4810d961
remove lockdown announcement from order form
2022-11-15 15:07:33 +08:00
Omair Saleh
ab3ba64d31
show anitha debtor ui
2022-11-14 15:01:56 +08:00
Omair Saleh
7bca4be9b9
show anitha debtor ui
2022-11-14 14:54:43 +08:00
Omair Saleh
4f12c7c8ac
show anitha debtor ui
2022-11-14 14:53:37 +08:00
Omair Saleh
759a9c19d7
show anitha debtor ui
2022-11-14 14:21:25 +08:00
Omair Saleh
6fa72a4195
show anitha debtor ui
2022-11-14 14:19:06 +08:00
Omair Saleh
c82581dcc4
show anitha debtor ui
2022-11-14 14:13:55 +08:00
Omair Saleh
d4a63c0095
disable notification for non production enviroments
2022-11-10 21:13:28 +08:00
Omair Saleh
22b03669c6
disable notification for non production enviroments
2022-11-10 21:11:45 +08:00
Omair Saleh
58e9e80fd9
dummy data seed
2022-11-10 20:32:14 +08:00
Omair Saleh
4dab73fc8e
re-release yd paid orders
2022-11-09 12:00:25 +08:00
Omair Saleh
9b87f26ca3
re-release yd paid orders
2022-11-09 11:56:43 +08:00
Omair Saleh
cd81683816
add container summary for billing report
2022-11-07 13:18:59 +08:00
Omair Saleh
169fac4ab0
add container summary for billing report
2022-11-07 13:17:22 +08:00
Omair Saleh
34b4482139
add container summary for billing report
2022-11-07 13:16:42 +08:00
Omair Saleh
945e8585d4
show edit billing address at invoice pending approval
2022-11-07 10:57:11 +08:00
Omair Saleh
68cb7b7df1
show edit billing address at invoice pending approval
2022-11-07 10:51:32 +08:00
Omair Saleh
84b6750bcc
show edit billing address at invoice pending approval
2022-11-07 10:21:27 +08:00
Omair Saleh
7f766cde6a
Invoice reminder and shipment update notification emails
2022-11-07 09:38:03 +08:00
Omair Saleh
5d1bb976f8
misc fixes
2022-11-07 08:20:24 +08:00
Omair Saleh
529eb1be93
GZ warehouse close notice
2022-11-03 20:28:30 +08:00
Omair Saleh
95fd0aa45d
shipping sales report
2022-11-01 15:45:46 +08:00
Omair Saleh
64a7e4e0b7
shipping sales report
2022-11-01 15:41:28 +08:00
Omair Saleh
de4577346c
shipping sales report
2022-11-01 15:36:37 +08:00
Omair Saleh
0ac9ca38f2
shipping sales report
2022-11-01 15:34:15 +08:00
Omair Saleh
4b79039a18
shipping sales report
2022-11-01 15:32:39 +08:00
Omair Saleh
4b32a48e07
shipping sales report
2022-11-01 15:30:53 +08:00
Omair Saleh
eb09993397
yd api to fetch 30 days
2022-11-01 12:36:29 +08:00
Omair Saleh
627d782e5d
yd api to fetch 30 days
2022-11-01 12:35:17 +08:00
Omair Saleh
04771cec4f
yd api to fetch 30 days
2022-11-01 12:24:48 +08:00
Omair Saleh
d7630af675
fix payment due date days filter
2022-10-31 12:30:24 +08:00
Omair Saleh
37c710def6
fix payment due date days filter
2022-10-30 20:41:20 +08:00
Omair Saleh
7423588324
fix payment due date days filter
2022-10-30 20:38:36 +08:00
Omair Saleh
cb76e86c75
fix payment due date days filter
2022-10-30 20:37:43 +08:00
Omair Saleh
cb862123b5
fix payment due date days filter
2022-10-30 20:37:02 +08:00
Omair Saleh
032efcb96b
fix payment due date days filter
2022-10-30 20:35:54 +08:00
Omair Saleh
a90730d616
fix payment due date days filter
2022-10-30 20:35:01 +08:00
Omair Saleh
d5026df3a5
fix payment due date days filter
2022-10-30 20:33:33 +08:00
Omair Saleh
6dd3849bff
fix payment due date days filter
2022-10-30 20:31:46 +08:00
Omair Saleh
9e4bad1eee
fix payment due date days filter
2022-10-30 19:02:29 +08:00
Omair Saleh
e356573715
fix payment due date days filter
2022-10-30 19:01:51 +08:00
Omair Saleh
de6cb6a75f
fix payment due date days filter
2022-10-30 18:59:47 +08:00
Omair Saleh
524da42526
fix payment due date days filter
2022-10-30 18:56:19 +08:00
Omair Saleh
1abc99fe10
fix payment due date days filter
2022-10-30 18:46:14 +08:00
Omair Saleh
e91e770bf3
fix payment due date days filter
2022-10-30 18:41:55 +08:00
omair saleh
2e5d39fe96
Merge branch '417-payment-filter' into 'master'
...
Payment filter
See merge request CIEFWorldwideSdnBhd/shipping-portal!137
2022-10-30 10:28:25 +00:00
omair saleh
6efa78e40d
Merge branch 'master' into '417-payment-filter'
...
# Conflicts:
# app/Http/Resources/PackingListResource.php
2022-10-30 10:28:19 +00:00
Fairuz
df862b7107
Payment filter
2022-10-30 17:44:14 +08:00
Omair Saleh
9df97f3db5
whitelist replica 3992WHE
2022-10-28 12:26:14 +08:00
Omair Saleh
aa2ce980bc
fix export invoice
2022-10-27 15:57:27 +08:00
Omair Saleh
a6446b88fd
shorten yd fetch duration
2022-10-20 11:37:55 +08:00
Omair Saleh
be283dee78
shorten yd fetch duration
2022-10-20 11:28:09 +08:00
Omair Saleh
2d58db7bd9
allow to edit company name for personal account s
2022-10-20 11:12:10 +08:00
Omair Saleh
2b44254186
add further description to export payments
2022-10-19 15:50:18 +08:00
Omair Saleh
e99cec81d7
add further description to export payments
2022-10-19 15:44:45 +08:00
Omair Saleh
5e810a1c16
add further description to export payments
2022-10-19 15:40:57 +08:00
Omair Saleh
b5cba80db9
add further description to export payments
2022-10-19 15:09:33 +08:00
Omair Saleh
3479aed911
add further description to export payments
2022-10-19 15:07:45 +08:00
Omair Saleh
f05e96725b
add further description to export payments
2022-10-19 15:06:41 +08:00
Omair Saleh
becb16c674
add further description to export payments
2022-10-19 14:53:51 +08:00
Omair Saleh
7e8163166b
add further description to export payments
2022-10-19 14:52:26 +08:00
Omair Saleh
ad21580c3e
add excel extension
2022-10-19 12:04:19 +08:00
Omair Saleh
2f15268897
add excel extension
2022-10-19 11:34:56 +08:00
Omair Saleh
ff4efdcd54
add excel extension
2022-10-19 11:31:52 +08:00
Omair Saleh
fe400264c7
add excel extension
2022-10-19 11:23:30 +08:00
Omair Saleh
cb0189e7d8
add excel extension
2022-10-19 10:49:57 +08:00
Omair Saleh
f5070b2138
add excel extension
2022-10-19 10:46:33 +08:00
Omair Saleh
6a6497cac3
add excel extension
2022-10-19 10:39:30 +08:00
Omair Saleh
dbf61d3a77
add excel extension
2022-10-19 10:37:43 +08:00
Omair Saleh
2f1164d606
add excel extension
2022-10-19 10:35:54 +08:00
Omair Saleh
a472ec6684
add excel extension
2022-10-19 10:27:50 +08:00
Omair Saleh
10403943d0
add excel extension
2022-10-19 10:22:30 +08:00
Omair Saleh
5d49847f1f
list customer with delayed shipment
2022-10-18 13:49:29 +08:00
Omair Saleh
f96321c854
list customer with delayed shipment
2022-10-18 13:48:37 +08:00
Omair Saleh
2e6432f2e5
list customer with delayed shipment
2022-10-18 13:45:24 +08:00
Omair Saleh
f8c37f4dbc
list customer with delayed shipment
2022-10-18 13:44:17 +08:00
Omair Saleh
9deed272ad
list customer with delayed shipment
2022-10-18 13:37:16 +08:00
Omair Saleh
38e7f89293
list customer with delayed shipment
2022-10-18 13:36:41 +08:00
Omair Saleh
724861270c
list customer with delayed shipment
2022-10-18 13:34:29 +08:00
Omair Saleh
88cf72eb75
fix invoice complete bug
2022-10-18 10:44:15 +08:00
Omair Saleh
5fcd11e84c
allow admin to do partial payment
2022-10-18 10:32:33 +08:00
Omair Saleh
13bd343198
allow admin to do partial payment
2022-10-18 10:29:59 +08:00
Omair Saleh
d6c5b45b44
show manual transfer bank in details
2022-10-17 16:59:40 +08:00
Omair Saleh
db0da02e27
show manual transfer bank in details
2022-10-17 16:57:08 +08:00
Omair Saleh
6db2675e76
hide sensitive pages from customer view
2022-10-17 16:31:25 +08:00
Omair Saleh
13271f311c
fix debtor upload ui
2022-10-17 16:25:18 +08:00
Omair Saleh
a2ac87b659
add published announcement filter
2022-10-17 15:21:21 +08:00
Omair Saleh
0b317ae1f7
hide payment button when outstanding is less than 0.01
2022-10-17 15:18:51 +08:00
Omair Saleh
5a0ef40e44
show debtor ui to anitha
2022-10-17 15:07:31 +08:00
Omair Saleh
97273a30cb
show debtor ui to anitha
2022-10-17 15:05:32 +08:00
Omair Saleh
c13145ad41
hide billing address button
2022-10-17 14:01:27 +08:00
Omair Saleh
045b0b9878
show edit billing address only to super admin
2022-10-17 13:55:24 +08:00
Omair Saleh
39a9e45fc4
export payment UI
2022-10-17 13:53:53 +08:00
Omair Saleh
910fa13867
export payment debug
2022-10-17 13:49:48 +08:00
Omair Saleh
6f86702df0
export payment debug
2022-10-17 13:49:06 +08:00
Omair Saleh
b79bcdbbb3
export payment debug
2022-10-17 13:48:22 +08:00
Omair Saleh
086b262fca
fix edit billing address ui
2022-10-17 13:44:32 +08:00
Omair Saleh
8396e8dab3
export payments
2022-10-17 13:43:26 +08:00
Omair Saleh
96948c96b5
edit billing address
2022-10-17 13:39:03 +08:00
Omair Saleh
d8386601c3
1. Import Debtor
...
2. export payments
2022-10-17 13:29:52 +08:00
omair saleh
bf2a6e7f23
Merge branch 'import-debtor' into 'master'
...
Import debtor
See merge request CIEFWorldwideSdnBhd/shipping-portal!136
2022-10-17 05:00:51 +00:00
omair saleh
235b04e395
Merge branch 'master' into 'import-debtor'
...
# Conflicts:
# routes/web.php
2022-10-17 05:00:42 +00:00
Omair Saleh
5ea4044e3f
debug callback url for billplz
2022-10-13 15:54:56 +08:00
Omair Saleh
66bbf9934c
fix payment ui & reload issue
2022-10-13 01:44:48 +08:00
Omair Saleh
94a6f0758c
fix payment ui & reload issue
2022-10-13 01:42:11 +08:00
Omair Saleh
04f43d8ea8
fix payment ui & reload issue
2022-10-13 01:40:47 +08:00
Omair Saleh
0808d86af9
fix payment ui & reload issue
2022-10-13 01:34:00 +08:00
Omair Saleh
714678fdc1
fix payment ui & reload issue
2022-10-13 01:31:41 +08:00
Omair Saleh
c050444cdb
export yd parcel postcode
2022-10-13 01:17:55 +08:00
Omair Saleh
bc6c690b54
export yd parcel postcode
2022-10-13 01:12:22 +08:00
Omair Saleh
7cfa328ec0
export yd parcel postcode
2022-10-13 01:05:54 +08:00
Omair Saleh
45685bf2a4
export yd parcel postcode
2022-10-13 01:04:26 +08:00
Omair Saleh
534e02a20f
export yd parcel postcode
2022-10-13 00:55:29 +08:00
Omair Saleh
26547328cb
remove delivery address postcode to yd to release goods from china
2022-10-13 00:36:18 +08:00
Omair Saleh
f92ca756aa
submit delivery address postcode to yd to release goods from china
2022-10-11 23:25:30 +08:00
Omair Saleh
5514f3b8e0
submit delivery address postcode to yd to release goods from china
2022-10-11 23:13:48 +08:00
Omair Saleh
14d80fd457
fix invoice date
2022-10-10 17:51:04 +08:00
Omair Saleh
c8d621057b
fix invoice date
2022-10-10 17:49:14 +08:00
Omair Saleh
6ecfa8e031
fix invoice date
2022-10-10 17:43:32 +08:00
Omair Saleh
975e3d49e7
hide payment button for floating amount
2022-09-30 16:20:54 +08:00
Omair Saleh
2bd30492c5
hide payment button for floating amount
2022-09-30 16:13:15 +08:00
Omair Saleh
c089b5f072
hide payment button for floating amount
2022-09-30 16:12:15 +08:00
Omair Saleh
fbaa1238cb
hide payment button for floating amount
2022-09-30 16:10:17 +08:00
Omair Saleh
d1cf06d700
hide payment button for floating amount
2022-09-30 16:09:05 +08:00
Omair Saleh
ff159730e0
hide payment button for floating amount
2022-09-30 16:07:06 +08:00
Omair Saleh
e59934fa7b
show order reference on payment verification component
2022-09-30 15:59:25 +08:00
Omair Saleh
650d232ab0
show order reference on payment verification component
2022-09-30 15:57:26 +08:00
Omair Saleh
71ae2437a4
show order reference on payment verification component
2022-09-30 15:54:06 +08:00
Omair Saleh
17edf59b57
show order reference on payment verification component
2022-09-30 15:52:21 +08:00
Omair Saleh
6268cdd21f
show order reference on payment verification component
2022-09-30 15:50:30 +08:00
Omair Saleh
2ea62bcfb9
show order reference on payment verification component
2022-09-30 15:48:46 +08:00
Omair Saleh
1debc8e2d5
show order reference on payment verification component
2022-09-30 15:46:21 +08:00
Omair Saleh
fb849aa4cc
show order reference on payment verification component
2022-09-30 15:44:31 +08:00
Omair Saleh
913f6f84e2
show order reference on payment verification component
2022-09-30 15:40:24 +08:00
Omair Saleh
f28d0382b8
show order reference on payment verification component
2022-09-30 15:35:57 +08:00
edmondlang
97a568322c
edit billing address in payment and billing
2022-09-29 20:53:00 +08:00
edmondlang
b01e2022dc
import debtor
2022-09-29 19:11:59 +08:00
Omair Saleh
f7a1ba05f8
customer announcement in customer profile
2022-09-28 17:34:27 +08:00
Omair Saleh
a05a6381df
fix delete packinglist
2022-09-28 13:12:57 +08:00
Omair Saleh
d7c0f7302d
delete duplicated buttons from unclaimed packing list component
2022-09-28 13:07:36 +08:00
Omair Saleh
78a8451699
fix unclaimed packing list pending invoice
2022-09-27 13:31:28 +08:00
Omair Saleh
5964123c5f
fix bug when dispute has no comment
2022-09-27 13:28:30 +08:00
Omair Saleh
28e5fa43a5
update delivery keywords for yd
2022-09-27 10:54:31 +08:00
Omair Saleh
4d39d7f43f
update delivery keywords for yd
2022-09-27 10:53:40 +08:00
Omair Saleh
ee65ceac1d
update delivery keywords for yd
2022-09-27 10:46:42 +08:00
Omair Saleh
ee1dfea0c8
show packing list reference
2022-09-27 10:33:13 +08:00
omair saleh
a90766ba13
fix cnt quantity in the invoice
2022-09-26 12:15:45 +08:00
omair saleh
6613ca9a86
fix qr image ratio in pdf
2022-09-25 22:36:34 +08:00
omair saleh
2839f7855c
fix qr image ratio in pdf
2022-09-25 22:35:56 +08:00
omair saleh
9b70fdf37f
fix qr image ratio in pdf
2022-09-25 22:35:09 +08:00
omair saleh
4667d8fbc3
fix qr image ratio in pdf
2022-09-25 22:34:32 +08:00
omair saleh
8b3e60a74a
fix qr image ratio in pdf
2022-09-25 22:33:59 +08:00
omair saleh
1f6c6bf87d
fix qr image ratio in pdf
2022-09-25 22:33:27 +08:00
omair saleh
8100ea0329
Merge remote-tracking branch 'origin/master'
2022-09-25 22:30:49 +08:00
omair saleh
20d706caf8
fix qr image ratio in pdf
2022-09-25 22:30:24 +08:00
edmondlang
3fe46f596a
delete pending approval invoice
2022-09-22 23:27:32 +08:00
omair saleh
c22e13f3cb
show address at invoice component
2022-09-22 15:47:34 +08:00
omair saleh
e39d364782
show address at invoice component
2022-09-22 15:35:47 +08:00
omair saleh
47fdac08aa
debug invoice
2022-09-22 13:40:22 +08:00
omair saleh
d824075e51
debug invoice
2022-09-22 13:40:10 +08:00
omair saleh
af5de245ad
debug invoice
2022-09-22 13:37:11 +08:00
omair saleh
a58a5bd9a6
debug invoice
2022-09-22 13:35:41 +08:00
omair saleh
0493057805
debug invoice
2022-09-22 13:34:56 +08:00
omair saleh
b6fc042d07
debug invoice
2022-09-22 13:33:19 +08:00
omair saleh
6bdcc007fc
debug invoice
2022-09-22 13:32:44 +08:00
omair saleh
747402a5bc
debug invoice
2022-09-22 13:32:06 +08:00
omair saleh
c49d43f000
debug vt container update script
2022-09-22 13:25:40 +08:00
omair saleh
1e06e4db21
debug vt container update script
2022-09-22 13:24:12 +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
a1ea94fa73
debug billing
2022-09-22 13:14:50 +08:00
omair saleh
79f6637b7b
hide payment and billing page from customer
2022-09-22 11:56:20 +08:00
omair saleh
dd684531c6
fetch vt recieve last 10 days
2022-09-21 13:02:01 +08:00
omair saleh
52e95b40ab
fetch vt recieve last 10 days
2022-09-21 12:43:31 +08:00
omair saleh
b6269ee369
fetch vt recieve last 10 days
2022-09-21 12:35:52 +08:00
omair saleh
144b5e7e13
fetch vt recieve last 10 days
2022-09-21 12:30:42 +08:00
omair saleh
a84f44e9b0
fetch vt recieve last 10 days
2022-09-21 12:19:11 +08:00
omair saleh
32b90a3387
fetch vt recieve last 10 days
2022-09-21 11:54:24 +08:00
omair saleh
7faf5331e5
billing fix up
2022-09-21 10:10:39 +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
d2d82aabac
Merge branch 'development' into 'master'
...
if company doesn't have billing address - hide generate invoice and show...
See merge request CIEFWorldwideSdnBhd/shipping-portal!135
2022-09-21 00:54:20 +00:00
omair saleh
6fe3023abc
billing fix up
2022-09-20 16:50:50 +08:00
omair saleh
e0356599bb
billing fix up
2022-09-20 16:46:03 +08:00
omair saleh
37c3f95eda
billing fix up
2022-09-20 16:43:21 +08:00
omair saleh
843b311c77
billing fix up
2022-09-20 16:41:30 +08:00
omair saleh
3fc7ccb51e
billing fix up
2022-09-20 16:31:40 +08:00
omair saleh
9216c176f3
billing fix up
2022-09-20 16:27:38 +08:00
omair saleh
021c200d07
billing fix up
2022-09-20 16:24:56 +08:00
omair saleh
a795a118a5
billing fix up
2022-09-20 16:23:05 +08:00
omair saleh
9833d07b04
billing fix up
2022-09-20 16:22:29 +08:00
omair saleh
7bf865ed3e
billing fix up
2022-09-20 16:21:36 +08:00
omair saleh
f7c8f68520
billing fix up
2022-09-20 16:19:05 +08:00
omair saleh
756e1b9419
billing fix up
2022-09-20 15:58:14 +08:00
omair saleh
dd28171011
billing fix up
2022-09-20 09:13:46 +08:00
omair saleh
9f6fe2722c
billing fix up
2022-09-20 09:09:11 +08:00
omair saleh
25928305ea
billing fix up
2022-09-20 09:08:15 +08:00
omair saleh
499d1f9759
billing fix up
2022-09-20 09:06:10 +08:00
omair saleh
0e8c74bec2
billing fix up
2022-09-20 09:05:08 +08:00
omair saleh
f774e90d50
billing fix up
2022-09-20 09:04:29 +08:00
omair saleh
6558ce20d9
billing fix up
2022-09-20 09:01:26 +08:00
omair saleh
f16a843197
billing fix up
2022-09-20 08:49:48 +08:00
omair saleh
1ea081d831
billing fix up
2022-09-20 08:47:32 +08:00
omair saleh
ce4e88fcdc
billing fix up
2022-09-20 08:44:59 +08:00
omair saleh
6ca4f235df
billing fix up
2022-09-20 08:06:39 +08:00
omair saleh
03843d8726
billing fix up
2022-09-20 08:04:43 +08:00
omair saleh
48b4381ba5
billing fix up
2022-09-20 07:56:29 +08:00
omair saleh
71d45fa100
billing fix up
2022-09-20 07:53:59 +08:00
omair saleh
ebd42cfcbe
billing fix up
2022-09-20 07:52:48 +08:00
omair saleh
9541f32641
billing fix up
2022-09-20 07:50:22 +08:00
omair saleh
5077e0e8d4
billing fix up
2022-09-20 07:48:49 +08:00
omair saleh
c1c2c155be
billing fix up
2022-09-20 07:36:20 +08:00
omair saleh
c69dcf6ba3
billing fix up
2022-09-20 07:32:05 +08:00
omair saleh
10a95f0b4d
billing fix up
2022-09-20 07:28:40 +08:00
omair saleh
d8b41cbe55
billing fix up
2022-09-20 06:43:54 +08:00
omair saleh
ad15b2f6b8
export parcel summary
2022-09-20 03:33:10 +08:00
omair saleh
5a69a31628
export parcel summary
2022-09-20 03:32:49 +08:00
omair saleh
65e0fe668d
export parcel summary
2022-09-20 03:30:43 +08:00
omair saleh
0cd2272e6c
export parcel summary
2022-09-20 03:29:55 +08:00
omair saleh
2f358c659b
export parcel summary
2022-09-20 03:29:18 +08:00
omair saleh
3bec5b9c86
export parcel summary
2022-09-20 03:28:09 +08:00
omair saleh
f499aaa0a7
export parcel summary
2022-09-20 03:27:29 +08:00
omair saleh
dfcb6064f8
export parcel summary
2022-09-20 03:26:10 +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
427bbb9de2
export parcel summary
2022-09-20 02:31:09 +08:00
omair saleh
dc4fabbf36
export parcel summary
2022-09-20 02:30:26 +08:00
omair saleh
e5e93e500e
fix pending delivery export
2022-09-19 12:03:07 +08:00
omair saleh
924f686381
fix pending delivery export
2022-09-19 11:57:36 +08:00
omair saleh
acb334f2c2
fix pending delivery export
2022-09-19 11:39:59 +08:00
omair saleh
35611da094
fix pending delivery export
2022-09-19 11:39:16 +08:00
omair saleh
ba192563ba
fix pending delivery export
2022-09-19 11:38:01 +08:00
omair saleh
42525a4d32
fix export on hold list
2022-09-15 12:57:14 +08:00
omair saleh
7af7b28408
move csw to yd
2022-09-14 13:40:58 +08:00
omair saleh
b90fa86eae
don't allow to release packing list with yd without person in charge info
2022-09-14 13:35:51 +08:00
omair saleh
ba7f9807a7
remove csw from yd exempt list
2022-09-09 14:17:59 +08:00
edmondlang
daf5c65bd7
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# routes/web.php
2022-09-07 21:50:48 +08:00
omair saleh
4280a9188c
add 2 days to eta date
2022-09-07 17:30:45 +08:00
omair saleh
08398c481e
break line for postcode
2022-09-07 15:35:40 +08:00
omair saleh
c8399cc336
break line for postcode
2022-09-07 15:31:13 +08:00
omair saleh
84bef88f16
break line for postcode
2022-09-07 15:25:22 +08:00
omair saleh
3e45f58b3b
break line for postcode
2022-09-07 15:24:33 +08:00
omair saleh
856302f480
break line for postcode
2022-09-07 15:22:36 +08:00
edmondlang
1a67fa31dc
fix connection segment in customer page
2022-09-03 18:59:12 +08:00
omair saleh
d045e0401d
billing segment
2022-09-03 15:03:17 +08:00
omair saleh
d2e3e1979a
remove announcement
2022-09-03 11:33:55 +08:00
omair saleh
4dba55eb32
add customers to the exception list for auto release
2022-09-02 14:39:17 +08:00
omair saleh
29fe4cf53c
csw move to yd
2022-08-30 15:21:10 +08:00
omair saleh
3b39477369
holiday announcement
2022-08-26 11:15:42 +08:00
omair saleh
a79d9249af
update holiday announcement
2022-08-26 11:14:14 +08:00
omair saleh
6c1a9fe992
fix vt container api
2022-08-25 16:54:12 +08:00
omair saleh
01b539bea8
fix vt container api
2022-08-25 16:52:15 +08:00
omair saleh
73ba896e7c
fix vt container api
2022-08-25 16:50:20 +08:00
omair saleh
8635e5f71f
fix vt container api
2022-08-25 16:49:26 +08:00
omair saleh
fb3405cdbc
fix vt container api
2022-08-25 16:48:12 +08:00
omair saleh
4e4e0b5d9c
fix vt container api
2022-08-25 16:45:48 +08:00
omair saleh
41c76c7c09
fix vt container api
2022-08-25 16:43:43 +08:00
omair saleh
5fada5310e
fix vt container api
2022-08-25 16:41:24 +08:00
omair saleh
10fc3d7f68
fix vt container api
2022-08-25 14:39:39 +08:00
omair saleh
a495d5ac0a
fix vt container api
2022-08-25 14:33:58 +08:00
omair saleh
49a21865b6
fix vt container api
2022-08-25 14:33:21 +08:00
omair saleh
32c03caff1
fix vt container api
2022-08-25 14:28:53 +08:00
omair saleh
42e7ee43f2
fix vt container api
2022-08-25 14:28:13 +08:00
omair saleh
18fab0e8d4
fix vt container api
2022-08-25 14:27:21 +08:00
omair saleh
f8bd9c0372
fix vt container api
2022-08-25 14:26:43 +08:00
omair saleh
9845b85cf0
fix vt container api
2022-08-25 14:24:58 +08:00
omair saleh
5163728298
fix vt container api
2022-08-25 14:17:41 +08:00
omair saleh
3e19696d02
fix vt container api
2022-08-25 14:16:32 +08:00
omair saleh
41dbd80d0d
fix vt container api
2022-08-25 14:10:43 +08:00
omair saleh
4e64d8cd1d
fix vt api
2022-08-24 18:49:50 +08:00
omair saleh
3108d20c16
fix vt update container
2022-08-24 18:42:53 +08:00
omair saleh
ea35cd0c10
fix vt container update
2022-08-24 18:41:16 +08:00
omair saleh
fffd6da513
fix vt container update
2022-08-24 18:40:17 +08:00
omair saleh
4b6d288485
fix vt container update
2022-08-24 18:37:33 +08:00
omair saleh
750ebbd769
fix vt container updates
2022-08-24 18:35:35 +08:00
omair saleh
e638186367
fix vt container updates
2022-08-24 18:34:38 +08:00
omair saleh
77812e625a
fix vt
2022-08-24 18:28:15 +08:00
omair saleh
5acd08d8e4
debug vt
2022-08-24 18:18:52 +08:00
omair saleh
6d7a05d264
add customer to exception for auto release from china
2022-08-24 17:11:47 +08:00
omair saleh
fcb16cc115
enable yiwu
2022-08-22 15:32:12 +08:00
omair saleh
4f7097772f
enable yiwu
2022-08-22 15:23:51 +08:00
omair saleh
9e8ee0f405
export all cbm report
2022-08-16 12:14:04 +08:00
omair saleh
8acbc56aeb
yiwu notice
2022-08-11 19:47:04 +08:00
omair saleh
460b141102
yiwu notice
2022-08-11 19:43:55 +08:00
edmondlang
d00620564b
update Customer order page and admin payment billing page - include remarks
2022-08-09 02:44:05 +08:00
edmondlang
68028d5cf3
add function for admin to regenerate the dispute invoice
2022-08-08 22:19:55 +08:00
edmondlang
a2c7eddf7b
update payment and billing
2022-08-07 17:11:26 +08:00
edmondlang
9e756132ca
update annoucment css
2022-08-06 23:53:43 +08:00
edmondlang
1706e2e1a3
remove console.log
2022-08-06 23:48:23 +08:00
edmondlang
e84e39b8a1
debug annoucment segment
2022-08-06 23:46:37 +08:00
edmondlang
6ed383c06c
update create annoucment service to suit the date time format from datetime picker
2022-08-06 23:34:07 +08:00
edmondlang
b52445f106
migrate annoucment module from exchange
2022-08-06 23:33:09 +08:00
edmondlang
e7f8b62116
update seeder for segment constant
2022-08-06 01:57:34 +08:00
edmondlang
cd59debee4
update CUSTOM SEGMENTS price api
2022-08-06 01:46:06 +08:00
edmondlang
f7a2861072
update admin payments billing page - do extra validation checking on each data with vue conditions
2022-08-06 00:42:20 +08:00
edmondlang
845fdfd5ca
debug all constant in settings
2022-08-06 00:41:28 +08:00
edmondlang
b984f931e1
update admin payments and billings page - add address and postcode
2022-08-05 23:40:59 +08:00
edmondlang
2b1fca6b2e
if company doesn't have billing address - hide generate invoice and show create billing address modal
2022-08-05 21:24:36 +08:00
edmondlang
433d8e63b4
hide generate invoice for un-claimed packing list
2022-08-05 20:07:55 +08:00
edmondlang
30bf744854
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# resources/assets/vue/components/settings/forms/EditSegmentPriceFormComponent.vue
2022-08-05 19:53:55 +08:00
omair saleh
ea880a1a54
update eta arrival date
2022-08-05 15:35:31 +08:00
omair saleh
b6a62fed2b
update eta arrival date
2022-08-05 15:34:35 +08:00
omair saleh
3106750be6
update eta arrival date
2022-08-05 15:26:02 +08:00
omair saleh
f1c2ff7364
update eta when arrival
2022-08-05 15:22:53 +08:00
omair saleh
0f307bda1f
update eta on arrival
2022-08-05 15:15:48 +08:00
omair saleh
52e601de00
disable yiwu warehouse temp
2022-08-05 10:40:49 +08:00
omair saleh
83351f17b1
hide payment and billing page from menu
2022-08-01 03:09:49 +08:00
omair saleh
be3d10e055
rename addon table
2022-08-01 03:06:52 +08:00
omair saleh
d6616c0c5c
rename addon table
2022-08-01 03:06:07 +08:00
omair saleh
a667e23647
rename addon table
2022-08-01 03:05:20 +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
omair saleh
c62231fe3a
hide notification temp
2022-08-01 02:15:03 +08:00
omair saleh
6335e90aab
update yd new delivery api
2022-08-01 02:13:19 +08:00
omair saleh
02c83044a2
Merge remote-tracking branch 'origin/master'
2022-08-01 02:11:40 +08:00
omair saleh
86e6ef7af5
update yd new delivery api
2022-08-01 02:11:07 +08:00
edmondlang
0bad26e8ff
update segment - delete props
2022-08-01 00:17:24 +08:00
edmondlang
c24ddb4fa2
remove code error
2022-07-31 22:52:05 +08:00
edmondlang
ff68ee76ab
update base price according to packlinglist drop date
2022-07-31 22:08:48 +08:00
edmondlang
2a0501ad99
remove extra line of codes
2022-07-31 22:08:15 +08:00
edmondlang
43491223ab
customer payment ui inside orders
2022-07-31 21:38:15 +08:00
edmondlang
436985db8f
fix error section not showing
2022-07-31 20:17:10 +08:00
edmondlang
37887de61d
add invoice in order resources
2022-07-31 20:15:38 +08:00
edmondlang
374cc7748a
update billplz ui
2022-07-31 18:00:05 +08:00
edmondlang
af15e462ba
Merge branch 'payment-and-billing-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-31 16:06:52 +08:00
edmondlang
db6412c5c0
when click on cancel will disminss the modal
2022-07-31 16:06:35 +08:00
edmondlang
afc6595715
Merge branch 'payment-and-billing-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-31 15:59:30 +08:00
edmondlang
e77e82bac2
move bill plz to shipping
2022-07-31 15:58:20 +08:00
edmondlang
ce38d098fd
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-31 14:38:36 +08:00
glovetleong
4db4f6094d
unit test bug
2022-07-30 09:56:30 +08:00
glovetleong
2a6a980fc3
unit test
2022-07-30 09:40:50 +08:00
omair saleh
1b230dbce0
Merge branch 'development' into 'master'
...
seperate log in page and sign up page for marketing
See merge request CIEFWorldwideSdnBhd/shipping-portal!131
2022-07-28 04:49:21 +00:00
edmondlang
4329f77e95
Merge branch 'payment-and-billing-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-27 20:20:41 +08:00
edmondlang
2f999d7e3c
code tidy up
2022-07-27 20:20:16 +08:00
edmondlang
302aa521ed
Merge branch 'payment-and-billing-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-27 20:10:46 +08:00
edmondlang
50ca61c587
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-27 20:10:30 +08:00
edmondlang
a6cbec3523
payment-and-billing ui
2022-07-27 20:09:53 +08:00
omair saleh
ee2208c992
debug claim packing list
2022-07-26 11:05:28 +08:00
omair saleh
b73ef5a386
debug claim packing list
2022-07-26 11:00:36 +08:00
omair saleh
cecc0a1b1b
debug claim packing list
2022-07-26 10:55:20 +08:00
omair saleh
b92a6fe710
debug claim packing list
2022-07-26 10:52:04 +08:00
omair saleh
24bd8be09d
debug claim packing list
2022-07-26 10:51:07 +08:00
omair saleh
d8801408ae
debug claim packing list
2022-07-26 10:49:44 +08:00
edmondlang
274b64de7e
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into payment-and-billing-ui
2022-07-23 23:32:54 +08:00
edmondlang
06da9bb435
add missing code
2022-07-23 23:32:31 +08:00
edmondlang
a276bc9582
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into payment-and-billing-ui
...
# Conflicts:
# routes/web.php
2022-07-23 20:30:41 +08:00
edmondlang
72f555d7d2
payments and billing
2022-07-23 20:28:50 +08:00
edmondlang
9db80220b8
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# resources/assets/vue/components/containers/elements/PackingListComponent.vue
# resources/assets/vue/components/orders/elements/UnclaimedPackinglistComponent.vue
2022-07-23 19:56:06 +08:00
omair saleh
55882aaacb
delete packinglist when deleting warehouselist
2022-07-22 19:17:18 +08:00
omair saleh
ca669f6f0a
fix exports pending delivery lists
2022-07-22 19:15:38 +08:00
omair saleh
ec70a390d0
fix exports pending delivery lists
2022-07-22 19:04:07 +08:00
omair saleh
987418d51a
fix exports pending delivery lists
2022-07-22 18:57:44 +08:00
omair saleh
6b641d44f2
fix exports pending delivery lists
2022-07-22 18:56:34 +08:00
omair saleh
b57dbe77be
delete unclaimed packing list button
2022-07-22 14:22:15 +08:00
omair saleh
b9ddd42f82
delete unclaimed packing list button
2022-07-22 14:21:43 +08:00
omair saleh
039a048150
delete unclaimed packing list button
2022-07-22 14:18:54 +08:00
omair saleh
f727389add
delete unclaimed packing list button
2022-07-22 14:18:18 +08:00
omair saleh
2bb6816794
delete unclaimed packing list button
2022-07-22 14:15:26 +08:00
omair saleh
0616ee0bac
show more data for unclaimed packages
2022-07-22 14:08:57 +08:00
omair saleh
c038324339
fix vt wrong delivery date
2022-07-21 11:00:32 +08:00
omair saleh
ac839c5835
break address words in packing list component
2022-07-21 10:48:38 +08:00
omair saleh
d4b85f2952
fix vt packing list api
2022-07-21 10:43:40 +08:00
omair saleh
2be24c4dac
fix vt packing list api
2022-07-19 19:24:05 +08:00
omair saleh
6caa68cfa4
fix vt packing list api
2022-07-19 19:21:55 +08:00
omair saleh
582534849a
fix vt packing list api
2022-07-19 19:00:55 +08:00
omair saleh
b4f816b90d
fix vt packing list api
2022-07-19 19:00:00 +08:00
omair saleh
0c939dca6f
fix vt packing list api
2022-07-19 18:59:11 +08:00
omair saleh
f5b2664f5f
fix vt packing list api
2022-07-19 18:56:44 +08:00
omair saleh
9613ed32c1
fix vt packing list api
2022-07-19 18:46:54 +08:00
omair saleh
202456289b
fix vt packing list api
2022-07-19 18:46:10 +08:00
omair saleh
c59bbd6677
fix vt packing list api
2022-07-19 18:41:27 +08:00
omair saleh
ebfa25933d
fix vt packing list api
2022-07-19 18:39:34 +08:00
omair saleh
3dedb75239
fix vt packing list api
2022-07-19 18:38:56 +08:00
omair saleh
9152bae815
fix vt packing list api
2022-07-19 18:38:35 +08:00
omair saleh
a88512e973
fix vt packing list api
2022-07-19 18:36:23 +08:00
omair saleh
2f59295f67
fix vt packing list api
2022-07-19 18:34:01 +08:00
omair saleh
bdb81daf1a
fix vt packing list api
2022-07-19 16:45:44 +08:00
omair saleh
42935d025d
fix vt packing list api
2022-07-19 16:36:22 +08:00
omair saleh
92b463b78e
fix vt packing list api
2022-07-18 14:41:46 +08:00
omair saleh
f62fc48636
fix vt packing list api
2022-07-18 14:39:40 +08:00
omair saleh
a71ca9dd29
fix vt packing list api
2022-07-18 09:44:31 +08:00
omair saleh
651dea8f3a
fix vt packing list api
2022-07-18 09:31:15 +08:00
omair saleh
79ada10312
fix vt containers api
2022-07-18 09:15:04 +08:00
omair saleh
66ef0c08f5
fix vt warehouse list api
2022-07-18 08:45:41 +08:00
omair saleh
fafc716109
fix vt warehouse list api
2022-07-18 08:37:54 +08:00
omair saleh
d93d51ff09
fix vt warehouse list api
2022-07-18 08:35:23 +08:00
omair saleh
b260d30e42
fix vt warehouse list api
2022-07-18 08:02:56 +08:00
omair saleh
af2d3adbcd
fix vt warehouse list api
2022-07-18 08:01:44 +08:00
omair saleh
846f617e00
fix packinglist without package bug in packinglist component
2022-07-18 06:25:23 +08:00
omair saleh
daa8618616
fix packinglist without package bug in packinglist component
2022-07-18 06:23:12 +08:00
omair saleh
22aaccbe21
yd fetch daily
2022-07-18 04:38:44 +08:00
omair saleh
1be99a0730
yd fetch daily
2022-07-18 04:30:54 +08:00
omair saleh
ac461a48b7
yd fetch daily
2022-07-18 04:20:07 +08:00
omair saleh
1619bc212f
yd fetch daily
2022-07-18 04:05:49 +08:00
omair saleh
c487b31673
yd fetch daily
2022-07-18 04:03:45 +08:00
omair saleh
0775c2687f
yd fetch daily
2022-07-18 04:03:13 +08:00
omair saleh
7767b4f177
yd fetch daily
2022-07-18 03:51:16 +08:00
omair saleh
ee7acbc683
yd fetch daily
2022-07-18 03:49:13 +08:00
omair saleh
b3b048ef2b
yd fetch daily
2022-07-18 03:47:02 +08:00
omair saleh
12e2ce4de1
yd fetch daily
2022-07-18 03:44:49 +08:00
omair saleh
d90347d2ee
yd debug
2022-07-18 03:42:34 +08:00
omair saleh
ad39cdd124
yd debug
2022-07-18 03:41:34 +08:00
omair saleh
e0f0e0e59e
yd debug
2022-07-18 03:38:53 +08:00
omair saleh
e497eec331
yd debug
2022-07-18 03:37:38 +08:00
omair saleh
1429f97bca
yd debug
2022-07-18 03:35:51 +08:00
omair saleh
952333e5cb
yd debug
2022-07-18 03:34:46 +08:00
omair saleh
e4af160ad2
yd debug
2022-07-18 03:33:59 +08:00
omair saleh
16031665a9
yd debug
2022-07-18 03:32:49 +08:00
omair saleh
39e1c09f05
yd debug
2022-07-18 03:11:00 +08:00
omair saleh
0d4db39013
yd debug
2022-07-18 03:09:50 +08:00
edmondlang
1e634ddc44
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-07-11 15:00:15 +08:00
omair saleh
06015cea72
remove customer profile junk code
2022-07-07 11:31:07 +08:00
omair saleh
3ccf7a088a
debug smc report
2022-07-06 10:40:34 +08:00
omair saleh
258b8085ee
debug smc report
2022-07-06 10:39:03 +08:00
omair saleh
76c05b7c77
debug smc report
2022-07-06 10:37:05 +08:00
omair saleh
6ebe22b798
debug smc report
2022-07-06 10:36:40 +08:00
omair saleh
17042b4312
debug smc report
2022-07-06 10:34:14 +08:00
omair saleh
f935cc10a6
debug smc report
2022-07-06 10:03:01 +08:00
omair saleh
415b5d7697
debug smc report
2022-07-06 10:00:00 +08:00
omair saleh
591575081a
add customer to yd exempt list
2022-06-30 09:20:28 +08:00
omair saleh
96fcfb241a
update air shipment product list
2022-06-29 11:08:28 +08:00
omair saleh
5b9a286467
Merge remote-tracking branch 'origin/development' into development
2022-06-29 11:07:29 +08:00
omair saleh
5ed84c1ee9
update air shipment product list
2022-06-29 11:07:05 +08:00
omair saleh
40fec78213
update yd list to fetch 3 months
2022-06-24 11:47:35 +08:00
ahmedsophyudden
b4dcc0f049
Create approve shipping invoice endpoint
2022-06-18 22:51:15 +08:00
ahmedsophyudden
6873ddb7cf
New endpoint to add/edit/delete item in shipping invoiceNew endpoint to add/edit/delete item in shipping invoice
2022-06-17 14:45:34 +08:00
ahmedsophyudden
84e45f9824
New endpoint to add/edit/delete item in shipping invoice
2022-06-17 09:28:14 +08:00
ahmedsophyudden
8079584f04
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-06-17 09:25:50 +08:00
ahmedsophyudden
866dda9d98
New endpoint to add/edit/delete item in shipping invoice
2022-06-17 09:25:47 +08:00
edmondlang
8715997f88
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-06-16 23:25:06 +08:00
omair saleh
822c9c467f
fix development js compile error
2022-06-16 14:52:38 +08:00
omair saleh
59d2b5c50a
fix development js compile error
2022-06-16 14:51:50 +08:00
omair saleh
6676951dee
temp disable vt
2022-06-15 11:17:31 +08:00
omair saleh
1ac7657870
Merge branch 'EXCHANGE-648-Shipping-Estimation-Calculator-API' into 'development'
...
implement ShippingEstimationCalculator
See merge request CIEFWorldwideSdnBhd/shipping-portal!132
2022-06-14 07:30:33 +00:00
omair saleh
761dedf427
Merge branch 'EXCHANGE-653-Revise-data-structure-of-the-segment_constant-table' into 'development'
...
implementing new data structure for segment_constant table
See merge request CIEFWorldwideSdnBhd/shipping-portal!133
2022-06-14 07:30:21 +00:00
edmondlang
0c2c64c637
Merge branch 'new-air-shipment-module' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-06-13 23:05:42 +08:00
edmondlang
10b699990f
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-06-13 22:59:07 +08:00
edmondlang
606325706e
air shipment module
2022-06-13 22:58:41 +08:00
omair saleh
742d26bdd3
update vt container packing list api
2022-06-13 11:39:41 +08:00
omair saleh
308a1bcdc0
update vt container packing list api
2022-06-13 11:36:21 +08:00
omair saleh
f0f70e421e
update vt container packing list api
2022-06-13 11:24:32 +08:00
omair saleh
3dff650b04
update vt container packing list api
2022-06-13 11:23:25 +08:00
omair saleh
5a55b4ccf2
update vt container packing list api
2022-06-13 11:22:50 +08:00
omair saleh
303b1abff1
update vt container packing list api
2022-06-13 11:21:07 +08:00
omair saleh
69a2743056
update vt container packing list api
2022-06-13 11:19:09 +08:00
omair saleh
cf49a661e1
update vt container packing list api
2022-06-13 11:17:21 +08:00
omair saleh
4bcb67e972
update vt container packing list api
2022-06-13 11:16:28 +08:00
omair saleh
e8564ee3b5
update vt container packing list api
2022-06-13 11:13:38 +08:00
omair saleh
23e5e1e268
update vt container packing list api
2022-06-13 11:13:25 +08:00
omair saleh
cce1979388
update vt container packing list api
2022-06-13 11:12:21 +08:00
omair saleh
f39f9ee2a7
update vt container packing list api
2022-06-13 11:09:59 +08:00
omair saleh
c1cf22544f
update vt container packing list api
2022-06-13 11:07:53 +08:00
omair saleh
321002ed04
remove old notice
2022-06-09 17:45:47 +08:00
omair saleh
de237a4110
update new notice
2022-06-09 17:41:08 +08:00
omair saleh
ee408da523
update smc monthly summary containers ref
2022-05-31 16:16:05 +08:00
omair saleh
de797d65ee
update smc monthly summary containers ref
2022-05-31 16:15:14 +08:00
omair saleh
9831ff29af
update smc monthly summary containers ref
2022-05-31 16:14:22 +08:00
omair saleh
0102dabdba
update smc monthly summary containers ref
2022-05-31 15:18:40 +08:00
omair saleh
86913ad80b
update smc monthly summary containers ref
2022-05-31 15:15:20 +08:00
omair saleh
fad2685534
update smc monthly summary containers ref
2022-05-31 15:14:22 +08:00
omair saleh
589422a9a8
update smc monthly summary containers ref
2022-05-31 15:09:05 +08:00
omair saleh
e2b96d7281
update smc monthly summary containers ref
2022-05-31 15:03:47 +08:00
omair saleh
df14f196b9
holiday announcement
2022-05-30 17:25:23 +08:00
omair saleh
7698c35b85
fix onhold packing list
2022-05-30 11:19:25 +08:00
omair saleh
88c0b4303e
update vt new warehouselist
2022-05-26 10:14:12 +08:00
omair saleh
c4eec73803
update vt new warehouselist
2022-05-26 10:11:55 +08:00
marjuqi@ad
6932b3291c
implementing new data structure for segment_constant table
2022-05-25 10:28:51 +07:00
edmondlang
cbaf05389e
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-05-24 00:12:34 +08:00
marjuqi@ad
00f4f141c4
remove unused newline
2022-05-20 09:07:24 +07:00
marjuqi@ad
7771b903ae
refactor codes in ShippingEstimationCalculatorLogic.php
2022-05-20 09:06:20 +07:00
marjuqi@ad
6de35b13f1
rearrange the lines of code to improve readability
2022-05-20 08:14:14 +07:00
marjuqi@ad
46da64fc47
revert the changes for CreateShippingInvoiceTransactionLogic.php and Helper.php
2022-05-20 08:11:28 +07:00
marjuqi@ad
0821db2899
refactor functions: getConstantByKey, checkPostcodeExistInConstant
2022-05-19 06:23:19 +07:00
marjuqi@ad
74005ba312
remove unused lines
2022-05-19 06:07:28 +07:00
marjuqi@ad
7935be2912
update logic for state_rate
2022-05-19 05:40:13 +07:00
omair saleh
8e0d23a208
update yd fetch api to include delivery missing cases
2022-05-18 16:59:49 +08:00
omair saleh
2a077edcde
update vt api url for new warehouse list
2022-05-18 16:41:15 +08:00
marjuqi@ad
142904b0af
activate lines after executing SegmentConstantsTableSeeder
2022-05-18 11:15:25 +07:00
marjuqi@ad
97fe1d9192
revise logic for ShippingEstimationCalculator following Omair's feedback
2022-05-18 10:43:09 +07:00
omair saleh
27940854e2
add chi bin to vt
2022-05-17 17:26:09 +08:00
marjuqi@ad
d4c35a5286
initial commit for ShippingEstimationCalculator
2022-05-17 15:31:17 +07:00
omair saleh
35dec3042b
fix export arrival list
2022-05-17 11:47:30 +08:00
omair saleh
918db70429
fix export arrival list
2022-05-17 11:46:24 +08:00
omair saleh
1796ddefbf
fix export arrival list
2022-05-17 11:45:13 +08:00
edmondlang
e1ee96f77c
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-05-13 23:03:35 +08:00
omair saleh
31e28c3dfa
fix export arrival list
2022-05-13 12:51:20 +08:00
omair saleh
faf4d35340
fix export arrival list
2022-05-13 12:50:36 +08:00
omair saleh
4fef6f8e6f
fix export arrival list
2022-05-13 12:45:54 +08:00
omair saleh
5d504b5111
fix export arrival list
2022-05-13 12:44:19 +08:00
omair saleh
3854884370
fix export arrival list
2022-05-12 12:14:29 +08:00
omair saleh
fe70c4b111
fix export arrival list
2022-05-11 18:00:13 +08:00
omair saleh
dad2f95eaa
fix export arrival list
2022-05-11 14:03:52 +08:00
omair saleh
764e709135
fix export arrival list
2022-05-11 14:01:02 +08:00
omair saleh
9b35f8c374
fix export arrival list
2022-05-11 13:51:13 +08:00
omair saleh
2e03ce370d
fix export arrival list
2022-05-11 13:42:26 +08:00
omair saleh
d972e98732
fix export arrival list
2022-05-10 19:50:19 +08:00
omair saleh
9041d9623b
fix export arrival list
2022-05-10 19:46:16 +08:00
omair saleh
f4a96fec78
fix export arrival list
2022-05-10 19:41:35 +08:00
omair saleh
c299c60d38
fix export arrival list
2022-05-10 19:38:04 +08:00
omair saleh
96eeb5a63e
fix export arrival list
2022-05-10 19:37:49 +08:00
omair saleh
fc6c365792
fix export arrival list
2022-05-10 19:37:39 +08:00
omair saleh
6094adadec
fix export arrival list
2022-05-10 19:35:16 +08:00
omair saleh
78ce2084b9
fix export arrival list
2022-05-10 19:31:04 +08:00
omair saleh
4fb284c85c
fix export arrival list
2022-05-10 19:27:45 +08:00
omair saleh
9e060bccd3
fix export arrival list
2022-05-10 19:24:02 +08:00
omair saleh
3100d42bd7
fix export arrival list
2022-05-10 19:23:03 +08:00
omair saleh
0640e0de9b
fix export arrival list
2022-05-10 19:13:36 +08:00
omair saleh
aa1d1dccc5
fix export arrival list
2022-05-10 18:57:22 +08:00
omair saleh
e369bc7f9e
fix export arrival list
2022-05-10 15:42:33 +08:00
omair saleh
6713542dc9
fix export arrival list
2022-05-10 15:02:06 +08:00
omair saleh
f73094ca06
fix export arrival list
2022-05-10 15:01:35 +08:00
omair saleh
453683ca76
fix export arrival list
2022-05-10 14:59:43 +08:00
edmondlang
caef08aa98
update generate invoice api
2022-05-07 22:28:13 +08:00
edmondlang
2c2e4eece8
update generate invoice api
2022-05-07 20:08:22 +08:00
omair saleh
a30421a3e9
fix addons table migration
2022-05-07 16:42:44 +08: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
92255056cc
Merge branch 'container-payment-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-05-07 16:28:40 +08:00
edmondlang
5e1626e6a4
add soft delete in segemtns model
2022-05-07 16:28:11 +08:00
edmondlang
c533c0c4a6
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-05-06 21:34:57 +08:00
omair saleh
e8eb02430b
update warehouse operation time
2022-05-06 13:49:14 +08:00
edmondlang
f17bfea250
fix generate invoice api and database seeder for segment constant
2022-05-05 21:05:45 +08:00
edmondlang
24ceb3cb39
Merge branch 'new-signup' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-05-02 12:05:40 +08:00
edmondlang
b6086554e2
sepereate delivery login component and shipping login component
2022-05-02 12:05:19 +08:00
edmondlang
fee73f7708
Merge branch 'new-signup' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-30 21:08:29 +08:00
edmondlang
cd7ee3afb3
new signup
2022-04-30 11:57:32 +08:00
edmondlang
3329028860
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-30 10:18:56 +08:00
omair saleh
6507b84e55
update warehouse operation time
2022-04-28 10:12:27 +08:00
omair saleh
eab465e837
update gz default warehouse
2022-04-27 17:29:26 +08:00
omair saleh
1cc0303539
update raya announcement
2022-04-27 12:55:49 +08:00
omair saleh
305ae6c217
update raya announcement
2022-04-27 12:51:39 +08:00
omair saleh
bcd926b4c9
update crisp session data
2022-04-25 15:14:11 +08:00
edmondlang
cd84348542
Merge branch 'delete-packing-list' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-24 23:30:18 +08:00
edmondlang
8e0efdf6e7
delete packing list
2022-04-24 23:30:02 +08:00
edmondlang
37cdbbb2c4
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-24 23:04:26 +08:00
edmondlang
86893efe3d
update base price date range
2022-04-23 14:59:52 +08:00
edmondlang
3dfec9fd6d
update list base price section component
2022-04-22 22:23:35 +08:00
edmondlang
0634fbf78e
update constant base price
2022-04-22 21:41:02 +08:00
edmondlang
6375ac753e
clean up error in console for settiongs page
2022-04-22 00:23:59 +08:00
edmondlang
3899dd8416
update base price api
2022-04-22 00:18:12 +08:00
edmondlang
8ca1cc1625
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-21 22:08:07 +08:00
edmondlang
d0ee2473ac
update section name
2022-04-21 22:07:50 +08:00
edmondlang
b67b676704
Merge branch 'update-delivery-date' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-21 21:42:53 +08:00
edmondlang
2f98dc976a
add file RescheduleTransportDateFormComponent
2022-04-21 21:42:32 +08:00
edmondlang
2421dd0988
Merge branch 'update-delivery-date' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-21 21:02:38 +08:00
edmondlang
20237d69fb
update
2022-04-21 21:02:25 +08:00
edmondlang
03851deeea
Merge branch 'update-delivery-date' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-21 20:59:16 +08:00
edmondlang
22f1548eac
update delivery date
2022-04-21 20:58:27 +08:00
omair saleh
4e4475ad12
switch back to temp warehouse
2022-04-21 14:12:23 +08:00
omair saleh
a287a1193a
allow admin to add arrived parcels
2022-04-21 12:19:57 +08:00
omair saleh
a80b3013c3
go to previous yd warehouse
2022-04-21 10:31:24 +08:00
edmondlang
4224c3e436
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-21 09:31:12 +08:00
edmondlang
33124d6588
update declare postcode and implement api
2022-04-21 09:30:56 +08:00
edmondlang
77c2ede28e
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-21 01:14:33 +08:00
edmondlang
86e257106a
add code to check if postcode constant does not exist, insert new postcode constant
2022-04-21 01:13:46 +08:00
edmondlang
edb644eaeb
remove insert segment if segment does not exist
2022-04-21 01:12:32 +08:00
edmondlang
8418268731
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-19 20:50:28 +08:00
edmondlang
98dc43d23a
update segment constant logic
2022-04-19 20:50:09 +08:00
edmondlang
5fdc6d5719
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-19 15:10:12 +08:00
edmondlang
cfd6757a84
tidy up
2022-04-19 15:09:56 +08:00
edmondlang
08517e8ee7
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-19 14:58:17 +08:00
edmondlang
eb31291e25
update warehouse api
2022-04-19 14:57:38 +08:00
edmondlang
ddbecaae6f
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-19 13:31:04 +08:00
edmondlang
7b88fd5c3c
update state charges
2022-04-19 13:28:56 +08:00
edmondlang
1814352780
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into api-intergration
2022-04-19 13:26:23 +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
f5cf2ac2df
fix login error handler & add new modern warehouse
2022-04-19 00:00:12 +08:00
omair saleh
2767d94a16
fix login error handler & add new modern warehouse
2022-04-18 23:56:27 +08:00
omair saleh
f68ef5c5e2
fix login error handler & add new modern warehouse
2022-04-18 23:46:25 +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
omair saleh
fd89233e49
fix LMD to HWT
2022-04-18 15:44:58 +08:00
omair saleh
be70afd9bf
fix LMD to HWT
2022-04-18 15:44:25 +08:00
omair saleh
efac46264e
fix LMD to HWT
2022-04-18 15:43:43 +08:00
omair saleh
a0817dbb6e
debug delivery registration
2022-04-18 15:42:10 +08:00
omair saleh
dfa7013f04
debug delivery registration
2022-04-18 15:39:57 +08:00
omair saleh
28a57887b6
debug forget password
2022-04-18 04:59:49 +08:00
edmondlang
762e9b8dca
update segment migration files
2022-04-17 23:54:44 +08:00
edmondlang
d8c9c77d8d
Merge branch 'api-intergration' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-17 23:42:26 +08:00
edmondlang
f21708ff57
Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# routes/web.php
2022-04-17 23:38:10 +08:00
edmondlang
ac4fcb05e9
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# resources/views/vendor/js.blade.php
2022-04-17 23:36:42 +08:00
edmondlang
b3a296f2eb
update notification ui, display no result found if no notification
2022-04-17 21:10:52 +08:00
edmondlang
5a723c5fd1
update notification ui - solve ui bug when only have 1 notification
2022-04-16 23:54:51 +08:00
edmondlang
6e9a27024b
update notification ui
2022-04-16 16:19:25 +08:00
omair saleh
8a96941127
debug forget password
2022-04-15 14:55:21 +08:00
omair saleh
3a5423a308
on hold packing list export
2022-04-15 14:21:08 +08:00
omair saleh
ddd1b7b29e
on hold packing list export
2022-04-15 14:20:20 +08:00
omair saleh
5433c202a7
on hold packing list export
2022-04-15 14:19:32 +08:00
omair saleh
b967e4f9ab
on hold packing list export
2022-04-15 14:18:38 +08:00
omair saleh
e9b7de47fa
on hold packing list export
2022-04-15 14:17:43 +08:00
omair saleh
3c942af883
on hold packing list export
2022-04-15 14:17:20 +08:00
omair saleh
baa9f79272
on hold packing list export
2022-04-15 14:00:13 +08:00
omair saleh
10c66dc2dc
export delivery list excel
2022-04-15 11:58:37 +08:00
omair saleh
05d4b7fe36
fix fetch from vt
2022-04-15 11:43:17 +08:00
omair saleh
7fc4568fbf
fix fetch from vt
2022-04-14 13:14:47 +08:00
omair saleh
f55a57c222
fix fetch from vt
2022-04-14 13:12:56 +08:00
omair saleh
301d7b5520
update hywavetech lineclear excel format
2022-04-14 10:15:07 +08:00
omair saleh
9f965109c7
update hywavetech lineclear excel format
2022-04-14 10:01:10 +08:00
omair saleh
108a952ee3
update hywavetech lineclear excel format
2022-04-13 21:56:21 +08:00
omair saleh
1426d804e5
fix yd fetch
2022-04-13 15:10:10 +08:00
omair saleh
88b3dc8b84
fix yd fetch
2022-04-13 14:27:08 +08:00
omair saleh
4b3274f6d5
fix yd fetch
2022-04-13 14:24:50 +08:00
omair saleh
da1b6b1b6d
fix yd fetch
2022-04-13 13:22:23 +08:00
omair saleh
ac0a90c168
fix yd fetch
2022-04-13 13:17:04 +08:00
omair saleh
a5e47324b2
fix yd fetch
2022-04-13 13:11:30 +08:00
omair saleh
40d22de809
fix customer profile
2022-04-13 12:19:34 +08:00
omair saleh
7154b5a943
fix customer profile
2022-04-13 12:15:32 +08:00
omair saleh
863c2874dd
fix yd fetch
2022-04-13 11:50:23 +08:00
omair saleh
862398b0d5
update qr pdf
2022-04-13 11:30:53 +08:00
omair saleh
9e20b717a6
update qr pdf
2022-04-13 11:29:15 +08:00
omair saleh
129f3ecf10
update crisp to production
2022-04-13 00:25:49 +08:00
omair saleh
f71f1fecd4
update crisp to production
2022-04-13 00:18:57 +08:00
omair saleh
6f5f854827
update crisp to production
2022-04-13 00:18:44 +08:00
omair saleh
f4275f20a3
update crisp to production
2022-04-13 00:17:19 +08:00
omair saleh
35d9a1f8d8
update crisp to production
2022-04-13 00:15:51 +08:00
omair saleh
de1afc26dc
update crisp to production
2022-04-12 16:22:57 +08:00
omair saleh
904fb3d9e5
update crisp to production
2022-04-12 16:18:33 +08:00
omair saleh
304337d5e2
update crisp to production
2022-04-12 16:02:00 +08:00
omair saleh
aa312c8f6e
Merge remote-tracking branch 'origin/master'
2022-04-12 15:20:41 +08:00
omair saleh
05d079f261
update crisp to production
2022-04-12 15:20:13 +08:00
omair saleh
a1cb511125
Merge branch 'export-arrived-parcel' into 'master'
...
export-arrived-parcel
See merge request CIEFWorldwideSdnBhd/shipping-portal!130
2022-04-12 07:10:44 +00:00
omair saleh
8d29a25793
create replica white list
2022-04-12 09:42:27 +08:00
edmondlang
a7593e4ab2
export-arrived-parcel
2022-04-11 23:29:39 +08:00
omair saleh
8ecb306e92
update final touch up for last delivery integration
2022-04-09 20:43:00 +08:00
omair saleh
918fd0d17d
update final touch up for last delivery integration
2022-04-09 20:41:48 +08:00
omair saleh
4f888da29a
Merge branch 'last-mile-integration' into 'master'
...
update field change value of 'Pickup_Address_Type' from sender to Default'
See merge request CIEFWorldwideSdnBhd/shipping-portal!129
2022-04-09 12:20:56 +00:00
edmondlang
559de29acf
update field change value of 'Pickup_Address_Type' from sender to Default'
...
export multiple sheet with the correct name of each field
2022-04-09 15:10:54 +08:00
edmondlang
5ba46a96a3
api intergration
2022-04-08 21:08:54 +08:00
edmondlang
1c79d88d8d
remove service set up and add in base price
2022-04-08 19:05:18 +08:00
edmondlang
029f25a003
update state charges
2022-04-08 18:42:30 +08:00
edmondlang
557881104c
implement api for warehouse charges
2022-04-08 18:23:54 +08:00
edmondlang
d30dab61ea
intergrate api for decalreing postcode area
2022-04-07 23:45:36 +08:00
edmondlang
e0018de70d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-07 22:57:28 +08:00
edmondlang
87116d29c9
last mile delivery search order ui and search order number function
2022-04-07 22:54:02 +08:00
omair saleh
d9eeaf4bef
update final touch up for last delivery integration
2022-04-07 22:47:30 +08:00
omair saleh
5dabc88fa9
update final touch up for last delivery integration
2022-04-07 22:40:01 +08:00
omair saleh
8c29fcda1f
update final touch up for last delivery integration
2022-04-07 22:28:51 +08:00
omair saleh
edd6b0d6ff
update final touch up for last delivery integration
2022-04-07 22:22:22 +08:00
omair saleh
6940290570
update final touch up for last delivery integration
2022-04-07 22:21:21 +08:00
omair saleh
327bd75cc9
update final touch up for last delivery integration
2022-04-07 22:20:47 +08:00
omair saleh
9f760d8694
Merge branch 'last-mile-integration' into 'master'
...
updates last mile intergration - add functions
See merge request CIEFWorldwideSdnBhd/shipping-portal!128
2022-04-07 14:13:57 +00:00
omair saleh
f5a0e9cd07
Merge branch 'last-mile-integration' into 'development'
...
update final touch up for last delivery integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!127
2022-04-07 13:28:33 +00:00
omair saleh
4a1905abde
update final touch up for last delivery integration
2022-04-07 21:27:53 +08:00
omair saleh
908c547ddc
Merge branch 'last-mile-integration' into 'development'
...
update final touch up for last delivery integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!126
2022-04-07 13:21:17 +00:00
omair saleh
5d1ff709eb
update final touch up for last delivery integration
2022-04-07 21:20:13 +08:00
omair saleh
cdda3ff5e1
Merge branch 'last-mile-integration' into 'development'
...
update final touch up for last delivery integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!125
2022-04-07 13:17:48 +00:00
omair saleh
a50b475525
update final touch up for last delivery integration
2022-04-07 21:16:59 +08:00
omair saleh
27bacd412a
Merge branch 'last-mile-integration' into 'development'
...
Last mile integration
See merge request CIEFWorldwideSdnBhd/shipping-portal!124
2022-04-07 13:13:58 +00:00
omair saleh
97ec65e292
Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration
2022-04-07 21:13:21 +08:00
omair saleh
5df226c153
update final touch up for last delivery integration
2022-04-07 21:12:15 +08:00
edmondlang
424ac600c3
Merge branch 'export-customer-order-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-07 12:31:05 +08:00
edmondlang
715635954a
update file name
2022-04-07 12:30:39 +08:00
edmondlang
a5a450a7d4
Merge branch 'export-customer-order-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-07 11:50:03 +08:00
edmondlang
3e87f320bf
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-04-07 11:45:56 +08:00
edmondlang
2919544769
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into export-customer-order-list
2022-04-07 11:37:10 +08:00
edmondlang
e3284fdf98
export customer order list
2022-04-07 11:36:03 +08:00
omair saleh
114a083627
Merge branch 'last-mile-integration' into 'development'
...
update last mile delivery logo
See merge request CIEFWorldwideSdnBhd/shipping-portal!123
2022-04-07 03:13:22 +00:00
omair saleh
408a3a1211
update last mile delivery logo
2022-04-07 11:12:27 +08:00
omair saleh
bed78c053a
remove memo
2022-04-07 10:59:50 +08:00
omair saleh
32a509d090
Merge branch 'last-mile-integration' into 'development'
...
updates last mile intergration - add functions
See merge request CIEFWorldwideSdnBhd/shipping-portal!122
2022-04-07 01:54:39 +00:00
omair saleh
c53ebf76b3
hide admin menu flashing
2022-04-07 09:53:59 +08:00
omair saleh
bd2b7b236b
Merge branch 'last-mile-integration' into 'development'
...
hide admin menu flashing
See merge request CIEFWorldwideSdnBhd/shipping-portal!121
2022-04-07 01:48:33 +00:00
omair saleh
4085ac4829
hide admin menu flashing
2022-04-07 09:46:22 +08:00
omair saleh
6a08d88031
Merge branch 'last-mile-integration' into 'development'
...
hide admin menu flashing
See merge request CIEFWorldwideSdnBhd/shipping-portal!120
2022-04-07 01:45:16 +00:00
omair saleh
778729b81d
hide admin menu flashing
2022-04-07 09:44:02 +08:00
omair saleh
ef95893c3b
Merge branch 'last-mile-integration' into 'development'
...
update last mile delivery module
See merge request CIEFWorldwideSdnBhd/shipping-portal!119
2022-04-06 10:53:05 +00:00
omair saleh
54c212e905
update last mile delivery module
2022-04-06 18:51:08 +08:00
edmondlang
5043b32191
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-06 18:31:15 +08:00
omair saleh
7169ba423c
Merge branch 'last-mile-integration' into 'development'
...
updates last mile intergration - add functions
See merge request CIEFWorldwideSdnBhd/shipping-portal!118
2022-04-06 10:25:09 +00:00
omair saleh
5b370a299c
update pending delivery report excel
2022-04-06 16:01:31 +08:00
omair saleh
e57dc231e6
update pending delivery report excel
2022-04-06 16:01:03 +08:00
omair saleh
5727801918
update pending delivery report excel
2022-04-06 15:59:28 +08:00
omair saleh
bf325ff028
update pending delivery report excel
2022-04-06 15:55:31 +08:00
omair saleh
229e757663
Merge branch 'export-delivery-list' into 'master'
...
Export delivery list
See merge request CIEFWorldwideSdnBhd/shipping-portal!117
2022-04-06 07:32:01 +00:00
edmondlang
f8e7573cfd
Merge branch 'export-delivery-list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-06 14:37:23 +08:00
edmondlang
10d62dd8d1
update export delivery list - include state and postcode
2022-04-06 13:53:43 +08:00
edmondlang
0fa0d8daab
Shipping portal - export function for Delivery list (only 'Pending Arrangement' tab)
2022-04-06 13:30:16 +08:00
edmondlang
bb59a444cf
update export excel form
2022-04-06 11:24:24 +08:00
edmondlang
45c878a2ed
add orders created date to the table
2022-04-06 10:21:40 +08:00
edmondlang
e871f4b287
hide tick and show only for admin
2022-04-05 20:03:27 +08:00
edmondlang
5aa93b30c7
update container select packing list
2022-04-05 19:05:57 +08:00
edmondlang
8c35601ccd
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-04-05 19:04:24 +08:00
omair saleh
0ec9226226
add crisp
2022-04-05 13:26:24 +08:00
omair saleh
3286939ccc
Merge remote-tracking branch 'origin/development' into development
2022-04-05 13:21:07 +08:00
omair saleh
3a2146146c
add crisp
2022-04-05 13:20:52 +08:00
edmondlang
6eaa810b67
remove text order list
2022-04-05 11:40:58 +08:00
omair saleh
68d961a681
custom clearance status
2022-04-05 11:38:21 +08:00
omair saleh
2c29e5939e
custom clearance status
2022-04-05 11:25:56 +08:00
omair saleh
6910dce35f
custom clearance status
2022-04-05 11:23:39 +08:00
omair saleh
a19db06b6b
custom clearance status
2022-04-05 11:20:45 +08:00
edmondlang
4e53e1b48a
updates last mile intergration - add functions
...
- admin cancel order
- add filter to display only active orders
- hide customer page
- show parcel weight as total weight (quantity * weight per quantity)
- in create order form
- order table
- export excel
- update export excel, only include the data of the selected Ids
2022-04-05 10:45:30 +08:00
omair saleh
aef9b82918
Merge remote-tracking branch 'origin/last-mile-integration' into last-mile-integration
...
# Conflicts:
# resources/views/pages/delivery/admin.blade.php
2022-04-04 19:41:43 +08:00
omair saleh
f96fef94fe
finalize last mile delivery
2022-04-04 19:40:54 +08:00
edmondlang
ab141ae160
update admin view for last mile intergration
2022-04-04 14:21:59 +08:00
edmondlang
bf4830ba7a
update mobile responsive for delivery order form component
2022-04-03 23:47:58 +08:00
edmondlang
5baf04c835
fix mobile responsive
2022-04-03 23:39:27 +08:00
edmondlang
4917c54868
remove vuetable
2022-04-03 23:26:45 +08:00
edmondlang
9c7d07f603
remove imports that are not using
2022-04-03 20:20:09 +08:00
edmondlang
6f9320f3a4
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-04-03 19:13:24 +08:00
omair saleh
c69c043576
fix the user ui, create delivery order, delivery customer dashboard
2022-04-03 19:10:06 +08:00
edmondlang
745655dbfa
last mile intergration
2022-04-02 15:21:14 +08:00
omair saleh
b764ee0769
update packing list monthly summary containers
2022-04-01 17:02:36 +08:00
omair saleh
ab1d92af86
fix yd missing packages from order
2022-04-01 14:58:27 +08:00
omair saleh
2ff9a38114
fix yd missing packages from order
2022-04-01 14:57:41 +08:00
omair saleh
0abdbd525e
fix yd missing packages from order
2022-04-01 14:56:46 +08:00
omair saleh
f44aace3c5
fix yd missing packages from order
2022-04-01 14:56:05 +08:00
omair saleh
0af84a9b7d
fix yd missing packages from order
2022-04-01 14:54:09 +08:00
omair saleh
1aff95b41c
fix yd missing packages from order
2022-04-01 14:51:57 +08:00
omair saleh
745f476f89
fix yd missing packages from order
2022-04-01 14:41:24 +08:00
omair saleh
e1d751b859
fix yd missing packages from order
2022-04-01 11:21:44 +08:00
omair saleh
6077b1fbbb
fix yd missing packages from order
2022-04-01 10:56:56 +08:00
omair saleh
5fe8a7a59e
fix order address update to vt
2022-03-31 21:15:19 +08:00
omair saleh
8b38bcac8a
fix order address update to vt
2022-03-31 21:10:23 +08:00
omair saleh
5561442932
fix order address update to vt
2022-03-31 21:09:01 +08:00
omair saleh
f33efd373c
fix order address update to vt
2022-03-31 21:05:44 +08:00
omair saleh
53c325b36d
fetch only 2 months orders from yd
2022-03-31 20:47:14 +08:00
omair saleh
cd141bf988
fix yd older than 2 months orders
2022-03-31 20:30:49 +08:00
omair saleh
908f3fc11b
fix yd older than 2 months orders
2022-03-31 20:29:49 +08:00
omair saleh
8e9f12b17e
fix yd older than 2 months orders
2022-03-31 20:29:14 +08:00
omair saleh
782bcc69f1
fix yd older than 2 months orders
2022-03-31 20:28:41 +08:00
omair saleh
144464621e
fix yd older than 2 months orders
2022-03-31 20:28:07 +08:00
omair saleh
b290f95426
fix yd older than 2 months orders
2022-03-31 20:27:31 +08:00
omair saleh
b7e6269aa9
fix yd older than 2 months orders
2022-03-31 20:25:14 +08:00
omair saleh
7180f802b3
fix yd older than 2 months orders
2022-03-31 20:20:19 +08:00
omair saleh
7159c1c11d
fix yd older than 2 months orders
2022-03-31 20:17:55 +08:00
omair saleh
cce0cae57c
fix yd older than 2 months orders
2022-03-31 20:17:03 +08:00
omair saleh
bebce6fbaa
fix yd older than 2 months orders
2022-03-31 19:50:55 +08:00
omair saleh
531ab699ba
show delivery delay days
2022-03-31 19:45:06 +08:00
omair saleh
9f9c17977d
show delivery delay days
2022-03-31 19:44:11 +08:00
omair saleh
24f5de8c2c
fix missing yd delivery
2022-03-31 14:41:10 +08:00
omair saleh
3b8079785a
fix missing yd delivery
2022-03-31 14:19:47 +08:00
omair saleh
627fb3aa96
fix missing yd delivery
2022-03-31 14:18:34 +08:00
omair saleh
2b4d3f1992
fix missing yd delivery
2022-03-31 14:16:40 +08:00
omair saleh
65daceb59c
fix missing yd delivery
2022-03-31 14:13:26 +08:00
omair saleh
d7457e7174
fix missing yd delivery
2022-03-31 14:10:24 +08:00
omair saleh
9753eb3a18
fix packages is missing in yd api
2022-03-31 13:56:47 +08:00
omair saleh
e7df49a0d1
fix packages is missing in yd api
2022-03-31 13:54:48 +08:00
omair saleh
cd4e7aab10
fix packages is missing in yd api
2022-03-31 13:52:36 +08:00
omair saleh
29350dbb86
fix packages is missing in yd api
2022-03-31 13:52:16 +08:00
omair saleh
7338ebc78a
fix packages is missing in yd api
2022-03-31 13:49:47 +08:00
omair saleh
4eded7a742
update holiday announcement
2022-03-31 09:31:09 +08:00
omair saleh
dc562f6554
update holiday announcement
2022-03-31 09:29:31 +08:00
edmondlang
d96a35a49f
revert RegistrationFormComponent
2022-03-30 20:01:45 +08:00
edmondlang
8024fef2e8
Merge branch 'new-registration-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into last-mile-integration
2022-03-30 19:54:35 +08:00
omair saleh
2d965009ec
move unclaimed packing lists to dashboard
2022-03-30 11:31:40 +08:00
omair saleh
7d84ddee95
fix do update bug
2022-03-30 00:25:18 +08:00
omair saleh
92b31a9342
fix do update bug
2022-03-30 00:22:05 +08:00
omair saleh
012dbfde09
fix do update bug
2022-03-30 00:21:14 +08:00
omair saleh
0b651953ea
fix do update bug
2022-03-30 00:20:24 +08:00
omair saleh
b34f50ae9d
fix do update bug
2022-03-30 00:20:11 +08:00
omair saleh
8f0d1e6fdf
fix do update bug
2022-03-30 00:19:22 +08:00
omair saleh
e8990d96f7
debug do update
2022-03-30 00:06:22 +08:00
omair saleh
69ee0eea2c
debug do update
2022-03-30 00:05:45 +08:00
omair saleh
adcdf5909e
debug do update
2022-03-29 23:57:16 +08:00
omair saleh
b9523fb567
debug do update
2022-03-29 23:56:31 +08:00
omair saleh
79678d7b93
debug do update
2022-03-29 23:56:01 +08:00
omair saleh
2bdfd2772a
debug do update
2022-03-29 23:54:14 +08:00
omair saleh
55513f5175
debug do update
2022-03-29 23:44:22 +08:00
omair saleh
709534ce04
debug do update
2022-03-29 23:43:29 +08:00
omair saleh
74d85eee60
debug do update
2022-03-29 23:42:32 +08:00
omair saleh
63badc08f0
debug do update
2022-03-29 23:41:34 +08:00
omair saleh
73010ed32b
debug do update
2022-03-29 23:40:20 +08:00
omair saleh
7a2a90545b
debug do update
2022-03-29 23:40:05 +08:00
omair saleh
c0ee3a8e57
debug do update
2022-03-29 23:39:28 +08:00
omair saleh
0c7e4d5785
debug do update
2022-03-29 23:38:33 +08:00
omair saleh
c3cd8ae3a0
debug do update
2022-03-29 23:35:27 +08:00
omair saleh
0e7469f1cd
new registration ui flow
2022-03-29 23:15:42 +08:00
omair saleh
32476afdd4
fix vt warehouse list
2022-03-27 12:56:31 +08:00
omair saleh
8b6db1fb68
temp test vt warehouse list
2022-03-27 12:55:06 +08:00
omair saleh
43f3fbff07
temp test vt warehouse list
2022-03-27 12:54:06 +08:00
omair saleh
caf8624d4c
temp test vt warehouse list
2022-03-27 12:51:43 +08:00
omair saleh
eb417cf389
temp test vt warehouse list
2022-03-27 12:50:23 +08:00
omair saleh
276a87ff0d
temp test vt warehouse list
2022-03-27 12:49:08 +08:00
omair saleh
6d2f179025
Merge branch 'development' into 'master'
...
Development
See merge request CIEFWorldwideSdnBhd/shipping-portal!116
2022-03-27 03:54:48 +00:00
omair saleh
8609c926f9
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-27 11:53:18 +08:00
omair saleh
368a055bb4
add chat box to development
2022-03-27 11:50:27 +08:00
omair saleh
d617001412
fix vt YW orders
2022-03-27 11:49:32 +08:00
omair saleh
c932cb00cc
add chat widget
2022-03-25 17:36:27 +08:00
omair saleh
1be62a5f77
fix vt order number to filter yw
2022-03-25 16:54:10 +08:00
omair saleh
445bcb3864
small clean up
2022-03-24 13:33:04 +08:00
omair saleh
d489775924
small clean up
2022-03-24 13:32:34 +08:00
omair saleh
fff428882d
small clean up
2022-03-24 13:31:37 +08:00
omair saleh
42205ddbc3
small clean up
2022-03-24 13:29:59 +08:00
omair saleh
722e502b3b
tidy up invoices details descriptions
2022-03-24 13:26:55 +08:00
omair saleh
4f93569b4c
Merge branch 'development' into 'master'
...
Development
See merge request CIEFWorldwideSdnBhd/shipping-portal!115
2022-03-24 05:22:35 +00:00
omair saleh
e1abebc66c
Merge branch 'transaction-invoice' into 'development'
...
transaction detail over weight
See merge request CIEFWorldwideSdnBhd/shipping-portal!114
2022-03-24 05:18:22 +00:00
omair saleh
2424882cfe
Merge branch 'development' into 'transaction-invoice'
...
# Conflicts:
# app/Classes/Modules/Transactions/ControllersLogic/CreateShippingInvoiceTransactionLogic.php
2022-03-24 05:18:17 +00:00
omair saleh
23f50faa84
release create warehouse arrival parcel module
2022-03-24 13:11:22 +08:00
edmondlang
edc510681e
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-24 11:40:20 +08:00
omair saleh
db03836ef5
add new way of detecting yd container rescheduling
2022-03-24 10:59:59 +08:00
edmondlang
3a5f404294
Tidy Up Export Customer activity details, add new filter - minOrders and minCbm
2022-03-23 00:53:16 +08:00
edmondlang
9b79f16faa
Merge branch 'api-to-update-segment-constants' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-22 21:55:24 +08:00
edmondlang
4ff4418f7f
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-19 13:35:09 +08:00
glovetleong
19c8f1e658
transaction detail over weight
2022-03-18 20:46:40 +08:00
omair saleh
e1c4d674b6
smc report for specific containers
2022-03-18 17:48:18 +08:00
omair saleh
3326de9c4f
smc report for specific containers
2022-03-18 17:44:28 +08:00
omair saleh
54dd6d407d
revert invoice changes
2022-03-18 16:18:44 +08:00
omair saleh
9ee81d9385
update rfm to table
2022-03-18 16:18:12 +08:00
omair saleh
aa1ba03415
update rfm to table
2022-03-18 16:16:25 +08:00
omair saleh
fb6b2173b5
update rfm to table
2022-03-18 16:14:42 +08:00
omair saleh
f18e4a882f
update container reschedule for yd
2022-03-17 17:47:34 +08:00
omair saleh
8edc91bb61
update container reschedule for yd
2022-03-17 17:46:24 +08:00
omair saleh
6122c288df
update container reschedule for yd
2022-03-17 17:45:10 +08:00
omair saleh
9650877819
update container reschedule for yd
2022-03-17 17:43:03 +08:00
omair saleh
c65d875a3d
update container reschedule for yd
2022-03-17 17:41:39 +08:00
omair saleh
c1bc610549
update container reschedule for yd
2022-03-17 17:41:06 +08:00
omair saleh
82d406abfc
update container reschedule for yd
2022-03-17 17:39:47 +08:00
omair saleh
701610978d
update container reschedule for yd
2022-03-17 17:37:07 +08:00
omair saleh
f7e1665a02
update container reschedule for yd
2022-03-17 17:36:24 +08:00
omair saleh
d389b87609
update container reschedule for yd
2022-03-17 17:34:51 +08:00
omair saleh
987fdcfba2
update container reschedule for yd
2022-03-17 17:33:23 +08:00
omair saleh
6214a2b723
update container reschedule for yd
2022-03-17 17:31:39 +08:00
omair saleh
fe00b1fab7
update container reschedule for yd
2022-03-17 17:22:02 +08:00
omair saleh
41df3e6ae7
update container reschedule for yd
2022-03-17 17:18:47 +08:00
omair saleh
cf7d9ccca5
update container reschedule for yd
2022-03-17 17:17:01 +08:00
omair saleh
384d234b50
update container reschedule for yd
2022-03-17 17:16:35 +08:00
omair saleh
3fbfa44a04
update container reschedule for yd
2022-03-17 17:14:02 +08:00
omair saleh
cbc294054e
update container reschedule for yd
2022-03-17 17:12:47 +08:00
omair saleh
324556985a
update container reschedule for yd
2022-03-17 17:08:23 +08:00
omair saleh
1b8c6ca317
update container reschedule for yd
2022-03-17 17:08:12 +08:00
omair saleh
bbd09d300c
update container reschedule for yd
2022-03-17 17:07:33 +08:00
omair saleh
47c97d6151
update container reschedule for yd
2022-03-17 17:05:04 +08:00
omair saleh
435e3a8f7a
update container reschedule for yd
2022-03-17 17:03:40 +08:00
omair saleh
151032bb66
update container reschedule for yd
2022-03-17 17:02:40 +08:00
omair saleh
f32335d57b
update container reschedule for yd
2022-03-17 16:58:52 +08:00
omair saleh
2deddc4e03
update container reschedule for yd
2022-03-17 16:57:49 +08:00
omair saleh
32e665e4f7
update container reschedule for yd
2022-03-17 16:57:03 +08:00
omair saleh
a987419040
update container reschedule for yd
2022-03-17 16:36:50 +08:00
omair saleh
b0a65f870c
update container reschedule for yd
2022-03-17 16:33:00 +08:00
omair saleh
33a75eca7d
smc monthly report
2022-03-17 13:53:50 +08:00
Leong Chee Siong
deb68dc723
Merge branch 'transaction-invoice' into 'development'
...
billpliz callback
See merge request CIEFWorldwideSdnBhd/shipping-portal!113
2022-03-17 02:13:19 +00:00
omair saleh
519408c2b5
lawas and Limbang show kk warehouse
2022-03-17 09:55:46 +08:00
omair saleh
53907e2463
lawas and Limbang show kk warehouse
2022-03-17 09:52:24 +08:00
omair saleh
10e6f6045e
lawas and Limbang show kk warehouse
2022-03-17 09:51:36 +08:00
omair saleh
c06cec5b41
lawas and Limbang show kk warehouse
2022-03-17 09:47:31 +08:00
omair saleh
cfe611d05d
lawas and Limbang show kk warehouse
2022-03-17 09:45:24 +08:00
ahmedsophyudden
b9b79ca65a
Shipping Portal - Api to update segment (general, state, postcode)
2022-03-17 01:01:01 +08:00
glovetleong
9a1562386f
billpliz callback
2022-03-16 23:01:38 +08:00
omair saleh
22700893a2
fix qr remark
2022-03-16 10:03:47 +08:00
omair saleh
550c9480a4
fix qr remark
2022-03-16 10:02:17 +08:00
omair saleh
48bab9998c
fix qr remark
2022-03-16 09:47:26 +08:00
omair saleh
3ff81d4f00
fix qr remark
2022-03-16 09:46:23 +08:00
omair saleh
cc7edfc784
sort deliveries by date
2022-03-16 01:24:37 +08:00
omair saleh
72448d656c
sort deliveries by date
2022-03-16 01:20:13 +08:00
omair saleh
c941f679b6
sort deliveries by date
2022-03-16 01:19:31 +08:00
omair saleh
78f6c70cad
sort deliveries by date
2022-03-16 01:18:53 +08:00
omair saleh
1575d62e0f
sort deliveries by date
2022-03-16 01:17:21 +08:00
omair saleh
43f4bc533a
sort deliveries by date
2022-03-16 01:16:13 +08:00
omair saleh
9ae36dc400
sort deliveries by date
2022-03-16 01:14:27 +08:00
omair saleh
02c55d97b7
sort deliveries by date
2022-03-16 01:00:27 +08:00
omair saleh
baeaa0f31a
sort deliveries by date
2022-03-16 00:58:16 +08:00
omair saleh
dadc786f1f
Merge branch 'development' into 'master'
...
Development
See merge request CIEFWorldwideSdnBhd/shipping-portal!112
2022-03-15 16:32:13 +00:00
omair saleh
bd9dab0029
hide invoice button for production
2022-03-16 00:31:24 +08:00
omair saleh
e2b795c872
Merge remote-tracking branch 'origin/development' into development
2022-03-16 00:30:55 +08:00
omair saleh
9a79c6dd1d
Merge branch 'development' into 'master'
...
Warehouse Profile
See merge request CIEFWorldwideSdnBhd/shipping-portal!111
2022-03-15 16:28:58 +00:00
omair saleh
d8e1c38429
hide invoice button for production
2022-03-16 00:24:18 +08:00
edmondlang
e2e8f69f90
update notification add List Notifications API and UI
2022-03-15 16:14:21 +08:00
Leong Chee Siong
aa28afb9f0
Merge branch 'transaction-invoice' into 'development'
...
soft delete user
See merge request CIEFWorldwideSdnBhd/shipping-portal!110
2022-03-14 05:45:21 +00:00
glovetleong
7ec109eb3e
soft delete user
2022-03-14 13:42:48 +08:00
omair saleh
7151616b04
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-14 13:19:04 +08:00
edmondlang
e5c28faba7
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into notification-ui
2022-03-14 12:38:13 +08:00
omair saleh
f2007b25e4
fix delivery list filter
2022-03-14 11:32:22 +08:00
omair saleh
6389fc6600
fix delivery list filter
2022-03-14 11:24:33 +08:00
omair saleh
eb6b2943af
fix delivery list filter
2022-03-14 11:21:20 +08:00
omair saleh
5fb7ddb0ec
fix delivery list filter
2022-03-14 11:20:16 +08:00
omair saleh
91feb5b8fa
fix delivery list filter
2022-03-14 11:19:45 +08:00
omair saleh
9c98693071
Merge remote-tracking branch 'origin/development' into development
2022-03-14 11:14:29 +08:00
omair saleh
56fb250e6f
fix delivery list filter
2022-03-14 11:14:14 +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
8902a09337
fix delivery list filter
2022-03-14 10:59:44 +08:00
omair saleh
0a69faeb3b
fix delivery list filter
2022-03-14 10:58:48 +08:00
omair saleh
bea9507dae
fix delivery list filter
2022-03-14 10:57:43 +08:00
edmondlang
4b81666cf2
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into notification-ui
2022-03-13 22:16:16 +08:00
edmondlang
a1a9ab76bb
tidy up route and put reports route inside report.php
2022-03-13 22:06:11 +08:00
glovetleong
5d9e621920
payment document approve
2022-03-12 20:06:10 +08:00
omair saleh
5b1f4eff0d
Merge remote-tracking branch 'origin/development' into development
2022-03-12 17:20:49 +08:00
omair saleh
ac41229f8b
notifiable
2022-03-12 17:20:32 +08:00
edmondlang
4a2fb8e9e4
update notification icon
2022-03-12 17:10:38 +08:00
edmondlang
ea772c3916
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into notification-ui
2022-03-12 17:02:36 +08:00
azumiru
2fb12d3a7c
container-export-pdf-ui add export button and call api
2022-03-11 20:54:49 +08:00
omair saleh
28088f7d9a
fix mysql crash on supplier update api
2022-03-11 14:43:21 +08:00
edmondlang
ced07a293e
update the createRemarkLogic, so all modules are able to use it
...
create a RemarkFormComponent
update order page to use this API
clean up old remark API
2022-03-10 19:39:47 +08:00
edmondlang
59ee063186
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-10 16:48:13 +08:00
omair saleh
8cd63e93c3
show order search to admin
2022-03-10 14:27:17 +08:00
omair saleh
d3bf6b0dee
show order search to admin
2022-03-10 14:25:01 +08:00
omair saleh
093ea075f0
show order search to admin
2022-03-10 14:24:14 +08:00
omair saleh
62066a5be5
show order search to admin
2022-03-10 14:22:24 +08:00
omair saleh
88c0ba31d7
show order search to admin
2022-03-10 14:21:31 +08:00
edmondlang
36236144ce
update downloadQrPdfController
2022-03-09 20:06:31 +08:00
omair saleh
69e4f83919
Merge remote-tracking branch 'origin/development' into development
2022-03-09 20:02:20 +08:00
omair saleh
6338fdf771
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-09 20:01:48 +08:00
edmondlang
83091caa46
create company module remark and ui
2022-03-09 18:51:23 +08:00
edmondlang
99f5dcf8ab
update indentation
2022-03-09 18:34:26 +08:00
edmondlang
eb6f313c77
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-09 18:33:18 +08:00
omair saleh
3b60a90435
fix yd to vt error
2022-03-09 11:14:25 +08:00
omair saleh
3a9fe2b6af
fix yd to vt error
2022-03-09 11:10:27 +08:00
omair saleh
603b807225
fix yd to vt error
2022-03-09 11:09:36 +08:00
omair saleh
0ae05f05b6
update qr for yd orders
2022-03-09 11:03:57 +08:00
edmondlang
290e531d12
update delivery-list api filters
2022-03-08 19:17:10 +08:00
edmondlang
a44ad3df3a
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-08 19:05:46 +08:00
glovetleong
de56c21734
payment transaction
2022-03-08 16:55:31 +08:00
omair saleh
89aa52e9c2
add enter trigger to search containers
2022-03-08 12:27:29 +08:00
omair saleh
072e65c00c
fix claim packinglist status
2022-03-08 12:06:59 +08:00
omair saleh
8701620dcf
add warehouse remark to qr pdf
2022-03-08 10:12:59 +08:00
ahmedsophyudden
e9f86f0603
Shipping Portal - Create filter for pending arrangement, pending delivery, delivered
2022-03-07 16:56:38 +08:00
omair saleh
6d77fe171a
fix yd exemption list
2022-03-07 15:36:34 +08:00
omair saleh
073250ce43
fix yd exemption list
2022-03-07 15:36:08 +08:00
edmondlang
07d3b4b7a3
update shipping invoice
2022-03-06 21:19:44 +08:00
edmondlang
3b86a50bed
update shipping-invoice
2022-03-06 21:12:09 +08:00
edmondlang
35cf8a20c3
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-06 16:08:21 +08:00
Leong Chee Siong
a17534ae6d
Merge branch 'transaction-invoice' into 'development'
...
notification
See merge request CIEFWorldwideSdnBhd/shipping-portal!106
2022-03-06 06:46:50 +00:00
glovetleong
ab12494ba5
pdf generate
2022-03-06 14:44:49 +08:00
omair saleh
b6834ac6f5
fix active customer list
2022-03-06 12:33:49 +08:00
omair saleh
200a954730
fix active customer list
2022-03-06 12:21:51 +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
edmondlang
537dbd4564
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-06 10:12:42 +08:00
omair saleh
a4365e5c33
fix active customer list
2022-03-05 18:06:21 +08:00
omair saleh
98424eacf4
fix active customer list
2022-03-05 18:04:11 +08:00
omair saleh
eb905e7176
fix active customer list
2022-03-05 17:59:02 +08:00
omair saleh
7998f6e43f
show packing list receive date
2022-03-05 16:51:30 +08:00
omair saleh
eb41d7c2ef
show packing list receive date
2022-03-05 16:49:19 +08:00
edmondlang
fd8f8d6cb4
Update copyright year using php to get current year
2022-03-05 16:47:19 +08:00
edmondlang
fafd145bca
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-05 16:39:02 +08:00
edmondlang
d9a3f42e87
Update copyright year using php to get current year
2022-03-05 16:38:17 +08:00
omair saleh
686ef83f31
group container packing lists by customer
2022-03-05 16:38:12 +08:00
omair saleh
5fab8224c6
group container packing lists by customer
2022-03-05 16:36:03 +08:00
omair saleh
9e95da84c4
group container packing lists by customer
2022-03-05 16:34:41 +08:00
omair saleh
a54aefcf9f
missing orders
2022-03-05 16:25:20 +08:00
omair saleh
d217cf0ef2
missing orders
2022-03-05 16:24:39 +08:00
omair saleh
1978cf017b
missing orders
2022-03-05 16:24:04 +08:00
omair saleh
ea381e0bf5
missing orders
2022-03-05 16:23:32 +08:00
omair saleh
de26957532
missing orders
2022-03-05 16:22:54 +08:00
omair saleh
715d26c9d2
missing orders
2022-03-05 16:18:32 +08:00
omair saleh
f1432388d8
missing orders
2022-03-05 16:07:06 +08:00
omair saleh
5ca53c2124
missing orders
2022-03-05 16:02:02 +08:00
omair saleh
48dbe00744
missing orders
2022-03-05 16:00:58 +08:00
omair saleh
e2df3af9cd
missing orders
2022-03-05 16:00:10 +08:00
omair saleh
df0b67d9b9
missing orders
2022-03-05 15:55:35 +08:00
omair saleh
a28a5a0c29
missing orders
2022-03-05 15:53:56 +08:00
omair saleh
1560bdfcf8
missing orders
2022-03-05 15:48:47 +08:00
omair saleh
585e4705a4
missing orders
2022-03-05 15:47:41 +08:00
omair saleh
2e41499fd1
missing orders
2022-03-05 15:44:57 +08:00
omair saleh
f3688385eb
missing orders
2022-03-05 15:44:04 +08:00
omair saleh
fdfae861c6
missing orders
2022-03-05 15:38:31 +08:00
omair saleh
b16eddf13a
missing orders
2022-03-05 15:37:43 +08:00
omair saleh
dd78be57fe
missing orders
2022-03-05 15:34:19 +08:00
omair saleh
49042f5507
missing orders
2022-03-05 15:29:33 +08:00
omair saleh
a97faa0024
missing orders
2022-03-05 15:28:35 +08:00
omair saleh
99d7aeac5f
missing orders
2022-03-05 15:26:54 +08:00
omair saleh
fe340b1246
missing orders
2022-03-05 15:25:49 +08:00
omair saleh
e79206a681
missing orders
2022-03-05 15:25:33 +08:00
omair saleh
1838e46d1b
missing orders
2022-03-05 15:23:45 +08:00
omair saleh
6bfbac6494
missing orders
2022-03-05 15:21:34 +08:00
omair saleh
266fd7302b
missing orders
2022-03-05 15:20:58 +08:00
omair saleh
f7b081eb94
missing orders
2022-03-05 15:20:13 +08:00
omair saleh
388a1024b4
missing orders
2022-03-05 15:19:09 +08:00
omair saleh
899f84aed0
missing orders
2022-03-05 15:18:17 +08:00
omair saleh
4a497dd61b
missing orders
2022-03-05 15:17:14 +08:00
edmondlang
02f3686768
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-03-05 14:42:18 +08:00
omair saleh
826840f992
missing orders
2022-03-05 13:51:02 +08:00
omair saleh
bd5d9fe520
missing orders
2022-03-05 13:47:52 +08:00
omair saleh
34d4aeed1c
missing order
2022-03-05 13:45:02 +08:00
omair saleh
6d5b6a206f
missing order
2022-03-05 13:43:23 +08:00
omair saleh
c9678b5be3
active customers filter list
2022-03-05 11:27:39 +08:00
omair saleh
f4c252546a
active customers filter list
2022-03-05 11:10:56 +08:00
omair saleh
24c8f5acbc
active customers filter list
2022-03-05 10:14:13 +08:00
omair saleh
5f2d5c36a1
active customers filter list
2022-03-05 10:08:24 +08:00
omair saleh
eed71a4696
Merge remote-tracking branch 'origin/development' into development
2022-03-05 09:46:47 +08:00
omair saleh
d947caa1e0
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# resources/views/pages/warehouse_list.blade.php
2022-03-05 09:46:33 +08:00
omair saleh
d3b6e56f76
fix missing order issue
2022-03-04 13:56:09 +08:00
omair saleh
5b692fa7a5
fix claim packing list
2022-03-03 16:49:43 +08:00
omair saleh
1413b619f6
fix claim packing list
2022-03-03 16:48:08 +08:00
omair saleh
46e49b7e5b
fix container attach packing list
2022-03-02 21:06:43 +08:00
omair saleh
5201874111
show estimated parcel cbm
2022-03-02 20:43:22 +08:00
omair saleh
7426d6dff2
show estimated parcel cbm
2022-03-02 20:41:51 +08:00
omair saleh
ede4231676
show estimated parcel cbm
2022-03-02 20:40:09 +08:00
omair saleh
bc1a7c04db
show estimated parcel cbm
2022-03-02 20:39:02 +08:00
omair saleh
5356098cc4
show estimated parcel cbm
2022-03-02 20:37:51 +08:00
omair saleh
e83206ceab
show estimated parcel cbm
2022-03-02 20:35:03 +08:00
omair saleh
251d44912f
show estimated parcel cbm
2022-03-02 20:31:05 +08:00
omair saleh
7e4b5d8528
update yiwu warehouse west malaysia notice
2022-03-02 11:20:07 +08:00
omair saleh
9ab0133e00
debug release button
2022-03-01 20:14:40 +08:00
omair saleh
87d7a7572f
debug release button
2022-03-01 20:13:25 +08:00
omair saleh
56c71e1500
debug release button
2022-03-01 20:12:04 +08:00
omair saleh
d37dfa2aa8
debug release button
2022-03-01 20:11:02 +08:00
omair saleh
2fad8a5994
debug release button
2022-03-01 20:08:59 +08:00
omair saleh
f3c7422e6c
update announcements
2022-03-01 13:33:34 +08:00
omair saleh
22da7b5efd
update announcements
2022-03-01 13:31:07 +08:00
omair saleh
5b7d6b0a2f
update announcements
2022-03-01 13:26:30 +08:00
omair saleh
788b632285
update announcements
2022-03-01 13:22:46 +08:00
edmondlang
35d0d9e97b
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-28 13:36:48 +08:00
omair saleh
0ef2c9bf6d
fix yd yiwu warehouse selection
2022-02-28 10:51:57 +08:00
omair saleh
34532d0f68
fix detached containers
2022-02-27 15:37:25 +08:00
omair saleh
50a545595f
fix detached containers
2022-02-27 15:34:13 +08:00
edmondlang
3462430474
Delivery List, Pending Delivery List
...
Customer Profile
2022-02-26 16:55:56 +08:00
edmondlang
60a263c508
change warehouse-list page to parcel page
...
add on hold parcel
2022-02-26 11:20:31 +08:00
edmondlang
5829d9c0a1
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into shipping-updates
2022-02-26 10:43:05 +08:00
edmondlang
9a061d2f37
Warehouse Profile
...
settings - warehouse - view details-> warehouse details / warehouse profile page
2022-02-26 10:40:45 +08:00
omair saleh
564bac38b9
remove receive date notice, for order form
2022-02-25 13:09:27 +08:00
omair saleh
ad2be90c3b
exception ley key to use vt gz warehouse
2022-02-25 12:53:26 +08:00
omair saleh
47624ed8f2
fix address approval bug
2022-02-25 12:29:02 +08:00
edmondlang
528cc2f68d
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into shipping-updates
...
# Conflicts:
# routes/web.php
2022-02-24 21:32:10 +08:00
omair saleh
69ede16fe9
fix address approval bug
2022-02-24 17:39:12 +08:00
omair saleh
6060c7966a
fix address approval bug
2022-02-24 17:32:02 +08:00
omair saleh
f8f470078c
fix address approval bug
2022-02-24 17:28:11 +08:00
omair saleh
e5f4068bc0
fix address approval bug
2022-02-24 17:25:40 +08:00
omair saleh
e0504c8d79
fix address approval bug
2022-02-24 17:24:25 +08:00
omair saleh
3a8f64719d
fix address approval bug
2022-02-24 17:16:51 +08:00
omair saleh
1d86949d54
fix container search
2022-02-24 14:37:41 +08:00
omair saleh
74b363fb12
revert temp hide setting button
2022-02-24 12:45:51 +08:00
omair saleh
1212372515
temp hide setting button
2022-02-24 12:35:35 +08:00
omair saleh
e17c4cb014
temp hide setting button
2022-02-24 12:34:44 +08:00
omair saleh
e4c32b5ad2
Merge branch 'development' into 'master'
...
hide all setting until the set up is complete
See merge request CIEFWorldwideSdnBhd/shipping-portal!107
2022-02-24 04:29:15 +00:00
omair saleh
6a86738f61
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
2022-02-24 12:27:41 +08:00
omair saleh
79d8acb50b
Merge remote-tracking branch 'origin/development' into development
2022-02-24 12:24:19 +08:00
omair saleh
388973de4c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
2022-02-24 12:24:06 +08:00
edmondlang
7292ce37e4
update function - update comapny name
2022-02-23 22:44:13 +08:00
omair saleh
f2ad76a7ae
Merge remote-tracking branch 'origin/development' into development
2022-02-23 21:37:21 +08:00
omair saleh
7d273b5ce6
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
2022-02-23 21:37:02 +08:00
edmondlang
15be2c14ab
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-23 19:08:16 +08:00
edmondlang
a735885bbb
cretae update comapny name function
2022-02-23 19:07:45 +08:00
omair saleh
1ed5a3e4a0
Merge remote-tracking branch 'origin/development' into development
2022-02-23 18:56:07 +08:00
omair saleh
816a40d647
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
2022-02-23 18:55:28 +08:00
edmondlang
0316b7c651
update form component file location
2022-02-23 18:44:30 +08:00
edmondlang
91415bd11d
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-23 18:15:27 +08:00
edmondlang
f037352a28
cretae update document reference function
2022-02-23 18:13:57 +08:00
omair saleh
0f508aed3a
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
2022-02-23 18:12:03 +08:00
omair saleh
7d352a90e5
Merge remote-tracking branch 'origin/development' into development
2022-02-23 18:11:19 +08:00
omair saleh
95c37f1e1f
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
2022-02-23 17:34:41 +08:00
edmondlang
a84e826c31
Create search function in container page
2022-02-23 17:26:26 +08:00
omair saleh
c882450dce
fix unclaimed packing lists
2022-02-23 13:57:14 +08:00
omair saleh
6fd8956892
fix unclaimed packing lists
2022-02-23 13:54:31 +08:00
omair saleh
adb9a18651
fix unclaimed packing lists
2022-02-23 13:51:17 +08:00
omair saleh
c932f2b86f
fix unclaimed packing lists
2022-02-23 13:49:48 +08:00
omair saleh
1dc23b088e
fix unclaimed packing lists
2022-02-23 13:48:34 +08:00
omair saleh
47704001dd
fix unclaimed packing lists
2022-02-23 13:47:18 +08:00
omair saleh
d02f395e72
fix unclaimed packing lists
2022-02-23 13:45:42 +08:00
omair saleh
bdfccca2c8
fix unclaimed packing lists
2022-02-23 13:42:46 +08:00
omair saleh
97c900447f
fix unclaimed packing lists
2022-02-23 13:42:12 +08:00
omair saleh
5db4b715e2
fix unclaimed packing lists
2022-02-23 13:39:16 +08:00
omair saleh
745cfef185
fix unclaimed packing lists
2022-02-23 13:37:19 +08:00
omair saleh
05aa23a645
fix unclaimed packing lists
2022-02-23 13:31:31 +08:00
omair saleh
c7330fd051
fix unclaimed packing lists
2022-02-23 13:29:41 +08:00
omair saleh
a4bb600a3c
fix unclaimed packing lists
2022-02-23 13:29:09 +08:00
omair saleh
2631edc326
fix unclaimed packing lists
2022-02-23 13:28:44 +08:00
omair saleh
c1faa710b4
fix unclaimed packing lists
2022-02-23 13:24:08 +08:00
omair saleh
ab37914145
fix unclaimed packing lists
2022-02-23 13:20:35 +08:00
omair saleh
c49ebe2836
fix unclaimed packing lists
2022-02-23 13:17:27 +08:00
omair saleh
85f67db797
Merge remote-tracking branch 'origin/development' into development
2022-02-23 13:12:53 +08:00
omair saleh
284b21ec51
fix unclaimed packing lists
2022-02-23 13:12:32 +08:00
edmondlang
7146600376
update service configuration form component
2022-02-21 20:53:55 +08:00
edmondlang
b5b2ba59af
add warehouse charges in settings
2022-02-21 20:34:25 +08:00
edmondlang
fa29de775c
update bugs
2022-02-21 20:00:09 +08:00
edmondlang
0496851286
update settings add state charges TAB
2022-02-21 16:11:39 +08:00
omair saleh
584fbccb93
fix yd bug
2022-02-21 14:55:58 +08:00
edmondlang
994d7ab4d9
update list postcode component
2022-02-21 14:42:10 +08:00
omair saleh
529cec7864
remove chinese new year announcement
2022-02-21 12:59:53 +08:00
edmondlang
6f30884a8c
add page orders table
2022-02-20 16:38:46 +08:00
glovetleong
f8a985035e
notification
2022-02-18 21:57:25 +08:00
edmondlang
ca3ecb0fda
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-17 21:50:55 +08:00
omair saleh
f5a67f7e97
test vt do
2022-02-17 15:11:27 +08:00
omair saleh
288cced125
test vt do
2022-02-17 15:10:57 +08:00
omair saleh
a76ce39830
test vt do
2022-02-17 15:09:40 +08:00
omair saleh
64467ea4be
test vt do
2022-02-17 15:07:25 +08:00
edmondlang
09e0565988
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-15 21:56:22 +08:00
edmondlang
22ce6b8156
Update admin setting ui icons
2022-02-15 17:04:50 +08:00
edmondlang
f810168dbb
update postcodes area ui
2022-02-15 16:44:25 +08:00
omair saleh
fc0809d9d2
add remark to yd address on release
2022-02-15 14:50:52 +08:00
omair saleh
29d1fb893d
add remark to yd address on release
2022-02-15 11:33:10 +08:00
omair saleh
f01640d9f2
add remark to yd address on release
2022-02-15 11:31:24 +08:00
omair saleh
753951a1d2
add remark to yd address on release
2022-02-15 11:30:43 +08:00
omair saleh
552b6f0e1e
add remark to yd address on release
2022-02-15 11:28:42 +08:00
omair saleh
314575e2b6
add remark to yd address on release
2022-02-15 11:28:10 +08:00
omair saleh
2deea66f0a
add remark to yd address on release
2022-02-15 11:25:40 +08:00
edmondlang
aab739737c
update code merge
2022-02-14 12:22:51 +08:00
edmondlang
595df401c2
update ui
2022-02-14 12:16:42 +08:00
edmondlang
b03601cec5
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into null_order_packing_list_ui
2022-02-14 00:09:15 +08:00
edmondlang
c040dfe2c3
update null_order_packing_list_ul
2022-02-14 00:08:37 +08:00
edmondlang
0abf617a0d
Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into merge-dev-conflict
...
# Conflicts:
# app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
# app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
# app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
# app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
# app/Classes/Modules/Segments/Services/CreatesSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
# app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php
# app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
# app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
# app/Http/Controllers/Segments/DeleteSegmentController.php
# routes/announcement.php
# routes/segment.php
# routes/web.php
2022-02-12 20:16:33 +08:00
edmondlang
ffe39f40ff
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into merge-dev-conflict
2022-02-12 20:06:27 +08:00
omair saleh
6f547b0a2f
add remark to yd address on release
2022-02-12 19:53:01 +08:00
Leong Chee Siong
06785efe9b
Merge branch 'transaction-invoice' into 'development'
...
Transaction invoice
See merge request CIEFWorldwideSdnBhd/shipping-portal!105
2022-02-12 04:00:37 +00: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
omair saleh
2691d7df33
fix $ is not a function bug
2022-02-10 11:26:55 +08:00
omair saleh
9df9e5bd7c
fix $ is not a function bug
2022-02-10 11:13:58 +08:00
edmondlang
05b1aedda5
Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
# app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
# app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
# app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
# app/Classes/Modules/Segments/Services/CreatesSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
# app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php
# app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
# app/Http/Controllers/Announcements/ListAnnouncementsController.php
# app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
# app/Http/Controllers/Announcements/UpdateAnnouncementController.php
# app/Http/Controllers/Segments/CreateSegmentController.php
# app/Http/Controllers/Segments/DeleteSegmentController.php
# routes/announcement.php
# routes/api.php
# routes/segment.php
# routes/web.php
2022-02-09 21:09:17 +08:00
edmondlang
7ece556475
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/Orders/Processors/ApproveChangeOrderAddressProcessor.php
# app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php
# app/Classes/Modules/PackingLists/ControllersLogic/UpdatePackingListStatusLogic.php
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
# resources/assets/vue/components/containers/elements/ContainerComponent.vue
# routes/web.php
2022-02-09 21:00:13 +08:00
edmondlang
919a48eb9a
Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-09 19:30:17 +08:00
omair saleh
495574e60d
Merge remote-tracking branch 'origin/development' into development
2022-02-09 19:29:06 +08:00
omair saleh
c17c29ad06
add owner id filter
2022-02-09 19:28:50 +08:00
omair saleh
4c8d363e25
add owner id filter
2022-02-09 19:27:59 +08:00
omair saleh
f5df10297e
add yd reschedule container logic
2022-02-09 19:07:06 +08:00
Leong Chee Siong
9245793ebe
Merge branch 'null_order_packing_list' into 'development'
...
bug
See merge request CIEFWorldwideSdnBhd/shipping-portal!104
2022-02-08 14:59:13 +00:00
edmondlang
5547e80993
Merge branch 'null_order_packing_list' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into development
2022-02-08 22:59:02 +08:00
glovetleong
658a669a4d
bug
2022-02-08 22:52:12 +08:00
Leong Chee Siong
d6faaecb35
Merge branch 'null_order_packing_list' into 'development'
...
bug
See merge request CIEFWorldwideSdnBhd/shipping-portal!103
2022-02-08 14:16:32 +00:00
glovetleong
fdc6a4adc1
bug
2022-02-08 22:15:18 +08:00
glovetleong
3dbcf81cc3
pull
2022-02-08 18:05:01 +08:00
omair saleh
b3bf814d25
add yd reschedule container logic
2022-02-06 12:08:11 +08:00
omair saleh
d489c0091f
add yd reschedule container logic
2022-02-06 12:01:09 +08:00
omair saleh
46699784da
fix yd tracking api json line break bug
2022-02-06 11:30:56 +08:00
omair saleh
1538994cc5
update chinese new year holiday announcement
2022-01-28 18:18:08 +08:00
omair saleh
a5cb002b4e
update chinese new year holiday announcement
2022-01-28 18:17:13 +08:00
omair saleh
7d23f86c0d
update chinese new year holiday announcement
2022-01-28 18:08:40 +08:00
omair saleh
999d2f535d
add over weight cbm to yd
2022-01-28 12:47:17 +08:00
omair saleh
fcdf4e32d7
add over weight cbm to yd
2022-01-28 12:43:57 +08:00
omair saleh
96dd0ec72a
add over weight cbm to yd
2022-01-28 12:40:20 +08:00
omair saleh
1b333e1061
add over weight cbm to yd
2022-01-28 12:38:22 +08:00
omair saleh
18a2ac1fd7
add over weight cbm to yd
2022-01-28 12:35:49 +08:00
omair saleh
52377d6ecb
add over weight cbm to yd
2022-01-28 12:32:20 +08:00
omair saleh
2b956f4cfe
add over weight cbm to yd
2022-01-28 12:26:05 +08:00
omair saleh
e84995bcc7
add over weight cbm to yd
2022-01-28 12:25:51 +08:00
omair saleh
97bda44d61
add over weight cbm to yd
2022-01-28 12:24:10 +08:00
omair saleh
fc2fe2c712
add over weight cbm to yd
2022-01-28 12:13:25 +08:00
omair saleh
983d7a5092
add over weight cbm to yd
2022-01-28 12:09:20 +08:00
omair saleh
df1112f86f
add over weight cbm to yd
2022-01-28 12:06:16 +08:00
omair saleh
1bfc44c1e0
add over weight cbm to yd
2022-01-28 12:05:22 +08:00
omair saleh
f75d2235a2
add over weight cbm to yd
2022-01-28 12:03:20 +08:00
omair saleh
31ce575f5f
add over weight cbm to yd
2022-01-28 11:57:51 +08:00
omair saleh
cd6d86fb4b
add over weight cbm to yd
2022-01-28 11:57:27 +08:00
omair saleh
7f7101cce5
add over weight cbm to yd
2022-01-28 11:37:54 +08:00
omair saleh
a892656725
fix yd delivery address update api
2022-01-27 16:06:59 +08:00
omair saleh
86cc7faf30
fix yd delivery address update api
2022-01-27 16:03:14 +08:00
omair saleh
c2ed6ce35e
fix yd delivery address update api
2022-01-27 15:30:43 +08:00
omair saleh
579bcbb17f
fix yd delivery address update api
2022-01-27 15:18:30 +08:00
omair saleh
4d4d9165ce
fix yd delivery address update api
2022-01-27 15:16:10 +08:00
omair saleh
bfcc3e1aae
fix yd delivery address update api
2022-01-27 15:09:12 +08:00
omair saleh
199a18e8dd
fix yd delivery address update api
2022-01-27 15:08:30 +08:00
omair saleh
33277d080a
fix yd delivery address update api
2022-01-27 15:08:04 +08:00
omair saleh
5c86e7fda0
fix yd delivery address update api
2022-01-27 13:32:19 +08:00
omair saleh
efdc235502
fix yd delivery address update api
2022-01-27 13:30:25 +08:00
omair saleh
c89510dda7
fix yd delivery address update api
2022-01-27 13:28:05 +08:00
omair saleh
a6ef50d350
fix yd delivery address update api
2022-01-27 13:23:56 +08:00
omair saleh
e7164e903d
fix yd delivery address update api
2022-01-27 13:21:20 +08:00
omair saleh
3eaeccc8d3
fix yd delivery address update api
2022-01-27 13:19:55 +08:00
omair saleh
8e4a6b3911
fix yd delivery address update api
2022-01-27 13:12:12 +08:00
omair saleh
f9b657ab43
fix yd delivery address update api
2022-01-27 13:10:00 +08:00
omair saleh
ada8117bd1
fix yd delivery address update api
2022-01-27 13:08:57 +08:00
omair saleh
402556d51b
fix yd delivery address update api
2022-01-27 13:01:25 +08:00
omair saleh
a60ab688da
fix yd delivery address update api
2022-01-27 12:55:16 +08:00
omair saleh
5d9a08ea0b
fix overlapping schedules for vt and yd
2022-01-27 12:48:55 +08:00
omair saleh
e4ef885553
update order address in yd
2022-01-27 12:27:14 +08:00
omair saleh
bdece13293
Merge branch 'customer_latest_order_date_export_master' into 'master'
...
customer export
See merge request CIEFWorldwideSdnBhd/shipping-portal!98
2022-01-27 03:50:45 +00:00
omair saleh
e3cfb002a5
Merge branch 'master' into 'customer_latest_order_date_export_master'
...
# Conflicts:
# app/Http/Controllers/Exports/ExportCustomersToExcelController.php
# routes/web.php
2022-01-27 03:50:27 +00:00
omair saleh
f5bace1c3b
Merge branch 'null_order_packing_list' into 'development'
...
Null order packing list
See merge request CIEFWorldwideSdnBhd/shipping-portal!102
2022-01-27 03:48:30 +00:00
glovetleong
642e1b2d5a
status
2022-01-26 17:44:36 +08:00
glovetleong
d2321a3347
out
2022-01-26 17:33:58 +08:00
glovetleong
5cf7511c31
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into null_order_packing_list
2022-01-26 17:33:15 +08:00
glovetleong
0a8109ae9e
null order packing list, assign packing list
2022-01-26 17:32:14 +08:00
omair saleh
36289a3694
minor clean up
2022-01-26 13:44:38 +08:00
omair saleh
46b079462a
confirm yd orders for release in china
2022-01-25 12:44:51 +08:00
omair saleh
3c83f91a27
confirm yd orders for release in china
2022-01-25 12:29:58 +08:00
omair saleh
0a51074064
confirm yd orders for release in china
2022-01-25 12:15:26 +08:00
omair saleh
bd5e89e832
confirm yd orders for release in china
2022-01-25 12:11:33 +08:00
omair saleh
763cc2d38c
add vue versions for cache issues
2022-01-21 19:23:15 +08:00
omair saleh
a36adc7ca5
show warehouse reference to admin
2022-01-21 19:09:02 +08:00
omair saleh
950b3d168a
show warehouse reference to admin
2022-01-21 19:07:11 +08:00
omair saleh
a35cf282f6
show warehouse reference to admin
2022-01-21 19:06:23 +08:00
omair saleh
39408e08ca
show warehouse reference to admin
2022-01-21 19:03:49 +08:00
omair saleh
e472260db1
update replica packages logic and over weight price announcement
2022-01-21 17:09:15 +08:00
omair saleh
2428fac309
update replica packages logic and over weight price announcement
2022-01-21 17:08:16 +08:00
omair saleh
aa681ecd93
update replica packages logic and over weight price announcement
2022-01-21 17:06:41 +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
c13d2ce219
update replica packages logic and over weight price announcement
2022-01-21 16:28:30 +08:00
omair saleh
412f4cc4b6
update replica packages logic and over weight price announcement
2022-01-21 16:26:15 +08:00
omair saleh
04650debbb
update replica packages logic and over weight price announcement
2022-01-21 16:24:54 +08:00
omair saleh
3436ed37a1
update replica packages logic and over weight price announcement
2022-01-21 16:22:35 +08:00
omair saleh
980dd22c4b
update replica packages logic and over weight price announcement
2022-01-21 16:21:55 +08:00
omair saleh
7cc43bcdd9
update replica packages logic and over weight price announcement
2022-01-21 16:20:27 +08:00
omair saleh
8487c6adf3
update replica packages logic and over weight price announcement
2022-01-21 16:00:53 +08:00
omair saleh
ca5879cab0
update replica packages logic and over weight price announcement
2022-01-21 16:00:38 +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
5c4fbe2c52
fix release and hold button for packing lists
2022-01-20 11:16:52 +08:00
omair saleh
1854ca24de
fix yd order number bug
2022-01-19 13:29:26 +08:00
omair saleh
d93e6ea25e
improve loading speed for container page
2022-01-18 15:42:24 +08:00
omair saleh
5c780ae0f9
improve loading speed for container page
2022-01-18 15:40:46 +08:00
omair saleh
5c374e2e19
improve loading speed for container page
2022-01-18 15:39:14 +08:00
edmondlang
b6ed451b54
update route for warehouse details
2022-01-15 14:46:23 +08:00
edmondlang
74ede9e3dd
shipping updates
2022-01-15 14:40:48 +08:00
edmondlang
f8d65d05da
notification-ui
2022-01-15 13:39:17 +08:00
omair saleh
438f7fdff5
fix yd fetch
2022-01-14 15:30:05 +08:00
omair saleh
d6647b488f
fix yd fetch
2022-01-14 15:23:00 +08:00
omair saleh
3fb7bc93d7
fix yd fetch
2022-01-14 15:17:00 +08:00
omair saleh
f97fc04a2b
fix yd fetch
2022-01-14 15:12:21 +08:00
omair saleh
77690cb607
fix yd fetch
2022-01-14 15:08:50 +08:00
omair saleh
f876c59a0d
fix yd fetch
2022-01-14 15:07:00 +08:00
omair saleh
c5d5195d2d
fix yd fetch
2022-01-14 15:05:36 +08:00
Leong Chee Siong
7ba48b07d1
Merge branch 'container-packing-list-export' into 'development'
...
export packing list
See merge request CIEFWorldwideSdnBhd/shipping-portal!101
2022-01-14 06:36:38 +00:00
glovetleong
96131c5b33
export packing list
2022-01-14 14:03:40 +08:00
edmondlang
3ae4b019ce
update text-color for days ago in container page
2022-01-12 23:55:05 +08:00
edmondlang
2558e8f4f2
Revert "update text-color for days ago in container page"
...
This reverts commit fdec05ca45 .
2022-01-12 23:11:42 +08:00
edmondlang
fdec05ca45
update text-color for days ago in container page
2022-01-12 22:53:58 +08:00
edmondlang
9fe86c52bd
update containers page add days ago
2022-01-12 22:26:28 +08:00
omair saleh
ea34c74f6d
fix monthly report
2022-01-11 19:46:18 +08:00
omair saleh
3a69ce6972
fix monthly report
2022-01-11 19:43:54 +08:00
omair saleh
83fc73acec
fix monthly report
2022-01-11 19:42:13 +08:00
omair saleh
e8613bd6d9
fix monthly report
2022-01-11 19:39:43 +08:00
omair saleh
3e4f627cbe
fix monthly report
2022-01-11 19:37:05 +08:00
omair saleh
a870d259f9
fix monthly report
2022-01-11 19:30:22 +08:00
omair saleh
ed0db2e372
fix monthly report
2022-01-11 19:28:20 +08:00
omair saleh
80359cc23b
fix monthly report
2022-01-11 19:26:56 +08:00
omair saleh
67867220ed
fix monthly report
2022-01-11 19:26:16 +08:00
omair saleh
35206ca249
fix monthly report
2022-01-11 19:22:39 +08:00
omair saleh
394eadf6a2
remove the exempted customer list from yd warehouse
2022-01-11 18:03:43 +08:00
omair saleh
440271bc27
activate yd warehouses as default
2022-01-11 12:56:16 +08:00
omair saleh
7769a27a73
activate yd warehouses as default
2022-01-11 12:56:00 +08:00
omair saleh
a28ad55508
activate yd warehouses as default
2022-01-11 12:55:05 +08:00
omair saleh
845873354f
activate yd warehouses as default
2022-01-11 12:47:13 +08:00
omair saleh
b065881715
activate yd warehouses as default
2022-01-11 00:55:26 +08:00
omair saleh
fb5c5ad890
add yd yiwu warehouse seeder
2022-01-10 20:54:47 +08:00
omair saleh
1e37de379d
update api routes
2022-01-10 15:52:51 +08:00
omair saleh
be2b9d8759
update api routes
2022-01-10 15:51:20 +08:00
omair saleh
aaf68b6368
fix monthly report
2022-01-08 11:01:32 +08:00
omair saleh
c0577128ae
fix monthly report
2022-01-08 10:53:12 +08:00
omair saleh
6a91da7b69
fix approve address change bug when doesn't exist on vt portal
2022-01-08 10:51:40 +08:00
omair saleh
d6eda8a11d
fix approve address change bug when doesn't exist on vt portal
2022-01-08 10:50:12 +08:00
omair saleh
5dec999cbf
fix on hold and release status for packing list
2022-01-07 15:17:48 +08:00
omair saleh
99060ffa51
add new customer to yd warehouse list
2022-01-06 22:39:11 +08:00
omair saleh
73fdc2c0f4
add yiwu warehouse announcement
2022-01-06 11:28:06 +08:00
omair saleh
52038cb365
add yiwu warehouse announcement
2022-01-06 11:22:19 +08:00
omair saleh
bb2f75d837
add yiwu warehouse announcement
2022-01-06 11:18:37 +08:00
Leong Chee Siong
b94b87c1b7
Merge branch 'yd_sync_update' into 'development'
...
Yd sync update
See merge request CIEFWorldwideSdnBhd/shipping-portal!100
2022-01-05 01:17:25 +00:00
omair saleh
0aa1979611
fix yd fetch data
2022-01-04 21:32:16 +08:00
omair saleh
9e872dfb35
fix yd fetch data
2022-01-04 21:25:03 +08:00
omair saleh
ff035c1f70
fix yd fetch data
2022-01-04 21:24:30 +08:00
omair saleh
8408add279
fix yd fetch data
2022-01-04 21:10:07 +08:00
omair saleh
47d6849dfa
fix yd fetch data
2022-01-04 21:08:56 +08:00
omair saleh
56559d3daa
fix yd fetch data
2022-01-04 21:08:45 +08:00
omair saleh
bae61caae1
fix yd fetch data
2022-01-04 21:08:21 +08:00
omair saleh
af07299bcf
fix yd fetch data
2022-01-04 21:07:25 +08:00
omair saleh
3e26c7e8ef
fix yd fetch data
2022-01-04 21:03:54 +08:00
omair saleh
bac81b57f4
fix yd fetch data
2022-01-04 20:56:01 +08:00
omair saleh
1d64dc9984
fix yd fetch data
2022-01-04 20:53:49 +08:00
omair saleh
bbadaa53ba
fix yd fetch data
2022-01-04 20:53:01 +08:00
omair saleh
e4f5210e83
fix yd fetch data
2022-01-04 20:52:26 +08:00
omair saleh
078e83477e
fix yd fetch data
2022-01-04 20:50:56 +08:00
omair saleh
ce6e6be2bf
fix yd fetch data
2022-01-04 20:50:04 +08:00
omair saleh
f608bb54f0
fix yd fetch data
2022-01-04 20:47:53 +08:00
omair saleh
bb210f8583
fix yd fetch data
2022-01-04 20:46:17 +08:00
omair saleh
d4016e869b
fix yd fetch data
2022-01-04 20:45:20 +08:00
omair saleh
e0d743b5a0
fix yd fetch data
2022-01-04 20:42:07 +08:00
omair saleh
8052ae3a11
fix yd fetch data
2022-01-04 20:41:31 +08:00
omair saleh
6a381446bc
fix yd fetch data
2022-01-04 20:40:17 +08:00
omair saleh
1dbade82a7
fix yd fetch data
2022-01-04 20:39:02 +08:00
omair saleh
e70d804c32
fix yd fetch data
2022-01-04 20:38:02 +08:00
omair saleh
39391990af
fix yd fetch data
2022-01-04 20:37:19 +08:00
omair saleh
b96dad37f5
fix yd fetch data
2022-01-04 20:26:34 +08:00
glovetleong
012904c522
yd sync update order address
2022-01-04 20:26:27 +08:00
omair saleh
90420cebe7
fix yd fetch data
2022-01-04 20:25:25 +08:00
omair saleh
04bd67573c
fix yd fetch data
2022-01-04 20:23:47 +08:00
omair saleh
f69c99b070
fix yd fetch data
2022-01-04 20:16:20 +08:00
omair saleh
fdf4f21155
fix yd fetch data
2022-01-04 20:13:15 +08:00
omair saleh
95ab15df21
fix yd fetch data
2022-01-04 20:12:21 +08:00
omair saleh
2d885776dd
fix yd fetch data
2022-01-04 20:10:55 +08:00
omair saleh
1f02b7247d
fix yd fetch data
2022-01-04 20:08:09 +08:00
omair saleh
ef3460f796
fix yd fetch data
2022-01-04 20:06:44 +08:00
omair saleh
8825e49b68
fix yd fetch data
2022-01-04 20:05:28 +08:00
omair saleh
7c17edc5fd
fix yd fetch data
2022-01-04 20:03:12 +08:00
omair saleh
6423aa6345
fix yd fetch data
2022-01-04 20:01:34 +08:00
omair saleh
d22e3884fa
fix yd fetch data
2022-01-04 20:00:35 +08:00
omair saleh
263e122dea
fix yd fetch data
2022-01-04 19:58:55 +08:00
omair saleh
6ecee81112
fix yd fetch data
2022-01-04 19:46:44 +08:00
omair saleh
cee6ca4eee
fix yd fetch data
2022-01-04 19:45:14 +08:00
omair saleh
e2766c66a1
fix yd fetch data
2022-01-04 19:42:35 +08:00
glovetleong
6c94e39da8
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal
...
# Conflicts:
# app/Http/Controllers/Exports/ExportCustomersToExcelController.php
# routes/web.php
2022-01-03 22:21:37 +08:00
omair saleh
c7b6622a62
fix yd fetch data
2022-01-03 16:59:56 +08:00
omair saleh
efe3a97f3e
fix yd fetch data
2022-01-03 16:58:44 +08:00
omair saleh
2d167ef47e
fix yd fetch data
2022-01-03 16:56:05 +08:00
omair saleh
e504b31b15
fix yd fetch data
2022-01-03 16:52:51 +08:00
omair saleh
0469a725ed
fix yd fetch data
2022-01-03 16:51:30 +08:00
omair saleh
68075186d4
fix yd fetch data
2022-01-03 16:50:25 +08:00
omair saleh
3897821cb7
fix yd fetch data
2022-01-03 16:47:00 +08:00
omair saleh
07d70af213
fix yd fetch data
2022-01-03 16:45:35 +08:00
omair saleh
6b491cc2e5
fix yd fetch data
2022-01-03 16:16:02 +08:00
omair saleh
53809af105
fix yd fetch data
2022-01-03 16:12:55 +08:00
omair saleh
1efbca15ec
fix total cbm order component
2022-01-03 16:11:35 +08:00
omair saleh
a331c659a8
debug yd orders
2022-01-03 16:08:47 +08:00
omair saleh
4a1d021b85
debug missing packages
2022-01-03 16:06:08 +08:00
omair saleh
87e155334b
debug missing packages
2022-01-03 16:02:00 +08:00
omair saleh
4d594bb084
debug missing packages
2022-01-03 15:58:29 +08:00
omair saleh
5fdae14e01
debug missing packages
2022-01-03 15:57:12 +08:00
omair saleh
7b3793e6d7
debug missing packages
2022-01-03 15:54:11 +08:00
omair saleh
d281017c24
fix order status count
2022-01-03 15:53:22 +08:00
omair saleh
d08ded395a
fix order status count
2022-01-03 15:50:17 +08:00
omair saleh
40c5692276
fix order status count
2022-01-03 15:40:38 +08:00
omair saleh
18554e9924
fix order status count
2022-01-03 15:19:15 +08:00
omair saleh
8a8fb3e03e
update schedule for fetching data from api
2022-01-03 10:37:34 +08:00
omair saleh
396f9370ae
set users list allowed to see original packing measurements
2022-01-03 10:13:14 +08:00
omair saleh
919cbc463b
set users list allowed to see original packing measurements
2022-01-03 10:12:29 +08:00
omair saleh
78e223844f
fix vt container transport bug
2022-01-03 09:46:04 +08:00
omair saleh
dcfbbd63a7
fix vt container transport bug
2022-01-03 09:45:39 +08:00
omair saleh
1fc9330d98
fix vt container transport bug
2022-01-03 09:43:32 +08:00
omair saleh
9ff98196f0
fix package component bug
2022-01-03 09:32:45 +08:00
omair saleh
d2fe2bfef4
adjust column size for order remark input
2022-01-03 09:28:03 +08:00
omair saleh
ff0713f005
Merge branch 'development' into 'master'
...
Development
See merge request CIEFWorldwideSdnBhd/shipping-portal!99
2022-01-03 01:22:12 +00:00
omair saleh
7bd24b6547
clean up before production
2022-01-03 08:36:41 +08:00
omair saleh
33086eb1a6
sort customers orders by latest
2021-12-31 17:04:00 +08:00
omair saleh
82517e3cb3
sort customers orders by latest
2021-12-31 17:02:49 +08:00
omair saleh
41d9769d04
fix package component before loading to container
2021-12-29 03:30:42 +08:00
omair saleh
906623bad3
fix package component before loading to container
2021-12-29 03:29:16 +08:00
omair saleh
898205ec9d
fix package component before loading to container
2021-12-29 03:28:17 +08:00
omair saleh
7b791abf80
YD curl request
2021-12-29 03:22:08 +08:00
omair saleh
27f2367e88
YD curl request
2021-12-29 03:19:28 +08:00
omair saleh
6874d09ced
YD curl request
2021-12-29 03:17:44 +08:00
omair saleh
eeaba20fb0
YD curl request
2021-12-29 03:16:06 +08:00
omair saleh
5599c1ba71
YD curl request
2021-12-29 02:54:49 +08:00
omair saleh
0220f876c4
YD curl request
2021-12-29 01:23:35 +08:00
omair saleh
1f0f5e8afd
YD curl request
2021-12-29 01:22:47 +08:00
omair saleh
1426d6f13c
YD curl request
2021-12-29 01:21:19 +08:00
omair saleh
187411237d
YD curl request
2021-12-29 01:20:18 +08:00
omair saleh
dac4470f72
YD curl request
2021-12-29 01:20:04 +08:00
omair saleh
65b49d4d61
YD curl request
2021-12-29 01:19:17 +08:00
omair saleh
bfbe07dc8e
YD curl request
2021-12-29 01:18:17 +08:00
omair saleh
4ef90f7cf2
YD curl request
2021-12-29 01:15:49 +08:00
omair saleh
c07aa6c1f1
YD curl request
2021-12-29 01:13:51 +08:00
omair saleh
28ad88900e
YD curl request
2021-12-29 01:05:23 +08:00
omair saleh
b707717418
YD curl request
2021-12-29 01:02:11 +08:00
omair saleh
6b4d2736c5
YD curl request
2021-12-29 00:53:04 +08:00
omair saleh
9ebacae701
YD curl request
2021-12-29 00:50:32 +08:00
omair saleh
e18f49b5b7
YD curl request
2021-12-29 00:48:00 +08:00
omair saleh
81a7d79e0c
YD curl request
2021-12-29 00:47:07 +08:00
omair saleh
c698466b3d
YD curl request
2021-12-29 00:46:52 +08:00
omair saleh
8e3be2747f
YD curl request
2021-12-29 00:45:44 +08:00
omair saleh
8dafa7d678
YD curl request
2021-12-29 00:44:11 +08:00
omair saleh
f36bb9d090
YD curl request
2021-12-29 00:43:20 +08:00
omair saleh
87c60dc488
YD curl request
2021-12-29 00:29:38 +08:00
omair saleh
e11e0307af
add packing list replica
2021-12-28 22:03:11 +08:00
omair saleh
78fcb6c111
add packing list replica
2021-12-28 21:50:30 +08:00
omair saleh
f0bc306ebd
Merge remote-tracking branch 'origin/development' into development
2021-12-28 21:45:50 +08:00
omair saleh
0671e24916
add packing list replica
2021-12-28 21:45:16 +08:00
glovetleong
a328be683e
customer export
2021-12-28 17:48:50 +08:00
Leong Chee Siong
4854e9b095
Merge branch 'customer_latest_order_date_export' into 'development'
...
Customer latest order date export
See merge request CIEFWorldwideSdnBhd/shipping-portal!97
2021-12-28 09:37:07 +00:00
glovetleong
64a4e4b45f
customer order latest date export
2021-12-28 17:35:16 +08:00
omair saleh
9774f4b823
add packing list replica
2021-12-28 15:42:42 +08:00
glovetleong
2365ad10cf
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into development
...
# Conflicts:
# app/Classes/Modules/Orders/Services/FetchesDataFromYDPortal.php
# app/Classes/Modules/PackingLists/Processors/FetchOrderListsFromYdPortalProcessor.php
# app/Console/Commands/CurlYdOrderListCommand.php
2021-12-28 15:31:01 +08:00
omair saleh
47eb9262ad
add packing list replica
2021-12-28 01:19:26 +08:00
omair saleh
9f6d0fbc79
Merge branch 'development'
...
# Conflicts:
# resources/views/pages/orders/index.blade.php
2021-12-21 19:36:46 +08:00
omair saleh
22a2d7d7a1
sync vt do with shipping portal
2021-12-21 19:10:03 +08:00
omair saleh
5339799312
Merge remote-tracking branch 'origin/development' into development
2021-12-20 14:48:07 +08:00
omair saleh
565fd5eae3
fix create address logic
2021-12-20 14:47:52 +08:00
omair saleh
1156f437df
Merge branch 'order-search-function' into 'development'
...
Order search function
See merge request CIEFWorldwideSdnBhd/shipping-portal!94
2021-12-19 05:46:09 +00:00
omair saleh
c5ffe372cc
Merge branch 'yb-job' into 'development'
...
yd-job connect
See merge request CIEFWorldwideSdnBhd/shipping-portal!91
2021-12-19 05:19:18 +00: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
82f45007d1
update chinese new year annoucement
2021-12-17 21:54:04 +08:00
omair saleh
048cd52fc8
fix warehouse name
2021-12-17 15:07:01 +08:00
omair saleh
4a7c4f51a5
debug address contact
2021-12-17 12:23:09 +08:00
omair saleh
3f9874a0bd
debug address contact
2021-12-17 12:21:44 +08:00
omair saleh
c972bc87a3
debug address contact
2021-12-17 12:19:43 +08:00
omair saleh
b057cd91c3
debug address contact
2021-12-17 12:17:53 +08:00
omair saleh
d29ead2144
debug address contact
2021-12-17 12:16:48 +08:00
omair saleh
71eb8db3f3
debug address contact
2021-12-17 12:15:23 +08:00
omair saleh
7b1df81649
debug address contact
2021-12-17 12:14:17 +08:00
omair saleh
ce1a2556b7
debug address contact
2021-12-17 12:12:34 +08: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
omair saleh
550f6c6b77
Merge branch 'order-contact-remark' into 'development'
...
Order contact remark
See merge request CIEFWorldwideSdnBhd/shipping-portal!88
2021-12-17 02:25:17 +00:00
omair saleh
5caac091aa
remove refresh orders button
2021-12-17 09:57:39 +08:00
glovetleong
1d3ab4ab2a
yd-job connect
2021-12-16 21:48:59 +08:00
glovetleong
5e11b8ebdf
job connect YD portal
2021-12-16 21:46:33 +08:00
edmondlang
4a158b8dac
update order profile section - only super admin can edit the order reference number
2021-12-16 18:17:27 +08:00
edmondlang
280f5f4974
update order profile section - only admins can edit the order reference number
2021-12-16 13:50:04 +08:00
glovetleong
926cb61ca3
Vt sync update
2021-12-13 21:23:04 +08:00
Fairuz
3aec23525c
Duplicate packing list for admin CIEF reference
2021-12-13 11:45:48 +08:00
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
0f0e99af35
fix announcement position
2021-12-08 15:53:47 +08:00
omair saleh
da1c653570
debug loaded container job
2021-12-07 13:08:20 +08:00
omair saleh
f86f129949
debug loaded container job
2021-12-07 13:06:47 +08:00
omair saleh
ec24033209
debug loaded container job
2021-12-07 13:05:20 +08:00
omair saleh
e3dd8440df
debug loaded container job
2021-12-07 13:01:38 +08:00
omair saleh
7647dc0e23
debug loaded container job
2021-12-07 12:58:53 +08:00
omair saleh
3bfb67b55a
debug loaded container job
2021-12-07 12:55:01 +08:00
omair saleh
a26368b728
debug loaded container job
2021-12-07 12:36:59 +08:00
omair saleh
a1a9ffa0aa
debug loaded container job
2021-12-07 12:32:44 +08:00
omair saleh
c3050445e1
debug loaded container job
2021-12-07 12:32:16 +08:00
omair saleh
3620e4c4b5
debug loaded container job
2021-12-07 12:30:39 +08:00
omair saleh
3dafe41c33
debug loaded container job
2021-12-07 12:04:38 +08:00
omair saleh
e28cc43b18
debug loaded container job
2021-12-07 12:00:13 +08:00
omair saleh
80873a14e2
debug loaded container job
2021-12-07 11:56:32 +08:00
omair saleh
799936fd8b
debug loaded container job
2021-12-07 11:55:05 +08:00
omair saleh
c6d4a6ffae
debug loaded container job
2021-12-07 11:49:35 +08:00
omair saleh
bc5a8bce47
debug loaded container job
2021-12-07 11:47:27 +08:00
omair saleh
2c03e68242
update chinese new year announcment
2021-12-06 11:35:00 +08:00
omair saleh
857004a6a5
update chinese new year announcment
2021-12-06 10:37:05 +08:00
omair saleh
35b2d526ed
list yiwu to sabah or srawak orders
2021-12-03 14:16:26 +08:00
omair saleh
7e7290acc5
list yiwu to sabah or srawak orders
2021-12-03 14:02:27 +08:00
omair saleh
5256d5b2f9
list yiwu to sabah or srawak orders
2021-12-03 14:00:50 +08:00
omair saleh
e8c33e46c4
list yiwu to sabah or srawak orders
2021-12-03 13:55:58 +08:00
omair saleh
5afd37652c
list yiwu to sabah or srawak orders
2021-12-03 13:55:28 +08:00
omair saleh
aeb0dfb025
list yiwu to sabah or srawak orders
2021-12-03 13:54:16 +08:00
omair saleh
1a591c0404
list yiwu to sabah or srawak orders
2021-12-03 13:53:13 +08:00
omair saleh
22c07b19ad
list yiwu to sabah or srawak orders
2021-12-03 13:52:10 +08:00
omair saleh
9d2dceab2e
Merge remote-tracking branch 'origin/master'
2021-12-03 13:45:27 +08:00
omair saleh
d00be021bc
list yiwu to sabah or srawak orders
2021-12-03 13:45:12 +08:00
omair saleh
3d89a25f5c
remove list yiwu to sabah or srawak orders
2021-12-03 13:44:42 +08:00
omair saleh
13c4b173d3
list yiwu to sabah or srawak orders
2021-12-03 13:44:08 +08:00
omair saleh
3a74fa5e12
add contact and remark to address
2021-11-29 11:46:43 +08:00
omair saleh
098297188d
add contact and remark to address
2021-11-29 11:44:02 +08:00
omair saleh
4440f229d9
add contact and remark to address
2021-11-29 11:33:26 +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
036f389308
package tracking page
2021-11-28 19:29:06 +08:00
omair saleh
3de95f7019
package tracking page
2021-11-28 19:27:02 +08:00
omair saleh
0dc1a3c289
package tracking page
2021-11-28 19:24:18 +08:00
omair saleh
4302b42ad8
package tracking page
2021-11-28 19:22:28 +08:00
omair saleh
95daebb8f1
package tracking page
2021-11-28 19:21:27 +08:00
omair saleh
2cc0465165
package tracking page
2021-11-28 19:19:18 +08:00
omair saleh
d626c0bb51
package tracking page
2021-11-28 16:49:40 +08:00
omair saleh
4601d5191b
package tracking page
2021-11-28 14:31:05 +08:00
omair saleh
13fa349605
package tracking page
2021-11-28 14:28:17 +08:00
omair saleh
bb2e6f0c67
package tracking page
2021-11-28 14:21:36 +08:00
omair saleh
c681e89d34
Merge remote-tracking branch 'origin/development' into development
2021-11-28 13:55:27 +08:00
omair saleh
fd686d9ca5
fix contact processor and remarks database
2021-11-28 13:55:13 +08:00
edmondlang
327c2958c4
adjust alignment for order remarks
2021-11-27 21:37:40 +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
42883b3723
Merge branch 'remark-create-api' into 'master'
...
remark for order, container, packing list
See merge request CIEFWorldwideSdnBhd/shipping-portal!80
2021-11-26 07:23:42 +00: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
b31c8d508c
Merge branch 'update-id-number' into 'development'
...
Update id number
See merge request CIEFWorldwideSdnBhd/shipping-portal!85
2021-11-26 07:10:16 +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
cf6bebcde2
Merge branch 'development' into 'master'
...
Development
See merge request CIEFWorldwideSdnBhd/shipping-portal!82
2021-11-26 01:56:02 +00:00
omair saleh
a6fc5dd1a5
change warehouse address format
2021-11-25 17:08:44 +08:00
omair saleh
fa88ffca49
add marking to new warehouse special list
2021-11-25 03:18:12 +08:00
omair saleh
2b6a2810e5
clean up company module un used dependencies
2021-11-25 03:11:20 +08:00
omair saleh
c67ee25654
add new yd Guangzhou warehouse
2021-11-25 03:08:32 +08:00
omair saleh
f1cde19261
hide login as exchange
2021-11-20 10:47:03 +08:00
omair saleh
b7e5475014
hide login as exchange
2021-11-20 10:42:18 +08:00
omair saleh
a75c05fdae
update container shortage announcement
2021-11-09 23:58:17 +08:00
omair saleh
3327b8a4f5
update container shortage announcement
2021-11-09 23:54:39 +08:00
omair saleh
604413d978
update container shortage announcement
2021-11-09 23:54:14 +08:00
omair saleh
a25feacf53
categorise containers
2021-11-03 20:42:35 +08:00
omair saleh
1090de9060
categorise containers
2021-11-02 23:08:41 +08:00
omair saleh
1c721f7f10
categorise containers
2021-11-02 23:05:42 +08:00
omair saleh
4813c54e6d
categorise containers
2021-11-02 23:03:45 +08:00
omair saleh
b79ecdc6a9
categorise containers
2021-11-02 22:41:39 +08:00
omair saleh
7fa70becde
categorise containers
2021-11-02 22:39:24 +08:00
omair saleh
57a0ea535a
categorise containers
2021-11-02 22:38:41 +08:00
omair saleh
f84415ce89
categorise containers
2021-11-02 22:37:32 +08:00
omair saleh
0b79ff5521
categorise containers
2021-11-02 22:29:46 +08:00
omair saleh
d0f209b006
categorise containers
2021-11-02 22:28:23 +08:00
omair saleh
8cec7b436f
categorise containers
2021-11-02 22:25:59 +08:00
omair saleh
d2468769df
categorise containers
2021-11-02 22:24:39 +08:00
omair saleh
884f4b33d1
categorise containers
2021-11-02 22:20:47 +08:00
omair saleh
c15f67e304
order container by loading date
2021-11-02 21:40:35 +08:00
omair saleh
f5ea06e3fe
show packages quantity loaded into container
2021-11-02 21:32:20 +08:00
edmondlang
6fcf952967
update order remark ui
2021-11-02 00:00:31 +08:00
edmondlang
b0a2ab08c9
tody up container forms component
2021-10-31 19:10:16 +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
edmondlang
feec49318b
update container profile comment section with api
2021-10-30 17:11:28 +08:00
omair saleh
9977d516e1
fix order by arrival date
2021-10-30 12:49:22 +08:00
omair saleh
c9131b3c3d
order warehouse parcels by arrival date
2021-10-30 12:37:52 +08:00
omair saleh
2675fd8704
Merge branch 'create-new-filter-to-order-by-arrival-dates'
...
# Conflicts:
# routes/api.php
2021-10-30 12:30:58 +08:00
omair saleh
02c6825c4a
Merge branch 'create-new-filter-to-order-by-arrival-dates'
...
# Conflicts:
# routes/api.php
2021-10-30 12:24:44 +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
omair saleh
cf03a032e5
create container remark
2021-10-27 21:20:01 +08:00
omair saleh
2cb8f9f407
show change ratio for profit model calculator
2021-10-26 10:51:06 +08:00
edmondlang
a846028919
wip
2021-10-25 22:49:42 +08:00
edmondlang
274cd83c81
order search funtion
2021-10-25 22:26:19 +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
86d26edb72
Merge branch 'improve-responsive-ui' into 'master'
...
improve responsive ui
See merge request CIEFWorldwideSdnBhd/shipping-portal!78
2021-10-25 05:56:44 +00:00
omair saleh
052218b621
Merge branch 'delivery-packing-list-ui' into 'master'
...
Delivery packing list ui
See merge request CIEFWorldwideSdnBhd/shipping-portal!76
2021-10-25 05:54:58 +00: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
edmondlang
487d024039
wip
2021-10-23 15:00:16 +08:00
edmondlang
25c36d085f
code review update id number, min length
2021-10-21 15:50:31 +08:00
edmondlang
ba0dbf80a1
update order no
2021-10-21 00:38:16 +08:00
edmondlang
afba2d6880
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into update-id-number
2021-10-20 22:16:08 +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
Obenny
624df67ca5
copied modules, resources, and updated route files
2021-10-18 19:38:56 +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
Obenny
ea6711f06b
copied controllers, models, migrations
2021-10-17 21:43:25 +08:00
Obenny
8c23d178e8
copied migrations, model, controllers, routes
2021-10-17 21:33:40 +08:00
glovetleong
aae9f160e6
simplify order resource
2021-10-17 17:55:16 +08:00
ahmedsophyudden
ba61f7f3ab
add & delete segment api
2021-10-15 19:18:09 +08:00
edmondlang
04117754db
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into improve-responsive-ui
2021-10-13 20:33:18 +08:00
edmondlang
821a39e5ff
improve responsive ui
2021-10-13 20:23:59 +08:00
glovetleong
05cb3dd35e
cross login
2021-10-13 14:10:32 +08:00
ahmedsophyudden
5b5bf1bb06
add & delete segment api
2021-10-12 11:29:09 +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
edmondlang
f6af7c5f4f
code review remove d-flex
2021-10-10 15:42:26 +08:00
edmondlang
6ea51d56c1
improve responsive ui
...
fix order status bar width problem
2021-10-10 15:38:48 +08:00
glovetleong
b36313e24c
remark for order, container, packing list
2021-10-10 15:22:49 +08:00
edmondlang
f2422ea45c
improve responsive ui
2021-10-09 20:59:23 +08:00
edmondlang
d26c90136b
improve responsive
2021-10-09 20:43:40 +08:00
edmondlang
c10e78ad51
imporve respnsive ui
2021-10-09 17:32:44 +08:00
edmondlang
e4c8c021ec
implement api from create-delivery-packing-list-api
2021-10-07 20:02:56 +08:00
edmondlang
46891669f1
Merge branch 'create-deliver-packing-list-api' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into delivery-packing-list-ui
2021-10-07 10:58:09 +08:00
glovetleong
c281beb87a
create deliver packing list api
2021-10-07 09:20:04 +08:00
edmondlang
0d53a61f18
update select all packing list funtion
2021-10-05 20:40:48 +08:00
edmondlang
6d0e7dd51d
delivery-packing-list-ui
2021-10-05 17:00:00 +08:00
glovetleong
592e8c489b
env
2021-09-29 14:24:37 +08:00
glovetleong
ee77fd236a
cross login
2021-09-29 14:23:50 +08:00
glovetleong
ee87443ca4
pull
2021-09-28 22:23:51 +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
glovetleong
5d34201579
pull
2021-09-28 22:07:19 +08:00
Haziq Danial
61a75a4ee1
update order reference id
2021-09-28 18:51:43 +08:00
glovetleong
f385407804
debug
2021-09-28 12:07:05 +08:00
glovetleong
0554cc895f
checkout
2021-09-05 12:55:11 +08:00
glovetleong
afcb1277f1
Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal into cross-login
...
# Conflicts:
# routes/web.php
2021-09-01 20:30:08 +08:00
glovetleong
2d49f4aabf
cross login
2021-08-25 10:01:32 +08:00
glovetleong
2095c18871
cross login
2021-08-22 13:55:51 +08:00