Commit Graph

1248 Commits

Author SHA1 Message Date
Aung Myo
a7dbb4442d upsate 2018-02-20 14:15:01 +06:30
Aung Myo
9ae1fb1084 update requset bill for api 2018-02-20 14:00:18 +06:30
Aung Myo
8f239cbb0b update conflix for request bill 2018-02-20 13:32:27 +06:30
Aung Myo
a5640877a3 update request bill 2018-02-20 11:59:57 +06:30
Aung Myo
31adc0e993 update request bill for another role in request_bill_con and sale.rb 2018-02-20 11:13:49 +06:30
Aung Myo
6d7da7f997 update request bill controller 2018-02-20 11:07:00 +06:30
Aung Myo
24c5b17fd6 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-20 09:38:14 +06:30
Aung Myo
a2d0aee1ab update applicaton contro and request bill 2018-02-20 09:37:30 +06:30
phyusin
8ccf45d06f check some function 2018-02-19 18:05:30 +06:30
phyusin
ee86b7ed30 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-19 17:40:02 +06:30
phyusin
6ae451f2bc check split bill 2018-02-19 17:23:39 +06:30
Aung Myo
48c33f68c2 fixed for survey for cashier and quick_ser 2018-02-19 14:50:38 +06:30
Aung Myo
c064f9d6f5 fixed conflix after pull split bill 2018-02-19 14:21:26 +06:30
Aung Myo
476f7425a2 update add order for menu and void foc for no table 2018-02-19 13:53:36 +06:30
phyusin
9594689f1c add survey update function 2018-02-19 10:23:15 +06:30
Aung Myo
0504a9505b update menu category 2018-02-19 09:12:51 +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
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
Aung Myo
941204afc1 update add order 2018-02-16 14:30:53 +06:30
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
Aung Myo
1d62e3c082 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-16 09:51:51 +06:30
Aung Myo
cf644892c9 update pending and quick service 2018-02-15 15:26:34 +06:30
phyusin
d31c936547 for all items 2018-02-15 13:24:29 +06:30
Aung Myo
a8fdf2ec30 update discount for qs 2018-02-15 11:49:01 +06:30
Aung Myo
a2bd8795cc update discount for qs 2018-02-15 11:23:40 +06:30
Aung Myo
47ffc5fa51 update no table quick srevice 2018-02-14 18:21:10 +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
Aung Myo
9757c34a09 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-14 15:01:57 +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
Aung Myo
80ab7e7c12 test no table 2018-02-14 14:33:30 +06:30
Aung Myo
b2cec95064 test no table 2018-02-14 14:26:36 +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
08e372cfb5 udpdate qs 2018-02-14 13:46:22 +06:30
Aung Myo
22a9e75efa update license and sym_master 2018-02-13 15:12:09 +06:30
Aung Myo
5854bd88e1 update liscense file 2018-02-13 10:53:29 +06:30
Aung Myo
b1e58ceb64 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 14:58:53 +06:30
Aung Myo
974dde54c0 update shop.name 2018-02-09 14:58:08 +06:30
phyusin
c902e2ea1b check one condition in order item 2018-02-09 14:56:33 +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
4c563e23bf add shop info in split bill 2018-02-09 14:19:53 +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