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
|
a844b51b39
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-09 15:08:07 +06:30 |
|
Aung Myo
|
7c07cd0118
|
update dashbord
|
2018-02-09 15:07:39 +06:30 |
|
phyusin
|
1b1ffa1146
|
check receipt
|
2018-02-09 15:07:01 +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
|
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 |
|
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
|
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
|
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 |
|
Aung Myo
|
d052fed803
|
update pay first and print later
|
2018-02-08 14:13:58 +06:30 |
|
Aung Myo
|
5e7a3a2212
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-08 13:12:03 +06:30 |
|
Aung Myo
|
420461918d
|
update print summary for before_updated_qty
|
2018-02-08 13:04:01 +06:30 |
|
Aung Myo
|
4c4d11582d
|
update order for pay first print last
|
2018-02-08 11:58:41 +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
|
2a1c761199
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-08 10:15:13 +06:30 |
|
phyusin
|
7ae8b44f4b
|
check status in sale payment
|
2018-02-08 10:11:05 +06:30 |
|
phyusin
|
898c05082a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-07 17:49:19 +06:30 |
|
phyusin
|
a2223a6b90
|
add edit route in oqs detail
|
2018-02-07 17:47:04 +06:30 |
|
phyusin
|
c71ece4327
|
change sale id for add to existing in room
|
2018-02-07 15:58:19 +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 |
|
San Wai Lwin
|
625ee9bd34
|
For add alert box for Close Cashier
|
2018-02-07 13:23:01 +06:30 |
|
Aung Myo
|
7c3cab4109
|
update origami order
|
2018-02-07 11:13:18 +06:30 |
|
Aung Myo
|
2101089f00
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-07 10:52:06 +06:30 |
|
Aung Myo
|
0517d66d48
|
update oqs
|
2018-02-07 10:51:49 +06:30 |
|
phyusin
|
41aa840eb2
|
conflict data
|
2018-02-06 18:12:59 +06:30 |
|
phyusin
|
21538f38f8
|
order query changed
|
2018-02-06 18:06:40 +06:30 |
|