Commit Graph

540 Commits

Author SHA1 Message Date
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
sma
5c0e9d3b10 prepare carton info 2024-02-13 17:07:22 +06:30
tzw
252be38912 update carton form and info 2024-02-13 11:02:46 +06:30
1ec130bf09 Merge branch 'master' of tzw/fcs into master 2024-02-10 11:20:30 +06:30
tzw
02cf4b7dff update upload image form 2024-02-09 17:47:35 +06:30
tzw
ba792e87ad update upload image form 2024-02-09 17:44:13 +06:30
tzw
95b07c22bb update cartion editor 2024-02-09 17:40:51 +06:30
tzw
edf89935a0 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-09 17:11:03 +06:30
tzw
86fbbe777f Merge branch 'master' of sma/fcs into master 2024-02-09 17:10:51 +06:30
tzw
a246097d05 add carton editor to update 2024-02-09 17:10:19 +06:30
sma
02f1954127 prepare carton info 2024-02-09 17:09:05 +06:30
tzw
2d912a20aa update carton info 2024-02-09 13:49:18 +06:30
tzw
e485e5792e update carton info 2024-02-09 13:35:32 +06:30
tzw
62c0da8a96 update carton info 2024-02-09 12:21:49 +06:30
tzw
aa5b7881d6 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-09 12:18:34 +06:30
tzw
79f93f3e87 Merge branch 'master' of sma/fcs into master 2024-02-09 12:18:21 +06:30
tzw
4a9c04ef1e move bill to to cartion size widget 2024-02-09 12:16:39 +06:30
sma
5d42e1ad78 prepare carton info 2024-02-09 12:16:18 +06:30
b2603c02ce Merge branch 'master' of tzw/fcs into master 2024-02-08 20:08:36 +06:30
tzw
13df9c78a6 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-08 17:10:31 +06:30
tzw
b944d371ce Merge branch 'master' of sma/fcs into master 2024-02-08 17:10:20 +06:30
sma
19d9d7ea2d merge 2024-02-08 17:09:53 +06:30
sma
22097f3b6c merge 2024-02-08 17:09:01 +06:30
tzw
b927619027 update cartion editor 2024-02-08 17:04:37 +06:30
sma
0530d401f4 prepare carton image upload page and carton info page 2024-02-08 17:01:32 +06:30
88d6287298 Merge branch 'master' of tzw/fcs into master 2024-02-07 17:57:27 +06:30
tzw
324981bd6c merge 2024-02-07 17:32:39 +06:30
tzw
d1f0eff0b0 Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-07 17:30:28 +06:30
tzw
dacc29a7dd Merge branch 'master' of sma/fcs into master 2024-02-07 17:30:14 +06:30
tzw
caf20f4e67 add cartion filter and search 2024-02-07 17:26:29 +06:30
sma
00011ad5d6 prepare carton info page and add cartonimage upload page 2024-02-07 17:25:29 +06:30
2d4cdb9620 Merge branch 'master' of tzw/fcs into master 2024-02-06 17:50:32 +06:30
tzw
b457b2a25b Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-06 17:45:47 +06:30
tzw
3a91b49a1a update cartion editor for package 2024-02-06 17:45:36 +06:30
tzw
4691d5850f Merge branch 'master' of sma/fcs into master 2024-02-06 17:44:36 +06:30
sma
f3474e655b preparing carton info page 2024-02-06 17:42:12 +06:30
3767ba76dc Merge branch 'master' of tzw/fcs into master 2024-02-06 07:36:01 +06:30
tzw
4bce9ba8cc Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-05 17:49:38 +06:30
tzw
8313ef3827 Merge branch 'master' of sma/fcs into master 2024-02-05 17:49:27 +06:30
tzw
a9e16ede8f add carton editor for package 2024-02-05 17:49:12 +06:30
sma
51b162e77b prepare carton info page 2024-02-05 17:28:53 +06:30
tzw
afb980e6ae merge 2024-02-05 11:20:18 +06:30
tzw
e0d92e8ae0 merge 2024-02-05 11:19:51 +06:30
tzw
9bd0c5d484 Merge branch 'master' of sma/fcs into master 2024-02-05 11:14:05 +06:30
tzw
ea206bed13 add submit widget for mix carton 2024-02-05 11:13:12 +06:30
sma
342e6aa68a preparing carton info 2024-02-05 11:11:44 +06:30
16ad71f257 Merge branch 'master' of tzw/fcs into master 2024-02-02 20:54:16 +06:30
tzw
e44bcb889b Merge branch 'master' of https://git.mokkon.com/tzw/fcs 2024-02-02 18:02:05 +06:30