Yan
dd95b29d7d
control order to logout
2017-06-29 19:09:01 +06:30
Yan
fd857146e8
fix for shift sale query and prepare rounding adj
2017-06-29 15:20:40 +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
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
557ad06600
update order queue printer
2017-06-29 10:52:12 +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
Yan
5ff75fad7d
fix for undefied method type in item pdf
2017-06-28 15:40:54 +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
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
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
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
Yan
def8ce34c2
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 12:07:35 +06:30
Phyo
f8062cec64
Credit payment
2017-06-27 12:05:45 +06:30
Yan
e38886790c
not show price 0 fixed
2017-06-27 11:52:51 +06:30
Yan
08e98409a5
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-27 10:16:28 +06:30
Yan
e09dbb095c
not to show price 0 and 10
2017-06-27 10:15:22 +06:30
Aung Myo
4c13be257b
update authroize
2017-06-26 22:45:34 +06:30
Min Zeya Phyo
1ea9125f80
Merge branch 'master' of ssh://bitbucket.org/code2lab/sxrestaurant
...
# Conflicts:
# Gemfile.lock
# app/views/layouts/application.html.erb
2017-06-26 21:57:55 +06:30
Min Zeya Phyo
b607154037
New Login form
2017-06-26 21:56:13 +06:30
Aung Myo
0726af072e
update cancan
2017-06-26 19:49:02 +06:30
Yan
6f741e0a0c
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 19:28:21 +06:30
Yan
99ac82c888
update seed for shop and oqs
2017-06-26 19:28:02 +06:30
Aung Myo
60fe3b9a67
update crmad ability
2017-06-26 19:22:16 +06:30
Aung Myo
376af85c64
update credit
2017-06-26 19:02:36 +06:30
Yan
ef8f280d0e
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 18:46:16 +06:30
Yan
034c9932a6
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 18:45:55 +06:30
Yan
cb77c771b8
oqs update
2017-06-26 18:45:20 +06:30
Aung Myo
f3417a61c0
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
2017-06-26 18:16:03 +06:30
Aung Myo
02e3ebefda
update receipt
2017-06-26 17:56:31 +06:30
Nweni
089848ed4a
credit note payment
2017-06-26 17:49:55 +06:30
Yan
e878275c1b
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
2017-06-26 17:10:25 +06:30
Nweni
d4983fabf5
item void
2017-06-26 17:07:17 +06:30
Yan
f60b3d554a
add table and order no in oqs
2017-06-26 16:23:00 +06:30
Yan
813f2ecf2d
merge with settings_backend
2017-06-26 14:46:31 +06:30
