Commit Graph

537 Commits

Author SHA1 Message Date
tzw
da402aaa52 Merge branch 'master' of sma/fcs into master 2024-03-02 18:15:15 +06:30
tzw
c63353636a update carton filter and merge api for shipment 2024-03-02 18:15:05 +06:30
sma
dd1cd5b63f add divider in search of packages and pickup 2024-03-02 17:54:23 +06:30
b1e45debc7 Merge branch 'master' of tzw/fcs into master 2024-03-02 02:04:29 +06:30
tzw
ef7c1e2129 update shipment path 2024-03-01 17:33:14 +06:30
tzw
545e697bc8 Merge branch 'master' of sma/fcs into master 2024-03-01 17:28:24 +06:30
tzw
41a1be745e update shipment type 2024-03-01 17:27:56 +06:30
sma
791f15f6d3 add validation in faq and discount page 2024-03-01 17:04:51 +06:30
1acb2057d4 Merge branch 'master' of tzw/fcs into master 2024-02-28 18:02:20 +06:30
tzw
a81fca5070 Merge branch 'master' of sma/fcs into master 2024-02-28 17:48:29 +06:30
tzw
8305cb45ce add markdown for term 2024-02-28 17:47:47 +06:30
sma
e00545a3d7 add validation in input form field 2024-02-28 17:07:23 +06:30
270be54d38 Merge branch 'master' of tzw/fcs into master 2024-02-26 18:45:01 +06:30
tzw
c06da8a60c add print qr code page 2024-02-26 17:26:25 +06:30
a3dd9f35fb Merge branch 'master' of tzw/fcs into master 2024-02-24 00:17:20 +06:30
tzw
bb7ff8a383 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-23 17:06:27 +06:30
tzw
5496bae681 fix logout issue 2024-02-23 17:05:51 +06:30
tzw
4dcb2ebab4 Merge branch 'master' of sma/fcs into master 2024-02-23 16:47:48 +06:30
sma
099da69e5c update carton info page 2024-02-23 16:31:21 +06:30
tzw
421bcf0a11 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-22 17:16:45 +06:30
tzw
7223b663be Merge branch 'master' of sma/fcs into master 2024-02-22 17:16:31 +06:30
tzw
cd3a05e064 add pdf generator 2024-02-22 17:16:19 +06:30
sma
d0cef82b19 update fcs-shipmentinfo,cartoninfo and pinlogin 2024-02-22 17:09:48 +06:30
c33d3dda8a Merge branch 'master' of tzw/fcs into master 2024-02-21 22:02:53 +06:30
tzw
2a1aa9662d merge 2024-02-21 17:14:59 +06:30
tzw
c2851e3026 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-21 17:05:51 +06:30
tzw
df7826102b Merge branch 'master' of sma/fcs into master 2024-02-21 17:05:31 +06:30
tzw
c77874d72c update pin editor 2024-02-21 17:05:20 +06:30
sma
165bbf68e7 update pin login page 2024-02-21 17:03:25 +06:30
968a42362a Merge branch 'master' of tzw/fcs into master 2024-02-19 19:24:39 +06:30
tzw
9094b999b4 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-19 17:09:56 +06:30
tzw
1282ec069c Merge branch 'master' of sma/fcs into master 2024-02-19 17:09:46 +06:30
sma
122ca8c5cf validate form in pinloginpage 2024-02-19 17:06:58 +06:30
tzw
f66895963b check form validateion 2024-02-19 17:06:36 +06:30
5ed6ace02f Merge branch 'master' of tzw/fcs into master 2024-02-15 17:53:50 +06:30
tzw
f75f7ed99f merge 2024-02-15 16:42:58 +06:30
tzw
0555629f1e Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-15 16:42:28 +06:30
tzw
5d20a8dc7e Merge branch 'master' of sma/fcs into master 2024-02-15 16:42:15 +06:30
tzw
ad5e61a6af update carton list 2024-02-15 16:41:49 +06:30
sma
cb857cfb29 Prepare pinlogin page 2024-02-15 16:38:57 +06:30
2993ed78a3 Merge branch 'master' of tzw/fcs into master 2024-02-15 08:34:58 +06:30
tzw
86aedb42af update pin login 2024-02-14 17:19:55 +06:30
tzw
ba45659d5e Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-14 16:59:25 +06:30
tzw
d1e2252201 Merge branch 'master' of sma/fcs into master 2024-02-14 16:59:13 +06:30
tzw
13e6e232d5 update staff list, add pin editor and privilege editor 2024-02-14 16:58:45 +06:30
sma
a66ecff159 add pinlogin_page and prepare profile 2024-02-14 16:54:38 +06:30
106ddded29 Merge branch 'master' of tzw/fcs into master 2024-02-13 18:18:45 +06:30
tzw
7f3492fdf9 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-13 17:48:37 +06:30
tzw
3a28a01df3 Merge branch 'master' of sma/fcs into master 2024-02-13 17:48:25 +06:30
tzw
f6fdef36b6 update package selection and cartion selection 2024-02-13 17:48:06 +06:30