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 |
|
Aung Myo
|
a2e7ebd27a
|
update payment show
|
2018-02-14 15:00:16 +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
|
a5c72b6540
|
test no table
|
2018-02-14 14:40:28 +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
|
6978dc5450
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa_test
|
2018-02-13 15:12:33 +06:30 |
|
Aung Myo
|
22a9e75efa
|
update license and sym_master
|
2018-02-13 15:12:09 +06:30 |
|
phyusin
|
76b6e63fd3
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-13 13:39:43 +06:30 |
|
Aung Myo
|
839fb14436
|
update inventory
|
2018-02-13 11:34:06 +06:30 |
|
Aung Myo
|
5854bd88e1
|
update liscense file
|
2018-02-13 10:53:29 +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
|
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 |
|
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
|
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
|
7ae8b44f4b
|
check status in sale payment
|
2018-02-08 10:11:05 +06:30 |
|