phcmemberspro 5.0.6 → 5.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcmemberspro/members/contacts_controller.rb +1 -1
  3. data/app/views/phcmemberspro/members/businesses/index.html.erb +1 -1
  4. data/app/views/phcmemberspro/members/contacts/_form.html.erb +0 -8
  5. data/app/views/phcmemberspro/members/contacts/_formpatch.html.erb +0 -8
  6. data/app/views/phcmemberspro/members/contacts/edit.html.erb +8 -4
  7. data/app/views/phcmemberspro/members/contacts/index.html.erb +17 -5
  8. data/app/views/phcmemberspro/members/contacts/new.html.erb +8 -4
  9. data/db/migrate/20160227194651_create_phcmemberspro_members_contacts.rb +0 -2
  10. data/lib/phcmemberspro/version.rb +1 -1
  11. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 80bd580990f11cf88f30d7dcc289216cfff8910c
4
- data.tar.gz: 702326e772f22f54d3474e3813bb6c97b4adf966
3
+ metadata.gz: b44c2c2f944787c5b3b83711237c65787f8ac1ff
4
+ data.tar.gz: e55241d202241f1993aab20536e901653fb07db6
5
5
  SHA512:
6
- metadata.gz: 4311f6ef9d62428fd2b704c757cd881a52e1eb873fd525d9717963999bb5622f63b7cfd433bd8723ada4e08802531cd5518697ee10de2cafe4290c1a37063fe4
7
- data.tar.gz: f28e5c5dce94d3ced92d036ea34918ced1876403a97debdd4cb55617ac9d795d5b4778a3655c829741a21a443496d25a4f1a2ccd8daa901c279666e5d9fe8a9e
6
+ metadata.gz: f12a7e9d1622f16e7bff98eb461dcce53d8225f8db550a2cc6695042f477862fd5413b9b188bcf4580d3ac832dfe55385999933fea1a5374504378b22cf58830
7
+ data.tar.gz: c8432fbdb444e470a88700d8b0e24086a121ecd83f383ac47db39bc74fc5ac6f9811b5f0bc92d0588da37082397ef0c88d4b713df2dcc6696ace26b3c16a42dc
data/app/controllers/phcmemberspro/members/contacts_controller.rb CHANGED
@@ -80,7 +80,7 @@ module Phcmemberspro
80
80
 
81
81
  # White List
82
82
  def members_contact_params
83
- params.require(:members_contact).permit(:mccontactname, :mccompanyname, :mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mcphone, :mcwebsite, :mcemail, :mctype, :main_id, :account_id)
83
+ params.require(:members_contact).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :main_id, :account_id)
84
84
  end
85
85
 
86
86
  end
data/app/views/phcmemberspro/members/businesses/index.html.erb CHANGED
@@ -30,7 +30,7 @@
30
30
  <span class="caption-subject bold uppercase">Members Business List</span>
31
31
  </div>
32
32
  <div class="actions">
33
- <%= link_to new_members_business_path(members_business), class: "btn blue-chambray btn-circle" do %>
33
+ <%= link_to new_members_main_business_path, class: "btn blue-chambray btn-circle" do %>
34
34
  <i class="fa fa-plus"></i> Add Another Business for <%= @members_main.mfirstname + ' ' + @members_main.mlastname %>
35
35
  <% end %>
36
36
  </div>
data/app/views/phcmemberspro/members/contacts/_form.html.erb CHANGED
@@ -27,14 +27,6 @@
27
27
  <label><%= f.label :mcpostalcode, "PostalCode" %></label>
28
28
  <%= f.text_field :mcpostalcode, class: "form-control", placeholder: "Mailing PostalCode" %>
29
29
  </div>
30
- <div class="form-group field_with_errors">
31
- <label><%= f.label :mcphone, "Contact Phone" %></label>
32
- <%= f.text_field :mcphone, class: "form-control masked", placeholder: "Contact Phone Number", data: {format: '(999) 999-9999', placeholder: 'x'} %>
33
- </div>
34
- <div class="form-group field_with_errors">
35
- <label><%= f.label :mcemail, "Contact Email" %></label>
36
- <%= f.text_field :mcemail, class: "form-control", placeholder: "Contact Email" %>
37
- </div>
38
30
  <div class="form-group">
39
31
  <label><%= f.label :mctype, "Address Type" %></label>
40
32
  <%= f.select :mctype, [['Billing Address','billing'],['Street Address','street'],['Mailing Address','mailing']], class: "form-control" %>
data/app/views/phcmemberspro/members/contacts/_formpatch.html.erb CHANGED
@@ -27,14 +27,6 @@
27
27
  <label><%= f.label :mcpostalcode, "PostalCode" %></label>
28
28
  <%= f.text_field :mcpostalcode, class: "form-control", placeholder: "Mailing PostalCode" %>
29
29
  </div>
30
- <div class="form-group field_with_errors">
31
- <label><%= f.label :mcphone, "Contact Phone" %></label>
32
- <%= f.text_field :mcphone, class: "form-control masked", placeholder: "Contact Phone Number", data: {format: '(999) 999-9999', placeholder: 'x'} %>
33
- </div>
34
- <div class="form-group field_with_errors">
35
- <label><%= f.label :mcemail, "Contact Email" %></label>
36
- <%= f.text_field :mcemail, class: "form-control", placeholder: "Contact Email" %>
37
- </div>
38
30
  <div class="form-group">
39
31
  <label><%= f.label :mctype, "Address Type" %></label>
40
32
  <%= f.select :mctype, [['Billing Address','billing'],['Street Address','street'],['Mailing Address','mailing']], class: "form-control" %>
data/app/views/phcmemberspro/members/contacts/edit.html.erb CHANGED
@@ -9,7 +9,7 @@
9
9
  <li><%= link_to "Home", members_root_path %><i class="fa fa-circle"></i></li>
10
10
  <li><%= link_to "Members List", members_mains_path %><i class="fa fa-circle"></i></li>
11
11
  <li><%= link_to "Members Contact", members_main_contacts_path %><i class="fa fa-circle"></i></li>
12
- <li class="active">Update Address for <%= @members_main.mfirstname + ' ' + @members_main.mlastname %></li>
12
+ <li class="active"><%= yield(:phc_title_tagline) %></li>
13
13
  </ul>
14
14
 
15
15
  </div>
@@ -22,14 +22,18 @@
22
22
 
23
23
  <!-- Main Content -->
24
24
  <div class="row">
25
- <div class="col-md-12">
25
+ <div class="col-lg-12">
26
+
27
+ <div class="portlet light">
26
28
 
27
- <div class="portlet box blue-chambray bordered">
28
29
  <div class="portlet-title">
29
30
  <div class="caption">
30
- <span class="caption-subject bold uppercase">Update Address for <%= @members_main.mfirstname + ' ' + @members_main.mlastname %></span>
31
+ <span class="caption-subject bold uppercase"><%= yield(:phc_title_tagline) %></span>
32
+ </div>
33
+ <div class="actions">
31
34
  </div>
32
35
  </div>
36
+
33
37
  <div class="portlet-body">
34
38
  <%= render 'formpatch' %>
35
39
  </div>
data/app/views/phcmemberspro/members/contacts/index.html.erb CHANGED
@@ -23,38 +23,50 @@
23
23
  <div class="row">
24
24
  <div class="col-lg-12">
25
25
 
26
- <div class="portlet box blue-chambray bordered">
26
+ <div class="portlet light">
27
+
27
28
  <div class="portlet-title">
28
29
  <div class="caption">
29
- <span class="caption-subject bold uppercase"><%= @members_main.mfirstname + ' ' + @members_main.mlastname %> Address Index</span>
30
+ <span class="caption-subject bold uppercase">Members Address List</span>
31
+ </div>
32
+ <div class="actions">
33
+ <%= link_to new_members_main_contact_path, class: "btn blue-chambray btn-circle" do %>
34
+ <i class="fa fa-plus"></i> Add an Address for <%= @members_main.mfirstname + ' ' + @members_main.mlastname %>
35
+ <% end %>
30
36
  </div>
31
37
  </div>
38
+
32
39
  <div class="portlet-body">
33
40
  <div class="table-responsive">
34
41
  <table class="table table-striped table-bordered table-hover table-header-fixed">
35
42
  <thead>
36
43
  <tr>
37
- <th>Full Name</th>
38
- <th>Company Name</th>
44
+ <th>Address Line 1</th>
45
+ <th>Address Line 2</th>
39
46
  <th>City</th>
40
47
  <th>Province</th>
41
48
  <th>Country</th>
49
+ <th>PostalCode</th>
50
+ <th>Type</th>
42
51
  <th></th>
43
52
  </tr>
44
53
  </thead>
45
54
  <tbody>
46
55
  <% @members_contacts.each do |members_contact| %>
47
56
  <tr>
57
+ <td><%= members_contact.mcaddressl1 %></td>
58
+ <td><%= members_contact.mcaddressl2 %></td>
48
59
  <td><%= members_contact.mccity %></td>
49
60
  <td><%= members_contact.mcprovince %></td>
50
61
  <td><%= members_contact.mccountry %></td>
62
+ <td><%= members_contact.mcpostalcode %></td>
63
+ <td><%= members_contact.mctype %></td>
51
64
  <td></td>
52
65
  </tr>
53
66
  <% end %>
54
67
  </tbody>
55
68
  </table>
56
69
  </div>
57
- <%= link_to 'Add a Private Address', new_members_main_contact_path, class: "btn blue-hoki" %>
58
70
  </div>
59
71
  </div>
60
72
 
data/app/views/phcmemberspro/members/contacts/new.html.erb CHANGED
@@ -10,7 +10,7 @@
10
10
  <li><%= link_to "Home", members_root_path %><i class="fa fa-circle"></i></li>
11
11
  <li><%= link_to "Members List", members_mains_path %><i class="fa fa-circle"></i></li>
12
12
  <li><%= link_to "Members Contact", members_main_contacts_path %><i class="fa fa-circle"></i></li>
13
- <li class="active">Create a New Address for <%= @members_main.mfirstname + ' ' + @members_main.mlastname %></li>
13
+ <li class="active"><%= yield(:phc_title_tagline) %></li>
14
14
  </ul>
15
15
 
16
16
  </div>
@@ -23,14 +23,18 @@
23
23
 
24
24
  <!-- Main Content -->
25
25
  <div class="row">
26
- <div class="col-md-12">
26
+ <div class="col-lg-12">
27
+
28
+ <div class="portlet light">
27
29
 
28
- <div class="portlet box blue-chambray bordered">
29
30
  <div class="portlet-title">
30
31
  <div class="caption">
31
- <span class="caption-subject bold uppercase">New Address Form for <%= @members_main.mfirstname + ' ' + @members_main.mlastname %></span>
32
+ <span class="caption-subject bold uppercase"><%= yield(:phc_title_tagline) %></span>
33
+ </div>
34
+ <div class="actions">
32
35
  </div>
33
36
  </div>
37
+
34
38
  <div class="portlet-body">
35
39
  <%= render 'form' %>
36
40
  </div>
data/db/migrate/20160227194651_create_phcmemberspro_members_contacts.rb CHANGED
@@ -8,8 +8,6 @@ class CreatePhcmembersproMembersContacts < ActiveRecord::Migration
8
8
  t.string :mcprovince
9
9
  t.string :mccountry
10
10
  t.string :mcpostalcode
11
- t.string :mcphone
12
- t.string :mcemail
13
11
 
14
12
  t.string :mctype
15
13
  t.references :main, index: true
data/lib/phcmemberspro/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Phcmemberspro
2
- VERSION = "5.0.6"
2
+ VERSION = "5.1.0"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcmemberspro
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.0.6
4
+ version: 5.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts