phcdevworks_members 8.0.0 → 10.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/phcdevworks_members_manifest.js +2 -2
  3. data/app/controllers/phcdevworks_members/directory/categories_controller.rb +1 -1
  4. data/app/controllers/phcdevworks_members/member/addresses_controller.rb +1 -1
  5. data/app/controllers/phcdevworks_members/member/listings_controller.rb +1 -1
  6. data/app/controllers/phcdevworks_members/member/profiles_controller.rb +1 -1
  7. data/app/models/phcdevworks_members/directory/category.rb +5 -4
  8. data/app/models/phcdevworks_members/member/address.rb +8 -8
  9. data/app/models/phcdevworks_members/member/listing.rb +14 -14
  10. data/app/models/phcdevworks_members/member/profile.rb +9 -9
  11. data/app/views/layouts/phcdevworks_members/components/backend/sidebars/_side_menu.html.erb +56 -34
  12. data/app/views/phcdevworks_members/directory/categories/_form.html.erb +2 -2
  13. data/app/views/phcdevworks_members/directory/categories/components/_category_list.html.erb +5 -5
  14. data/app/views/phcdevworks_members/directory/categories/components/_category_main.html.erb +2 -12
  15. data/app/views/phcdevworks_members/directory/categories/components/_category_sidebar.html.erb +1 -1
  16. data/app/views/phcdevworks_members/directory/categories/index.html.erb +1 -1
  17. data/app/views/phcdevworks_members/directory/categories/show.html.erb +1 -1
  18. data/app/views/phcdevworks_members/member/addresses/_form.html.erb +14 -14
  19. data/app/views/phcdevworks_members/member/addresses/edit.html.erb +2 -2
  20. data/app/views/phcdevworks_members/member/addresses/index.html.erb +8 -8
  21. data/app/views/phcdevworks_members/member/addresses/new.html.erb +2 -2
  22. data/app/views/phcdevworks_members/member/listings/_form.html.erb +23 -23
  23. data/app/views/phcdevworks_members/member/listings/components/_listing_audits_table.html.erb +1 -1
  24. data/app/views/phcdevworks_members/member/listings/components/_listing_main.html.erb +9 -9
  25. data/app/views/phcdevworks_members/member/listings/edit.html.erb +2 -2
  26. data/app/views/phcdevworks_members/member/listings/index.html.erb +9 -9
  27. data/app/views/phcdevworks_members/member/listings/new.html.erb +2 -2
  28. data/app/views/phcdevworks_members/member/listings/show.html.erb +4 -14
  29. data/app/views/phcdevworks_members/member/profiles/_form.html.erb +12 -12
  30. data/app/views/phcdevworks_members/member/profiles/components/_profile_addresses_table.html.erb +6 -6
  31. data/app/views/phcdevworks_members/member/profiles/components/_profile_audits_table.html.erb +1 -1
  32. data/app/views/phcdevworks_members/member/profiles/components/_profile_header.html.erb +3 -3
  33. data/app/views/phcdevworks_members/member/profiles/components/_profile_information_table.html.erb +7 -7
  34. data/app/views/phcdevworks_members/member/profiles/components/_profile_listings_table.html.erb +6 -6
  35. data/app/views/phcdevworks_members/member/profiles/edit.html.erb +1 -1
  36. data/app/views/phcdevworks_members/member/profiles/index.html.erb +4 -4
  37. data/app/views/phcdevworks_members/member/profiles/show.html.erb +4 -24
  38. data/db/migrate/20170517064030_create_phcdevworks_members_member_profile_versions.rb +0 -1
  39. data/db/migrate/20170517064049_create_phcdevworks_members_member_listing_versions.rb +0 -1
  40. data/db/migrate/20170517064114_create_phcdevworks_members_member_address_versions.rb +0 -1
  41. data/db/migrate/20170517064427_create_phcdevworks_members_directory_category_versions.rb +0 -1
  42. data/db/migrate/20190728233154_create_phcdevworks_members_member_addresses.rb +7 -7
  43. data/db/migrate/20190729233450_create_phcdevworks_members_member_listings.rb +15 -13
  44. data/db/migrate/20190729235705_create_phcdevworks_members_member_profiles.rb +6 -6
  45. data/db/migrate/20190730101344_create_phcdevworks_members_directory_categories.rb +3 -1
  46. data/lib/phcdevworks_members/engine.rb +3 -0
  47. data/lib/phcdevworks_members/version.rb +1 -1
  48. metadata +110 -40
data/app/views/phcdevworks_members/member/addresses/_form.html.erb CHANGED
@@ -7,38 +7,38 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= form.label :address_line_1, "Address Line1" %>
11
- <%= form.text_field :address_line_1, placeholder: "Address Line 1 - Street Address", class: "form-control" %>
10
+ <%= form.label :member_address_line_1, "Address Line1" %>
11
+ <%= form.text_field :member_address_line_1, placeholder: "Address Line 1 - Street Address", class: "form-control" %>
12
12
  </div>
13
13
 
14
14
  <div class="form-group field_with_errors">
15
- <%= form.label :address_line_2, "Address Line2" %>
16
- <%= form.text_field :address_line_2, placeholder: "Address Line 2 - Box - Suite - Floor", class: "form-control" %>
15
+ <%= form.label :member_address_line_2, "Address Line2" %>
16
+ <%= form.text_field :member_address_line_2, placeholder: "Address Line 2 - Box - Suite - Floor", class: "form-control" %>
17
17
  </div>
18
18
 
19
19
  <div class="form-group field_with_errors">
20
- <%= form.label :address_city, "City" %>
21
- <%= form.text_field :address_city, placeholder: "City", class: "form-control" %>
20
+ <%= form.label :member_address_city, "City" %>
21
+ <%= form.text_field :member_address_city, placeholder: "City", class: "form-control" %>
22
22
  </div>
23
23
 
24
24
  <div class="form-group field_with_errors">
25
- <%= form.label :address_province, "Province/State" %>
26
- <%= form.text_field :address_province, placeholder: "Province/State", class: "form-control" %>
25
+ <%= form.label :member_address_province, "Province/State" %>
26
+ <%= form.text_field :member_address_province, placeholder: "Province/State", class: "form-control" %>
27
27
  </div>
28
28
 
29
29
  <div class="form-group field_with_errors">
30
- <%= form.label :address_country, "Country" %>
31
- <%= form.text_field :address_country, placeholder: "Country", class: "form-control" %>
30
+ <%= form.label :member_address_country, "Country" %>
31
+ <%= form.text_field :member_address_country, placeholder: "Country", class: "form-control" %>
32
32
  </div>
33
33
 
34
34
  <div class="form-group field_with_errors">
35
- <%= form.label :address_postal_code, "PostalCode" %>
36
- <%= form.text_field :address_postal_code, placeholder: "PostalCode", class: "form-control" %>
35
+ <%= form.label :member_address_postal_code, "PostalCode" %>
36
+ <%= form.text_field :member_address_postal_code, placeholder: "PostalCode", class: "form-control" %>
37
37
  </div>
38
38
 
39
39
  <div class="form-group field_with_errors">
40
- <%= form.label :address_type, "Address Type" %>
41
- <%= form.select( :address_type, [["Billing Address","Billing"],["Street Address","Street"],["Mailing Address","Mailing"],["Home Address","Home"],["Business Address","Business"]], {}, {class: "form-control"}) %>
40
+ <%= form.label :member_address_type, "Address Type" %>
41
+ <%= form.select( :member_address_type, [["Billing Address","Billing"],["Street Address","Street"],["Mailing Address","Mailing"],["Home Address","Home"],["Business Address","Business"]], {}, {class: "form-control"}) %>
42
42
  </div>
43
43
  <!-- Form Input Fields -->
44
44
 
data/app/views/phcdevworks_members/member/addresses/edit.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Update New Address for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Update New Address for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Addresses for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.member_profile_addresses_path %>
5
+ <% phc_breadcrumb_two link_to "Addresses for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.member_profile_addresses_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- PHCTitleSEO Title Variables -->
8
8
 
data/app/views/phcdevworks_members/member/addresses/index.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Addresses for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Addresses for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to @member_profile.profile_first_name + " " + @member_profile.profile_last_name + " Details", phcdevworks_members.member_profile_path(@member_profile) %>
5
+ <% phc_breadcrumb_two link_to @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name + " Details", phcdevworks_members.member_profile_path(@member_profile) %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- PHCTitleSEO Title Variables -->
8
8
 
@@ -52,11 +52,11 @@
52
52
  <tbody>
53
53
  <% @member_addresses.each do |member_address| %>
54
54
  <tr>
55
- <td><%= link_to member_address.address_line_1, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
56
- <td><%= link_to member_address.address_city, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
57
- <td><%= link_to member_address.address_country, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
58
- <td><%= link_to member_address.address_postal_code, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
59
- <td><%= link_to member_address.address_type, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
55
+ <td><%= link_to member_address.member_address_line_1, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
56
+ <td><%= link_to member_address.member_address_city, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
57
+ <td><%= link_to member_address.member_address_country, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
58
+ <td><%= link_to member_address.member_address_postal_code, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
59
+ <td><%= link_to member_address.member_address_type, phcdevworks_members.member_profile_address_path(member_address.profile, member_address) %></td>
60
60
  <td>
61
61
  <div class="btn-group d-flex" role="group">
62
62
  <%= link_to "Address Details", member_profile_address_path(member_address.profile, member_address), class: "btn btn-primary btn-xs" %>
@@ -75,7 +75,7 @@
75
75
  <!-- New Button -->
76
76
  <%= link_to phcdevworks_members.new_member_profile_address_path, class: "btn btn-primary btn-sm" do %>
77
77
  <i class="fad fa-plus-circle"></i>
78
- <%= "Add a New Address for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
78
+ <%= "Add a New Address for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
79
79
  <% end %>
80
80
  <!-- New Button -->
81
81
 
data/app/views/phcdevworks_members/member/addresses/new.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Member Address Manager" %>
3
- <% phc_title_tagline "Create a New Address for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Create a New Address for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Addresses for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.member_profile_addresses_path %>
5
+ <% phc_breadcrumb_two link_to "Addresses for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.member_profile_addresses_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- PHCTitleSEO Title Variables -->
8
8
 
data/app/views/phcdevworks_members/member/listings/_form.html.erb CHANGED
@@ -7,62 +7,62 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= form.label :listing_company_name, "Company Name" %>
11
- <%= form.text_field :listing_company_name, placeholder: "Business/Organization: Name", class: "form-control" %>
10
+ <%= form.label :member_listing_company_name, "Company Name" %>
11
+ <%= form.text_field :member_listing_company_name, placeholder: "Business/Organization: Name", class: "form-control" %>
12
12
  </div>
13
13
 
14
14
  <div class="form-group field_with_errors">
15
- <%= form.label :listing_contact_name, "Contact Name" %>
16
- <%= form.text_field :listing_contact_name, placeholder: "Business/Organization: Contact Person", class: "form-control" %>
15
+ <%= form.label :member_listing_contact_name, "Contact Name" %>
16
+ <%= form.text_field :member_listing_contact_name, placeholder: "Business/Organization: Contact Person", class: "form-control" %>
17
17
  </div>
18
18
 
19
19
  <div class="form-group field_with_errors">
20
- <%= form.label :listing_address_line_1, "Address Line 1" %>
21
- <%= form.text_field :listing_address_line_1, placeholder: "Location: Street Address", class: "form-control" %>
20
+ <%= form.label :member_listing_address_line_1, "Address Line 1" %>
21
+ <%= form.text_field :member_listing_address_line_1, placeholder: "Location: Street Address", class: "form-control" %>
22
22
  </div>
23
23
 
24
24
  <div class="form-group field_with_errors">
25
- <%= form.label :listing_address_line_2, "Address Line 2" %>
26
- <%= form.text_field :listing_address_line_2, placeholder: "Location: Box - Suite - Floor", class: "form-control" %>
25
+ <%= form.label :member_listing_address_line_2, "Address Line 2" %>
26
+ <%= form.text_field :member_listing_address_line_2, placeholder: "Location: Box - Suite - Floor", class: "form-control" %>
27
27
  </div>
28
28
 
29
29
  <div class="form-group field_with_errors">
30
- <%= form.label :listing_city, "City" %>
31
- <%= form.text_field :listing_city, placeholder: "Location: City", class: "form-control" %>
30
+ <%= form.label :member_listing_city, "City" %>
31
+ <%= form.text_field :member_listing_city, placeholder: "Location: City", class: "form-control" %>
32
32
  </div>
33
33
 
34
34
  <div class="form-group field_with_errors">
35
- <%= form.label :listing_province, "Province/State" %>
36
- <%= form.text_field :listing_province, placeholder: "Location: Province/State", class: "form-control" %>
35
+ <%= form.label :member_listing_province, "Province/State" %>
36
+ <%= form.text_field :member_listing_province, placeholder: "Location: Province/State", class: "form-control" %>
37
37
  </div>
38
38
 
39
39
  <div class="form-group field_with_errors">
40
- <%= form.label :listing_country, "Country" %>
41
- <%= form.text_field :listing_country, placeholder: "Country", class: "form-control" %>
40
+ <%= form.label :member_listing_country, "Country" %>
41
+ <%= form.text_field :member_listing_country, placeholder: "Country", class: "form-control" %>
42
42
  </div>
43
43
 
44
44
  <div class="form-group field_with_errors">
45
- <%= form.label :listing_postal_code, "Postal Code" %><br>
46
- <%= form.text_field :listing_postal_code, placeholder: "Location: PostalCode", class: "form-control" %>
45
+ <%= form.label :member_listing_postal_code, "Postal Code" %><br>
46
+ <%= form.text_field :member_listing_postal_code, placeholder: "Location: PostalCode", class: "form-control" %>
47
47
  </div>
48
48
 
49
49
  <div class="form-group field_with_errors">
50
- <%= form.label :listing_phone, "Business Phone Number" %>
51
- <%= form.text_field :listing_phone, placeholder: "Business/Organization: PhoneNumber (Public)", class: "form-control" %>
50
+ <%= form.label :member_listing_phone, "Business Phone Number" %>
51
+ <%= form.text_field :member_listing_phone, placeholder: "Business/Organization: PhoneNumber (Public)", class: "form-control" %>
52
52
  </div>
53
53
 
54
54
  <div class="form-group field_with_errors">
55
- <%= form.label :listing_contact_email, "Business General Email" %>
56
- <%= form.text_field :listing_contact_email, placeholder: "Business/Organization: Email Address (Public)", class: "form-control" %>
55
+ <%= form.label :member_listing_contact_email, "Business General Email" %>
56
+ <%= form.text_field :member_listing_contact_email, placeholder: "Business/Organization: Email Address (Public)", class: "form-control" %>
57
57
  </div>
58
58
 
59
59
  <div class="form-group field_with_errors">
60
- <%= form.label :listing_website, "Business Website" %>
61
- <%= form.text_field :listing_website, placeholder: "Business/Organization: Website (Public)", class: "form-control" %>
60
+ <%= form.label :member_listing_website, "Business Website" %>
61
+ <%= form.text_field :member_listing_website, placeholder: "Business/Organization: Website (Public)", class: "form-control" %>
62
62
  </div>
63
63
 
64
64
  <div class="form-group field_with_errors">
65
- <%= form.collection_check_boxes :category_ids, PhcdevworksMembers::Directory::Category.all, :id, :category_name do |listing_category| %>
65
+ <%= form.collection_check_boxes :category_ids, PhcdevworksMembers::Directory::Category.all, :id, :directory_category_name do |listing_category| %>
66
66
  <%= listing_category.check_box %>
67
67
  <%= listing_category.label %><br>
68
68
  <% end %>
data/app/views/phcdevworks_members/member/listings/components/_listing_audits_table.html.erb CHANGED
@@ -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 + ' ' + @member_profile.profile_first_name + ' ' + @member_profile.profile_last_name %> Listing Information</td>
8
+ <td><%= member_listing_version.event.humanize + ' ' + @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_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>
data/app/views/phcdevworks_members/member/listings/components/_listing_main.html.erb CHANGED
@@ -1,18 +1,18 @@
1
1
  <div class="row">
2
2
  <div class="col-6">
3
3
  <address class="m-t-5 m-b-5">
4
- <div><strong class="text-inverse"><%= @member_listing.listing_company_name %></strong></div>
5
- <div><strong class="text-inverse"><%= @member_listing.listing_contact_name %></strong></div>
6
- <div><%= @member_listing.listing_address_line_1 %></div>
7
- <div><%= @member_listing.listing_address_line_2 %></div>
8
- <div><%= @member_listing.listing_city %> <%= @member_listing.listing_province %></div>
9
- <div><%= @member_listing.listing_country %> <%= @member_listing.listing_postal_code %></div>
4
+ <div><strong class="text-inverse"><%= @member_listing.member_listing_company_name %></strong></div>
5
+ <div><strong class="text-inverse"><%= @member_listing.member_listing_contact_name %></strong></div>
6
+ <div><%= @member_listing.member_listing_address_line_1 %></div>
7
+ <div><%= @member_listing.member_listing_address_line_2 %></div>
8
+ <div><%= @member_listing.member_listing_city %> <%= @member_listing.member_listing_province %></div>
9
+ <div><%= @member_listing.member_listing_country %> <%= @member_listing.member_listing_postal_code %></div>
10
10
  </address>
11
11
  </div>
12
12
  <div class="col-6">
13
- Phone: <%= @member_listing.listing_phone %><br>
14
- Email: <%= @member_listing.listing_contact_email %><br>
15
- Website: <%= @member_listing.listing_website %><br>
13
+ Phone: <%= @member_listing.member_listing_phone %><br>
14
+ Email: <%= @member_listing.member_listing_contact_email %><br>
15
+ Website: <%= @member_listing.member_listing_website %><br>
16
16
  </div>
17
17
  </div>
18
18
  <br>
data/app/views/phcdevworks_members/member/listings/edit.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Member Listing Manager" %>
3
- <% phc_title_tagline "Update Listing for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Update Listing for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Listings for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.member_profile_listings_path %>
5
+ <% phc_breadcrumb_two link_to "Listings for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.member_profile_listings_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- PHCTitleSEO Title Variables -->
8
8
 
data/app/views/phcdevworks_members/member/listings/index.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Member Listings Manager" %>
3
- <% phc_title_tagline "Listings for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Listings for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to @member_profile.profile_first_name + " " + @member_profile.profile_last_name + " Details", phcdevworks_members.member_profile_path(@member_profile) %>
5
+ <% phc_breadcrumb_two link_to @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name + " Details", phcdevworks_members.member_profile_path(@member_profile) %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- PHCTitleSEO Title Variables -->
8
8
 
@@ -53,12 +53,12 @@
53
53
  <tbody>
54
54
  <% @member_listings.each do |member_listing| %>
55
55
  <tr>
56
- <td class="highlight"><%= link_to member_listing.listing_company_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
57
- <td class="highlight"><%= link_to member_listing.listing_contact_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
58
- <td class="highlight"><%= link_to member_listing.listing_city, member_profile_listing_path(member_listing.profile, member_listing) %></td>
59
- <td class="highlight"><%= link_to member_listing.listing_province, member_profile_listing_path(member_listing.profile, member_listing) %></td>
60
- <td class="highlight"><%= link_to member_listing.listing_contact_email, member_profile_listing_path(member_listing.profile, member_listing) %></td>
61
- <td class="highlight"><%= link_to member_listing.listing_website, member_profile_listing_path(member_listing.profile, member_listing) %></td>
56
+ <td class="highlight"><%= link_to member_listing.member_listing_company_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
57
+ <td class="highlight"><%= link_to member_listing.member_listing_contact_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
58
+ <td class="highlight"><%= link_to member_listing.member_listing_city, member_profile_listing_path(member_listing.profile, member_listing) %></td>
59
+ <td class="highlight"><%= link_to member_listing.member_listing_province, member_profile_listing_path(member_listing.profile, member_listing) %></td>
60
+ <td class="highlight"><%= link_to member_listing.member_listing_contact_email, member_profile_listing_path(member_listing.profile, member_listing) %></td>
61
+ <td class="highlight"><%= link_to member_listing.member_listing_website, member_profile_listing_path(member_listing.profile, member_listing) %></td>
62
62
  <td>
63
63
  <div class="btn-group d-flex" role="group">
64
64
  <%= link_to "Listing Details", member_profile_listing_path(member_listing.profile, member_listing), class: "btn btn-primary btn-xs" %>
@@ -77,7 +77,7 @@
77
77
  <!-- New Button -->
78
78
  <%= link_to phcdevworks_members.new_member_profile_listing_path, class: "btn btn-primary btn-sm" do %>
79
79
  <i class="fad fa-plus-circle"></i>
80
- <%= "Add a New Listing for " + @member_profile .profile_first_name + " " + @member_profile .profile_last_name %>
80
+ <%= "Add a New Listing for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
81
81
  <% end %>
82
82
  <!-- New Button -->
83
83
 
data/app/views/phcdevworks_members/member/listings/new.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Member Listing Manager" %>
3
- <% phc_title_tagline "Create a New Listing for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Create a New Listing for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Listings for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.member_profile_listings_path %>
5
+ <% phc_breadcrumb_two link_to "Listings for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.member_profile_listings_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- PHCTitleSEO Title Variables -->
8
8
 
data/app/views/phcdevworks_members/member/listings/show.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <!-- Title Variables -->
2
2
  <% phc_title "Member Listing Manager" %>
3
- <% phc_title_tagline "Detailed Listing Information for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Detailed Listing Information for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Members List", phcdevworks_members.member_profiles_path %>
5
- <% phc_breadcrumb_two link_to "Listings for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.member_profile_listings_path %>
5
+ <% phc_breadcrumb_two link_to "Listings for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.member_profile_listings_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
7
7
  <!-- Title System -->
8
8
 
@@ -25,12 +25,7 @@
25
25
  <div class="col-12">
26
26
  <div class="panel panel-inverse">
27
27
  <div class="panel-heading">
28
- <div class="panel-heading-btn">
29
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
30
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
31
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
32
- </div>
33
- <h4 class="panel-title"><%= @member_profile.profile_first_name + " " + @member_profile.profile_last_name %> Listing Details</h4>
28
+ <h4 class="panel-title"><%= @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %> Listing Details</h4>
34
29
  </div>
35
30
  <div class="panel-body">
36
31
  <!-- Table - Members Listings -->
@@ -45,12 +40,7 @@
45
40
  <div class="col-12">
46
41
  <div class="panel panel-inverse">
47
42
  <div class="panel-heading">
48
- <div class="panel-heading-btn">
49
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
50
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
51
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
52
- </div>
53
- <h4 class="panel-title"><%= @member_profile.profile_first_name + " " + @member_profile.profile_last_name %> Listing Change Log</h4>
43
+ <h4 class="panel-title"><%= @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %> Listing Change Log</h4>
54
44
  </div>
55
45
  <div class="panel-body">
56
46
  <!-- Table - Members Listing Audit -->
data/app/views/phcdevworks_members/member/profiles/_form.html.erb CHANGED
@@ -7,33 +7,33 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= form.label :profile_first_name, "First Name*" %>
11
- <%= form.text_field :profile_first_name, placeholder: "First Name", class: "form-control" %>
10
+ <%= form.label :member_profile_first_name, "First Name*" %>
11
+ <%= form.text_field :member_profile_first_name, placeholder: "First Name", class: "form-control" %>
12
12
  </div>
13
13
 
14
14
  <div class="form-group field_with_errors">
15
- <%= form.label :profile_last_name, "Last Name*" %>
16
- <%= form.text_field :profile_last_name, placeholder: "Last Name", class: "form-control" %>
15
+ <%= form.label :member_profile_last_name, "Last Name*" %>
16
+ <%= form.text_field :member_profile_last_name, placeholder: "Last Name", class: "form-control" %>
17
17
  </div>
18
18
 
19
19
  <div class="form-group field_with_errors">
20
- <%= form.label :profile_title, "Job Title" %>
21
- <%= form.text_field :profile_title, placeholder: "Job Title/Salutation", class: "form-control" %>
20
+ <%= form.label :member_profile_title, "Job Title" %>
21
+ <%= form.text_field :member_profile_title, placeholder: "Job Title/Salutation", class: "form-control" %>
22
22
  </div>
23
23
 
24
24
  <div class="form-group field_with_errors">
25
- <%= form.label :profile_email, "Contact Email Address*" %>
26
- <%= form.text_field :profile_email, placeholder: "Contact Email (Will Remain Private)", class: "form-control masked" %>
25
+ <%= form.label :member_profile_email, "Contact Email Address*" %>
26
+ <%= form.text_field :member_profile_email, placeholder: "Contact Email (Will Remain Private)", class: "form-control masked" %>
27
27
  </div>
28
28
 
29
29
  <div class="form-group field_with_errors">
30
- <%= form.label :profile_phone, "Contact Phone Number*" %>
31
- <%= form.text_field :profile_phone, placeholder: "Contact Phone Number (Will Remain Private)", data: {format: "(999) 999-9999", placeholder: "x"}, class: "form-control masked" %>
30
+ <%= form.label :member_profile_phone, "Contact Phone Number*" %>
31
+ <%= form.text_field :member_profile_phone, placeholder: "Contact Phone Number (Will Remain Private)", data: {format: "(999) 999-9999", placeholder: "x"}, class: "form-control masked" %>
32
32
  </div>
33
33
 
34
34
  <div class="form-group field_with_errors">
35
- <%= form.label :profile_notes, "Member" %>
36
- <%= form.text_area :profile_notes, placeholder: "Member Notes", class: "form-control" %>
35
+ <%= form.label :member_profile_notes, "Member" %>
36
+ <%= form.text_area :member_profile_notes, placeholder: "Member Notes", class: "form-control" %>
37
37
  </div>
38
38
  <!-- Form Input Fields -->
39
39
 
data/app/views/phcdevworks_members/member/profiles/components/_profile_addresses_table.html.erb CHANGED
@@ -11,14 +11,14 @@
11
11
  <tbody>
12
12
  <% @member_profile.addresses.each do |members_main_address| %>
13
13
  <tr>
14
- <td><%= members_main_address.address_line_1 %></td>
15
- <td><%= members_main_address.address_city %></td>
16
- <td><%= members_main_address.address_province %></td>
17
- <td><%= members_main_address.address_type %></td>
14
+ <td><%= members_main_address.member_address_line_1 %></td>
15
+ <td><%= members_main_address.member_address_city %></td>
16
+ <td><%= members_main_address.member_address_province %></td>
17
+ <td><%= members_main_address.member_address_type %></td>
18
18
  </tr>
19
19
  <% end %>
20
20
  </tbody>
21
21
  </table>
22
- <%= link_to "See All of " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name + " Addresses", phcdevworks_members.member_profile_addresses_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
- <%= link_to "Add a New Address for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.new_member_profile_address_path(@member_profile), class: "btn btn-purple btn-xs" %>
22
+ <%= link_to "See All of " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name + " Addresses", phcdevworks_members.member_profile_addresses_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
+ <%= link_to "Add a New Address for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.new_member_profile_address_path(@member_profile), class: "btn btn-purple btn-xs" %>
24
24
  </div>
data/app/views/phcdevworks_members/member/profiles/components/_profile_audits_table.html.erb CHANGED
@@ -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.profile_first_name + ' ' + @member_profile.profile_last_name %> Profile Information</td>
8
+ <td><%= member_profile_version.event.humanize + ' ' + @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_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>
data/app/views/phcdevworks_members/member/profiles/components/_profile_header.html.erb CHANGED
@@ -10,10 +10,10 @@
10
10
  <%= image_tag @member_profile.gravatar_url :secure => true, :filetype => :png, :size => 128 %>
11
11
  </div>
12
12
  <div class="profile-header-info">
13
- <h4 class="m-t-10 m-b-5"><%= @member_profile.profile_first_name + ' ' + @member_profile.profile_last_name %></h4>
14
- <p class="m-b-10"><%= @member_profile.profile_phone %></p>
13
+ <h4 class="m-t-10 m-b-5"><%= @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_last_name %></h4>
14
+ <p class="m-b-10"><%= @member_profile.member_profile_phone %></p>
15
15
  <%= link_to edit_member_profile_path(@member_profile), class: "btn btn-xs btn-yellow" do %>
16
- <i class="far fa-pencil-alt"></i> Update Member Information
16
+ <i class="fad fa-user-edit"></i> Update Member Information
17
17
  <% end %>
18
18
  </div>
19
19
  </div>
data/app/views/phcdevworks_members/member/profiles/components/_profile_information_table.html.erb CHANGED
@@ -11,17 +11,17 @@
11
11
  </thead>
12
12
  <tbody>
13
13
  <tr>
14
- <td><%= @member_profile.profile_first_name %></td>
15
- <td><%= @member_profile.profile_last_name %></td>
16
- <td><%= @member_profile.profile_title %></td>
17
- <td><%= @member_profile.profile_email %></td>
18
- <td><%= @member_profile.profile_phone %></td>
14
+ <td><%= @member_profile.member_profile_first_name %></td>
15
+ <td><%= @member_profile.member_profile_last_name %></td>
16
+ <td><%= @member_profile.member_profile_title %></td>
17
+ <td><%= @member_profile.member_profile_email %></td>
18
+ <td><%= @member_profile.member_profile_phone %></td>
19
19
  </tr>
20
20
  <tr>
21
21
  <td><strong>Notes:</strong></td>
22
- <td colspan="4"><%= @member_profile.profile_notes %></td>
22
+ <td colspan="4"><%= @member_profile.member_profile_notes %></td>
23
23
  </tr>
24
24
  </tbody>
25
25
  </table>
26
- <%= link_to "Update " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name + " Information", phcdevworks_members.edit_member_profile_path(@member_profile), class: "btn btn-primary btn-xs" %>
26
+ <%= link_to "Update " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name + " Information", phcdevworks_members.edit_member_profile_path(@member_profile), class: "btn btn-primary btn-xs" %>
27
27
  </div>