phcdevworks_members 8.0.0 → 9.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (42) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcdevworks_members/directory/categories_controller.rb +1 -1
  3. data/app/controllers/phcdevworks_members/member/addresses_controller.rb +1 -1
  4. data/app/controllers/phcdevworks_members/member/listings_controller.rb +1 -1
  5. data/app/controllers/phcdevworks_members/member/profiles_controller.rb +1 -1
  6. data/app/models/phcdevworks_members/directory/category.rb +4 -4
  7. data/app/models/phcdevworks_members/member/address.rb +8 -8
  8. data/app/models/phcdevworks_members/member/listing.rb +13 -13
  9. data/app/models/phcdevworks_members/member/profile.rb +9 -9
  10. data/app/views/layouts/phcdevworks_members/components/backend/sidebars/_side_menu.html.erb +28 -28
  11. data/app/views/phcdevworks_members/directory/categories/_form.html.erb +2 -2
  12. data/app/views/phcdevworks_members/directory/categories/components/_category_list.html.erb +5 -5
  13. data/app/views/phcdevworks_members/directory/categories/components/_category_main.html.erb +2 -12
  14. data/app/views/phcdevworks_members/directory/categories/components/_category_sidebar.html.erb +1 -1
  15. data/app/views/phcdevworks_members/directory/categories/index.html.erb +1 -1
  16. data/app/views/phcdevworks_members/directory/categories/show.html.erb +1 -1
  17. data/app/views/phcdevworks_members/member/addresses/_form.html.erb +14 -14
  18. data/app/views/phcdevworks_members/member/addresses/edit.html.erb +2 -2
  19. data/app/views/phcdevworks_members/member/addresses/index.html.erb +8 -8
  20. data/app/views/phcdevworks_members/member/addresses/new.html.erb +2 -2
  21. data/app/views/phcdevworks_members/member/listings/_form.html.erb +23 -23
  22. data/app/views/phcdevworks_members/member/listings/components/_listing_audits_table.html.erb +1 -1
  23. data/app/views/phcdevworks_members/member/listings/components/_listing_main.html.erb +9 -9
  24. data/app/views/phcdevworks_members/member/listings/edit.html.erb +2 -2
  25. data/app/views/phcdevworks_members/member/listings/index.html.erb +9 -9
  26. data/app/views/phcdevworks_members/member/listings/new.html.erb +2 -2
  27. data/app/views/phcdevworks_members/member/listings/show.html.erb +4 -14
  28. data/app/views/phcdevworks_members/member/profiles/_form.html.erb +12 -12
  29. data/app/views/phcdevworks_members/member/profiles/components/_profile_addresses_table.html.erb +6 -6
  30. data/app/views/phcdevworks_members/member/profiles/components/_profile_audits_table.html.erb +1 -1
  31. data/app/views/phcdevworks_members/member/profiles/components/_profile_header.html.erb +3 -3
  32. data/app/views/phcdevworks_members/member/profiles/components/_profile_information_table.html.erb +7 -7
  33. data/app/views/phcdevworks_members/member/profiles/components/_profile_listings_table.html.erb +6 -6
  34. data/app/views/phcdevworks_members/member/profiles/edit.html.erb +1 -1
  35. data/app/views/phcdevworks_members/member/profiles/index.html.erb +4 -4
  36. data/app/views/phcdevworks_members/member/profiles/show.html.erb +4 -24
  37. data/db/migrate/20190728233154_create_phcdevworks_members_member_addresses.rb +7 -7
  38. data/db/migrate/20190729233450_create_phcdevworks_members_member_listings.rb +11 -11
  39. data/db/migrate/20190729235705_create_phcdevworks_members_member_profiles.rb +6 -6
  40. data/db/migrate/20190730101344_create_phcdevworks_members_directory_categories.rb +1 -1
  41. data/lib/phcdevworks_members/version.rb +1 -1
  42. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c9e3561cf59626793938057ebc925b8d6386db75420b7537b0103942d0ea5e75
4
- data.tar.gz: ac5f48cd76e7c900ebfa2914956db2ff826343d155944358df0908e9cdf33c8d
3
+ metadata.gz: 21810a72893c535f30b0f52568d33de3da893f913907e2dec5b617fc4a3c730e
4
+ data.tar.gz: 7db1142baa97a83aa1bbdc710e008cd816fe27ea96b3fdbd29b9d9594f409e9f
5
5
  SHA512:
6
- metadata.gz: 885c0f1c9bec3eba7cb07d66ca4236d917eb0b36f6a37c2d59f2bb2d4dd6e917cdddb381170ffb162cbeac37f197e476d586bdb76b0d26cd76c4076437f0a31c
7
- data.tar.gz: 3e5d849e151793b27d8a0702065036ef4ac14e6a5e2d5838498f6b6990faa72af6233635eafe531644111d3fa94f7af5194b9fa97f940a34422209bf1f83fc41
6
+ metadata.gz: 03e77d89e434cee234bcb77b24d708bde76af5097cd6a999de75ae70a1556903919f16b1837aba83144578f72d3ec2c9afbe65d3ba51d972b370e114f59982e2
7
+ data.tar.gz: c5c900a49ed0d570037c451285e51a12d6cd25b5cce19565203aea33783818ec45fed41e73b7075c49b0ecb840e42c26a7088c8b91548f85979342d7cb42bc3f
@@ -80,7 +80,7 @@ module PhcdevworksMembers
80
80
 
81
81
  # Whitelist
82
82
  def directory_category_params
83
- params.require(:directory_category).permit(:category_name, :slug, :user_id, :org_id)
83
+ params.require(:directory_category).permit(:directory_category_name, :slug, :user_id, :org_id)
84
84
  end
85
85
 
86
86
  end
@@ -88,7 +88,7 @@ module PhcdevworksMembers
88
88
 
89
89
  # Whitelist
90
90
  def member_address_params
91
- params.require(:member_address).permit(:address_line_1, :address_line_2, :address_city, :address_province, :address_country, :address_postal_code, :address_type, :profile_id, :slug, :user_id, :org_id)
91
+ params.require(:member_address).permit(:member_address_line_1, :member_address_line_2, :member_address_city, :member_address_province, :member_address_country, :member_address_postal_code, :member_address_type, :profile_id, :slug, :user_id, :org_id)
92
92
  end
93
93
 
94
94
  end
@@ -88,7 +88,7 @@ module PhcdevworksMembers
88
88
 
89
89
  # Whitelist
90
90
  def member_listing_params
91
- 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, :org_id, category_ids: [])
91
+ params.require(:member_listing).permit(:member_listing_company_name, :member_listing_contact_name, :member_listing_address_line_1, :member_listing_address_line_2, :member_listing_city, :member_listing_country, :member_listing_province, :member_listing_postal_code, :member_listing_phone, :member_listing_contact_email, :member_listing_website, :profile_id, :slug, :user_id, :org_id, category_ids: [])
92
92
  end
93
93
 
94
94
  end
@@ -81,7 +81,7 @@ module PhcdevworksMembers
81
81
 
82
82
  # Whitelist
83
83
  def member_profile_params
84
- params.require(:member_profile).permit(:profile_first_name, :profile_last_name, :profile_title, :profile_email, :profile_phone, :profile_notes, :slug, :user_id, :org_id)
84
+ params.require(:member_profile).permit(:member_profile_first_name, :member_profile_last_name, :member_profile_title, :member_profile_email, :member_profile_phone, :member_profile_notes, :slug, :user_id, :org_id)
85
85
  end
86
86
 
87
87
  end
@@ -11,15 +11,15 @@ module PhcdevworksMembers
11
11
  has_and_belongs_to_many :listings, class_name: "PhcdevworksMembers::Member::Listing", :join_table => "phcdevworks_members_categories_lstings", :dependent => :destroy
12
12
 
13
13
  # Form Fields Validation
14
- validates :category_name,
14
+ validates :directory_category_name,
15
15
  presence: true
16
16
 
17
17
  # Clean URL Define
18
- friendly_id :phcdev_directory_category_nice_urls, use: [:slugged, :finders]
18
+ friendly_id :directory_category_nice_urls, use: [:slugged, :finders]
19
19
 
20
- def phcdev_directory_category_nice_urls
20
+ def directory_category_nice_urls
21
21
  [
22
- [:category_name]
22
+ [:directory_category_name]
23
23
  ]
24
24
  end
25
25
 
@@ -11,27 +11,27 @@ module PhcdevworksMembers
11
11
  belongs_to :profile, class_name: 'PhcdevworksMembers::Member::Profile'
12
12
 
13
13
  # Form Fields Validation
14
- validates :address_line_1,
14
+ validates :member_address_line_1,
15
15
  presence: true
16
16
 
17
- validates :address_city,
17
+ validates :member_address_city,
18
18
  presence: true
19
19
 
20
- validates :address_province,
20
+ validates :member_address_province,
21
21
  presence: true
22
22
 
23
- validates :address_country,
23
+ validates :member_address_country,
24
24
  presence: true
25
25
 
26
- validates :address_postal_code,
26
+ validates :member_address_postal_code,
27
27
  presence: true
28
28
 
29
29
  # Clean URL Define
30
- friendly_id :phcdev_members_address_nice_urls, use: [:slugged, :finders]
30
+ friendly_id :members_address_nice_urls, use: [:slugged, :finders]
31
31
 
32
- def phcdev_members_address_nice_urls
32
+ def members_address_nice_urls
33
33
  [
34
- [:address_type, :address_city, :address_province]
34
+ [:member_address_type, :member_address_city, :member_address_province]
35
35
  ]
36
36
  end
37
37
 
@@ -13,45 +13,45 @@ module PhcdevworksMembers
13
13
  has_and_belongs_to_many :categories, class_name: "PhcdevworksMembers::Directory::Category", :join_table => "phcdevworks_members_categories_lstings"
14
14
 
15
15
  # Form Fields Validation
16
- validates :listing_company_name,
16
+ validates :member_listing_company_name,
17
17
  presence: true
18
18
 
19
- validates :listing_contact_name,
19
+ validates :member_listing_contact_name,
20
20
  presence: true
21
21
 
22
- validates :listing_address_line_1,
22
+ validates :member_listing_address_line_1,
23
23
  presence: true
24
24
 
25
- validates :listing_city,
25
+ validates :member_listing_city,
26
26
  presence: true
27
27
 
28
- validates :listing_country,
28
+ validates :member_listing_country,
29
29
  presence: true
30
30
 
31
- validates :listing_province,
31
+ validates :member_listing_province,
32
32
  presence: true
33
33
 
34
- validates :listing_postal_code,
34
+ validates :member_listing_postal_code,
35
35
  presence: true
36
36
 
37
- validates :listing_contact_email,
37
+ validates :member_listing_contact_email,
38
38
  presence: true,
39
39
  format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
40
40
 
41
- validates :listing_website,
41
+ validates :member_listing_website,
42
42
  presence: true,
43
43
  format: { with: URI::regexp(%w(http https)), message: "Please follow this URL format http or https://www.**********.com" }
44
44
 
45
- validates :listing_phone,
45
+ validates :member_listing_phone,
46
46
  presence: true,
47
47
  format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Member Format: ***-***-****" }
48
48
 
49
49
  # Clean URL Define
50
- friendly_id :phcdev_members_listing_nice_urls, use: [:slugged, :finders]
50
+ friendly_id :members_listing_nice_urls, use: [:slugged, :finders]
51
51
 
52
- def phcdev_members_listing_nice_urls
52
+ def members_listing_nice_urls
53
53
  [
54
- [:listing_company_name, :listing_contact_name]
54
+ [:member_listing_company_name, :member_listing_contact_name]
55
55
  ]
56
56
  end
57
57
 
@@ -9,36 +9,36 @@ module PhcdevworksMembers
9
9
 
10
10
  # Profile Gravatar
11
11
  include Gravtastic
12
- gravtastic :profile_email
12
+ gravtastic :member_profile_email
13
13
 
14
14
  # Relationships
15
15
  has_many :addresses, class_name: 'Member::Address', :dependent => :destroy
16
16
  has_many :listings, class_name: 'Member::Listing', :dependent => :destroy
17
17
 
18
18
  # Form Fields Validation
19
- validates :profile_first_name,
19
+ validates :member_profile_first_name,
20
20
  presence: true
21
21
 
22
- validates :profile_last_name,
22
+ validates :member_profile_last_name,
23
23
  presence: true
24
24
 
25
- validates :profile_title,
25
+ validates :member_profile_title,
26
26
  presence: true
27
27
 
28
- validates :profile_email,
28
+ validates :member_profile_email,
29
29
  presence: true,
30
30
  format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
31
31
 
32
- validates :profile_phone,
32
+ validates :member_profile_phone,
33
33
  presence: true,
34
34
  format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
35
35
 
36
36
  # Clean URL Define
37
- friendly_id :phcdev_members_profile_nice_urls, use: [:slugged, :finders]
37
+ friendly_id :members_profile_nice_urls, use: [:slugged, :finders]
38
38
 
39
- def phcdev_members_profile_nice_urls
39
+ def members_profile_nice_urls
40
40
  [
41
- [:profile_first_name, :profile_last_name]
41
+ [:member_profile_first_name, :member_profile_last_name]
42
42
  ]
43
43
  end
44
44
 
@@ -112,34 +112,6 @@
112
112
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Tutorials -->
113
113
  <% end %>
114
114
 
115
- <% if defined?phcdevworks_core_modules %>
116
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
117
- <li class="nav-header">Core Modules</li>
118
- <li class="has-sub">
119
- <a href="javascript:;">
120
- <b class="caret"></b>
121
- <i class="fad fa-sitemap"></i>
122
- <span>Categories</span>
123
- </a>
124
- <ul class="sub-menu">
125
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
126
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
127
- </ul>
128
- </li>
129
- <li class="has-sub">
130
- <a href="javascript:;">
131
- <b class="caret"></b>
132
- <i class="fad fa-analytics"></i>
133
- <span>Marketing</span>
134
- </a>
135
- <ul class="sub-menu">
136
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
137
- <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
138
- </ul>
139
- </li>
140
- <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
141
- <% end %>
142
-
143
115
  <% if defined?phcdevworks_members %>
144
116
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Members -->
145
117
  <li class="nav-header">Membership Manager</li>
@@ -238,6 +210,34 @@
238
210
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks RealEstate -->
239
211
  <% end %>
240
212
 
213
+ <% if defined?phcdevworks_core_modules %>
214
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
215
+ <li class="nav-header">Core Modules</li>
216
+ <li class="has-sub">
217
+ <a href="javascript:;">
218
+ <b class="caret"></b>
219
+ <i class="fad fa-sitemap"></i>
220
+ <span>Categories</span>
221
+ </a>
222
+ <ul class="sub-menu">
223
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories") %>"><%= link_to("Category Index", phcdevworks_core_modules.post_categories_path) %></li>
224
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/post/categories#new") %>"><%= link_to("New Category", phcdevworks_core_modules.new_post_category_path) %></li>
225
+ </ul>
226
+ </li>
227
+ <li class="has-sub">
228
+ <a href="javascript:;">
229
+ <b class="caret"></b>
230
+ <i class="fad fa-analytics"></i>
231
+ <span>Marketing</span>
232
+ </a>
233
+ <ul class="sub-menu">
234
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations") %>"><%= link_to("SEO Data Index", phcdevworks_core_modules.marketing_optimizations_path) %></li>
235
+ <li class="<%= phc_menu_active_controller("phcdevworks_core_modules/marketing/optimizations#new") %>"><%= link_to("Add SEO Data", phcdevworks_core_modules.new_marketing_optimization_path) %></li>
236
+ </ul>
237
+ </li>
238
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
239
+ <% end %>
240
+
241
241
  <% if current_user && current_user.admin? %>
242
242
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
243
243
  <li class="nav-header">User Administration</li>
@@ -7,8 +7,8 @@
7
7
 
8
8
  <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= form.label :category_name, "Category Name" %>
11
- <%= form.text_field :category_name, placeholder: "Directory Category", class: "form-control" %>
10
+ <%= form.label :directory_category_name, "Category Name" %>
11
+ <%= form.text_field :directory_category_name, placeholder: "Directory Category", class: "form-control" %>
12
12
  </div>
13
13
  <!-- Form Input Fields -->
14
14
 
@@ -3,11 +3,11 @@
3
3
  <tbody>
4
4
  <% @directory_category.listings.each do |member_listing| %>
5
5
  <tr>
6
- <td><%= link_to member_listing.listing_company_name, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
7
- <td><%= link_to member_listing.listing_contact_name, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
8
- <td><%= link_to member_listing.listing_phone, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
9
- <td><%= link_to member_listing.listing_contact_email, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
10
- <td><%= link_to member_listing.listing_website, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
6
+ <td><%= link_to member_listing.member_listing_company_name, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
7
+ <td><%= link_to member_listing.member_listing_contact_name, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
8
+ <td><%= link_to member_listing.member_listing_phone, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
9
+ <td><%= link_to member_listing.member_listing_contact_email, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
10
+ <td><%= link_to member_listing.member_listing_website, phcdevworks_members.member_profile_listing_path(member_listing.profile, member_listing) %></td>
11
11
  </tr>
12
12
  <% end %>
13
13
  </tbody>
@@ -1,12 +1,7 @@
1
1
  <!-- Page Content -->
2
2
  <div class="panel panel-inverse">
3
3
  <div class="panel-heading">
4
- <div class="panel-heading-btn">
5
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
6
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
7
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
8
- </div>
9
- <h4 class="panel-title">Active Listings in <%= @directory_category.category_name %> Directory Category</h4>
4
+ <h4 class="panel-title">Active Listings in <%= @directory_category.directory_category_name %> Directory Category</h4>
10
5
  </div>
11
6
  <div class="panel-body">
12
7
  <%= render 'phcdevworks_members/directory/categories/components/category_list' %>
@@ -17,12 +12,7 @@
17
12
  <!-- Page Content -->
18
13
  <div class="panel panel-inverse">
19
14
  <div class="panel-heading">
20
- <div class="panel-heading-btn">
21
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
22
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
23
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
24
- </div>
25
- <h4 class="panel-title">Active Listings in <%= @directory_category.category_name %> Directory Category Change Log</h4>
15
+ <h4 class="panel-title">Active Listings in <%= @directory_category.directory_category_name %> Directory Category Change Log</h4>
26
16
  </div>
27
17
  <div class="panel-body">
28
18
  <%= render 'phcdevworks_members/directory/categories/components/category_audits' %>
@@ -3,7 +3,7 @@
3
3
  <h4 class="panel-title text-center">Directory Category Options</h4>
4
4
  </div>
5
5
  <div class="panel-body">
6
- <h1 class="text-center"><%= @directory_category.category_name %></h1>
6
+ <h1 class="text-center"><%= @directory_category.directory_category_name %></h1>
7
7
  <div class="text-center">
8
8
  <%= link_to edit_directory_category_path(@directory_category), class: "btn btn-sm btn-primary" do %>
9
9
  <i class="fa fa-pencil-square-o"></i> Update
@@ -37,7 +37,7 @@
37
37
  <% @directory_categories.each do |directory_category| %>
38
38
  <li class="list-group-item">
39
39
  <span class="badge badge-default badge-roundless"><%= directory_category.listings.count %></span></span>
40
- <%= link_to directory_category.category_name, directory_category %>
40
+ <%= link_to directory_category.directory_category_name, directory_category %>
41
41
  </li>
42
42
  <% end %>
43
43
  </ul>
@@ -1,6 +1,6 @@
1
1
  <!-- Title System -->
2
2
  <% phc_title "Directory Category Manager" %>
3
- <% phc_title_tagline "Detailed Information for " + @directory_category.category_name %>
3
+ <% phc_title_tagline "Detailed Information for " + @directory_category.directory_category_name %>
4
4
  <% phc_breadcrumb_one link_to "Dashboard", phcdevworks_members.dashboard_path %>
5
5
  <% phc_breadcrumb_two link_to "Directory Category Index", phcdevworks_members.directory_categories_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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 %>
@@ -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>
@@ -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>
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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 -->
@@ -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
 
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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_company_name %></td>
15
- <td><%= member_profile_listing.listing_contact_name %></td>
16
- <td><%= member_profile_listing.listing_city %></td>
17
- <td><%= member_profile_listing.listing_phone %></td>
14
+ <td><%= member_profile_listing.member_listing_company_name %></td>
15
+ <td><%= member_profile_listing.member_listing_contact_name %></td>
16
+ <td><%= member_profile_listing.member_listing_city %></td>
17
+ <td><%= member_profile_listing.member_listing_phone %></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 + " Listings", phcdevworks_members.member_profile_listings_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
- <%= link_to "Add a New Listing for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name, phcdevworks_members.new_member_profile_listing_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 + " Listings", phcdevworks_members.member_profile_listings_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
+ <%= link_to "Add a New Listing for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name, phcdevworks_members.new_member_profile_listing_path(@member_profile), class: "btn btn-purple btn-xs" %>
24
24
  </div>
@@ -1,6 +1,6 @@
1
1
  <!-- PHCTitleSEO Title Variables -->
2
2
  <% phc_title "Members Manager" %>
3
- <% phc_title_tagline "Update Member Information for " + @member_profile.profile_first_name + " " + @member_profile.profile_last_name %>
3
+ <% phc_title_tagline "Update Member Information for " + @member_profile.member_profile_first_name + " " + @member_profile.member_profile_last_name %>
4
4
  <% phc_breadcrumb_one link_to "Dashboard", phcdevworks_members.dashboard_path %>
5
5
  <% phc_breadcrumb_two link_to "Member Profiles", phcdevworks_members.member_profiles_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
@@ -49,10 +49,10 @@
49
49
  <tbody>
50
50
  <% @member_profiles.each do |member_profile| %>
51
51
  <tr>
52
- <td><%= link_to member_profile.profile_first_name, member_profile %></td>
53
- <td><%= link_to member_profile.profile_last_name, member_profile %></td>
54
- <td><%= link_to member_profile.profile_email, member_profile %></td>
55
- <td><%= link_to member_profile.profile_phone, member_profile %></td>
52
+ <td><%= link_to member_profile.member_profile_first_name, member_profile %></td>
53
+ <td><%= link_to member_profile.member_profile_last_name, member_profile %></td>
54
+ <td><%= link_to member_profile.member_profile_email, member_profile %></td>
55
+ <td><%= link_to member_profile.member_profile_phone, member_profile %></td>
56
56
  <td>
57
57
  <div class="btn-group d-flex" role="group">
58
58
  <%= link_to "Member Details", member_profile, class: "btn btn-primary btn-xs" %>
@@ -22,12 +22,7 @@
22
22
  <!-- Member Profiles - Content - Information -->
23
23
  <div class="panel panel-inverse">
24
24
  <div class="panel-heading">
25
- <div class="panel-heading-btn">
26
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
27
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
28
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
29
- </div>
30
- <h4 class="panel-title"><%= @member_profile.profile_first_name + ' ' + @member_profile.profile_last_name %> Information</h4>
25
+ <h4 class="panel-title"><%= @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_last_name %> Information</h4>
31
26
  </div>
32
27
  <div class="panel-body">
33
28
  <%= render 'phcdevworks_members/member/profiles/components/profile_information_table' %>
@@ -42,12 +37,7 @@
42
37
  <!-- Member Profiles - Content - Addresses -->
43
38
  <div class="panel panel-inverse">
44
39
  <div class="panel-heading">
45
- <div class="panel-heading-btn">
46
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
47
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
48
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
49
- </div>
50
- <h4 class="panel-title"><%= @member_profile.profile_first_name + ' ' + @member_profile.profile_last_name %> Addresses</h4>
40
+ <h4 class="panel-title"><%= @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_last_name %> Addresses</h4>
51
41
  </div>
52
42
  <div class="panel-body">
53
43
  <%= render 'phcdevworks_members/member/profiles/components/profile_addresses_table' %>
@@ -62,12 +52,7 @@
62
52
  <!-- Member Profiles - Content - Listings -->
63
53
  <div class="panel panel-inverse">
64
54
  <div class="panel-heading">
65
- <div class="panel-heading-btn">
66
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
67
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
68
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
69
- </div>
70
- <h4 class="panel-title"><%= @member_profile.profile_first_name + ' ' + @member_profile.profile_last_name %> Listings</h4>
55
+ <h4 class="panel-title"><%= @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_last_name %> Listings</h4>
71
56
  </div>
72
57
  <div class="panel-body">
73
58
  <%= render 'phcdevworks_members/member/profiles/components/profile_listings_table' %>
@@ -82,12 +67,7 @@
82
67
  <!-- Member Profiles - Content - Audit Log -->
83
68
  <div class="panel panel-inverse">
84
69
  <div class="panel-heading">
85
- <div class="panel-heading-btn">
86
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
87
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
88
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
89
- </div>
90
- <h4 class="panel-title"><%= @member_profile.profile_first_name + ' ' + @member_profile.profile_last_name %> Change Log</h4>
70
+ <h4 class="panel-title"><%= @member_profile.member_profile_first_name + ' ' + @member_profile.member_profile_last_name %> Change Log</h4>
91
71
  </div>
92
72
  <div class="panel-body">
93
73
  <%= render 'phcdevworks_members/member/profiles/components/profile_audits_table' %>
@@ -2,13 +2,13 @@ class CreatePhcdevworksMembersMemberAddresses < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_members_member_addresses do |t|
4
4
 
5
- t.string :address_line_1
6
- t.string :address_line_2
7
- t.string :address_city
8
- t.string :address_province
9
- t.string :address_country
10
- t.string :address_postal_code
11
- t.string :address_type
5
+ t.string :member_address_line_1
6
+ t.string :member_address_line_2
7
+ t.string :member_address_city
8
+ t.string :member_address_province
9
+ t.string :member_address_country
10
+ t.string :member_address_postal_code
11
+ t.string :member_address_type
12
12
 
13
13
  t.string :slug
14
14
  t.string :user_id
@@ -2,19 +2,19 @@ class CreatePhcdevworksMembersMemberListings < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_members_member_listings do |t|
4
4
 
5
- t.string :listing_company_name
6
- t.string :listing_contact_name
5
+ t.string :member_listing_company_name
6
+ t.string :member_listing_contact_name
7
7
 
8
- t.string :listing_address_line_1
9
- t.string :listing_address_line_2
10
- t.string :listing_city
11
- t.string :listing_country
12
- t.string :listing_province
13
- t.string :listing_postal_code
8
+ t.string :member_listing_address_line_1
9
+ t.string :member_listing_address_line_2
10
+ t.string :member_listing_city
11
+ t.string :member_listing_country
12
+ t.string :member_listing_province
13
+ t.string :member_listing_postal_code
14
14
 
15
- t.string :listing_phone
16
- t.string :listing_contact_email
17
- t.string :listing_website
15
+ t.string :member_listing_phone
16
+ t.string :member_listing_contact_email
17
+ t.string :member_listing_website
18
18
 
19
19
  t.string :slug
20
20
  t.string :user_id
@@ -2,12 +2,12 @@ class CreatePhcdevworksMembersMemberProfiles < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_members_member_profiles do |t|
4
4
 
5
- t.string :profile_first_name
6
- t.string :profile_last_name
7
- t.string :profile_title
8
- t.string :profile_email
9
- t.string :profile_phone
10
- t.text :profile_notes
5
+ t.string :member_profile_first_name
6
+ t.string :member_profile_last_name
7
+ t.string :member_profile_title
8
+ t.string :member_profile_email
9
+ t.string :member_profile_phone
10
+ t.text :member_profile_notes
11
11
 
12
12
  t.string :slug
13
13
  t.string :user_id
@@ -2,7 +2,7 @@ class CreatePhcdevworksMembersDirectoryCategories < ActiveRecord::Migration[6.0]
2
2
  def change
3
3
  create_table :phcdevworks_members_directory_categories do |t|
4
4
 
5
- t.string :category_name
5
+ t.string :directory_category_name
6
6
 
7
7
  t.string :slug
8
8
  t.string :user_id
@@ -1,3 +1,3 @@
1
1
  module PhcdevworksMembers
2
- VERSION = "8.0.0"
2
+ VERSION = "9.0.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcdevworks_members
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.0.0
4
+ version: 9.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - PHCDevworks
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-07-10 00:00:00.000000000 Z
11
+ date: 2020-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -120,14 +120,14 @@ dependencies:
120
120
  requirements:
121
121
  - - "~>"
122
122
  - !ruby/object:Gem::Version
123
- version: '4.0'
123
+ version: '5.0'
124
124
  type: :runtime
125
125
  prerelease: false
126
126
  version_requirements: !ruby/object:Gem::Requirement
127
127
  requirements:
128
128
  - - "~>"
129
129
  - !ruby/object:Gem::Version
130
- version: '4.0'
130
+ version: '5.0'
131
131
  - !ruby/object:Gem::Dependency
132
132
  name: phcdevworks_notifications
133
133
  requirement: !ruby/object:Gem::Requirement