git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'crm' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2017-06-06 10:26:56 +06:30
parent 187a050c19 6ecf791673
commit bb68063f33
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -91,3 +91,5 @@ end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'httparty', '~> 0.15.5'

4
Gemfile.lock
View File

@@ -92,6 +92,8 @@ GEM
railties (>= 3.2, < 5.2) railties (>= 3.2, < 5.2)
globalid (0.4.0) globalid (0.4.0)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
httparty (0.15.5)
multi_xml (>= 0.5.2)
i18n (0.8.4) i18n (0.8.4)
jbuilder (2.6.4) jbuilder (2.6.4)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
@@ -114,6 +116,7 @@ GEM
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.10.2) minitest (5.10.2)
multi_json (1.12.1) multi_json (1.12.1)
multi_xml (0.6.0)
mysql2 (0.4.6) mysql2 (0.4.6)
nio4r (2.1.0) nio4r (2.1.0)
nokogiri (1.7.2) nokogiri (1.7.2)
@@ -247,6 +250,7 @@ DEPENDENCIES
factory_girl_rails (~> 4.0) factory_girl_rails (~> 4.0)
faker faker
font-awesome-rails font-awesome-rails
httparty (~> 0.15.5)
jbuilder (~> 2.5) jbuilder (~> 2.5)
jquery-rails jquery-rails
kaminari! kaminari!

1
app/controllers/crm/customers_controller.rb
View File

@@ -15,6 +15,7 @@ class Crm::CustomersController < ApplicationController
# GET /crm/customers/new # GET /crm/customers/new
def new def new
@crm_customer = Customer.new @crm_customer = Customer.new
@membership = Customer.get_member_group
end end
# GET /crm/customers/1/edit # GET /crm/customers/1/edit