Commit Graph

493 Commits

Author SHA1 Message Date
Yan
8cfa2bc5c5 payment bill added and origami bug fixed 2017-06-14 19:41:32 +06:30
Yan
dd9863025f prepare for payment bill 2017-06-14 18:15:01 +06:30
Aung Myo
2da2edc5ec update sale and customer 2017-06-14 18:13:13 +06:30
Yan
ac7d99362d Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 16:52:54 +06:30
Yan
41e9aec389 add cashier in sale and origami ui updated 2017-06-14 16:51:25 +06:30
Nweni
15c19e0cbb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 16:06:24 +06:30
Nweni
f00bd9df37 update 2017-06-14 16:06:11 +06:30
Aung Myo
391b57ccd5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 15:59:52 +06:30
Aung Myo
1963acbec0 Merge branch 'crm' 2017-06-14 15:59:19 +06:30
Yan
7d6414cce6 auto reload page for oqs 5sec and origami 10sec 2017-06-14 15:59:08 +06:30
Aung Myo
914069e3af update customer and sale 2017-06-14 15:58:41 +06:30
Yan
c1e8f3ffb2 updated printer for each stations 2017-06-14 15:30:28 +06:30
Phyo
af623cb474 Instances Name Show 2017-06-14 15:01:36 +06:30
Yan
cd588d9b4f print setting ui updated 2017-06-14 14:37:23 +06:30
Yan
ff65f4f480 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-14 14:13:45 +06:30
Phyo
2d0d962677 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 13:58:09 +06:30
Nweni
f7451a4675 update 2017-06-14 13:33:09 +06:30
Phyo
5cff9c891b Other Payment shown by type 2017-06-14 12:02:52 +06:30
Yan
1565b054df Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into staging 2017-06-14 11:25:14 +06:30
Yan
7d7ac9fe06 oqs print formatted 2017-06-14 11:21:37 +06:30
Nweni
7b2d2731c1 auth 2017-06-14 11:05:15 +06:30
Yan
7e35850c69 comment nokogiri gem 2017-06-14 10:53:37 +06:30
Nweni
d7fca79881 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:49:19 +06:30
Nweni
9d1aff2fa2 other payment updated 2017-06-14 10:49:00 +06:30
Aung Myo
14e0d91a4e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:45:36 +06:30
Phyo
4126012e6d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:44:00 +06:30
Aung Myo
c155c86970 update checkbox in customer view 2017-06-14 10:43:27 +06:30
Phyo
f0fe589ec6 Payment conflict in Del key 2017-06-14 10:43:19 +06:30
Nweni
3d2b9f745e payment 2017-06-14 10:41:26 +06:30
Yan
74350e2b73 nokogiri gem re-add 2017-06-14 10:38:57 +06:30
Nweni
998b23aae5 update key 2017-06-14 10:27:15 +06:30
Aung Myo
3cb5878293 update sale 2017-06-14 10:18:48 +06:30
Yan
b4021a87c8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into pre_master 2017-06-14 10:16:55 +06:30
Yan
b7f1a0a029 print format updating 2017-06-14 10:15:35 +06:30
Nweni
a16af5e404 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-14 10:07:48 +06:30
Nweni
7d5d23e5a6 Update 2017-06-14 10:07:31 +06:30
Aung Myo
871c37f04e update search 2017-06-14 00:11:03 +06:30
Aung Myo
3db6252304 update search and crm 2017-06-14 00:09:54 +06:30
Aung Myo
713e0a367c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm 2017-06-13 20:23:00 +06:30
Aung Myo
e9d3ca3059 pull master for membership 2017-06-13 20:22:33 +06:30
Moe Su
27971f406b Seed 2017-06-13 20:22:28 +06:30
Aung Myo
7057e320cf Merge branch 'crm' 2017-06-13 20:13:01 +06:30
Aung Myo
b86ae8d32d customer search 2017-06-13 20:11:24 +06:30
Nweni
2e316f46fe seed updated 2017-06-13 19:58:15 +06:30
Nweni
d1d8226528 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:49:35 +06:30
Nweni
71f88f8a5d Update 2017-06-13 19:49:25 +06:30
Phyo
57f7f1037d Change Amount Bug Fix 2017-06-13 19:41:51 +06:30
Nweni
db2cce3dfa Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-06-13 19:06:59 +06:30
Nweni
0e86b12ecd order controller update 2017-06-13 19:06:50 +06:30
Moe Su
b69d2525fe add auth_token 2017-06-13 19:02:06 +06:30