Aung Myo
|
c16d322cea
|
update pdf and font
|
2017-06-28 11:50:05 +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 |
|
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 |
|
Aung Myo
|
f762664912
|
update bill
|
2017-06-27 14:16:48 +06:30 |
|
Zin Lin Phyo
|
bce4380d70
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 14:04:41 +06:30 |
|
Zin Lin Phyo
|
1c65a38b70
|
fix conflit
|
2017-06-27 14:04:29 +06:30 |
|
Nweni
|
c6f482da83
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 14:02:54 +06:30 |
|
Nweni
|
df722de0e7
|
billed
|
2017-06-27 14:02:44 +06:30 |
|
Yan
|
def8ce34c2
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 12:07:35 +06:30 |
|
Phyo
|
697bacf200
|
rake task
|
2017-06-27 12:06:39 +06:30 |
|
Phyo
|
7810fc693b
|
Pending Payment
|
2017-06-27 12:06:18 +06:30 |
|
Phyo
|
f8062cec64
|
Credit payment
|
2017-06-27 12:05:45 +06:30 |
|
Yan
|
9f44ac0031
|
update page height bill pdf
|
2017-06-27 12:03:17 +06:30 |
|
Yan
|
4f78c63b63
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 11:53:46 +06:30 |
|
Yan
|
e38886790c
|
not show price 0 fixed
|
2017-06-27 11:52:51 +06:30 |
|
Zin Lin Phyo
|
8d8f7b9093
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 11:35:48 +06:30 |
|
Zin Lin Phyo
|
bcd44db9a2
|
multiple invoice void
|
2017-06-27 11:35:36 +06:30 |
|
Phyo
|
b5518c2ddb
|
rake task fix
|
2017-06-27 11:35:10 +06:30 |
|
Phyo
|
2f8c6e25a1
|
Shop View
|
2017-06-27 11:33:03 +06:30 |
|
Phyo
|
37da55610f
|
Shop View
|
2017-06-27 11:32:10 +06:30 |
|
Nweni
|
463e8e5875
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 10:28:58 +06:30 |
|
Nweni
|
535a5825fb
|
get update
|
2017-06-27 10:28:47 +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
|
c1646b812e
|
route update
|
2017-06-27 01:15:40 +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 |
|
Yan
|
1023f4348a
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 20:58:32 +06:30 |
|
Yan
|
a236c94910
|
mobile bill updated
|
2017-06-26 20:58:12 +06:30 |
|
Aung Myo
|
25967b82d3
|
update home link
|
2017-06-26 20:44:15 +06:30 |
|
Aung Myo
|
c6906ba293
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into crm
|
2017-06-26 20:31:55 +06:30 |
|
Aung Myo
|
9a5656c5e6
|
update crm customer
|
2017-06-26 20:13:56 +06:30 |
|
Aung Myo
|
0726af072e
|
update cancan
|
2017-06-26 19:49:02 +06:30 |
|
Aung Myo
|
75dd4db10f
|
update seed
|
2017-06-26 19:33:29 +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
|
6afec4a482
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 18:52:25 +06:30 |
|
Phyo
|
79befa4876
|
rake task fix
|
2017-06-26 18:49:41 +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 |
|