Commit Graph

249 Commits

Author SHA1 Message Date
Sai Naw Wun
8f5542c4fb add length picker 2020-10-14 01:51:53 +06:30
6ab65065ec Merge branch 'master' of tzw/fcs into master 2020-10-13 13:19:40 +00:00
5a8a756e8b Merge branch 'master' of phyothandar/fcs into master 2020-10-13 13:19:32 +00:00
PhyoThandar
e61dc5d0e3 update invoice 2020-10-13 18:38:00 +06:30
Thinzar Win
34385c4295 update boxes 2020-10-13 15:45:01 +06:30
PhyoThandar
01d12c0eae Merge remote-tracking branch 'upstream/master' 2020-10-13 11:49:44 +06:30
PhyoThandar
fb2a3c8323 merge 2020-10-13 11:49:35 +06:30
Sai Naw Wun
e032cee922 add shipments 2020-10-13 07:50:25 +06:30
PhyoThandar
af568b8adf Merge remote-tracking branch 'upstream/master' 2020-10-12 13:13:55 +06:30
Sai Naw Wun
dc79f424a5 fix staff viewing packages 2020-10-12 13:01:40 +06:30
PhyoThandar
c10a2a5f29 Merge remote-tracking branch 'upstream/master' 2020-10-12 09:19:20 +06:30
Sai Naw Wun
ea1f384370 fix staff mode sharepref 2020-10-12 09:00:22 +06:30
Sai Naw Wun
2b02806715 add shipment 2020-10-12 08:26:27 +06:30
Sai Naw Wun
b13dc69161 add packages, receiving & processing 2020-10-12 03:34:05 +06:30
Sai Naw Wun
32e6be2abd fix profile 2020-10-11 02:17:23 +06:30
PhyoThandar
d0e9caab4d modify invoice 2020-10-09 20:49:25 +06:30
b0ce53f856 Merge branch 'master' of phyothandar/fcs into master 2020-10-09 13:24:38 +00:00
PhyoThandar
baa0f7896a merge 2020-10-09 19:02:35 +06:30
PhyoThandar
81663b1224 update invoice 2020-10-09 19:00:39 +06:30
dbb32a6715 Merge branch 'master' of tzw/fcs into master 2020-10-09 11:38:24 +00:00
Thinzar Win
c3a44b1909 update box 2020-10-09 17:28:42 +06:30
Sai Naw Wun
776ebf52ee fix barcode scanning 2020-10-09 02:42:21 +06:30
3f2442dbf2 Merge branch 'master' of tzw/fcs into master 2020-10-08 10:38:17 +00:00
1cd46d8731 Merge branch 'master' of phyothandar/fcs into master 2020-10-08 10:38:13 +00:00
Thinzar Win
b516360c02 add processing 2020-10-08 16:53:43 +06:30
PhyoThandar
570a1a2b16 modify text 2020-10-08 16:03:29 +06:30
PhyoThandar
cbe50f3cbf merge 2020-10-08 15:59:45 +06:30
PhyoThandar
169a782ecc merge 2020-10-08 15:56:47 +06:30
PhyoThandar
7ecb25409b change name to delivery address 2020-10-08 15:54:43 +06:30
d5a53c2945 Merge branch 'master' of tzw/fcs into master 2020-10-08 08:30:37 +00:00
Thinzar Win
6d5cbca953 add receiving 2020-10-08 14:40:18 +06:30
Thinzar Win
aecf89e17d Merge remote-tracking branch 'upstream/master' 2020-10-08 11:44:02 +06:30
Thinzar Win
88967ba2d4 replace fcsInput to InputText 2020-10-08 11:43:53 +06:30
Sai Naw Wun
7ae74275cd add delivery address vo 2020-10-08 11:38:05 +06:30
Sai Naw Wun
6105b45cb8 add fcs shipment apis 2020-10-08 03:32:52 +06:30
Sai Naw Wun
ad1999f5c9 Merge branch 'master' of https://git.mokkon.com/sainw/fcs 2020-10-08 00:29:14 +06:30
a7858dd07e Merge branch 'master' of tzw/fcs into master 2020-10-07 13:36:23 +00:00
Thinzar Win
08f3a9d020 merge PR 2020-10-07 19:53:47 +06:30
e77de26c22 Merge branch 'master' of phyothandar/fcs into master 2020-10-07 12:42:51 +00:00
Thinzar Win
99e4c08414 clean up localization 2020-10-07 18:49:28 +06:30
PhyoThandar
6e3c5bba28 modify FCS shipment 2020-10-07 18:19:12 +06:30
Sai Naw Wun
a0569a0986 add fcs shipment service 2020-10-07 17:22:01 +06:30
Thinzar Win
aeb0d22cd3 Merge remote-tracking branch 'upstream/master' 2020-10-07 14:45:06 +06:30
PhyoThandar
8a680911b2 Merge remote-tracking branch 'upstream/master' 2020-10-07 14:43:59 +06:30
Sai Naw Wun
897e5c9b93 rename shipment 2020-10-07 14:42:07 +06:30
Thinzar Win
98c2ee9353 resolve conflit 2020-10-07 13:45:18 +06:30
Thinzar Win
827fac7e68 resolve conflite 2020-10-07 13:42:30 +06:30
PhyoThandar
784d547200 conflict 2020-10-07 13:41:02 +06:30
PhyoThandar
cb600db166 merge 2020-10-07 13:39:20 +06:30
Sai Naw Wun
65dda16fe6 clean up 2020-10-07 02:33:06 +06:30