Aung Myo
1d08954a76
update shift sale
2017-06-30 13:32:56 +06:30
Aung Myo
3b9c16d8d5
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-29 15:42:45 +06:30
Aung Myo
9305e0c4b4
update authorize void and edit in cashier
2017-06-29 15:39:46 +06:30
Yan
fd857146e8
fix for shift sale query and prepare rounding adj
2017-06-29 15:20:40 +06:30
Aung Myo
f60c145c00
update queue
2017-06-29 14:33:05 +06:30
Yan
769509adec
add shift module
2017-06-29 14:09:56 +06:30
Yan
fbeab17b3c
merge with origin master
2017-06-29 14:08:20 +06:30
Yan
b63155a315
boolean updated
2017-06-29 14:06:58 +06:30
Nweni
11c3be8f4a
Update
2017-06-29 14:05:03 +06:30
Nweni
cf851327b3
fixed conflict
2017-06-29 13:52:55 +06:30
Nweni
8d09e5a919
shift sale update
2017-06-29 13:48:14 +06:30
Yan
8ba2606f6e
merge with crm
2017-06-29 13:40:30 +06:30
Nweni
e3c2f02c81
fixed conflict
2017-06-29 13:39:37 +06:30
Nweni
618a89472a
shift open/close
2017-06-29 13:35:09 +06:30
Yan
8045bb31e9
merge with discount
2017-06-29 11:41:29 +06:30
Yan
9991970203
add first bill
2017-06-29 11:34:13 +06:30
Aung Myo
524edfc3b0
update print oqs order item
2017-06-29 11:06:04 +06:30
Aung Myo
557ad06600
update order queue printer
2017-06-29 10:52:12 +06:30
Aung Myo
173d824c27
update card column in queue
2017-06-28 23:45:28 +06:30
Aung Myo
58e95e573e
update numberformat in pdf
2017-06-28 23:13:20 +06:30
Aung Myo
342b654f81
update print setting migration and delete unnessary font
2017-06-28 17:12:09 +06:30
Yan
50091e4016
updated for api bill controller
2017-06-28 16:56:43 +06:30
Aung Myo
e9e184894d
update fixed conflict
2017-06-28 16:44:31 +06:30
Aung Myo
20f89a65f8
delete japaness font
2017-06-28 16:39:25 +06:30
Aung Myo
02f9245c7f
update receipt and oqs font
2017-06-28 16:18:14 +06:30
Yan
d35aa23e34
still dev to respond code for order
2017-06-28 16:17:56 +06:30
Yan
5ff75fad7d
fix for undefied method type in item pdf
2017-06-28 15:40:54 +06:30
Nweni
45961880c8
fixed conflict
2017-06-28 15:35:05 +06:30
Nweni
f42c800ae1
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into payment
2017-06-28 15:34:14 +06:30
Nweni
6a3973beea
fixed conflict
2017-06-28 15:33:27 +06:30
Nweni
986655052a
shift
2017-06-28 15:29:44 +06:30
Yan
879a4b366c
print as print copies in printer setting
2017-06-28 14:29:11 +06:30
Yan
ea4ba325fa
text change percentage value
2017-06-28 14:15:35 +06:30
Nweni
55278c83bc
fixed conflict
2017-06-28 12:58:27 +06:30
Nweni
f01e1b1ce3
edit login
2017-06-28 12:57:39 +06:30
Aung Myo
ab7f08b1d6
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-28 12:47:18 +06:30
Min Zeya Phyo
5716294955
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
...
* 'master' of ssh://bitbucket.org/code2lab/sxrestaurant:
billed
rake task
Pending Payment
Credit payment
update page height bill pdf
not show price 0 fixed
multiple invoice void
rake task fix
Shop View
Shop View
get update
not to show price 0 and 10
2017-06-28 12:45:05 +06:30
Aung Myo
c16d322cea
update pdf and font
2017-06-28 11:50:05 +06:30
Yan
b975d6194f
add remove item and remove all in discount
2017-06-28 10:59:03 +06:30
Min Zeya Phyo
ee651763b7
shift close and payment journal
2017-06-28 10:34:42 +06:30
Yan
58a8cdec6e
still dev dis
2017-06-27 18:32:58 +06:30
Aung Myo
53ff3989b5
update merge cancan
2017-06-27 16:55:56 +06:30
Aung Myo
4f2e06cfe2
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-27 16:48:51 +06:30
Aung Myo
5a52183846
update pull master
2017-06-27 16:48:05 +06:30
Aung Myo
de398c09c3
update
2017-06-27 16:24:03 +06:30
Aung Myo
238cad0c8d
update conflict fix
2017-06-27 15:29:14 +06:30
Yan
950fff469f
update for req bill by cashier
2017-06-27 15:28:48 +06:30
Yan
464e72012b
waiter and cashier in api/bill_controller
2017-06-27 15:26:02 +06:30
Aung Myo
945963362a
update queue migration
2017-06-27 15:25:13 +06:30
Aung Myo
ff2844124e
update utc
2017-06-27 15:10:42 +06:30
