Commit Graph

195 Commits

Author SHA1 Message Date
Yan
0a9b3b5407 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-03-20 17:11:34 +06:30
Yan
e3f9ecbc87 add jade print 2018-03-20 11:38:51 +06:30
phyusin
25b6458450 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-03-19 18:41:50 +06:30
Yan
0c61a98150 merge with master 2018-03-19 14:41:40 +06:30
phyusin
a9c8eb4e93 check tax profile 2018-03-19 11:35:43 +06:30
Yan
fa125df355 add junction pay 2018-03-16 18:37:54 +06:30
Yan
c982da4264 add printer brand and api and type 2018-03-15 18:56:29 +06:30
phyusin
6ccf315242 remove JSON parse in set item options 2018-03-15 16:14:15 +06:30
phyusin
dcac662c8e change set menu item format in api and origami 2018-03-15 15:51:12 +06:30
Aung Myo
6ec03e3454 update today issue 2018-03-14 17:52:23 +06:30
Aung Myo
04b053d2b7 fixed conflix payment page 2018-03-11 16:37:33 +06:30
Aung Myo
4ea2337fae update second display 2018-03-11 16:14:44 +06:30
phyusin
21d39349d3 check shift update data 2018-03-09 11:54:35 +06:30
phyusin
7dd0f71894 check and fixed SQA feedback 2018-03-09 09:49:19 +06:30
phyusin
23be4771fd add function for member card and qr code in payment 2018-03-08 14:57:45 +06:30
phyusin
aedd79376f receipt no and print pdf 2018-03-07 15:36:05 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +06:30
phyusin
8b064a4428 change assigned item id to order item id 2018-02-26 10:01:35 +06:30
phyusin
d287ab267d Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-26 09:21:46 +06:30
phyusin
7043eccb73 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-26 09:21:08 +06:30
Aung Myo
f4f5915532 update waiter view add order 2018-02-26 09:19:14 +06:30
phyusin
3bb6649d39 add edit for rooms and check inventory link 2018-02-23 15:45:59 +06:30
Aung Myo
ac47501e01 update conflic for pull master 2018-02-23 14:58:35 +06:30
Aung Myo
77a66d726b update foc and void overall add remark 2018-02-23 14:53:08 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
phyusin
38bedf6129 change split bill btn 2018-02-22 09:42:55 +06:30
phyusin
ac2b1d76c7 change split bill btn 2018-02-21 17:23:15 +06:30
phyusin
d134e3f67d add survey for waiter 2018-02-19 14:43:34 +06:30
Aung Myo
c064f9d6f5 fixed conflix after pull split bill 2018-02-19 14:21:26 +06:30
phyusin
80729e686f change survey update function 2018-02-16 16:58:55 +06:30
phyusin
d459a6e2a3 check order item split process 2018-02-16 15:11:16 +06:30
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
phyusin
f19fb769f6 change split bill process 2018-02-14 14:14:53 +06:30
Aung Myo
aeafbb4fae update pull split bill 2018-02-09 14:31:34 +06:30
phyusin
9f6505fd95 remove conflict data in ability.rb 2018-02-09 14:06:16 +06:30
Aung Myo
54cb5b0c87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 11:32:49 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30
phyusin
00d3397834 conflict data remove for order/show.index.html.erb 2018-02-08 18:04:36 +06:30
phyusin
e445b3e88e add order count and change orders UI for table and room 2018-02-08 17:56:41 +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
492bf93185 change split bill ui 2018-02-07 15:50:36 +06:30
phyusin
7a055470e8 add split bill for order item in room 2018-02-06 17:46:58 +06:30
phyusin
9387703862 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-06 16:17:27 +06:30
Aung Myo
76b1cda530 update discount for first bill 2018-02-06 11:15:43 +06:30
Aung Myo
90e30440c1 update discount for first bill 2018-02-06 11:06:30 +06:30
Aung Myo
1cbcab75b4 update for first bill 2018-02-06 10:43:59 +06:30
Aung Myo
85020d91bf update table box 2018-02-06 09:52:27 +06:30
San Wai Lwin
3f247f731e Shop name in navbar,linke to shop info 2018-02-05 18:11:45 +06:30
Aung Myo
76a094972e update payment 2018-02-05 15:10:35 +06:30
phyusin
991bc48505 order item split bill process 2018-02-06 09:46:30 +06:30