Yan
|
5ff75fad7d
|
fix for undefied method type in item pdf
|
2017-06-28 15:40:54 +06:30 |
|
Yan
|
879a4b366c
|
print as print copies in printer setting
|
2017-06-28 14:29:11 +06:30 |
|
Yan
|
58a8cdec6e
|
still dev dis
|
2017-06-27 18:32:58 +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 |
|
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 |
|
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 |
|
Yan
|
00c19fdd67
|
sub total fixed in origami shows
|
2017-06-26 14:16:22 +06:30 |
|
Yan
|
ecc9ab53ec
|
Merge branch 'cancan' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 09:59:16 +06:30 |
|
Phyo
|
05b4dbac7c
|
Rebate Redeem add field
|
2017-06-23 18:45:15 +06:30 |
|
Yan
|
e01ecc6e0f
|
merge origin master
|
2017-06-23 17:53:53 +06:30 |
|
Nweni
|
81c50f220a
|
edit invoice
|
2017-06-23 17:37:08 +06:30 |
|
Yan
|
3a0e26b2ea
|
accounts and discount updated
|
2017-06-23 17:05:08 +06:30 |
|
Aung Myo
|
01e5b7ba6c
|
update authorize
|
2017-06-23 09:41:48 +06:30 |
|
Yan
|
139c3c997a
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 18:05:38 +06:30 |
|
Yan
|
5d60d620b4
|
add for room tab and complete
|
2017-06-22 18:03:16 +06:30 |
|
Yan
|
7bf2499e83
|
add options in oqs
|
2017-06-22 17:32:13 +06:30 |
|
Nweni
|
0c0e44c808
|
move table
|
2017-06-22 16:31:41 +06:30 |
|
Aung Myo
|
25b6a893f2
|
first cancan
|
2017-06-22 15:33:55 +06:30 |
|
Nweni
|
09252ba055
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 14:27:12 +06:30 |
|
Nweni
|
0ea2b778d1
|
multiple sale and order
|
2017-06-22 14:26:23 +06:30 |
|
Aung Myo
|
187caa5253
|
update customre
|
2017-06-22 11:58:16 +06:30 |
|
Yan
|
de8f577786
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 09:53:04 +06:30 |
|
Yan
|
3f15e7bc6f
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-22 09:51:22 +06:30 |
|
Nweni
|
0ff10f2f32
|
move multiple order and sales
|
2017-06-22 05:51:42 +06:30 |
|
Nweni
|
168c571a23
|
multiple invoice
|
2017-06-22 05:24:31 +06:30 |
|
Yan
|
2525bfbdd9
|
discount updated
|
2017-06-21 20:30:12 +06:30 |
|
Aung Myo
|
a6912d4e5b
|
update customer search in card no
|
2017-06-21 18:30:51 +06:30 |
|
Nweni
|
64210f30ac
|
move table
|
2017-06-21 17:53:44 +06:30 |
|
Aung Myo
|
d2549df2e9
|
update receipt bill payment
|
2017-06-21 17:37:16 +06:30 |
|
Aung Myo
|
7c5456d712
|
assign table ,membership transaction and queue
|
2017-06-21 16:22:53 +06:30 |
|