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 |
|
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 |
|
Aung Myo
|
9757c34a09
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-14 15:01:57 +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
|
91aa216666
|
check booking sale id is null for all order
|
2018-02-14 14:20:20 +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
|
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 |
|
phyusin
|
19e9a941c8
|
show set item price in origami
|
2018-02-09 12:07:53 +06:30 |
|
Aung Myo
|
54cb5b0c87
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-09 11:32:49 +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 |
|
phyusin
|
e445b3e88e
|
add order count and change orders UI for table and room
|
2018-02-08 17:56:41 +06:30 |
|
Aung Myo
|
d052fed803
|
update pay first and print later
|
2018-02-08 14:13:58 +06:30 |
|
Aung Myo
|
8e2ec90ee6
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-08 11:09:21 +06:30 |
|
Aung Myo
|
38dc13ecf7
|
update pending order
|
2018-02-08 11:08:52 +06:30 |
|
phyusin
|
18eb7677c2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-07 15:50:57 +06:30 |
|
phyusin
|
492bf93185
|
change split bill ui
|
2018-02-07 15:50:36 +06:30 |
|
Aung Myo
|
7c3cab4109
|
update origami order
|
2018-02-07 11:13:18 +06:30 |
|
phyusin
|
503f1df0ab
|
change order data
|
2018-02-06 18:05:02 +06:30 |
|
phyusin
|
7a055470e8
|
add split bill for order item in room
|
2018-02-06 17:46:58 +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 |
|
phyusin
|
9387703862
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-06 16:17:27 +06:30 |
|
phyusin
|
f093f1f0a7
|
split bill for order item
|
2018-02-06 16:17:08 +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 |
|
phyusin
|
0780744377
|
check booking with order item split
|
2018-02-05 16:57:46 +06:30 |
|
Aung Myo
|
76a094972e
|
update payment
|
2018-02-05 15:10:35 +06:30 |
|
phyusin
|
65d9f0fb6f
|
order update
|
2018-02-05 13:07:30 +06:30 |
|
phyusin
|
8fed8d701a
|
add booking
|
2018-02-05 11:05:58 +06:30 |
|
phyusin
|
991bc48505
|
order item split bill process
|
2018-02-06 09:46:30 +06:30 |
|
Aung Myo
|
1d9164aaf0
|
update quick service for payment
|
2018-02-02 18:03:43 +06:30 |
|
phyusin
|
d1fd92bfd3
|
split bill ui
|
2018-02-02 13:41:38 +06:30 |
|
phyusin
|
b553dd0661
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-01 18:04:17 +06:30 |
|