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

..

api

For pull

2017-06-07 18:11:03 +06:30

crm

queue and crm view updated

2017-06-09 09:29:25 +06:30

oqs

…

origami

edit membership setting , otherpayment page

2017-06-11 15:48:53 +06:30

reports

update authorize

2017-06-23 09:41:48 +06:30

settings

finished order and sales in setting

2017-06-12 00:45:59 +06:30

transactions

…

application_helper.rb

New Login form

2017-06-26 21:56:13 +06:30

print_settings_helper.rb

…