Commit Graph

2703 Commits

Author SHA1 Message Date
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
phyusin
e77d523a7f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-15 13:24:41 +06:30
phyusin
d31c936547 for all items 2018-02-15 13:24:29 +06:30
Aung Myo
4794f6cce7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-15 11:52:03 +06:30
Aung Myo
d98f8782b1 update order summary pdf for before_qty_update 2018-02-15 11:51:51 +06:30
phyusin
37c94b3665 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-02-14 17:33:18 +06:30
phyusin
4f1a6fefe7 check void for table status update 2018-02-14 17:32:34 +06:30
phyusin
8898ba597a change split bill 2018-02-14 17:07:33 +06:30
phyusin
75cadc7ed3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-14 14:46:44 +06:30
phyusin
d83d3fd998 Merge branch 'sqa_test' of bitbucket.org:code2lab/sxrestaurant 2018-02-14 14:45:46 +06:30
phyusin
867148a038 db/sym_master.sql 2018-02-14 14:45:14 +06:30
phyusin
a4ec4bf7c7 db/sym_master.sql 2018-02-14 14:39:48 +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
54354f0aea Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test 2018-02-14 14:00:24 +06:30
Aung Myo
086d5a7306 update symn for display images 2018-02-14 13:59:28 +06:30
Aung Myo
85c641c9ee Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test 2018-02-14 13:47:16 +06:30
phyusin
13ab1ff5be Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-14 09:43:14 +06:30
Aung Myo
1b1ab32328 update sym_master 2018-02-13 16:55:28 +06:30
Aung Myo
6978dc5450 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test 2018-02-13 15:12:33 +06:30
Aung Myo
22a9e75efa update license and sym_master 2018-02-13 15:12:09 +06:30
phyusin
23cb3dbbc1 gemfile.lock 2018-02-13 13:48:25 +06:30
phyusin
76b6e63fd3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-13 13:39:43 +06:30
phyusin
5ef5ff4fbe add column to existing table and new table for second display images 2018-02-13 13:29:19 +06:30
Aung Myo
839fb14436 update inventory 2018-02-13 11:34:06 +06:30
Aung Myo
5854bd88e1 update liscense file 2018-02-13 10:53:29 +06:30
phyusin
1b1ffa1146 check receipt 2018-02-09 15:07:01 +06:30
phyusin
c902e2ea1b check one condition in order item 2018-02-09 14:56:33 +06:30
phyusin
3774198589 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-09 14:20:11 +06:30
phyusin
4c563e23bf add shop info in split bill 2018-02-09 14:19:53 +06:30
Aung Myo
a62e1bae4c update addorder set price 2018-02-09 14:18:54 +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
phyusin
c124a5fb77 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-09 14:04:36 +06:30
Aung Myo
b1323c4165 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-09 14:03:49 +06:30
phyusin
19e9a941c8 show set item price in origami 2018-02-09 12:07:53 +06:30
Aung Myo
e7206dbafd update add order for set price 2018-02-09 12:07:37 +06:30
San Wai Lwin
a59d692569 remove conflict data in oqs/home_controller.rb 2018-02-09 10:20:43 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30
phyusin
88a3deca30 change ui for split bill 2018-02-08 18:17:17 +06:30
phyusin
8f96249c21 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-08 18:11:50 +06:30
phyusin
d42fc485ae change ui for left sidebar 2018-02-08 18:10:11 +06:30
phyusin
00d3397834 conflict data remove for order/show.index.html.erb 2018-02-08 18:04:36 +06:30
phyusin
2963839d31 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-08 17:56:55 +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
c4452c2730 update order queue printer for order_summary with before update qty 2018-02-08 14:15:29 +06:30
Aung Myo
420461918d update print summary for before_updated_qty 2018-02-08 13:04:01 +06:30
phyusin
2a1c761199 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-08 10:15:13 +06:30