Commit Graph

251 Commits

Author SHA1 Message Date
Aung Myo
3792133aad update shift update from void in sale 2017-07-20 10:29:20 +06:30
Yan
1fa8520a5e change discount_type to campaign_type 2017-07-18 18:06:59 +06:30
Yan
a5546920b6 nfc done 2017-07-18 16:06:36 +06:30
Yan
df06b81b28 Merge branch 'staging' 2017-07-17 15:13:31 +06:30
Aung Myo
25ef380b4f finished report for all 2017-07-17 11:22:24 +06:30
Aung Myo
0b7b5cae30 update osaka demo bugs 2017-07-14 17:23:40 +06:30
Yan
6f57bb8a79 adding shift sale summary 2017-07-13 11:12:02 +06:30
Aung Myo
e34d267fc8 update control member for osaka 2017-07-12 19:43:56 +06:30
Aung Myo
1d873ddb68 update member discount and seed for detail 2017-07-12 17:05:10 +06:30
Aung Myo
ac7b4dc56d dev dis 2017-07-12 10:19:02 +06:30
Aung Myo
32bc3c5229 update member discount 2017-07-12 10:13:19 +06:30
Aung Myo
772bec9ba3 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-07-11 18:56:50 +06:30
Aung Myo
bf25d7697b update member discount 2017-07-11 18:47:36 +06:30
Aung Myo
3f8a5f8ef2 update discount 2017-07-11 18:38:55 +06:30
Aung Myo
600e8e47f4 update queue assign and member discount change 2017-07-11 18:26:36 +06:30
Aung Myo
f51687e8fd update 2017-07-11 16:50:41 +06:30
Aung Myo
d840b08db2 queue acess on cashier and shiftclose to logout 2017-07-11 16:20:30 +06:30
Aung Myo
28c51300cf update discount message 2017-07-11 15:45:01 +06:30
Yan
ebf72f7d42 Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant 2017-07-11 11:07:01 +06:30
Aung Myo
72aa769490 added member discount 2017-07-11 11:06:13 +06:30
Yan
152af3a3cb add table no and cus id in payment ui 2017-07-10 17:17:22 +06:30
Yan
082627018f dis fix 2017-07-10 16:23:37 +06:30
Yan
8e3eef06a2 Merge branch 'master' into discount 2017-07-10 12:08:03 +06:30
Yan
0031300947 dis ui calc fix and update for shift 2017-07-09 11:04:43 +06:30
Yan
c73cfa4c2d control to req bill and discount ui update 2017-07-08 23:29:31 +06:30
Yan
b8b3a7e0a7 deving dis 2017-07-07 20:47:45 +06:30
Yan
3fe0f708bd add req and fix for shift 2017-07-07 17:19:14 +06:30
Yan
1b0bcbffea update for shift and deving member dis 2017-07-07 14:56:05 +06:30
Aung Myo
040d60402b update edit qty and price and cash and credit div in payment details 2017-07-06 12:54:04 +06:30
Aung Myo
fcc9ed02a0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-07-05 18:28:55 +06:30
Aung Myo
05b5afcafa update edit 2017-07-05 18:27:30 +06:30
Yan
3f4fbb7793 update payment cntr 2017-07-05 18:11:02 +06:30
Yan
efa7b8997b control normal user no call paypar 2017-07-05 17:59:15 +06:30
Aung Myo
7cee40746d update unsuccessfully rebate and alert 2017-07-05 14:42:40 +06:30
Aung Myo
b5b1c6f10a update membership 2017-07-04 18:01:08 +06:30
Aung Myo
8aa12406db update scrll and member transaction 2017-07-03 17:44:26 +06:30
Aung Myo
e3477fd268 update 2017-07-03 13:22:02 +06:30
Aung Myo
92712787e1 update origami for room 2017-07-03 12:20:03 +06:30
Aung Myo
09370a2a78 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-02 12:08:09 +06:30
Aung Myo
b78119f848 update print 2017-07-02 11:41:47 +06:30
Nweni
acca5b5a1d Update 2017-07-02 11:22:49 +06:30
Yan
97c70fb72b merge with crm 2017-07-01 20:11:52 +06:30
Aung Myo
c26b80066b update shift close print 2017-07-01 20:05:26 +06:30
Yan
e9b1845ed2 saturday fixed 2017-07-01 20:02:14 +06:30
Yan
51a779cbee add zone with oqs and tax calculte method update 2017-07-01 19:11:04 +06:30
Aung Myo
740f585a31 update rounding adj 2017-07-01 18:19:41 +06:30
Nweni
5f3708e11d menu updated | edit qty updated 2017-07-01 17:15:12 +06:30
Nweni
23f8430032 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-07-01 09:46:44 +06:30
Nweni
c589f11758 shift sale 2017-07-01 09:46:14 +06:30
Aung Myo
be781ff022 update customer 2017-06-30 19:41:39 +06:30