phcmemberspro 87.0.0 → 88.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +1 -1
  3. data/app/controllers/phcmemberspro/api/v1/categories_controller.rb +2 -3
  4. data/app/controllers/phcmemberspro/api/v1/listings_controller.rb +2 -2
  5. data/app/controllers/phcmemberspro/application_controller.rb +18 -18
  6. data/app/controllers/phcmemberspro/directory/categories_controller.rb +15 -16
  7. data/app/controllers/phcmemberspro/member/addresses_controller.rb +12 -13
  8. data/app/controllers/phcmemberspro/member/dashboards_controller.rb +5 -4
  9. data/app/controllers/phcmemberspro/member/listings_controller.rb +15 -16
  10. data/app/controllers/phcmemberspro/member/profiles_controller.rb +12 -13
  11. data/app/jobs/phcmemberspro/application_job.rb +1 -1
  12. data/app/mailers/phcmemberspro/application_mailer.rb +1 -1
  13. data/app/models/phcmemberspro/address_versions.rb +3 -3
  14. data/app/models/phcmemberspro/directory/category.rb +10 -12
  15. data/app/models/phcmemberspro/member/address.rb +18 -27
  16. data/app/models/phcmemberspro/member/listing.rb +35 -43
  17. data/app/models/phcmemberspro/member/profile.rb +10 -14
  18. data/app/views/layouts/phcmemberspro/application.html.erb +7 -12
  19. data/app/views/layouts/phcmemberspro/components/backend/footer/_footer.html.erb +5 -5
  20. data/app/views/layouts/phcmemberspro/components/backend/navigation/_top_menu.html.erb +1 -42
  21. data/app/views/layouts/phcmemberspro/components/backend/sidebars/_side_menu.html.erb +68 -61
  22. data/app/views/layouts/phcmemberspro/mailer.html.erb +0 -1
  23. data/app/views/layouts/phcmemberspro/member_profile.html.erb +7 -12
  24. data/app/views/phcmemberspro/api/v1/listings/index.json.rabl +1 -1
  25. data/app/views/phcmemberspro/directory/categories/_form.html.erb +12 -11
  26. data/app/views/phcmemberspro/directory/categories/edit.html.erb +3 -1
  27. data/app/views/phcmemberspro/directory/categories/index.html.erb +22 -17
  28. data/app/views/phcmemberspro/directory/categories/new.html.erb +3 -1
  29. data/app/views/phcmemberspro/directory/categories/show.html.erb +1 -1
  30. data/app/views/phcmemberspro/member/addresses/_form.html.erb +24 -23
  31. data/app/views/phcmemberspro/member/addresses/components/_address_audits_table.html.erb +7 -7
  32. data/app/views/phcmemberspro/member/addresses/components/_address_main.html.erb +17 -0
  33. data/app/views/phcmemberspro/member/addresses/edit.html.erb +3 -3
  34. data/app/views/phcmemberspro/member/addresses/index.html.erb +23 -20
  35. data/app/views/phcmemberspro/member/addresses/new.html.erb +3 -3
  36. data/app/views/phcmemberspro/member/addresses/show.html.erb +38 -28
  37. data/app/views/phcmemberspro/member/listings/_form.html.erb +34 -33
  38. data/app/views/phcmemberspro/member/listings/components/_listing_audits_table.html.erb +7 -7
  39. data/app/views/phcmemberspro/member/listings/components/_listing_main.html.erb +22 -0
  40. data/app/views/phcmemberspro/member/listings/edit.html.erb +3 -3
  41. data/app/views/phcmemberspro/member/listings/index.html.erb +24 -23
  42. data/app/views/phcmemberspro/member/listings/new.html.erb +3 -3
  43. data/app/views/phcmemberspro/member/listings/show.html.erb +38 -28
  44. data/app/views/phcmemberspro/member/profiles/_form.html.erb +22 -21
  45. data/app/views/phcmemberspro/member/profiles/components/_profile_addresses_table.html.erb +6 -6
  46. data/app/views/phcmemberspro/member/profiles/components/_profile_audits_table.html.erb +7 -7
  47. data/app/views/phcmemberspro/member/profiles/components/_profile_header.html.erb +1 -0
  48. data/app/views/phcmemberspro/member/profiles/components/_profile_information_table.html.erb +2 -2
  49. data/app/views/phcmemberspro/member/profiles/components/_profile_listings_table.html.erb +6 -6
  50. data/app/views/phcmemberspro/member/profiles/components/_profile_sidebar.html.erb +15 -15
  51. data/app/views/phcmemberspro/member/profiles/edit.html.erb +3 -3
  52. data/app/views/phcmemberspro/member/profiles/index.html.erb +24 -22
  53. data/app/views/phcmemberspro/member/profiles/new.html.erb +3 -3
  54. data/app/views/phcmemberspro/member/profiles/show.html.erb +2 -2
  55. data/config/routes.rb +8 -11
  56. data/lib/phcmemberspro.rb +0 -1
  57. data/lib/phcmemberspro/engine.rb +9 -8
  58. data/lib/phcmemberspro/version.rb +1 -1
  59. metadata +64 -64
  60. data/app/views/phcmemberspro/member/addresses/components/_address_table.html.erb +0 -26
  61. data/app/views/phcmemberspro/member/listings/components/_listing_table.html.erb +0 -33
data/app/views/phcmemberspro/member/listings/_form.html.erb CHANGED
@@ -1,67 +1,68 @@
1
- <!-- PHCMembers Form - Web Directory Listings -->
2
- <%= form_for([@member_listing.profile, @member_listing], url: form_url) do |phc_members_pro_member_listings| %>
1
+ <!-- Form - Member - Listing -->
2
+ <%= form_with(model: [ @member_profile, @member_listing], url: form_url, local: true) do |form| %>
3
3
 
4
4
  <!-- PHCNotifi Render Validation -->
5
- <%= render 'phcnotifi/validations', :object => @member_listing %>
5
+ <%= render 'phcnotifi/default/validations', :object => @member_listing %>
6
6
  <!-- PHCNotifi Render Validation -->
7
7
 
8
- <!-- PHCMembers Fields - Web Directory Listings -->
8
+ <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= phc_members_pro_member_listings.label :listing_company_name, "Company Name" %>
11
- <%= phc_members_pro_member_listings.text_field :listing_company_name, class: "form-control", placeholder: "Business/Organization: Name" %>
10
+ <%= form.label :listing_company_name, "Company Name" %>
11
+ <%= form.text_field :listing_company_name, class: "form-control", placeholder: "Business/Organization: Name" %>
12
12
  </div>
13
13
  <div class="form-group field_with_errors">
14
- <%= phc_members_pro_member_listings.label :listing_contact_name, "Contact Name" %>
15
- <%= phc_members_pro_member_listings.text_field :listing_contact_name, class: "form-control", placeholder: "Business/Organization: Contact Person" %>
14
+ <%= form.label :listing_contact_name, "Contact Name" %>
15
+ <%= form.text_field :listing_contact_name, class: "form-control", placeholder: "Business/Organization: Contact Person" %>
16
16
  </div>
17
17
  <div class="form-group field_with_errors">
18
- <%= phc_members_pro_member_listings.label :listing_address_line_1, "Address Line 1" %>
19
- <%= phc_members_pro_member_listings.text_field :listing_address_line_1, class: "form-control", placeholder: "Location: Street Address" %>
18
+ <%= form.label :listing_address_line_1, "Address Line 1" %>
19
+ <%= form.text_field :listing_address_line_1, class: "form-control", placeholder: "Location: Street Address" %>
20
20
  </div>
21
21
  <div class="form-group field_with_errors">
22
- <%= phc_members_pro_member_listings.label :listing_address_line_2, "Address Line 2" %>
23
- <%= phc_members_pro_member_listings.text_field :listing_address_line_2, class: "form-control", placeholder: "Location: Box - Suite - Floor" %>
22
+ <%= form.label :listing_address_line_2, "Address Line 2" %>
23
+ <%= form.text_field :listing_address_line_2, class: "form-control", placeholder: "Location: Box - Suite - Floor" %>
24
24
  </div>
25
25
  <div class="form-group field_with_errors">
26
- <%= phc_members_pro_member_listings.label :listing_city, "City" %>
27
- <%= phc_members_pro_member_listings.text_field :listing_city, class: "form-control", placeholder: "Location: City" %>
26
+ <%= form.label :listing_city, "City" %>
27
+ <%= form.text_field :listing_city, class: "form-control", placeholder: "Location: City" %>
28
28
  </div>
29
29
  <div class="form-group field_with_errors">
30
- <%= phc_members_pro_member_listings.label :listing_province, "Province/State" %>
31
- <%= phc_members_pro_member_listings.text_field :listing_province, class: "form-control", placeholder: "Location: Province/State" %>
30
+ <%= form.label :listing_province, "Province/State" %>
31
+ <%= form.text_field :listing_province, class: "form-control", placeholder: "Location: Province/State" %>
32
32
  </div>
33
33
  <div class="form-group field_with_errors">
34
- <%= phc_members_pro_member_listings.label :listing_country, "Country" %>
35
- <%= phc_members_pro_member_listings.text_field :listing_country, class: "form-control", placeholder: "Country" %>
34
+ <%= form.label :listing_country, "Country" %>
35
+ <%= form.text_field :listing_country, class: "form-control", placeholder: "Country" %>
36
36
  </div>
37
37
  <div class="form-group field_with_errors">
38
- <%= phc_members_pro_member_listings.label :listing_postal_code, "Postal Code" %><br>
39
- <%= phc_members_pro_member_listings.text_field :listing_postal_code, class: "form-control", placeholder: "Location: PostalCode" %>
38
+ <%= form.label :listing_postal_code, "Postal Code" %><br>
39
+ <%= form.text_field :listing_postal_code, class: "form-control", placeholder: "Location: PostalCode" %>
40
40
  </div>
41
41
  <div class="form-group field_with_errors">
42
- <%= phc_members_pro_member_listings.label :listing_phone, "Business Phone Number" %>
43
- <%= phc_members_pro_member_listings.text_field :listing_phone, class: "form-control", placeholder: "Business/Organization: PhoneNumber (Public)" %>
42
+ <%= form.label :listing_phone, "Business Phone Number" %>
43
+ <%= form.text_field :listing_phone, class: "form-control", placeholder: "Business/Organization: PhoneNumber (Public)" %>
44
44
  </div>
45
45
  <div class="form-group field_with_errors">
46
- <%= phc_members_pro_member_listings.label :listing_contact_email, "Business General Email" %>
47
- <%= phc_members_pro_member_listings.text_field :listing_contact_email, class: "form-control", placeholder: "Business/Organization: Email Address (Public)" %>
46
+ <%= form.label :listing_contact_email, "Business General Email" %>
47
+ <%= form.text_field :listing_contact_email, class: "form-control", placeholder: "Business/Organization: Email Address (Public)" %>
48
48
  </div>
49
49
  <div class="form-group field_with_errors">
50
- <%= phc_members_pro_member_listings.label :listing_website, "Business Website" %>
51
- <%= phc_members_pro_member_listings.text_field :listing_website, class: "form-control", placeholder: "Business/Organization: Website (Public)" %>
50
+ <%= form.label :listing_website, "Business Website" %>
51
+ <%= form.text_field :listing_website, class: "form-control", placeholder: "Business/Organization: Website (Public)" %>
52
52
  </div>
53
53
  <div class="form-group field_with_errors">
54
- <%= phc_members_pro_member_listings.collection_check_boxes :category_ids, Phcmemberspro::Directory::Category.where(org_id: current_user.org_id), :id, :category_name do |listing_category| %>
54
+ <%= form.collection_check_boxes :category_ids, Phcmemberspro::Directory::Category.all, :id, :category_name do |listing_category| %>
55
55
  <%= listing_category.check_box %>
56
- <%= listing_category.label %></br>
56
+ <%= listing_category.label %><br>
57
57
  <% end %>
58
58
  </div>
59
- <br>
59
+ <!-- Form Input Fields -->
60
+
61
+ <!-- Form Submition Button -->
60
62
  <div class="actions">
61
- <%= phc_members_pro_member_listings.submit class: "btn btn-primary btn-gradient waves-effect waves-light btn-md" %>
63
+ <%= form.submit class: "btn btn-primary btn-md" %>
62
64
  </div>
63
- <br>
64
- <!-- PHCMembers Fields - Web Directory Listings -->
65
+ <!-- For Submition Button -->
65
66
 
66
67
  <% end %>
67
- <!-- PHCMembers Form - Web Directory Listings -->
68
+ <!-- Form - Member - Listing -->
data/app/views/phcmemberspro/member/listings/components/_listing_audits_table.html.erb CHANGED
@@ -2,13 +2,13 @@
2
2
  <table class="table table-striped table-bordered table-hover">
3
3
  <tbody>
4
4
  <% @member_listing_versions.each do |member_listing_version| %>
5
- <tr>
6
- <td><span class="label label-primary"><%= member_listing_version.event.humanize %></span></td>
7
- <td><small>LISTING EVENT ID#<%= member_listing_version.id %></small></td>
8
- <td><%= member_listing_version.event.humanize + ' ' + @members_profile_info.member_first_name + ' ' + @members_profile_info.member_last_name %> Listing Information</td>
9
- <td><%= member_listing_version.whodunnit %></td>
10
- <td><%= l(member_listing_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_listing_version.created_at, format: "%H:%M %Z") %></td>
11
- </tr>
5
+ <tr>
6
+ <td><span class="label label-primary"><%= member_listing_version.event.humanize %></span></td>
7
+ <td><small>LISTING EVENT ID#<%= member_listing_version.id %></small></td>
8
+ <td><%= member_listing_version.event.humanize + ' ' + @members_profile_info.member_first_name + ' ' + @members_profile_info.member_last_name %> Listing Information</td>
9
+ <td><%= member_listing_version.whodunnit %></td>
10
+ <td><%= l(member_listing_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_listing_version.created_at, format: "%H:%M %Z") %></td>
11
+ </tr>
12
12
  <% end %>
13
13
  </tbody>
14
14
  </table>
data/app/views/phcmemberspro/member/listings/components/_listing_main.html.erb ADDED
@@ -0,0 +1,22 @@
1
+ <div class="row">
2
+ <div class="col-6">
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>
10
+ </address>
11
+ </div>
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>
16
+ </div>
17
+ </div>
18
+ <br>
19
+ <div class="btn-group d-flex" role="group">
20
+ <%= link_to 'Update', edit_member_profile_listing_path, class: "btn btn-purple btn-xs" %>
21
+ <%= link_to 'Remove', member_profile_listing_path, class: "btn btn-danger btn-xs", method: :delete, data: { confirm: 'Are you sure? This will remove listing information and cannot be reversed.' } %>
22
+ </div>
data/app/views/phcmemberspro/member/listings/edit.html.erb CHANGED
@@ -17,7 +17,7 @@
17
17
  <!-- Page Header -->
18
18
  <h1 class="page-header"><%= yield(:phc_title) %></h1>
19
19
  <!-- Page Header -->
20
-
20
+
21
21
  <!-- Page Content -->
22
22
  <div class="panel panel-inverse">
23
23
  <div class="panel-heading">
@@ -29,9 +29,9 @@
29
29
  <h4 class="panel-title"><%= yield(:phc_title) %></h4>
30
30
  </div>
31
31
  <div class="panel-body">
32
- <!-- Form for Member Listing Update -->
32
+ <!-- Form to Edit Member Listing -->
33
33
  <%= render 'form', { form_url: member_profile_listing_path } %>
34
- <!-- Form for Member Listing Update -->
34
+ <!-- Form to Edit Member Listing -->
35
35
  </div>
36
36
  </div>
37
37
  <!-- Page Content -->
data/app/views/phcmemberspro/member/listings/index.html.erb CHANGED
@@ -8,37 +8,38 @@
8
8
 
9
9
  <!-- Page Bradcrumbs -->
10
10
  <ol class="breadcrumb pull-right">
11
- <li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
12
- <li class="breadcrumb-item"><%= yield(:phc_breadcrumb_two) %></li>
13
- <li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_three) %></li>
11
+ <li class="breadcrumb-item"><%= yield(:phc_breadcrumb_one) %></li>
12
+ <li class="breadcrumb-item active"><%= yield(:phc_breadcrumb_two) %></li>
14
13
  </ol>
15
14
  <!-- Page Bradcrumbs -->
16
15
 
17
16
  <!-- Page Header -->
18
17
  <h1 class="page-header"><%= yield(:phc_title) %></h1>
19
18
  <!-- Page Header -->
20
-
21
- <!-- Page Content -->
19
+
20
+ <!-- Page & Panel Content -->
22
21
  <div class="panel panel-inverse">
23
- <div class="panel-heading">
24
- <div class="panel-heading-btn">
25
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
26
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
27
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
28
- </div>
29
- <h4 class="panel-title"><%= yield(:phc_title_tagline) %></h4>
30
- </div>
31
- <div class="panel-body">
32
- <!-- Table - Members Listings -->
22
+ <!-- Panel Heading -->
23
+ <div class="panel-heading">
24
+ <div class="panel-heading-btn">
25
+ <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
26
+ <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
27
+ <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
28
+ </div>
29
+ <h4 class="panel-title"><%= yield(:phc_title_tagline) %></h4>
30
+ </div>
31
+ <!-- Panel Heading -->
32
+ <!-- Panel Body -->
33
+ <div class="panel-body">
34
+ <!-- Table - Member - Listings - Index -->
33
35
  <div class="table-responsive">
34
- <table class="table table-striped table-bordered table-hover">
35
- <thead class="thead-inverse">
36
+ <table class="table table-striped table-bordered">
37
+ <thead>
36
38
  <tr>
37
39
  <th>Company Name</th>
38
40
  <th>Conact Name</th>
39
41
  <th>City</th>
40
42
  <th>Country</th>
41
- <th>Listing Phone</th>
42
43
  <th>Listing Email</th>
43
44
  <th>Listing Website</th>
44
45
  <th></th>
@@ -51,7 +52,6 @@
51
52
  <td class="highlight"><%= link_to member_listing.listing_contact_name, member_profile_listing_path(member_listing.profile, member_listing) %></td>
52
53
  <td class="highlight"><%= link_to member_listing.listing_city, member_profile_listing_path(member_listing.profile, member_listing) %></td>
53
54
  <td class="highlight"><%= link_to member_listing.listing_province, member_profile_listing_path(member_listing.profile, member_listing) %></td>
54
- <td class="highlight"><%= link_to member_listing.listing_phone, member_profile_listing_path(member_listing.profile, member_listing) %></td>
55
55
  <td class="highlight"><%= link_to member_listing.listing_contact_email, member_profile_listing_path(member_listing.profile, member_listing) %></td>
56
56
  <td class="highlight"><%= link_to member_listing.listing_website, member_profile_listing_path(member_listing.profile, member_listing) %></td>
57
57
  <td>
@@ -66,11 +66,12 @@
66
66
  </tbody>
67
67
  </table>
68
68
  <%= link_to phcmemberspro.new_member_profile_listing_path, class: "btn btn-primary btn-sm" do %>
69
- <i class="fas fa-plus-circle"></i>
69
+ <i class="fas fa-plus-circle"></i>
70
70
  <%= "Add a New Listing for " + @members_profile_info .member_first_name + " " + @members_profile_info .member_last_name %>
71
71
  <% end %>
72
72
  </div>
73
- <!-- Table - Members Listings -->
74
- </div>
73
+ <!-- Table - Member - Listings - Index -->
74
+ </div>
75
+ <!-- Panel Body -->
75
76
  </div>
76
- <!-- Page Content -->
77
+ <!-- Page & Panel Content -->
data/app/views/phcmemberspro/member/listings/new.html.erb CHANGED
@@ -17,7 +17,7 @@
17
17
  <!-- Page Header -->
18
18
  <h1 class="page-header"><%= yield(:phc_title) %></h1>
19
19
  <!-- Page Header -->
20
-
20
+
21
21
  <!-- Page Content -->
22
22
  <div class="panel panel-inverse">
23
23
  <div class="panel-heading">
@@ -29,9 +29,9 @@
29
29
  <h4 class="panel-title"><%= yield(:phc_title) %></h4>
30
30
  </div>
31
31
  <div class="panel-body">
32
- <!-- Form for Member Listing New -->
32
+ <!-- Form for New Member Listings -->
33
33
  <%= render 'form', { form_url: member_profile_listings_path } %>
34
- <!-- Form for Member Listing New -->
34
+ <!-- Form for New Member Listings -->
35
35
  </div>
36
36
  </div>
37
37
  <!-- Page Content -->
data/app/views/phcmemberspro/member/listings/show.html.erb CHANGED
@@ -17,39 +17,49 @@
17
17
  <!-- Page Header -->
18
18
  <h1 class="page-header"><%= yield(:phc_title) %></h1>
19
19
  <!-- Page Header -->
20
-
20
+
21
21
  <!-- Page Content -->
22
- <div class="panel panel-inverse">
23
- <div class="panel-heading">
24
- <div class="panel-heading-btn">
25
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
26
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
27
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
22
+ <div class="row">
23
+
24
+ <!-- Listing Information -->
25
+ <div class="col-12">
26
+ <div class="panel panel-inverse">
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"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Listing Details</h4>
34
+ </div>
35
+ <div class="panel-body">
36
+ <!-- Table - Members Listings -->
37
+ <%= render 'phcmemberspro/member/listings/components/listing_main' %>
38
+ <!-- Table - Members Listings -->
39
+ </div>
28
40
  </div>
29
- <h4 class="panel-title"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Listing Details</h4>
30
41
  </div>
31
- <div class="panel-body">
32
- <!-- Table - Members Listings -->
33
- <%= render 'phcmemberspro/member/listings/components/listing_table' %>
34
- <!-- Table - Members Listings -->
35
- </div>
36
- </div>
37
- <!-- Page Content -->
42
+ <!-- Listing Information -->
38
43
 
39
- <!-- Page Content -->
40
- <div class="panel panel-inverse">
41
- <div class="panel-heading">
42
- <div class="panel-heading-btn">
43
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
44
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
45
- <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
44
+ <!-- Listing Information -->
45
+ <div class="col-12">
46
+ <div class="panel panel-inverse">
47
+ <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"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Listing Change Log</h4>
54
+ </div>
55
+ <div class="panel-body">
56
+ <!-- Table - Members Listing Audit -->
57
+ <%= render 'phcmemberspro/member/listings/components/listing_audits_table' %>
58
+ <!-- Table - Members Listing Audit -->
59
+ </div>
46
60
  </div>
47
- <h4 class="panel-title"><%= @members_profile_info.member_first_name + " " + @members_profile_info.member_last_name %> Listing Change Log</h4>
48
- </div>
49
- <div class="panel-body">
50
- <!-- Table - Members Listing Audit -->
51
- <%= render 'phcmemberspro/member/listings/components/listing_audits_table' %>
52
- <!-- Table - Members Listing Audit -->
53
61
  </div>
62
+ <!-- Listing Information -->
63
+
54
64
  </div>
55
65
  <!-- Page Content -->
data/app/views/phcmemberspro/member/profiles/_form.html.erb CHANGED
@@ -1,41 +1,42 @@
1
- <!-- PHCMembers Form - Profiles -->
2
- <%= form_with(model: @member_profile, local: true) do |phc_members_pro_member_profile| %>
1
+ <!-- Form - Member - Profile -->
2
+ <%= form_with(model: @member_profile, local: true) do |form| %>
3
3
 
4
4
  <!-- PHCNotifi Render Validation -->
5
- <%= render 'phcnotifi/validations', :object => @member_profile %>
5
+ <%= render 'phcnotifi/default/validations', :object => @member_profile %>
6
6
  <!-- PHCNotifi Render Validation -->
7
7
 
8
- <!-- PHCMembers Fields - Profiles -->
8
+ <!-- Form Input Fields -->
9
9
  <div class="form-group field_with_errors">
10
- <%= phc_members_pro_member_profile.label :member_first_name, "First Name*" %>
11
- <%= phc_members_pro_member_profile.text_field :member_first_name, class: 'form-control', placeholder: 'First Name' %>
10
+ <%= form.label :member_first_name, "First Name*" %>
11
+ <%= form.text_field :member_first_name, class: 'form-control', placeholder: 'First Name' %>
12
12
  </div>
13
13
  <div class="form-group field_with_errors">
14
- <%= phc_members_pro_member_profile.label :member_last_name, "Last Name*" %>
15
- <%= phc_members_pro_member_profile.text_field :member_last_name, class: 'form-control', placeholder: 'Last Name' %>
14
+ <%= form.label :member_last_name, "Last Name*" %>
15
+ <%= form.text_field :member_last_name, class: 'form-control', placeholder: 'Last Name' %>
16
16
  </div>
17
17
  <div class="form-group field_with_errors">
18
- <%= phc_members_pro_member_profile.label :member_title, "Job Title" %>
19
- <%= phc_members_pro_member_profile.text_field :member_title, class: 'form-control', placeholder: 'Job Title/Salutation' %>
18
+ <%= form.label :member_title, "Job Title" %>
19
+ <%= form.text_field :member_title, class: 'form-control', placeholder: 'Job Title/Salutation' %>
20
20
  </div>
21
21
  <div class="form-group field_with_errors">
22
- <%= phc_members_pro_member_profile.label :member_email, "Contact Email Address*" %>
23
- <%= phc_members_pro_member_profile.text_field :member_email, class: 'form-control', placeholder: 'Contact Email (Will Remain Private)' %>
22
+ <%= form.label :member_email, "Contact Email Address*" %>
23
+ <%= form.text_field :member_email, class: 'form-control', placeholder: 'Contact Email (Will Remain Private)' %>
24
24
  </div>
25
25
  <div class="form-group field_with_errors">
26
- <%= phc_members_pro_member_profile.label :member_phone, "Contact Phone Number*" %>
27
- <%= phc_members_pro_member_profile.text_field :member_phone, class: 'form-control masked', placeholder: 'Contact Phone Number (Will Remain Private)', data: {format: '(999) 999-9999', placeholder: 'x'} %>
26
+ <%= form.label :member_phone, "Contact Phone Number*" %>
27
+ <%= form.text_field :member_phone, class: 'form-control masked', placeholder: 'Contact Phone Number (Will Remain Private)', data: {format: '(999) 999-9999', placeholder: 'x'} %>
28
28
  </div>
29
29
  <div class="form-group field_with_errors">
30
- <%= phc_members_pro_member_profile.label :member_notes, "Member" %>
31
- <%= phc_members_pro_member_profile.text_area :member_notes, class: 'form-control masked', placeholder: 'Member Notes' %>
30
+ <%= form.label :member_notes, "Member" %>
31
+ <%= form.text_area :member_notes, class: 'form-control masked', placeholder: 'Member Notes' %>
32
32
  </div>
33
- <br>
33
+ <!-- Form Input Fields -->
34
+
35
+ <!-- Form Submition Button -->
34
36
  <div class="actions">
35
- <%= phc_members_pro_member_profile.submit class: "btn btn-primary btn-gradient waves-effect waves-light btn-md" %>
37
+ <%= form.submit class: "btn btn-primary btn-md" %>
36
38
  </div>
37
- <br>
38
- <!-- PHCMembers Fields - Profiles -->
39
+ <!-- For Submition Button -->
39
40
 
40
41
  <% end %>
41
- <!-- PHCMembers Form - Profiles -->
42
+ <!-- Form - Member - Profile -->
data/app/views/phcmemberspro/member/profiles/components/_profile_addresses_table.html.erb CHANGED
@@ -10,12 +10,12 @@
10
10
  </thead>
11
11
  <tbody>
12
12
  <% @member_profile.addresses.each do |members_main_address| %>
13
- <tr>
14
- <td><%= members_main_address.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>
18
- </tr>
13
+ <tr>
14
+ <td><%= members_main_address.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>
18
+ </tr>
19
19
  <% end %>
20
20
  </tbody>
21
21
  </table>
data/app/views/phcmemberspro/member/profiles/components/_profile_audits_table.html.erb CHANGED
@@ -2,13 +2,13 @@
2
2
  <table class="table table-striped table-bordered table-hover">
3
3
  <tbody>
4
4
  <% @member_profile_versions.each do |member_profile_version| %>
5
- <tr>
6
- <td><span class="label label-primary"><%= member_profile_version.event.humanize %></span></td>
7
- <td><small>PROFILE EVENT ID#<%= member_profile_version.id %></small></td>
8
- <td><%= member_profile_version.event.humanize + ' ' + @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Profile Information</td>
9
- <td><%= member_profile_version.whodunnit %></td>
10
- <td><%= l(member_profile_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_profile_version.created_at, format: "%H:%M %Z") %></td>
11
- </tr>
5
+ <tr>
6
+ <td><span class="label label-primary"><%= member_profile_version.event.humanize %></span></td>
7
+ <td><small>PROFILE EVENT ID#<%= member_profile_version.id %></small></td>
8
+ <td><%= member_profile_version.event.humanize + ' ' + @member_profile.member_first_name + ' ' + @member_profile.member_last_name %> Profile Information</td>
9
+ <td><%= member_profile_version.whodunnit %></td>
10
+ <td><%= l(member_profile_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_profile_version.created_at, format: "%H:%M %Z") %></td>
11
+ </tr>
12
12
  <% end %>
13
13
  </tbody>
14
14
  </table>