Aung Myo
|
53ff3989b5
|
update merge cancan
|
2017-06-27 16:55:56 +06:30 |
|
Aung Myo
|
5a52183846
|
update pull master
|
2017-06-27 16:48:05 +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
|
1c65a38b70
|
fix conflit
|
2017-06-27 14:04:29 +06:30 |
|
Yan
|
def8ce34c2
|
Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-27 12:07:35 +06:30 |
|
Phyo
|
7810fc693b
|
Pending Payment
|
2017-06-27 12:06:18 +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
|
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 |
|
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
|
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 |
|
Yan
|
6f741e0a0c
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 19:28:21 +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 |
|
Zin Lin Phyo
|
5489da2066
|
route conflit fix
|
2017-06-26 18:02:08 +06:30 |
|
Zin Lin Phyo
|
feb1d66257
|
overall void
|
2017-06-26 18:00:48 +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
|
adf06cf6f5
|
Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 17:02:25 +06:30 |
|
Yan
|
c81663003f
|
update in discount
|
2017-06-26 17:01:25 +06:30 |
|
Aung Myo
|
6e77a71946
|
update customer seed shop and receipt bill
|
2017-06-26 16:50:04 +06:30 |
|
Yan
|
4e5ca54eee
|
Merge branch 'oqs' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 16:38:15 +06:30 |
|
Yan
|
0c2e299ced
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-06-26 16:37:02 +06:30 |
|
Nweni
|
04e44c4859
|
fixed conflict
|
2017-06-26 16:35:24 +06:30 |
|
Nweni
|
20afabd86d
|
item void
|
2017-06-26 16:34:03 +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 |
|
Phyo
|
46ad87314a
|
Add color blue to orders
|
2017-06-26 14:39:25 +06:30 |
|
Yan
|
cc67abcfc1
|
add time in oqs
|
2017-06-26 14:35:44 +06:30 |
|
Yan
|
e1c981e8c2
|
merge with crm
|
2017-06-26 14:23:56 +06:30 |
|
Yan
|
00c19fdd67
|
sub total fixed in origami shows
|
2017-06-26 14:16:22 +06:30 |
|
Phyo
|
f878b2f1d8
|
Accounts disable Bonus and discount
|
2017-06-26 13:53:54 +06:30 |
|
Phyo
|
cb2124c6a6
|
refresh 10 sec
|
2017-06-26 12:57:36 +06:30 |
|
Phyo
|
a05fc0f646
|
Up to Amount bug fix
|
2017-06-26 12:55:44 +06:30 |
|
Phyo
|
5017549f86
|
Merge branch 'master' into settings_backend
|
2017-06-26 11:13:06 +06:30 |
|
Phyo
|
6e49f91b89
|
Multiple Invoices Phase 1
|
2017-06-26 11:10:49 +06:30 |
|
Aung Myo
|
12483aba97
|
update crm customer
|
2017-06-26 11:10:08 +06:30 |
|