Commit Graph

763 Commits

Author SHA1 Message Date
Yan
e878275c1b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:10:25 +06:30
Nweni
d4983fabf5 item void 2017-06-26 17:07:17 +06:30
Yan
adf06cf6f5 Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 17:02:25 +06:30
Yan
c81663003f update in discount 2017-06-26 17:01:25 +06:30
Aung Myo
6e77a71946 update customer seed shop and receipt bill 2017-06-26 16:50:04 +06:30
Yan
d3dc2e2dd8 remove pg in gem 2017-06-26 16:39:55 +06:30
Yan
4e5ca54eee Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 16:38:15 +06:30
Yan
0c2e299ced Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 16:37:02 +06:30
Nweni
04e44c4859 fixed conflict 2017-06-26 16:35:24 +06:30
Nweni
20afabd86d item void 2017-06-26 16:34:03 +06:30
Yan
f60b3d554a add table and order no in oqs 2017-06-26 16:23:00 +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
cc67abcfc1 add time in oqs 2017-06-26 14:35:44 +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
f878b2f1d8 Accounts disable Bonus and discount 2017-06-26 13:53:54 +06:30
Nweni
3b71cb1d30 uncomment pg @ gem 2017-06-26 13:52:43 +06:30
Phyo
cb2124c6a6 refresh 10 sec 2017-06-26 12:57:36 +06:30
Phyo
a05fc0f646 Up to Amount bug fix 2017-06-26 12:55:44 +06:30
Phyo
5017549f86 Merge branch 'master' into settings_backend 2017-06-26 11:13:06 +06:30
Phyo
6e49f91b89 Multiple Invoices Phase 1 2017-06-26 11:10:49 +06:30
Aung Myo
12483aba97 update crm customer 2017-06-26 11:10:08 +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
Yan
560ea343a6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 09:55:56 +06:30
Nweni
69f24101f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-26 06:28:23 +06:30
Nweni
c65c466399 edit 2017-06-26 06:28:09 +06:30
Yan
a91816bb4e qty edit in oqs 2017-06-25 22:41:26 +06:30
Aung Myo
d9c53e73f8 update customer 2017-06-24 11:12:30 +06:30
Phyo
4958cb6872 Merge branch 'master' into settings_backend 2017-06-23 19:22:20 +06:30
Yan
30df25d78a Merge branch 'master' into oqs 2017-06-23 19:22:07 +06:30
Yan
1f6a0eb1f6 fix with merge 2017-06-23 19:20:00 +06:30
Yan
9ed6b510c4 updating oqs 2017-06-23 19:01:33 +06:30
Yan
e9fb90d8a0 updating oqs 2017-06-23 19:00:49 +06:30
Phyo
ecabed5d5d Account type change 2017-06-23 18:45:46 +06:30
Phyo
05b4dbac7c Rebate Redeem add field 2017-06-23 18:45:15 +06:30
Aung Myo
6a6c629da4 update cancan alert message 2017-06-23 17:56:09 +06:30
Yan
e01ecc6e0f merge origin master 2017-06-23 17:53:53 +06:30
Yan
a996ccc7ee Merge branch 'discount' of bitbucket.org:code2lab/sxrestaurant 2017-06-23 17:51:46 +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
Yan
3a0e26b2ea accounts and discount updated 2017-06-23 17:05:08 +06:30
Aung Myo
f5f0f9e077 update crm customer and bind customer and queue 2017-06-23 17:03:52 +06:30
Yan
55c8ab80da discount updated 2017-06-23 11:40:11 +06:30
Phyo
68403617a5 Change Font and show status in origami 2017-06-23 11:14:48 +06:30
Phyo
62156e2e3e Employee Show 2017-06-23 11:13:29 +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