Aung Myo
|
8069ac15ca
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-23 11:13:30 +06:30 |
|
Aung Myo
|
31c7048075
|
update oqs js
|
2018-02-23 11:12:58 +06:30 |
|
phyusin
|
ffbfd71330
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-22 18:52:55 +06:30 |
|
phyusin
|
7cbb67fd30
|
add link for oqs in origami
|
2018-02-22 18:51:57 +06:30 |
|
Aung Myo
|
c7b77aebfa
|
update taday list and addorder
|
2018-02-22 18:48:59 +06:30 |
|
phyusin
|
8d03fab703
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-22 09:43:13 +06:30 |
|
Aung Myo
|
0e70f3b763
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-22 09:39:54 +06:30 |
|
Aung Myo
|
7d144b0307
|
update edit sale for qs
|
2018-02-22 09:37:14 +06:30 |
|
phyusin
|
e2903075b2
|
change split bill equal person flow
|
2018-02-21 18:24:04 +06:30 |
|
Aung Myo
|
0302bb408b
|
update no table oqs print
|
2018-02-21 16:11:05 +06:30 |
|
Aung Myo
|
c3af21d71c
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-21 13:28:43 +06:30 |
|
Aung Myo
|
ebdf838b52
|
update request sale for another role
|
2018-02-21 13:12:41 +06:30 |
|
Aung Myo
|
4455b03e8a
|
update print pay in qs
|
2018-02-21 12:34:03 +06:30 |
|
Aung Myo
|
20103a54a5
|
update sale for request
|
2018-02-20 14:33:36 +06:30 |
|
Aung Myo
|
8f239cbb0b
|
update conflix for request bill
|
2018-02-20 13:32:27 +06:30 |
|
Aung Myo
|
58d78b8674
|
Merge branch 'adminbsb_material_ui'
|
2018-02-20 13:25:00 +06:30 |
|
Aung Myo
|
a5640877a3
|
update request bill
|
2018-02-20 11:59:57 +06:30 |
|
Aung Myo
|
31adc0e993
|
update request bill for another role in request_bill_con and sale.rb
|
2018-02-20 11:13:49 +06:30 |
|
Aung Myo
|
817784796a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-19 14:52:46 +06:30 |
|
Aung Myo
|
c064f9d6f5
|
fixed conflix after pull split bill
|
2018-02-19 14:21:26 +06:30 |
|
phyusin
|
150ff66446
|
change slae item query
|
2018-02-19 10:49:24 +06:30 |
|
Aung Myo
|
0504a9505b
|
update menu category
|
2018-02-19 09:12:51 +06:30 |
|
phyusin
|
032e085b6e
|
change query for origami
|
2018-02-16 17:47:34 +06:30 |
|
phyusin
|
0ddaee7444
|
equal split and order split in order tab'
|
2018-02-16 12:13:35 +06:30 |
|
Aung Myo
|
2f7f412150
|
update addorder move + and box
|
2018-02-16 09:46:55 +06:30 |
|
Aung Myo
|
cf644892c9
|
update pending and quick service
|
2018-02-15 15:26:34 +06:30 |
|
Aung Myo
|
0d515d9c93
|
paending order sale model
|
2018-02-15 10:27:00 +06:30 |
|
Aung Myo
|
47ffc5fa51
|
update no table quick srevice
|
2018-02-14 18:21:10 +06:30 |
|
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 |
|
phyusin
|
75cadc7ed3
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-14 14:46:44 +06:30 |
|
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
|
22a9e75efa
|
update license and sym_master
|
2018-02-13 15:12:09 +06:30 |
|
Aung Myo
|
aeafbb4fae
|
update pull split bill
|
2018-02-09 14:31:34 +06:30 |
|
phyusin
|
9f6505fd95
|
remove conflict data in ability.rb
|
2018-02-09 14:06:16 +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 |
|
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 |
|
phyusin
|
41aa840eb2
|
conflict data
|
2018-02-06 18:12:59 +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 |
|