Commit Graph

465 Commits

Author SHA1 Message Date
Sai Naw Wun
caf600e4eb fix delete rates 2020-10-15 15:05:07 +06:30
Sai Naw Wun
37289e42c0 add discount api 2020-10-15 10:53:41 +06:30
Sai Naw Wun
47c07a6c88 add rate service 2020-10-15 03:06:13 +06:30
7b88658893 Merge branch 'master' of tzw/fcs into master 2020-10-14 15:28:59 +00:00
Thinzar Win
68ff930145 resolve conflit 2020-10-14 21:46:35 +06:30
3a6fee3f43 Merge branch 'master' of phyothandar/fcs into master 2020-10-14 14:29:10 +00:00
PhyoThandar
76c1c139ca Merge remote-tracking branch 'upstream/master' 2020-10-14 20:57:13 +06:30
PhyoThandar
f2e8487122 update invoice 2020-10-14 20:56:46 +06:30
e7b2858760 Merge branch 'master' of phyothandar/fcs into master 2020-10-14 14:25:17 +00:00
Thinzar Win
4862f1123d update boxes 2020-10-14 16:53:16 +06:30
PhyoThandar
1052278029 merge 2020-10-14 13:57:27 +06:30
PhyoThandar
7ec9a5a5fa merge 2020-10-14 13:56:03 +06:30
PhyoThandar
4007d20fd2 change page navigation 2020-10-14 13:54:42 +06:30
6c871ea066 Merge branch 'master' of tzw/fcs into master 2020-10-14 06:52:14 +00:00
Thinzar Win
a3dde7ec1c update localization 2020-10-14 13:17:12 +06:30
Sai Naw Wun
fa49b6a202 update widgets 2020-10-14 10:33:14 +06:30
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