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 |
|
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 |
|
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 |
|
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 |
|
Aung Myo
|
4440f16559
|
update oqs for loading
|
2018-02-06 17:44:10 +06:30 |
|
Aung Myo
|
313bcd5db9
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2018-02-06 17:02:44 +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
|
6503ca9a48
|
update home for oqs
|
2018-02-06 16:24:00 +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
|
76b1cda530
|
update discount for first bill
|
2018-02-06 11:15:43 +06:30 |
|
Aung Myo
|
90e30440c1
|
update discount for first bill
|
2018-02-06 11:06:30 +06:30 |
|
Aung Myo
|
1cbcab75b4
|
update for first bill
|
2018-02-06 10:43:59 +06:30 |
|