Commit Graph

1327 Commits

Author SHA1 Message Date
Aung Myo
0e70f3b763 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-22 09:39:54 +06:30
Aung Myo
7d144b0307 update edit sale for qs 2018-02-22 09:37:14 +06:30
phyusin
e2903075b2 change split bill equal person flow 2018-02-21 18:24:04 +06:30
Yan
3d6da8fc66 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-21 16:30:37 +06:30
Aung Myo
0302bb408b update no table oqs print 2018-02-21 16:11:05 +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
ebdf838b52 update request sale for another role 2018-02-21 13:12:41 +06:30
Aung Myo
4455b03e8a update print pay in qs 2018-02-21 12:34:03 +06:30
Yan
84b45f03ff Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-21 10:12:19 +06:30
Yan
cd95d1d5c9 license test 2018-02-21 10:12:05 +06:30
phyusin
76ccc36208 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-21 09:15:53 +06:30
phyusin
84c0a60c08 add filter for dashboard 2018-02-21 09:15:41 +06:30
San Wai Lwin
51a243ea7c To update close cashier 2018-02-20 17:35:54 +06:30
Aung Myo
20103a54a5 update sale for request 2018-02-20 14:33:36 +06:30
Aung Myo
8f239cbb0b update conflix for request bill 2018-02-20 13:32:27 +06:30
Aung Myo
58d78b8674 Merge branch 'adminbsb_material_ui' 2018-02-20 13:25:00 +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
817784796a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-19 14:52:46 +06:30
phyusin
d134e3f67d add survey for waiter 2018-02-19 14:43:34 +06:30
phyusin
50372116ad Merge branch 'sqa-1802-001' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-19 14:41:58 +06:30
Aung Myo
c064f9d6f5 fixed conflix after pull split bill 2018-02-19 14:21:26 +06:30
phyusin
dc5cd84f5c show cashier dashboard view 2018-02-19 13:46:08 +06:30
phyusin
150ff66446 change slae item query 2018-02-19 10:49:24 +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
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
Aung Myo
2f7f412150 update addorder move + and box 2018-02-16 09:46:55 +06:30
San Wai Lwin
e50915aa3b Add Dinein, Takeway, Change Total to Gross Sale,Grand Total 2018-02-15 18:35:33 +06:30
Aung Myo
cf644892c9 update pending and quick service 2018-02-15 15:26:34 +06:30
San Wai Lwin
016d3f4187 sqa 2018-02-15 13:29:52 +06:30
San Wai Lwin
d8d119edd6 release_c1 2018-02-15 13:27:45 +06:30
San Wai Lwin
2f08fe03b6 Merge branch 'sqa-1802-001' into r-1802001-01 2018-02-15 12:16:41 +06:30
San Wai Lwin
35721cd917 remove space line 2018-02-15 12:15:39 +06:30
San Wai Lwin
dff0a4798e add new line 2018-02-15 12:11:54 +06:30
Aung Myo
0d515d9c93 paending order sale model 2018-02-15 10:27:00 +06:30
Aung Myo
47ffc5fa51 update no table quick srevice 2018-02-14 18:21:10 +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
Aung Myo
b2cec95064 test no table 2018-02-14 14:26:36 +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
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
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
phyusin
00d3397834 conflict data remove for order/show.index.html.erb 2018-02-08 18:04:36 +06:30
Aung Myo
a64fc8a4f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-08 14:46:57 +06:30
Aung Myo
c4452c2730 update order queue printer for order_summary with before update qty 2018-02-08 14:15:29 +06:30