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 |
|
phyusin
|
9387703862
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-06 16:17:27 +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
|
2ebfdbe8bc
|
add updated qty text in oqs
|
2018-02-05 15:29:31 +06:30 |
|
phyusin
|
76e86bcfd4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-05 11:09:49 +06:30 |
|
phyusin
|
f84b01a058
|
change item unit price in sale ite report
|
2018-02-06 10:19:30 +06:30 |
|
phyusin
|
991bc48505
|
order item split bill process
|
2018-02-06 09:46:30 +06:30 |
|
Aung Myo
|
6657c11122
|
update cups restart for order
|
2018-02-01 17:14:34 +06:30 |
|
Aung Myo
|
9efd54e68b
|
update remove job from cable and cup control in print
|
2018-02-01 15:30:30 +06:30 |
|
Aung Myo
|
d5c4f834a0
|
update job
|
2018-02-01 11:04:56 +06:30 |
|
Aung Myo
|
2f024e8691
|
update qurick raw
|
2018-02-01 10:29:24 +06:30 |
|
Aung Myo
|
ddaa581b32
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2018-01-27 13:18:16 +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 |
|
Aung Myo
|
f4effe8dde
|
update rom and table show
|
2018-01-27 13:16:42 +06:30 |
|
phyusin
|
27300dfb81
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-01-25 17:34:24 +06:30 |
|
phyusin
|
61142b7244
|
add void in sale item again
|
2018-01-25 17:34:13 +06:30 |
|
Aung Myo
|
ca54fa21ab
|
Merge branch 'adminbsb_material_ui'
|
2018-01-25 15:34:48 +06:30 |
|