phcmembers 62.1.0 → 63.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcmembers/directory/categories_controller.rb +2 -3
  3. data/app/controllers/phcmembers/member/addresses_controller.rb +2 -3
  4. data/app/controllers/phcmembers/member/dashboards_controller.rb +4 -4
  5. data/app/controllers/phcmembers/member/listings_controller.rb +2 -3
  6. data/app/controllers/phcmembers/member/profiles_controller.rb +2 -3
  7. data/app/models/phcmembers/member/address.rb +3 -3
  8. data/app/models/phcmembers/member/listing.rb +8 -8
  9. data/app/models/phcmembers/member/profile.rb +3 -3
  10. data/app/views/layouts/phcmembers/application.html.erb +0 -6
  11. data/app/views/layouts/phcmembers/member_profile.html.erb +0 -6
  12. data/app/views/phcmembers/directory/categories/components/_category_list.html.erb +3 -3
  13. data/app/views/phcmembers/member/addresses/_form.html.erb +6 -6
  14. data/app/views/phcmembers/member/addresses/components/_address_audits_table.html.erb +1 -1
  15. data/app/views/phcmembers/member/addresses/components/_address_table.html.erb +2 -2
  16. data/app/views/phcmembers/member/addresses/edit.html.erb +2 -2
  17. data/app/views/phcmembers/member/addresses/index.html.erb +4 -4
  18. data/app/views/phcmembers/member/addresses/new.html.erb +2 -2
  19. data/app/views/phcmembers/member/addresses/show.html.erb +4 -4
  20. data/app/views/phcmembers/member/dashboards/index.html.erb +43 -51
  21. data/app/views/phcmembers/member/listings/_form.html.erb +13 -13
  22. data/app/views/phcmembers/member/listings/components/_listing_audits_table.html.erb +1 -1
  23. data/app/views/phcmembers/member/listings/components/_listing_table.html.erb +2 -2
  24. data/app/views/phcmembers/member/listings/edit.html.erb +2 -2
  25. data/app/views/phcmembers/member/listings/index.html.erb +5 -5
  26. data/app/views/phcmembers/member/listings/new.html.erb +2 -2
  27. data/app/views/phcmembers/member/listings/show.html.erb +4 -4
  28. data/app/views/phcmembers/member/profiles/_form.html.erb +8 -4
  29. data/app/views/phcmembers/member/profiles/components/_profile_addresses_table.html.erb +3 -3
  30. data/app/views/phcmembers/member/profiles/components/_profile_audits_table.html.erb +1 -1
  31. data/app/views/phcmembers/member/profiles/components/_profile_header.html.erb +1 -1
  32. data/app/views/phcmembers/member/profiles/components/_profile_information_table.html.erb +3 -3
  33. data/app/views/phcmembers/member/profiles/components/_profile_listings_table.html.erb +4 -4
  34. data/app/views/phcmembers/member/profiles/edit.html.erb +1 -1
  35. data/app/views/phcmembers/member/profiles/index.html.erb +2 -2
  36. data/app/views/phcmembers/member/profiles/show.html.erb +4 -4
  37. data/db/migrate/20160728230901_create_phcmembers_member_addresses.rb +3 -3
  38. data/db/migrate/20160728231011_create_phcmembers_member_listings.rb +6 -6
  39. data/db/migrate/20160728231036_create_phcmembers_member_profiles.rb +2 -2
  40. data/lib/phcmembers/version.rb +1 -1
  41. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bc4b50e1ed4d39f3f1793fe7b5a7d6e62968a014fe6b726f592e3cf80e4d0f95
4
- data.tar.gz: a3f5a9145393ba5ad4b19c201f2fcd5d3c265e392596692e8d22b6aa2a6c4eb6
3
+ metadata.gz: 007db96e99be6fb3fe0b5507d85c12646edfa7f99c00e26d2a092aa344c6993e
4
+ data.tar.gz: 28f7aee6012dbb3efc7640424c1e36778ef0bfc7a6945da86624dc290e02e1af
5
5
  SHA512:
6
- metadata.gz: 77c89c9731134baa73f8205cb96875a268406806e1790a528abac6669c0f2d615d88411769aaa8194c8d7442e21f88b6bb15907286179ad79ca2c7cb4885f164
7
- data.tar.gz: ec6b8b6068a515f69af26bcd00662c69ce2f913e7e6348ecafcbd574aa64293abefbdb6ee7b6527f61c39c4d70458214b7eb8d5079cad16ae3dc4cffb6b72461
6
+ metadata.gz: 8b1be66a37f11f915c37d0102ebccc8a5f6e1680c3f045fa215933898a94c6f2b4ec338a567a1ff82c6946ab9c9a346c460f3a4108149d8901749d2014a772bf
7
+ data.tar.gz: 759d2e701c9c08c80678f8905161b3f27455ef28639b2ad16dc55e0bd17e542afced842bd8b954437ad39413bd4d9e5b09333e681fde0fb3f53f5c05fbeb4a3f
@@ -11,7 +11,7 @@ module Phcmembers
11
11
 
12
12
  # INDEX - Directory Category
13
13
  def index
14
- @directory_categories = Directory::Category.where(org_id: current_user.org_id)
14
+ @directory_categories = Directory::Category.all
15
15
  end
16
16
 
17
17
  # DETAILED - Directory Category
@@ -33,7 +33,6 @@ module Phcmembers
33
33
  def create
34
34
  @directory_category = Directory::Category.new(directory_category_params)
35
35
  @directory_category.user_id = current_user.id
36
- @directory_category.org_id = current_user.org_id
37
36
  if @directory_category.save
38
37
  redirect_to directory_categories_url, notice: 'Category was successfully created.'
39
38
  else
@@ -65,7 +64,7 @@ module Phcmembers
65
64
 
66
65
  # Whitelist
67
66
  def directory_category_params
68
- params.require(:directory_category).permit(:category_name, :slug, :user_id, :org_id)
67
+ params.require(:directory_category).permit(:category_name, :slug, :user_id)
69
68
  end
70
69
 
71
70
  end
@@ -13,7 +13,7 @@ module Phcmembers
13
13
  # INDEX - Directory Listings
14
14
  def index
15
15
  profile = Member::Profile.find(params[:profile_id])
16
- @member_addresses = profile.addresses.where(org_id: current_user.org_id)
16
+ @member_addresses = profile.addresses.all
17
17
  end
18
18
 
19
19
  # LISTINGS DETAILS - Directory Listings
@@ -38,7 +38,6 @@ module Phcmembers
38
38
  @profile = Member::Profile.find(params[:profile_id])
39
39
  @member_address = @profile.addresses.create(member_address_params)
40
40
  @member_address.user_id = current_user.id
41
- @member_address.org_id = current_user.org_id
42
41
  if @member_address.save
43
42
  redirect_to member_profile_addresses_url, notice: 'Address was successfully created.'
44
43
  else
@@ -73,7 +72,7 @@ module Phcmembers
73
72
 
74
73
  # Whitelist
75
74
  def member_address_params
76
- params.require(:member_address).permit(:address_addressl1, :address_addressl2, :address_city, :address_province, :address_country, :address_postalcode, :address_type, :user_name, :profile_id, :slug, :user_id, :org_id)
75
+ params.require(:member_address).permit(:address_address_line_1, :address_address_line_2, :address_city, :address_province, :address_country, :address_postal_code, :address_type, :user_name, :profile_id, :slug, :user_id)
77
76
  end
78
77
 
79
78
  end
@@ -7,10 +7,10 @@ module Phcmembers
7
7
  before_action :authenticate_user!
8
8
 
9
9
  def index
10
- @member_profile = Phcmembers::Member::Profile.where(org_id: current_user.org_id)
11
- @member_listing = Phcmembers::Member::Listing.where(org_id: current_user.org_id)
12
- @member_address = Phcmembers::Member::Address.where(org_id: current_user.org_id)
13
- @directory_category = Phcmembers::Directory::Category.where(org_id: current_user.org_id)
10
+ @member_profile = Phcmembers::Member::Profile.all
11
+ @member_listing = Phcmembers::Member::Listing.all
12
+ @member_address = Phcmembers::Member::Address.all
13
+ @directory_category = Phcmembers::Directory::Category.all
14
14
  end
15
15
 
16
16
  end
@@ -13,7 +13,7 @@ module Phcmembers
13
13
  # INDEX - Directory Listings
14
14
  def index
15
15
  profile = Member::Profile.find(params[:profile_id])
16
- @member_listings = profile.listings.where(org_id: current_user.org_id)
16
+ @member_listings = profile.listings.all
17
17
  end
18
18
 
19
19
  # LISTINGS DETAILS - Directory Listings
@@ -38,7 +38,6 @@ module Phcmembers
38
38
  @profile = Member::Profile.find(params[:profile_id])
39
39
  @member_listing = @profile.listings.create(member_listing_params)
40
40
  @member_listing.user_id = current_user.id
41
- @member_listing.org_id = current_user.org_id
42
41
  if @member_listing.save
43
42
  redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
44
43
  else
@@ -73,7 +72,7 @@ module Phcmembers
73
72
 
74
73
  # Whitelist
75
74
  def member_listing_params
76
- params.require(:member_listing).permit(:listing_companyname, :listing_contactname, :listing_addressl1, :listing_addressl2, :listing_city, :listing_country, :listing_province, :listing_postalcode, :listing_phone, :listing_contactemail, :listing_website, :profile_id, :slug, :user_id, :org_id, category_ids: [])
75
+ params.require(:member_listing).permit(:listing_company_name, :listing_contact_name, :listing_address_line_1, :listing_address_line_2, :listing_city, :listing_country, :listing_province, :listing_postal_code, :listing_phone, :listing_contact_email, :listing_website, :profile_id, :slug, :user_id, category_ids: [])
77
76
  end
78
77
 
79
78
  end
@@ -12,7 +12,7 @@ module Phcmembers
12
12
 
13
13
  # INDEX - Member Profile
14
14
  def index
15
- @member_profiles = Member::Profile.where(org_id: current_user.org_id)
15
+ @member_profiles = Member::Profile.all
16
16
  end
17
17
 
18
18
  # DETAILED PROFILE - Member Profile
@@ -34,7 +34,6 @@ module Phcmembers
34
34
  def create
35
35
  @member_profile = Member::Profile.new(member_profile_params)
36
36
  @member_profile.user_id = current_user.id
37
- @member_profile.org_id = current_user.org_id
38
37
  if @member_profile.save
39
38
  redirect_to member_profiles_url, notice: 'Profile was successfully created.'
40
39
  else
@@ -66,7 +65,7 @@ module Phcmembers
66
65
 
67
66
  # Whitelist
68
67
  def member_profile_params
69
- params.require(:member_profile).permit(:member_firstname, :member_lastname, :member_title, :member_email, :member_phone, :member_notes, :slug, :user_id, :org_id)
68
+ params.require(:member_profile).permit(:member_first_name, :member_last_name, :member_title, :member_email, :member_phone, :member_notes, :slug, :user_id)
70
69
  end
71
70
 
72
71
  end
@@ -11,7 +11,7 @@ module Phcmembers
11
11
  belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
12
12
 
13
13
  # Validation for Form Fields
14
- validates :address_addressl1,
14
+ validates :address_address_line_1,
15
15
  presence: true,
16
16
  length: { minimum: 2 }
17
17
 
@@ -26,7 +26,7 @@ module Phcmembers
26
26
  presence: true,
27
27
  length: { minimum: 2 }
28
28
 
29
- validates :address_postalcode,
29
+ validates :address_postal_code,
30
30
  presence: true,
31
31
  length: { minimum: 3 }
32
32
 
@@ -40,7 +40,7 @@ module Phcmembers
40
40
  # Define for Multiple Records
41
41
  def phcmembers_address_slug
42
42
  [
43
- [:address_addressl1, :address_city, :address_province]
43
+ [:address_city, :address_province, :address_type]
44
44
  ]
45
45
  end
46
46
 
@@ -12,15 +12,15 @@ module Phcmembers
12
12
  has_and_belongs_to_many :categories, class_name: 'Phcmembers::Directory::Category', :join_table => 'categories_listings'
13
13
 
14
14
  # Validation for Form Fields
15
- validates :listing_companyname,
15
+ validates :listing_company_name,
16
16
  presence: true,
17
17
  length: { minimum: 2 }
18
18
 
19
- validates :listing_contactname,
19
+ validates :listing_contact_name,
20
20
  presence: true,
21
21
  length: { minimum: 2 }
22
22
 
23
- validates :listing_addressl1,
23
+ validates :listing_address_line_1,
24
24
  length: { minimum: 3 }
25
25
 
26
26
  validates :listing_city,
@@ -35,11 +35,11 @@ module Phcmembers
35
35
  presence: true,
36
36
  length: { minimum: 2 }
37
37
 
38
- validates :listing_postalcode,
38
+ validates :listing_postal_code,
39
39
  presence: true,
40
40
  length: { minimum: 3 }
41
41
 
42
- validates :listing_contactemail,
42
+ validates :listing_contact_email,
43
43
  presence: true,
44
44
  length: { minimum: 3 },
45
45
  format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
@@ -53,12 +53,12 @@ module Phcmembers
53
53
  format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Member Format: ***-***-****" }
54
54
 
55
55
  # Clean URL Define
56
- friendly_id :phcmelisting_erspro_listings_slug, use: [:slugged, :finders]
56
+ friendly_id :phcmembers_listings_slug, use: [:slugged, :finders]
57
57
 
58
58
  # Define for Multiple Records
59
- def phcmelisting_erspro_listings_slug
59
+ def phcmembers_listings_slug
60
60
  [
61
- [:listing_companyname, :listing_contactname, :listing_addressl1]
61
+ [:listing_company_name, :listing_contact_name]
62
62
  ]
63
63
  end
64
64
 
@@ -16,11 +16,11 @@ module Phcmembers
16
16
  has_many :listings, class_name: 'Phcmembers::Member::Listing', :dependent => :destroy
17
17
 
18
18
  # Validation for Form Fields
19
- validates :member_firstname,
19
+ validates :member_first_name,
20
20
  presence: true,
21
21
  length: { minimum: 1 }
22
22
 
23
- validates :member_lastname,
23
+ validates :member_last_name,
24
24
  presence: true,
25
25
  length: { minimum: 1 }
26
26
 
@@ -42,7 +42,7 @@ module Phcmembers
42
42
  # Define for Multiple Records
43
43
  def phcmembers_profiles_slug
44
44
  [
45
- [:member_firstname, :member_lastname]
45
+ [:member_first_name, :member_last_name]
46
46
  ]
47
47
  end
48
48
 
@@ -59,12 +59,6 @@
59
59
  </div>
60
60
  <!-- Footer Content -->
61
61
 
62
- <!-- Scroll to Top -->
63
- <a href="javascript:;" class="btn btn-icon btn-circle btn-success btn-scroll-to-top fade" data-click="scroll-top">
64
- <i class="fa fa-angle-up"></i>
65
- </a>
66
- <!-- Scroll to Top -->
67
-
68
62
  </div>
69
63
  <!-- Page Container -->
70
64
 
@@ -59,12 +59,6 @@
59
59
  </div>
60
60
  <!-- Footer Content -->
61
61
 
62
- <!-- Scroll to Top -->
63
- <a href="javascript:;" class="btn btn-icon btn-circle btn-success btn-scroll-to-top fade" data-click="scroll-top">
64
- <i class="fa fa-angle-up"></i>
65
- </a>
66
- <!-- Scroll to Top -->
67
-
68
62
  </div>
69
63
  <!-- Page Container -->
70
64
 
@@ -3,10 +3,10 @@
3
3
  <tbody>
4
4
  <% @directory_category.listings.each do |member_listing| %>
5
5
  <tr>
6
- <td><%= link_to member_listing.listing_companyname, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
7
- <td><%= link_to member_listing.listing_contactname, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
6
+ <td><%= link_to member_listing.listing_company_name, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
7
+ <td><%= link_to member_listing.listing_contact_name, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
8
8
  <td><%= link_to member_listing.listing_phone, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
9
- <td><%= link_to member_listing.listing_contactemail, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
9
+ <td><%= link_to member_listing.listing_contact_email, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
10
10
  <td><%= link_to member_listing.listing_website, phcmembers.member_profile_listing_path(member_listing.profile, member_listing) %></td>
11
11
  </tr>
12
12
  <% end %>
@@ -7,12 +7,12 @@
7
7
 
8
8
  <!-- PHCMembers Fields - Address -->
9
9
  <div class="form-group field_with_errors">
10
- <%= phc_members_member_address.label :address_addressl1, "Address Line1" %>
11
- <%= phc_members_member_address.text_field :address_addressl1, class: "form-control", placeholder: "Address Line 1 - Street Address" %>
10
+ <%= phc_members_member_address.label :address_address_line_1, "Address Line1" %>
11
+ <%= phc_members_member_address.text_field :address_address_line_1, class: "form-control", placeholder: "Address Line 1 - Street Address" %>
12
12
  </div>
13
13
  <div class="form-group field_with_errors">
14
- <%= phc_members_member_address.label :address_addressl2, "Address Line2" %>
15
- <%= phc_members_member_address.text_field :address_addressl2, class: "form-control", placeholder: "Address Line 2 - Box - Suite - Floor" %>
14
+ <%= phc_members_member_address.label :address_address_line_2, "Address Line2" %>
15
+ <%= phc_members_member_address.text_field :address_address_line_2, class: "form-control", placeholder: "Address Line 2 - Box - Suite - Floor" %>
16
16
  </div>
17
17
  <div class="form-group field_with_errors">
18
18
  <%= phc_members_member_address.label :address_city, "City" %>
@@ -27,8 +27,8 @@
27
27
  <%= phc_members_member_address.text_field :address_country, class: "form-control", placeholder: "Country" %>
28
28
  </div>
29
29
  <div class="form-group field_with_errors">
30
- <%= phc_members_member_address.label :address_postalcode, "PostalCode" %>
31
- <%= phc_members_member_address.text_field :address_postalcode, class: "form-control", placeholder: "PostalCode" %>
30
+ <%= phc_members_member_address.label :address_postal_code, "PostalCode" %>
31
+ <%= phc_members_member_address.text_field :address_postal_code, class: "form-control", placeholder: "PostalCode" %>
32
32
  </div>
33
33
  <div class="form-group field_with_errors">
34
34
  <%= phc_members_member_address.label :address_type, "Address Type" %>
@@ -5,7 +5,7 @@
5
5
  <tr>
6
6
  <td><span class="label label-primary"><%= member_address_version.event.humanize %></span></td>
7
7
  <td><small>ADDRESS EVENT ID#<%= member_address_version.id %></small></td>
8
- <td><%= member_address_version.event.humanize + ' ' + @members_profile_info.member_firstname + ' ' + @members_profile_info.member_lastname %> Address Information</td>
8
+ <td><%= member_address_version.event.humanize + ' ' + @members_profile_info.member_first_name + ' ' + @members_profile_info.member_last_name %> Address Information</td>
9
9
  <td><%= member_address_version.whodunnit %></td>
10
10
  <td><%= l(member_address_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_address_version.created_at, format: "%H:%M %Z") %></td>
11
11
  </tr>
@@ -13,11 +13,11 @@
13
13
  </thead>
14
14
  <tbody>
15
15
  <tr>
16
- <td><%= link_to @member_address.address_addressl1, phcmembers.edit_member_profile_address_path %></td>
16
+ <td><%= link_to @member_address.address_address_line_1, phcmembers.edit_member_profile_address_path %></td>
17
17
  <td><%= link_to @member_address.address_city, phcmembers.edit_member_profile_address_path %></td>
18
18
  <td><%= link_to @member_address.address_province, phcmembers.edit_member_profile_address_path %></td>
19
19
  <td><%= link_to @member_address.address_country, phcmembers.edit_member_profile_address_path %></td>
20
- <td><%= link_to @member_address.address_postalcode, phcmembers.edit_member_profile_address_path %></td>
20
+ <td><%= link_to @member_address.address_postal_code, phcmembers.edit_member_profile_address_path %></td>
21
21
  <td><%= link_to @member_address.address_type, phcmembers.edit_member_profile_address_path %></td>
22
22
  <td>
23
23
  <div class="btn-group d-flex" role="group">
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Update Address for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Update Address for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcmembers.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Addresses for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname, phcmembers.member_profile_addresses_path %>
5
+ <% phc_breadcrumb_two link_to "Addresses for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name, phcmembers.member_profile_addresses_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -1,6 +1,6 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Addresses for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Addresses for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Dashboard", phcmembers.dashboard_path %>
5
5
  <% phc_breadcrumb_two link_to "Members List", phcmembers.member_profiles_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
@@ -45,10 +45,10 @@
45
45
  <tbody>
46
46
  <% @member_addresses.each do |member_address| %>
47
47
  <tr>
48
- <td><%= link_to member_address.address_addressl1, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
48
+ <td><%= link_to member_address.address_address_line_1, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
49
49
  <td><%= link_to member_address.address_city, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
50
50
  <td><%= link_to member_address.address_country, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
51
- <td><%= link_to member_address.address_postalcode, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
51
+ <td><%= link_to member_address.address_postal_code, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
52
52
  <td><%= link_to member_address.address_type, phcmembers.member_profile_address_path(member_address.profile, member_address) %></td>
53
53
  <td>
54
54
  <div class="btn-group d-flex" role="group">
@@ -63,7 +63,7 @@
63
63
  </table>
64
64
  <%= link_to phcmembers.new_member_profile_address_path, class: "btn btn-primary btn-sm" do %>
65
65
  <i class="fas fa-plus-circle"></i>
66
- <%= "Add a New Address for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
66
+ <%= "Add a New Address for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
67
67
  <% end %>
68
68
  </div>
69
69
  <!-- Table - Members Address -->
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Create a New Address for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Create a New Address for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcmembers.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Addresses for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname, phcmembers.member_profile_addresses_path %>
5
+ <% phc_breadcrumb_two link_to "Addresses for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name, phcmembers.member_profile_addresses_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Detailed Address Information for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Detailed Address Information for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcmembers.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Addresses for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname, phcmembers.member_profile_addresses_path %>
5
+ <% phc_breadcrumb_two link_to "Addresses for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name, phcmembers.member_profile_addresses_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -26,7 +26,7 @@
26
26
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
27
27
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
28
28
  </div>
29
- <h4 class="panel-title"><%= @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %> Address Details</h4>
29
+ <h4 class="panel-title"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Address Details</h4>
30
30
  </div>
31
31
  <div class="panel-body">
32
32
  <!-- Table - Members Listings -->
@@ -44,7 +44,7 @@
44
44
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
45
45
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
46
46
  </div>
47
- <h4 class="panel-title"><%= @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %> Address Change Log</h4>
47
+ <h4 class="panel-title"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Address Change Log</h4>
48
48
  </div>
49
49
  <div class="panel-body">
50
50
  <!-- Table - Members Listing Audit -->
@@ -1,62 +1,54 @@
1
1
  <div class="row border-bottom white-bg dashboard-header">
2
-
3
2
  </div>
4
- <div class="row">
5
- <div class="col-lg-12">
6
- <div class="wrapper wrapper-content">
7
-
8
- <div class="row">
9
3
 
10
- <div class="col-lg-3 col-md-6">
11
- <div class="widget widget-stats bg-gradient-teal">
12
- <div class="stats-icon stats-icon-lg">
13
- <i class="fas fa-users fa-fw"></i>
14
- </div>
15
- <div class="stats-content">
16
- <div class="stats-title">Total <%= "Member".pluralize(2) %></div>
17
- <div class="stats-number"><%= @member_profile.count(:all) %></div>
18
- </div>
19
- </div>
20
- </div>
21
-
22
- <div class="col-lg-3 col-md-6">
23
- <div class="widget widget-stats bg-gradient-blue">
24
- <div class="stats-icon stats-icon-lg">
25
- <i class="fas fa-globe-asia fa-fw"></i>
26
- </div>
27
- <div class="stats-content">
28
- <div class="stats-title">Total <%= "Address".pluralize(2) %></div>
29
- <div class="stats-number"><%= @member_address.count(:all) %></div>
30
- </div>
31
- </div>
32
- </div>
4
+ <div class="row">
33
5
 
34
- <div class="col-lg-3 col-md-6">
35
- <div class="widget widget-stats bg-gradient-purple">
36
- <div class="stats-icon stats-icon-lg">
37
- <i class="fas fa-address-card fa-fw"></i>
38
- </div>
39
- <div class="stats-content">
40
- <div class="stats-title">Total <%= "Listing".pluralize(2) %></div>
41
- <div class="stats-number"><%= @member_listing.count(:all) %></div>
42
- </div>
43
- </div>
44
- </div>
6
+ <div class="col-lg-3 col-md-6">
7
+ <div class="widget widget-stats bg-gradient-teal">
8
+ <div class="stats-icon stats-icon-lg">
9
+ <i class="fas fa-users fa-fw"></i>
10
+ </div>
11
+ <div class="stats-content">
12
+ <div class="stats-title">Total <%= "Member".pluralize(2) %></div>
13
+ <div class="stats-number"><%= @member_profile.count(:all) %></div>
14
+ </div>
15
+ </div>
16
+ </div>
45
17
 
46
- <div class="col-lg-3 col-md-6">
47
- <div class="widget widget-stats bg-gradient-pink">
48
- <div class="stats-icon stats-icon-lg">
49
- <i class="fas fa-sitemap fa-fw"></i>
50
- </div>
51
- <div class="stats-content">
52
- <div class="stats-title">Total <%= "Category".pluralize(2) %></div>
53
- <div class="stats-number"><%= @directory_category.count(:all) %></div>
54
- </div>
55
- </div>
56
- </div>
18
+ <div class="col-lg-3 col-md-6">
19
+ <div class="widget widget-stats bg-gradient-blue">
20
+ <div class="stats-icon stats-icon-lg">
21
+ <i class="fas fa-globe-asia fa-fw"></i>
22
+ </div>
23
+ <div class="stats-content">
24
+ <div class="stats-title">Total <%= "Address".pluralize(2) %></div>
25
+ <div class="stats-number"><%= @member_address.count(:all) %></div>
26
+ </div>
27
+ </div>
28
+ </div>
57
29
 
30
+ <div class="col-lg-3 col-md-6">
31
+ <div class="widget widget-stats bg-gradient-purple">
32
+ <div class="stats-icon stats-icon-lg">
33
+ <i class="fas fa-address-card fa-fw"></i>
58
34
  </div>
35
+ <div class="stats-content">
36
+ <div class="stats-title">Total <%= "Listing".pluralize(2) %></div>
37
+ <div class="stats-number"><%= @member_listing.count(:all) %></div>
38
+ </div>
39
+ </div>
40
+ </div>
59
41
 
42
+ <div class="col-lg-3 col-md-6">
43
+ <div class="widget widget-stats bg-gradient-pink">
44
+ <div class="stats-icon stats-icon-lg">
45
+ <i class="fas fa-sitemap fa-fw"></i>
46
+ </div>
47
+ <div class="stats-content">
48
+ <div class="stats-title">Total <%= "Category".pluralize(2) %></div>
49
+ <div class="stats-number"><%= @directory_category.count(:all) %></div>
50
+ </div>
60
51
  </div>
61
52
  </div>
53
+
62
54
  </div>
@@ -7,20 +7,20 @@
7
7
 
8
8
  <!-- PHCMembers Fields - Web Directory Listings -->
9
9
  <div class="form-group field_with_errors">
10
- <%= phc_members_member_listings.label :listing_companyname, "Company Name" %>
11
- <%= phc_members_member_listings.text_field :listing_companyname, class: "form-control", placeholder: "Business/Organization: Name" %>
10
+ <%= phc_members_member_listings.label :listing_company_name, "Company Name" %>
11
+ <%= phc_members_member_listings.text_field :listing_company_name, class: "form-control", placeholder: "Business/Organization: Name" %>
12
12
  </div>
13
13
  <div class="form-group field_with_errors">
14
- <%= phc_members_member_listings.label :listing_contactname, "Contact Name" %>
15
- <%= phc_members_member_listings.text_field :listing_contactname, class: "form-control", placeholder: "Business/Organization: Contact Person" %>
14
+ <%= phc_members_member_listings.label :listing_contact_name, "Contact Name" %>
15
+ <%= phc_members_member_listings.text_field :listing_contact_name, class: "form-control", placeholder: "Business/Organization: Contact Person" %>
16
16
  </div>
17
17
  <div class="form-group field_with_errors">
18
- <%= phc_members_member_listings.label :listing_addressl1, "Address Line 1" %>
19
- <%= phc_members_member_listings.text_field :listing_addressl1, class: "form-control", placeholder: "Location: Street Address" %>
18
+ <%= phc_members_member_listings.label :listing_address_line_1, "Address Line 1" %>
19
+ <%= phc_members_member_listings.text_field :listing_address_line_1, class: "form-control", placeholder: "Location: Street Address" %>
20
20
  </div>
21
21
  <div class="form-group field_with_errors">
22
- <%= phc_members_member_listings.label :listing_addressl2, "Address Line 2" %>
23
- <%= phc_members_member_listings.text_field :listing_addressl2, class: "form-control", placeholder: "Location: Box - Suite - Floor" %>
22
+ <%= phc_members_member_listings.label :listing_address_line_2, "Address Line 2" %>
23
+ <%= phc_members_member_listings.text_field :listing_address_line_2, class: "form-control", placeholder: "Location: Box - Suite - Floor" %>
24
24
  </div>
25
25
  <div class="form-group field_with_errors">
26
26
  <%= phc_members_member_listings.label :listing_city, "City" %>
@@ -35,23 +35,23 @@
35
35
  <%= phc_members_member_listings.text_field :listing_country, class: "form-control", placeholder: "Country" %>
36
36
  </div>
37
37
  <div class="form-group field_with_errors">
38
- <%= phc_members_member_listings.label :listing_postalcode, "Postal Code" %><br>
39
- <%= phc_members_member_listings.text_field :listing_postalcode, class: "form-control", placeholder: "Location: PostalCode" %>
38
+ <%= phc_members_member_listings.label :listing_postal_code, "Postal Code" %><br>
39
+ <%= phc_members_member_listings.text_field :listing_postal_code, class: "form-control", placeholder: "Location: PostalCode" %>
40
40
  </div>
41
41
  <div class="form-group field_with_errors">
42
42
  <%= phc_members_member_listings.label :listing_phone, "Business Phone Number" %>
43
43
  <%= phc_members_member_listings.text_field :listing_phone, class: "form-control", placeholder: "Business/Organization: PhoneNumber (Public)" %>
44
44
  </div>
45
45
  <div class="form-group field_with_errors">
46
- <%= phc_members_member_listings.label :listing_contactemail, "Business General Email" %>
47
- <%= phc_members_member_listings.text_field :listing_contactemail, class: "form-control", placeholder: "Business/Organization: Email Address (Public)" %>
46
+ <%= phc_members_member_listings.label :listing_contact_email, "Business General Email" %>
47
+ <%= phc_members_member_listings.text_field :listing_contact_email, class: "form-control", placeholder: "Business/Organization: Email Address (Public)" %>
48
48
  </div>
49
49
  <div class="form-group field_with_errors">
50
50
  <%= phc_members_member_listings.label :listing_website, "Business Website" %>
51
51
  <%= phc_members_member_listings.text_field :listing_website, class: "form-control", placeholder: "Business/Organization: Website (Public)" %>
52
52
  </div>
53
53
  <div class="form-group field_with_errors">
54
- <%= phc_members_member_listings.collection_check_boxes :category_ids, Phcmembers::Directory::Category.where(org_id: current_user.org_id), :id, :category_name do |listing_category| %>
54
+ <%= phc_members_member_listings.collection_check_boxes :category_ids, Phcmembers::Directory::Category.all, :id, :category_name do |listing_category| %>
55
55
  <%= listing_category.check_box %>
56
56
  <%= listing_category.label %></br>
57
57
  <% end %>
@@ -5,7 +5,7 @@
5
5
  <tr>
6
6
  <td><span class="label label-primary"><%= member_listing_version.event.humanize %></span></td>
7
7
  <td><small>LISTING EVENT ID#<%= member_listing_version.id %></small></td>
8
- <td><%= member_listing_version.event.humanize + ' ' + @members_profile_info.member_firstname + ' ' + @members_profile_info.member_lastname %> Listing Information</td>
8
+ <td><%= member_listing_version.event.humanize + ' ' + @members_profile_info.member_first_name + ' ' + @members_profile_info.member_last_name %> Listing Information</td>
9
9
  <td><%= member_listing_version.whodunnit %></td>
10
10
  <td><%= l(member_listing_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_listing_version.created_at, format: "%H:%M %Z") %></td>
11
11
  </tr>
@@ -14,8 +14,8 @@
14
14
  </thead>
15
15
  <tbody>
16
16
  <tr>
17
- <td><%= link_to @member_listing.listing_companyname, phcmembers.edit_member_profile_listing_path %></td>
18
- <td><%= link_to @member_listing.listing_contactname, phcmembers.edit_member_profile_listing_path %></td>
17
+ <td><%= link_to @member_listing.listing_company_name, phcmembers.edit_member_profile_listing_path %></td>
18
+ <td><%= link_to @member_listing.listing_contact_name, phcmembers.edit_member_profile_listing_path %></td>
19
19
  <td><%= link_to @member_listing.listing_city, phcmembers.edit_member_profile_listing_path %></td>
20
20
  <td><%= link_to @member_listing.listing_province, phcmembers.edit_member_profile_listing_path %></td>
21
21
  <td><%= link_to @member_listing.listing_country, phcmembers.edit_member_profile_listing_path %></td>
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Listing Manager" %>
3
- <% phc_title_tagline "Update Listing for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Update Listing for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcmembers.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Listings for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname, phcmembers.member_profile_listings_path %>
5
+ <% phc_breadcrumb_two link_to "Listings for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name, phcmembers.member_profile_listings_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -1,6 +1,6 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Listings Manager" %>
3
- <% phc_title_tagline "Listings for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Listings for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Dashboard", phcmembers.dashboard_path %>
5
5
  <% phc_breadcrumb_two link_to "Members List", phcmembers.member_profiles_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
@@ -47,12 +47,12 @@
47
47
  <tbody>
48
48
  <% @member_listings.each do |member_listing| %>
49
49
  <tr>
50
- <td class="highlight"><%= link_to member_listing.listing_companyname, member_profile_listing_path(member_listing.profile, member_listing) %></td>
51
- <td class="highlight"><%= link_to member_listing.listing_contactname, member_profile_listing_path(member_listing.profile, member_listing) %></td>
50
+ <td class="highlight"><%= link_to member_listing.listing_company_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
51
+ <td class="highlight"><%= link_to member_listing.listing_contact_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
52
52
  <td class="highlight"><%= link_to member_listing.listing_city, member_profile_listing_path(member_listing.profile, member_listing) %></td>
53
53
  <td class="highlight"><%= link_to member_listing.listing_province, member_profile_listing_path(member_listing.profile, member_listing) %></td>
54
54
  <td class="highlight"><%= link_to member_listing.listing_phone, member_profile_listing_path(member_listing.profile, member_listing) %></td>
55
- <td class="highlight"><%= link_to member_listing.listing_contactemail, member_profile_listing_path(member_listing.profile, member_listing) %></td>
55
+ <td class="highlight"><%= link_to member_listing.listing_contact_email, member_profile_listing_path(member_listing.profile, member_listing) %></td>
56
56
  <td class="highlight"><%= link_to member_listing.listing_website, member_profile_listing_path(member_listing.profile, member_listing) %></td>
57
57
  <td>
58
58
  <div class="btn-group d-flex" role="group">
@@ -67,7 +67,7 @@
67
67
  </table>
68
68
  <%= link_to phcmembers.new_member_profile_listing_path, class: "btn btn-primary btn-sm" do %>
69
69
  <i class="fas fa-plus-circle"></i>
70
- <%= "Add a New Listing for " + @members_profile_info .member_firstname + " " + @members_profile_info .member_lastname %>
70
+ <%= "Add a New Listing for " + @members_profile_info .member_first_name + " " + @members_profile_info .member_last_name %>
71
71
  <% end %>
72
72
  </div>
73
73
  <!-- Table - Members Listings -->
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Listing Manager" %>
3
- <% phc_title_tagline "Create a New Listing for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Create a New Listing for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcmembers.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Listings for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname, phcmembers.member_profile_listings_path %>
5
+ <% phc_breadcrumb_two link_to "Listings for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name, phcmembers.member_profile_listings_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Listing Manager" %>
3
- <% phc_title_tagline "Detailed Listing Information for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %>
3
+ <% phc_title_tagline "Detailed Listing Information for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcmembers.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Listings for " + @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname, phcmembers.member_profile_listings_path %>
5
+ <% phc_breadcrumb_two link_to "Listings for " + @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name, phcmembers.member_profile_listings_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -26,7 +26,7 @@
26
26
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
27
27
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
28
28
  </div>
29
- <h4 class="panel-title"><%= @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %> Listing Details</h4>
29
+ <h4 class="panel-title"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Listing Details</h4>
30
30
  </div>
31
31
  <div class="panel-body">
32
32
  <!-- Table - Members Listings -->
@@ -44,7 +44,7 @@
44
44
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
45
45
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
46
46
  </div>
47
- <h4 class="panel-title"><%= @members_profile_info.member_firstname + " " + @members_profile_info.member_lastname %> Listing Change Log</h4>
47
+ <h4 class="panel-title"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Listing Change Log</h4>
48
48
  </div>
49
49
  <div class="panel-body">
50
50
  <!-- Table - Members Listing Audit -->
@@ -7,12 +7,12 @@
7
7
 
8
8
  <!-- PHCMembers Fields - Profiles -->
9
9
  <div class="form-group field_with_errors">
10
- <%= phc_members_member_profile.label :member_firstname, "First Name*" %>
11
- <%= phc_members_member_profile.text_field :member_firstname, class: 'form-control', placeholder: 'First Name' %>
10
+ <%= phc_members_member_profile.label :member_first_name, "First Name*" %>
11
+ <%= phc_members_member_profile.text_field :member_first_name, class: 'form-control', placeholder: 'First Name' %>
12
12
  </div>
13
13
  <div class="form-group field_with_errors">
14
- <%= phc_members_member_profile.label :member_lastname, "Last Name*" %>
15
- <%= phc_members_member_profile.text_field :member_lastname, class: 'form-control', placeholder: 'Last Name' %>
14
+ <%= phc_members_member_profile.label :member_last_name, "Last Name*" %>
15
+ <%= phc_members_member_profile.text_field :member_last_name, class: 'form-control', placeholder: 'Last Name' %>
16
16
  </div>
17
17
  <div class="form-group field_with_errors">
18
18
  <%= phc_members_member_profile.label :member_title, "Job Title" %>
@@ -26,6 +26,10 @@
26
26
  <%= phc_members_member_profile.label :member_phone, "Contact Phone Number*" %>
27
27
  <%= phc_members_member_profile.text_field :member_phone, class: 'form-control masked', placeholder: 'Contact Phone Number (Will Remain Private)', data: {format: '(999) 999-9999', placeholder: 'x'} %>
28
28
  </div>
29
+ <div class="form-group field_with_errors">
30
+ <%= phc_members_member_profile.label :member_notes, "Member" %>
31
+ <%= phc_members_member_profile.text_area :member_notes, class: 'form-control masked', placeholder: 'Member Notes' %>
32
+ </div>
29
33
  <br>
30
34
  <div class="actions">
31
35
  <%= phc_members_member_profile.submit class: "btn btn-primary btn-gradient waves-effect waves-light btn-md" %>
@@ -11,7 +11,7 @@
11
11
  <tbody>
12
12
  <% @member_profile.addresses.each do |members_main_address| %>
13
13
  <tr>
14
- <td><%= members_main_address.address_addressl1 %></td>
14
+ <td><%= members_main_address.address_address_line_1 %></td>
15
15
  <td><%= members_main_address.address_city %></td>
16
16
  <td><%= members_main_address.address_province %></td>
17
17
  <td><%= members_main_address.address_type %></td>
@@ -19,6 +19,6 @@
19
19
  <% end %>
20
20
  </tbody>
21
21
  </table>
22
- <%= link_to "See All of " + @member_profile.member_firstname + " " + @member_profile.member_lastname + " Addresses", phcmembers.member_profile_addresses_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
- <%= link_to "Add a New Address for " + @member_profile.member_firstname + " " + @member_profile.member_lastname, phcmembers.new_member_profile_address_path(@member_profile), class: "btn btn-purple btn-xs" %>
22
+ <%= link_to "See All of " + @member_profile.member_first_name + " " + @member_profile.member_last_name + " Addresses", phcmembers.member_profile_addresses_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
+ <%= link_to "Add a New Address for " + @member_profile.member_first_name + " " + @member_profile.member_last_name, phcmembers.new_member_profile_address_path(@member_profile), class: "btn btn-purple btn-xs" %>
24
24
  </div>
@@ -5,7 +5,7 @@
5
5
  <tr>
6
6
  <td><span class="label label-primary"><%= member_profile_version.event.humanize %></span></td>
7
7
  <td><small>PROFILE EVENT ID#<%= member_profile_version.id %></small></td>
8
- <td><%= member_profile_version.event.humanize + ' ' + @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Profile Information</td>
8
+ <td><%= member_profile_version.event.humanize + ' ' + @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Profile Information</td>
9
9
  <td><%= member_profile_version.whodunnit %></td>
10
10
  <td><%= l(member_profile_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_profile_version.created_at, format: "%H:%M %Z") %></td>
11
11
  </tr>
@@ -9,7 +9,7 @@
9
9
  <%= image_tag current_user.gravatar_url :secure => true, :filetype => :png, :size => 128 %>
10
10
  </div>
11
11
  <div class="profile-header-info">
12
- <h4 class="m-t-10 m-b-5"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %></h4>
12
+ <h4 class="m-t-10 m-b-5"><%= @member_profile.member_first_name + ' ' + @member_profile.member_last_name %></h4>
13
13
  <p class="m-b-10"><%= @member_profile.member_phone %></p>
14
14
  <%= link_to edit_member_profile_path(@member_profile), class: "btn btn-xs btn-yellow" do %>
15
15
  <i class="far fa-pencil-alt"></i> Update Member Information
@@ -11,8 +11,8 @@
11
11
  </thead>
12
12
  <tbody>
13
13
  <tr>
14
- <td><%= @member_profile.member_firstname %></td>
15
- <td><%= @member_profile.member_lastname %></td>
14
+ <td><%= @member_profile.member_first_name %></td>
15
+ <td><%= @member_profile.member_last_name %></td>
16
16
  <td><%= @member_profile.member_title %></td>
17
17
  <td><%= @member_profile.member_email %></td>
18
18
  <td><%= @member_profile.member_phone %></td>
@@ -23,5 +23,5 @@
23
23
  </tr>
24
24
  </tbody>
25
25
  </table>
26
- <%= link_to "Update " + @member_profile.member_firstname + " " + @member_profile.member_lastname + " Information", phcmembers.edit_member_profile_path(@member_profile), class: "btn btn-primary btn-xs" %>
26
+ <%= link_to "Update " + @member_profile.member_first_name + " " + @member_profile.member_last_name + " Information", phcmembers.edit_member_profile_path(@member_profile), class: "btn btn-primary btn-xs" %>
27
27
  </div>
@@ -11,14 +11,14 @@
11
11
  <tbody>
12
12
  <% @member_profile.listings.each do |member_profile_listing| %>
13
13
  <tr>
14
- <td><%= member_profile_listing.listing_companyname %></td>
15
- <td><%= member_profile_listing.listing_contactname %></td>
14
+ <td><%= member_profile_listing.listing_company_name %></td>
15
+ <td><%= member_profile_listing.listing_contact_name %></td>
16
16
  <td><%= member_profile_listing.listing_city %></td>
17
17
  <td><%= member_profile_listing.listing_phone %></td>
18
18
  </tr>
19
19
  <% end %>
20
20
  </tbody>
21
21
  </table>
22
- <%= link_to "See All of " + @member_profile.member_firstname + " " + @member_profile.member_lastname + " Listings", phcmembers.member_profile_listings_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
- <%= link_to "Add a New Listing for " + @member_profile.member_firstname + " " + @member_profile.member_lastname, phcmembers.new_member_profile_listing_path(@member_profile), class: "btn btn-purple btn-xs" %>
22
+ <%= link_to "See All of " + @member_profile.member_first_name + " " + @member_profile.member_last_name + " Listings", phcmembers.member_profile_listings_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
+ <%= link_to "Add a New Listing for " + @member_profile.member_first_name + " " + @member_profile.member_last_name, phcmembers.new_member_profile_listing_path(@member_profile), class: "btn btn-purple btn-xs" %>
24
24
  </div>
@@ -1,6 +1,6 @@
1
1
  <!-- Title System -->
2
2
  <% phc_title "Members Manager" %>
3
- <% phc_title_tagline "Update Member Information for " + @member_profile.member_firstname + " " + @member_profile.member_lastname %>
3
+ <% phc_title_tagline "Update Member Information for " + @member_profile.member_first_name + " " + @member_profile.member_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Dashboard", phcmembers.dashboard_path %>
5
5
  <% phc_breadcrumb_two link_to "Member Profiles", phcmembers.member_profiles_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
@@ -42,8 +42,8 @@
42
42
  <tbody>
43
43
  <% @member_profiles.each do |member_profile| %>
44
44
  <tr>
45
- <td><%= link_to member_profile.member_firstname, member_profile %></td>
46
- <td><%= link_to member_profile.member_lastname, member_profile %></td>
45
+ <td><%= link_to member_profile.member_first_name, member_profile %></td>
46
+ <td><%= link_to member_profile.member_last_name, member_profile %></td>
47
47
  <td><%= link_to member_profile.member_email, member_profile %></td>
48
48
  <td><%= link_to member_profile.member_phone, member_profile %></td>
49
49
  <td>
@@ -25,7 +25,7 @@
25
25
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
26
26
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
27
27
  </div>
28
- <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Information</h4>
28
+ <h4 class="panel-title"><%= @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Information</h4>
29
29
  </div>
30
30
  <div class="panel-body">
31
31
  <%= render 'phcmembers/member/profiles/components/profile_information_table' %>
@@ -45,7 +45,7 @@
45
45
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
46
46
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
47
47
  </div>
48
- <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Addresses</h4>
48
+ <h4 class="panel-title"><%= @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Addresses</h4>
49
49
  </div>
50
50
  <div class="panel-body">
51
51
  <%= render 'phcmembers/member/profiles/components/profile_addresses_table' %>
@@ -65,7 +65,7 @@
65
65
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
66
66
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
67
67
  </div>
68
- <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Listings</h4>
68
+ <h4 class="panel-title"><%= @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Listings</h4>
69
69
  </div>
70
70
  <div class="panel-body">
71
71
  <%= render 'phcmembers/member/profiles/components/profile_listings_table' %>
@@ -85,7 +85,7 @@
85
85
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
86
86
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
87
87
  </div>
88
- <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Change Log</h4>
88
+ <h4 class="panel-title"><%= @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Change Log</h4>
89
89
  </div>
90
90
  <div class="panel-body">
91
91
  <%= render 'phcmembers/member/profiles/components/profile_audits_table' %>
@@ -3,12 +3,12 @@ class CreatePhcmembersMemberAddresses < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmembers_member_addresses do |t|
5
5
 
6
- t.string :address_addressl1
7
- t.string :address_addressl2
6
+ t.string :address_address_line_1
7
+ t.string :address_address_line_2
8
8
  t.string :address_city
9
9
  t.string :address_province
10
10
  t.string :address_country
11
- t.string :address_postalcode
11
+ t.string :address_postal_code
12
12
  t.string :address_type
13
13
 
14
14
  t.references :profile
@@ -3,16 +3,16 @@ class CreatePhcmembersMemberListings < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmembers_member_listings do |t|
5
5
 
6
- t.string :listing_companyname
7
- t.string :listing_contactname
8
- t.string :listing_addressl1
9
- t.string :listing_addressl2
6
+ t.string :listing_company_name
7
+ t.string :listing_contact_name
8
+ t.string :listing_address_line_1
9
+ t.string :listing_address_line_2
10
10
  t.string :listing_city
11
11
  t.string :listing_province
12
12
  t.string :listing_country
13
- t.string :listing_postalcode
13
+ t.string :listing_postal_code
14
14
  t.string :listing_phone
15
- t.string :listing_contactemail
15
+ t.string :listing_contact_email
16
16
  t.string :listing_website
17
17
 
18
18
  t.references :profile
@@ -3,8 +3,8 @@ class CreatePhcmembersMemberProfiles < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmembers_member_profiles do |t|
5
5
 
6
- t.string :member_firstname
7
- t.string :member_lastname
6
+ t.string :member_first_name
7
+ t.string :member_last_name
8
8
  t.string :member_title
9
9
  t.string :member_email
10
10
  t.string :member_phone
@@ -1,3 +1,3 @@
1
1
  module Phcmembers
2
- VERSION = "62.1.0"
2
+ VERSION = "63.0.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcmembers
3
3
  version: !ruby/object:Gem::Version
4
- version: 62.1.0
4
+ version: 63.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-05-05 00:00:00.000000000 Z
11
+ date: 2019-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails