Commit Graph

130 Commits

Author SHA1 Message Date
Aung Myo
83b8d72632 update add order 2017-07-26 15:04:35 +06:30
Aung Myo
c93b50d46a update conflict oragimi.scss 2017-07-26 10:04:49 +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
Yan
6f57bb8a79 adding shift sale summary 2017-07-13 11:12:02 +06:30
Aung Myo
fc986bfed2 update show for discount 2017-07-12 17:23:20 +06:30
Aung Myo
1d873ddb68 update member discount and seed for detail 2017-07-12 17:05:10 +06:30
Aung Myo
d99ed58d28 update view 2017-07-09 21:00:33 +06:30
Yan
c73cfa4c2d control to req bill and discount ui update 2017-07-08 23:29:31 +06:30
Yan
1b0bcbffea update for shift and deving member dis 2017-07-07 14:56:05 +06:30
Aung Myo
2d55ea0dab update add order 2017-07-07 09:56:18 +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
05b5afcafa update edit 2017-07-05 18:27:30 +06:30
Yan
d8ba15f6ce adm route to dashboard 2017-07-04 19:19:09 +06:30
Aung Myo
8aa12406db update scrll and member transaction 2017-07-03 17:44:26 +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
Yan
6fe2de877c remove add order 2017-07-01 20:08:57 +06:30
Aung Myo
740f585a31 update rounding adj 2017-07-01 18:19:41 +06:30
Yan
9c1a324eff add other charges 2017-06-30 13:29:55 +06:30
Yan
fd857146e8 fix for shift sale query and prepare rounding adj 2017-06-29 15:20:40 +06:30
Nweni
8d09e5a919 shift sale update 2017-06-29 13:48:14 +06:30
Nweni
e3c2f02c81 fixed conflict 2017-06-29 13:39:37 +06:30
Nweni
618a89472a shift open/close 2017-06-29 13:35:09 +06:30
Yan
9991970203 add first bill 2017-06-29 11:34:13 +06:30
Nweni
6a3973beea fixed conflict 2017-06-28 15:33:27 +06:30
Zin Lin Phyo
1c65a38b70 fix conflit 2017-06-27 14:04:29 +06:30
Phyo
7810fc693b Pending Payment 2017-06-27 12:06:18 +06:30
Zin Lin Phyo
bcd44db9a2 multiple invoice void 2017-06-27 11:35:36 +06:30
Zin Lin Phyo
5489da2066 route conflit fix 2017-06-26 18:02:08 +06:30
Zin Lin Phyo
feb1d66257 overall void 2017-06-26 18:00:48 +06:30
Yan
813f2ecf2d merge with settings_backend 2017-06-26 14:46:31 +06:30
Phyo
46ad87314a Add color blue to orders 2017-06-26 14:39:25 +06:30
Yan
e1c981e8c2 merge with crm 2017-06-26 14:23:56 +06:30
Yan
00c19fdd67 sub total fixed in origami shows 2017-06-26 14:16:22 +06:30
Phyo
cb2124c6a6 refresh 10 sec 2017-06-26 12:57:36 +06:30
Phyo
6e49f91b89 Multiple Invoices Phase 1 2017-06-26 11:10:49 +06:30
Aung Myo
f426be57ab update crm 2017-06-26 10:21:56 +06:30
Yan
ecc9ab53ec Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:59:16 +06:30
Aung Myo
d9c53e73f8 update customer 2017-06-24 11:12:30 +06:30
Yan
e01ecc6e0f merge origin master 2017-06-23 17:53:53 +06:30
Yan
27ff8b89e7 merge with crm 2017-06-23 17:51:09 +06:30
Nweni
81c50f220a edit invoice 2017-06-23 17:37:08 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Phyo
68403617a5 Change Font and show status in origami 2017-06-23 11:14:48 +06:30
Phyo
69ec0386b9 Merge branch 'master' into settings_backend 2017-06-23 10:17:13 +06:30
Nweni
7dcc8547d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-23 09:50:52 +06:30
Nweni
19528b189f Update 2017-06-23 09:50:37 +06:30
Aung Myo
01e5b7ba6c update authorize 2017-06-23 09:41:48 +06:30
Phyo
dfdbc1bfcc Merge branch 'master' into settings_backend 2017-06-23 09:14:32 +06:30