Commit Graph

615 Commits

Author SHA1 Message Date
Aung Myo
0acd533bfe update add oredr 2018-02-28 10:14:18 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
Aung Myo
f4f5915532 update waiter view add order 2018-02-26 09:19:14 +06:30
phyusin
7c171057d1 product sale 2018-02-23 14:03:25 +06:30
phyusin
a1906ed555 check table type in oqs 2018-02-23 10:42:12 +06:30
phyusin
ed12897986 oqs js 2018-02-23 10:15:55 +06:30
phyusin
06abf1c744 check oqs edit in origami 2018-02-22 19:18:24 +06:30
phyusin
ffbfd71330 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-22 18:52:55 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
Aung Myo
c7b77aebfa update taday list and addorder 2018-02-22 18:48:59 +06:30
Aung Myo
c3af21d71c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-21 13:28:43 +06:30
Aung Myo
4455b03e8a update print pay in qs 2018-02-21 12:34:03 +06:30
Aung Myo
098ea8e931 update edit form 2018-02-20 18:15:55 +06:30
Aung Myo
4ebe353182 update conflix for request bill 2018-02-20 16:24:06 +06:30
Aung Myo
98c4737a2a fixed minor issuse 2018-02-20 16:09:11 +06:30
Aung Myo
a15025c8a0 update add orderjs and origami js 2018-02-19 17:45:30 +06:30
Aung Myo
eef5432092 update add order css 2018-02-19 15:57:01 +06:30
Aung Myo
510e76b3c4 update add order js & css 2018-02-19 15:47:53 +06:30
Aung Myo
476f7425a2 update add order for menu and void foc for no table 2018-02-19 13:53:36 +06:30
Aung Myo
4743ab6558 update addorderjs 2018-02-16 18:07:33 +06:30
Aung Myo
4b185f21d3 update addorder view 2018-02-16 17:41:26 +06:30
Aung Myo
8291a0a992 update addorder view 2018-02-16 17:20:32 +06:30
Aung Myo
941204afc1 update add order 2018-02-16 14:30:53 +06:30
Aung Myo
2f7f412150 update addorder move + and box 2018-02-16 09:46:55 +06:30
Aung Myo
aeafbb4fae update pull split bill 2018-02-09 14:31:34 +06:30
Aung Myo
69db4656ba Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 14:20:22 +06:30
phyusin
3774198589 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-09 14:20:11 +06:30
Aung Myo
8cce090566 update addorder set price 2018-02-09 14:13:18 +06:30
phyusin
9f6505fd95 remove conflict data in ability.rb 2018-02-09 14:06:16 +06:30
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30
Aung Myo
8e2ec90ee6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-08 11:09:21 +06:30
phyusin
898c05082a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-07 17:49:19 +06:30
phyusin
a2223a6b90 add edit route in oqs detail 2018-02-07 17:47:04 +06:30
phyusin
492bf93185 change split bill ui 2018-02-07 15:50:36 +06:30
phyusin
41aa840eb2 conflict data 2018-02-06 18:12:59 +06:30
Aung Myo
4440f16559 update oqs for loading 2018-02-06 17:44:10 +06:30
Aung Myo
5543b64b27 update table box 2018-02-06 10:30:16 +06:30
San Wai Lwin
3f247f731e Shop name in navbar,linke to shop info 2018-02-05 18:11:45 +06:30
Aung Myo
1d9164aaf0 update quick service for payment 2018-02-02 18:03:43 +06:30
phyusin
48ce8e4809 split bill 2018-02-01 18:12:59 +06:30
Aung Myo
6657c11122 update cups restart for order 2018-02-01 17:14:34 +06:30
Aung Myo
2f024e8691 update qurick raw 2018-02-01 10:29:24 +06:30
Aung Myo
142bac74a8 update payment action cable 2018-01-25 15:33:52 +06:30
Aung Myo
357c7c8682 update table invoice 2018-01-24 18:12:47 +06:30
phyusin
05eb068e38 check oqs js 2018-01-22 22:20:35 +06:30
phyusin
3a21d85a4b add set_menu_item in origami and oqs 2018-01-19 16:06:58 +06:30
Aung Myo
b4fb8b2be6 update menu valid date and limit time ,addorder for parent order item id 2018-01-18 10:41:29 +06:30
Aung Myo
eb29b20654 update combine cloud and master bugs 2018-01-16 10:57:20 +06:30
Aung Myo
9ab9f3b002 update cloud and master 2018-01-15 15:08:52 +06:30