Commit Graph

160 Commits

Author SHA1 Message Date
phyusin
5ba98d76be add change tax in table/room and check-in for room 2018-06-22 13:33:01 +06:30
Aung Myo
7b5c04c797 update add order cache menu 2018-05-10 14:28:28 +06:30
Aung Myo
ef81987334 udpate access code for supervisor and manager 2018-05-04 13:16:57 +06:30
Aung Myo
69eeede474 update access code 2018-05-03 18:08:27 +06:30
Nweni
285f5d4cd0 fixed conflict 2018-04-23 18:21:47 +06:30
Yan
0ff340cac2 shop upate for 20 files 2018-04-10 18:10:40 +06:30
phyusin
818f441529 check mobile 2018-04-06 13:15:32 +06:30
phyusin
0b869ccb89 cehck mobile 2018-04-06 12:00:45 +06:30
phyusin
a44e86ed21 check orgami js 2018-04-05 19:00:13 +06:30
phyusin
a2e4863c9d check user agent and token when webview is loaded 2018-04-06 15:36:08 +06:30
phyusin
7c15dac2aa webview 2018-04-05 17:30:44 +06:30
Aung Myo
5588f40753 update waste and spoilage 2018-03-30 14:20:47 +06:30
phyusin
dcac662c8e change set menu item format in api and origami 2018-03-15 15:51:12 +06:30
San Wai Lwin
a0c6c363fd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-03-13 14:53:07 +06:30
San Wai Lwin
9228168ebc route changes 2018-03-13 14:51:07 +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
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30
San Wai Lwin
07c3bcd7a7 Change Dashboard, Account in login, Shop name, Reference no for other charges 2018-02-28 15:31:55 +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
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
phyusin
6ae451f2bc check split bill 2018-02-19 17:23:39 +06:30
phyusin
9f2bab7187 check customer tax profiles in origami 2018-02-19 14:49:46 +06:30
phyusin
032e085b6e change query for origami 2018-02-16 17:47:34 +06:30
phyusin
8b6dd007ad Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-16 17:23:13 +06:30
phyusin
74310797db remove order item count in origami 2018-02-16 17:18:49 +06:30
phyusin
d31c936547 for all items 2018-02-15 13:24:29 +06:30
phyusin
4f1a6fefe7 check void for table status update 2018-02-14 17:32:34 +06:30
phyusin
75cadc7ed3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-14 14:46:44 +06:30
phyusin
50948be8bf sym_master 2018-02-14 14:37:28 +06:30
phyusin
4203aa995e conflict data 2018-02-14 14:24:01 +06:30
phyusin
91aa216666 check booking sale id is null for all order 2018-02-14 14:20:20 +06:30
phyusin
f19fb769f6 change split bill process 2018-02-14 14:14:53 +06:30
Aung Myo
22a9e75efa update license and sym_master 2018-02-13 15:12:09 +06:30
phyusin
9f6505fd95 remove conflict data in ability.rb 2018-02-09 14:06:16 +06:30
phyusin
c124a5fb77 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-09 14:04:36 +06:30
phyusin
19e9a941c8 show set item price in origami 2018-02-09 12:07:53 +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
phyusin
d416f788cb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-06 16:41:37 +06:30
Aung Myo
ee5abb65f8 update home for order 2018-02-06 16:21:47 +06:30
San Wai Lwin
3f247f731e Shop name in navbar,linke to shop info 2018-02-05 18:11:45 +06:30
phyusin
991bc48505 order item split bill process 2018-02-06 09:46:30 +06:30
phyusin
ae4746acfc change checkin time checked 2018-02-01 16:34:18 +06:30
phyusin
6c33040173 remove checkin if checkin not used 2018-02-01 16:25:11 +06:30
phyusin
8b99c8bcc6 cahnge empty json to NIL 2018-01-22 22:13:17 +06:30
phyusin
3a21d85a4b add set_menu_item in origami and oqs 2018-01-19 16:06:58 +06:30