phyusin
|
75cadc7ed3
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-14 14:46:44 +06:30 |
|
phyusin
|
50948be8bf
|
sym_master
|
2018-02-14 14:37:28 +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
|
22a9e75efa
|
update license and sym_master
|
2018-02-13 15:12:09 +06:30 |
|
phyusin
|
c902e2ea1b
|
check one condition in order item
|
2018-02-09 14:56:33 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
phyusin
|
48ce8e4809
|
split bill
|
2018-02-01 18:12:59 +06:30 |
|
phyusin
|
f608aa8516
|
check checkin time is available or valid time
|
2018-02-01 17:00:57 +06:30 |
|
phyusin
|
ae4746acfc
|
change checkin time checked
|
2018-02-01 16:34:18 +06:30 |
|
phyusin
|
6c33040173
|
remove checkin if checkin not used
|
2018-02-01 16:25:11 +06:30 |
|
phyusin
|
383aeded60
|
check checkedin exist in lookups and void - sale
|
2018-02-01 16:16:26 +06:30 |
|
phyusin
|
73858fc293
|
change checkout time
|
2018-02-01 18:19:35 +06:30 |
|
phyusin
|
e9d7b9e2f5
|
change utc to utc.getlocal
|
2018-02-01 15:31:48 +06:30 |
|
phyusin
|
ee17ddac92
|
add rounding adj for table invoices
|
2018-01-31 17:47:06 +06:30 |
|
phyusin
|
2a09945d36
|
check add to existing invoice
|
2018-01-28 16:29:59 +06:30 |
|
phyusin
|
aa129ad469
|
heck rounding adjustment error
|
2018-01-28 16:12:59 +06:30 |
|
phyusin
|
8b99c8bcc6
|
cahnge empty json to NIL
|
2018-01-22 22:13:17 +06:30 |
|
phyusin
|
3a21d85a4b
|
add set_menu_item in origami and oqs
|
2018-01-19 16:06:58 +06:30 |
|
Aung Myo
|
b3d6b9858b
|
update addorder controller for order items
|
2018-01-18 11:43:21 +06:30 |
|
phyusin
|
bc2d6e07f1
|
check empty for checkout time and checkout alert time
|
2018-01-16 14:59:47 +06:30 |
|
Aung Myo
|
2472a66c12
|
Merge branch 'adminbsb_material_ui'
|
2018-01-16 11:01:34 +06:30 |
|
Aung Myo
|
eb29b20654
|
update combine cloud and master bugs
|
2018-01-16 10:57:20 +06:30 |
|
phyusin
|
89e563ce1e
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-01-16 10:15:43 +06:30 |
|
phyusin
|
ca98efc756
|
change checkout time and checkout alert time process
|
2018-01-16 10:15:28 +06:30 |
|
Aung Myo
|
649e99f176
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-01-15 17:49:21 +06:30 |
|