phcmemberspro 83.0.0 → 84.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/phcmemberspro/directory/categories_controller.rb +1 -1
  3. data/app/controllers/phcmemberspro/member/addresses_controller.rb +3 -3
  4. data/app/controllers/phcmemberspro/member/listings_controller.rb +1 -1
  5. data/app/controllers/phcmemberspro/member/profiles_controller.rb +1 -1
  6. data/app/models/phcmemberspro/member/address.rb +7 -12
  7. data/app/models/phcmemberspro/member/listing.rb +14 -14
  8. data/app/models/phcmemberspro/member/profile.rb +7 -7
  9. data/app/views/layouts/phcmemberspro/application.html.erb +22 -18
  10. data/app/views/layouts/phcmemberspro/components/backend/sidebars/_side_menu.html.erb +38 -10
  11. data/app/views/layouts/phcmemberspro/member_profile.html.erb +17 -14
  12. data/app/views/phcmemberspro/api/v1/categories/index.json.rabl +1 -1
  13. data/app/views/phcmemberspro/directory/categories/_form.html.erb +2 -2
  14. data/app/views/phcmemberspro/directory/categories/components/_category_main.html.erb +2 -2
  15. data/app/views/phcmemberspro/directory/categories/components/_category_sidebar.html.erb +1 -1
  16. data/app/views/phcmemberspro/directory/categories/edit.html.erb +1 -1
  17. data/app/views/phcmemberspro/directory/categories/index.html.erb +1 -1
  18. data/app/views/phcmemberspro/directory/categories/show.html.erb +1 -1
  19. data/app/views/phcmemberspro/member/addresses/_form.html.erb +14 -14
  20. data/app/views/phcmemberspro/member/addresses/components/_address_audits_table.html.erb +1 -1
  21. data/app/views/phcmemberspro/member/addresses/components/_address_table.html.erb +7 -7
  22. data/app/views/phcmemberspro/member/addresses/edit.html.erb +3 -3
  23. data/app/views/phcmemberspro/member/addresses/index.html.erb +14 -9
  24. data/app/views/phcmemberspro/member/addresses/new.html.erb +2 -2
  25. data/app/views/phcmemberspro/member/addresses/show.html.erb +4 -4
  26. data/app/views/phcmemberspro/member/listings/_form.html.erb +22 -22
  27. data/app/views/phcmemberspro/member/listings/index.html.erb +16 -11
  28. data/app/views/phcmemberspro/member/listings/new.html.erb +2 -2
  29. data/app/views/phcmemberspro/member/listings/show.html.erb +4 -4
  30. data/app/views/phcmemberspro/member/profiles/_form.html.erb +10 -10
  31. data/app/views/phcmemberspro/member/profiles/components/_profile_addresses_table.html.erb +6 -6
  32. data/app/views/phcmemberspro/member/profiles/components/_profile_audits_table.html.erb +1 -1
  33. data/app/views/phcmemberspro/member/profiles/components/_profile_header.html.erb +4 -3
  34. data/app/views/phcmemberspro/member/profiles/components/_profile_information_table.html.erb +27 -0
  35. data/app/views/phcmemberspro/member/profiles/components/_profile_listings_table.html.erb +6 -6
  36. data/app/views/phcmemberspro/member/profiles/edit.html.erb +1 -1
  37. data/app/views/phcmemberspro/member/profiles/index.html.erb +18 -4
  38. data/app/views/phcmemberspro/member/profiles/show.html.erb +24 -4
  39. data/db/migrate/20160728230720_create_phcmemberspro_directory_categories.rb +1 -1
  40. data/db/migrate/20160728230901_create_phcmemberspro_member_addresses.rb +7 -7
  41. data/db/migrate/20160728231011_create_phcmemberspro_member_listings.rb +11 -11
  42. data/db/migrate/20160728231036_create_phcmemberspro_member_profiles.rb +6 -6
  43. data/lib/phcmemberspro/version.rb +1 -1
  44. metadata +3 -2
data/app/views/phcmemberspro/member/profiles/components/_profile_addresses_table.html.erb CHANGED
@@ -11,14 +11,14 @@
11
11
  <tbody>
12
12
  <% @member_profile.addresses.each do |members_main_address| %>
13
13
  <tr>
14
- <td class="highlight"><%= members_main_address.mcaddressl1 %></td>
15
- <td class="highlight"><%= members_main_address.mccity %></td>
16
- <td class="highlight"><%= members_main_address.mcprovince %></td>
17
- <td class="highlight"><%= members_main_address.mctype %></td>
14
+ <td><%= members_main_address.address_addressl1 %></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
18
  </tr>
19
19
  <% end %>
20
20
  </tbody>
21
21
  </table>
22
- <%= link_to "See All of " + @member_profile.mfirstname + " " + @member_profile.mlastname + " Addresses", phcmemberspro.member_profile_addresses_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
- <%= link_to "Add a New Address for " + @member_profile.mfirstname + " " + @member_profile.mlastname, phcmemberspro.new_member_profile_address_path(@member_profile), class: "btn btn-purple btn-xs" %>
22
+ <%= link_to "See All of " + @member_profile.member_firstname + " " + @member_profile.member_lastname + " Addresses", phcmemberspro.member_profile_addresses_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
+ <%= link_to "Add a New Address for " + @member_profile.member_firstname + " " + @member_profile.member_lastname, phcmemberspro.new_member_profile_address_path(@member_profile), class: "btn btn-purple btn-xs" %>
24
24
  </div>
data/app/views/phcmemberspro/member/profiles/components/_profile_audits_table.html.erb CHANGED
@@ -5,7 +5,7 @@
5
5
  <tr>
6
6
  <td><span class="label label-primary"><%= member_profile_version.event.humanize %></span></td>
7
7
  <td><small>PROFILE EVENT ID#<%= member_profile_version.id %></small></td>
8
- <td><%= member_profile_version.event.humanize + ' ' + @member_profile.mfirstname + ' ' + @member_profile.mlastname %> Profile Information</td>
8
+ <td><%= member_profile_version.event.humanize + ' ' + @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Profile Information</td>
9
9
  <td><%= member_profile_version.whodunnit %></td>
10
10
  <td><%= l(member_profile_version.created_at, format: "%-d/%m/%Y") %> - <%= l(member_profile_version.created_at, format: "%H:%M %Z") %></td>
11
11
  </tr>
data/app/views/phcmemberspro/member/profiles/components/_profile_header.html.erb CHANGED
@@ -9,10 +9,10 @@
9
9
  <%= image_tag current_user.gravatar_url :secure => true, :filetype => :png, :size => 128 %>
10
10
  </div>
11
11
  <div class="profile-header-info">
12
- <h4 class="m-t-10 m-b-5"><%= current_user.firstname + ' ' + current_user.lastname %></h4>
13
- <p class="m-b-10"><%= current_user.username %></p>
12
+ <h4 class="m-t-10 m-b-5"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %></h4>
13
+ <p class="m-b-10"><%= @member_profile.member_phone %></p>
14
14
  <%= link_to edit_member_profile_path(@member_profile), class: "btn btn-xs btn-yellow" do %>
15
- <i class="far fa-pencil-alt"></i> Edit Member
15
+ <i class="far fa-pencil-alt"></i> Update Member Information
16
16
  <% end %>
17
17
  </div>
18
18
  </div>
@@ -20,6 +20,7 @@
20
20
 
21
21
  <!-- Member Profiles - Header - Tab Bar -->
22
22
  <ul class="profile-header-tab nav nav-tabs">
23
+ <li class="nav-item"><a href="#profile-information" class="nav-link" data-toggle="tab">MEMBER INFORMATION</a></li>
23
24
  <li class="nav-item"><a href="#profile-addresses" class="nav-link" data-toggle="tab">MEMBER ADDRESSES</a></li>
24
25
  <li class="nav-item"><a href="#profile-listings" class="nav-link" data-toggle="tab">MEMBER LISTINGS</a></li>
25
26
  <li class="nav-item"><a href="#profile-logs" class="nav-link" data-toggle="tab">MEMBER CHANGE LOG</a></li>
data/app/views/phcmemberspro/member/profiles/components/_profile_information_table.html.erb ADDED
@@ -0,0 +1,27 @@
1
+ <div class="table-responsive">
2
+ <table class="table table-striped table-bordered table-hover">
3
+ <thead>
4
+ <tr>
5
+ <th>First Name</th>
6
+ <th>Last Name</th>
7
+ <th>Title</th>
8
+ <th>Email</th>
9
+ <th>Phone</th>
10
+ </tr>
11
+ </thead>
12
+ <tbody>
13
+ <tr>
14
+ <td><%= @member_profile.member_firstname %></td>
15
+ <td><%= @member_profile.member_lastname %></td>
16
+ <td><%= @member_profile.member_title %></td>
17
+ <td><%= @member_profile.member_email %></td>
18
+ <td><%= @member_profile.member_phone %></td>
19
+ </tr>
20
+ <tr>
21
+ <td><strong>Note:</strong></td>
22
+ <td colspan="4"><%= @member_profile.member_notes %></td>
23
+ </tr>
24
+ </tbody>
25
+ </table>
26
+ <%= link_to "Update " + @member_profile.member_firstname + " " + @member_profile.member_lastname + " Information", phcmemberspro.edit_member_profile_path(@member_profile), class: "btn btn-primary btn-xs" %>
27
+ </div>
data/app/views/phcmemberspro/member/profiles/components/_profile_listings_table.html.erb CHANGED
@@ -11,14 +11,14 @@
11
11
  <tbody>
12
12
  <% @member_profile.listings.each do |member_profile_listing| %>
13
13
  <tr>
14
- <td class="highlight"><%= member_profile_listing.mbcompanyname %></td>
15
- <td class="highlight"><%= member_profile_listing.mbcontactname %></td>
16
- <td class="highlight"><%= member_profile_listing.mbcity %></td>
17
- <td class="highlight"><%= member_profile_listing.mbphone %></td>
14
+ <td><%= member_profile_listing.listing_companyname %></td>
15
+ <td><%= member_profile_listing.listing_contactname %></td>
16
+ <td><%= member_profile_listing.listing_city %></td>
17
+ <td><%= member_profile_listing.listing_phone %></td>
18
18
  </tr>
19
19
  <% end %>
20
20
  </tbody>
21
21
  </table>
22
- <%= link_to "See All of " + @member_profile.mfirstname + " " + @member_profile.mlastname + " Listings", phcmemberspro.member_profile_listings_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
- <%= link_to "Add a New Listing for " + @member_profile.mfirstname + " " + @member_profile.mlastname, phcmemberspro.new_member_profile_listing_path(@member_profile), class: "btn btn-purple btn-xs" %>
22
+ <%= link_to "See All of " + @member_profile.member_firstname + " " + @member_profile.member_lastname + " Listings", phcmemberspro.member_profile_listings_path(@member_profile), class: "btn btn-primary btn-xs" %>
23
+ <%= link_to "Add a New Listing for " + @member_profile.member_firstname + " " + @member_profile.member_lastname, phcmemberspro.new_member_profile_listing_path(@member_profile), class: "btn btn-purple btn-xs" %>
24
24
  </div>
data/app/views/phcmemberspro/member/profiles/edit.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <!-- Title System -->
2
2
  <% phc_title "Members Manager" %>
3
- <% phc_title_tagline "Update Member Information for " + @member_profile.mfirstname + " " + @member_profile.mlastname %>
3
+ <% phc_title_tagline "Update Member Information for " + @member_profile.member_firstname + " " + @member_profile.member_lastname %>
4
4
  <% phc_breadcrumb_one link_to "Dashboard", phcmemberspro.dashboard_path %>
5
5
  <% phc_breadcrumb_two link_to "Member Profiles", phcmemberspro.member_profiles_path %>
6
6
  <% phc_breadcrumb_three yield(:phc_title_tagline) %>
data/app/views/phcmemberspro/member/profiles/index.html.erb CHANGED
@@ -36,19 +36,33 @@
36
36
  <th>Last Name</th>
37
37
  <th>Email</th>
38
38
  <th>Phone</th>
39
+ <th></th>
39
40
  </tr>
40
41
  </thead>
41
42
  <tbody>
42
43
  <% @member_profiles.each do |member_profile| %>
43
44
  <tr>
44
- <td><%= link_to member_profile.mfirstname, member_profile %></td>
45
- <td><%= link_to member_profile.mlastname, member_profile %></td>
46
- <td><%= link_to member_profile.memail, member_profile %></td>
47
- <td><%= link_to member_profile.mphone, member_profile %></td>
45
+ <td><%= link_to member_profile.member_firstname, member_profile %></td>
46
+ <td><%= link_to member_profile.member_lastname, member_profile %></td>
47
+ <td><%= link_to member_profile.member_email, member_profile %></td>
48
+ <td><%= link_to member_profile.member_phone, member_profile %></td>
49
+ <td>
50
+ <div class="btn-group d-flex" role="group">
51
+ <%= link_to 'Details', member_profile, class: "btn btn-primary btn-xs" %>
52
+ <%= link_to 'Update', edit_member_profile_path(member_profile), class: "btn btn-purple btn-xs" %>
53
+ <%= link_to 'Remove', member_profile, method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-danger btn-xs" %>
54
+ </div>
55
+ </td>
48
56
  </tr>
49
57
  <% end %>
50
58
  </tbody>
51
59
  </table>
60
+ <!-- Button - Members Profile -->
61
+ <%= link_to phcmemberspro.new_member_profile_path, class: "btn btn-primary btn-sm" do %>
62
+ <i class="fas fa-plus-circle"></i>
63
+ <%= "Add a New Member" %>
64
+ <% end %>
65
+ <!-- Button - Members Profile -->
52
66
  </div>
53
67
  <!-- Table - Members Profile -->
54
68
  </div>
data/app/views/phcmemberspro/member/profiles/show.html.erb CHANGED
@@ -15,8 +15,28 @@
15
15
  <div class="profile-content">
16
16
  <div class="tab-content p-0">
17
17
 
18
+ <!-- Member Profiles - Content - Information Tab -->
19
+ <div class="tab-pane active" id="profile-information">
20
+ <!-- Member Profiles - Content - Information -->
21
+ <div class="panel panel-inverse">
22
+ <div class="panel-heading">
23
+ <div class="panel-heading-btn">
24
+ <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-default" data-click="panel-expand"><i class="fa fa-expand"></i></a>
25
+ <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
26
+ <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
27
+ </div>
28
+ <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Information</h4>
29
+ </div>
30
+ <div class="panel-body">
31
+ <%= render 'phcmemberspro/member/profiles/components/profile_information_table' %>
32
+ </div>
33
+ </div>
34
+ <!-- Member Profiles - Content - Information -->
35
+ </div>
36
+ <!-- Member Profiles - Content - Information Tab -->
37
+
18
38
  <!-- Member Profiles - Content - Addresses Tab -->
19
- <div class="tab-pane active" id="profile-addresses">
39
+ <div class="tab-pane" id="profile-addresses">
20
40
  <!-- Member Profiles - Content - Addresses -->
21
41
  <div class="panel panel-inverse">
22
42
  <div class="panel-heading">
@@ -25,7 +45,7 @@
25
45
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
26
46
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
27
47
  </div>
28
- <h4 class="panel-title"><%= @member_profile.mfirstname + ' ' + @member_profile.mlastname %> Addresses</h4>
48
+ <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Addresses</h4>
29
49
  </div>
30
50
  <div class="panel-body">
31
51
  <%= render 'phcmemberspro/member/profiles/components/profile_addresses_table' %>
@@ -45,7 +65,7 @@
45
65
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
46
66
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
47
67
  </div>
48
- <h4 class="panel-title"><%= @member_profile.mfirstname + ' ' + @member_profile.mlastname %> Listings</h4>
68
+ <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Listings</h4>
49
69
  </div>
50
70
  <div class="panel-body">
51
71
  <%= render 'phcmemberspro/member/profiles/components/profile_listings_table' %>
@@ -65,7 +85,7 @@
65
85
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-success" data-click="panel-reload"><i class="fa fa-redo"></i></a>
66
86
  <a href="javascript:;" class="btn btn-xs btn-icon btn-circle btn-warning" data-click="panel-collapse"><i class="fa fa-minus"></i></a>
67
87
  </div>
68
- <h4 class="panel-title"><%= @member_profile.mfirstname + ' ' + @member_profile.mlastname %> Change Log</h4>
88
+ <h4 class="panel-title"><%= @member_profile.member_firstname + ' ' + @member_profile.member_lastname %> Change Log</h4>
69
89
  </div>
70
90
  <div class="panel-body">
71
91
  <%= render 'phcmemberspro/member/profiles/components/profile_audits_table' %>
data/db/migrate/20160728230720_create_phcmemberspro_directory_categories.rb CHANGED
@@ -3,7 +3,7 @@ class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmemberspro_directory_categories do |t|
5
5
 
6
- t.string :catname
6
+ t.string :category_name
7
7
  t.string :slug
8
8
 
9
9
  t.string :user_id
data/db/migrate/20160728230901_create_phcmemberspro_member_addresses.rb CHANGED
@@ -3,13 +3,13 @@ class CreatePhcmembersproMemberAddresses < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmemberspro_member_addresses do |t|
5
5
 
6
- t.string :mcaddressl1
7
- t.string :mcaddressl2
8
- t.string :mccity
9
- t.string :mcprovince
10
- t.string :mccountry
11
- t.string :mcpostalcode
12
- t.string :mctype
6
+ t.string :address_addressl1
7
+ t.string :address_addressl2
8
+ t.string :address_city
9
+ t.string :address_province
10
+ t.string :address_country
11
+ t.string :address_postalcode
12
+ t.string :address_type
13
13
 
14
14
  t.references :profile
15
15
 
data/db/migrate/20160728231011_create_phcmemberspro_member_listings.rb CHANGED
@@ -3,17 +3,17 @@ class CreatePhcmembersproMemberListings < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmemberspro_member_listings do |t|
5
5
 
6
- t.string :mbcompanyname
7
- t.string :mbcontactname
8
- t.string :mbaddressl1
9
- t.string :mbaddressl2
10
- t.string :mbcity
11
- t.string :mbprovince
12
- t.string :mbcountry
13
- t.string :mbpostalcode
14
- t.string :mbphone
15
- t.string :mbcontactemail
16
- t.string :mbwebsite
6
+ t.string :listing_companyname
7
+ t.string :listing_contactname
8
+ t.string :listing_addressl1
9
+ t.string :listing_addressl2
10
+ t.string :listing_city
11
+ t.string :listing_province
12
+ t.string :listing_country
13
+ t.string :listing_postalcode
14
+ t.string :listing_phone
15
+ t.string :listing_contactemail
16
+ t.string :listing_website
17
17
 
18
18
  t.references :profile
19
19
 
data/db/migrate/20160728231036_create_phcmemberspro_member_profiles.rb CHANGED
@@ -3,12 +3,12 @@ class CreatePhcmembersproMemberProfiles < ActiveRecord::Migration[5.2]
3
3
 
4
4
  create_table :phcmemberspro_member_profiles do |t|
5
5
 
6
- t.string :mfirstname
7
- t.string :mlastname
8
- t.string :mtitle
9
- t.string :memail
10
- t.string :mphone
11
- t.string :mnotes
6
+ t.string :member_firstname
7
+ t.string :member_lastname
8
+ t.string :member_title
9
+ t.string :member_email
10
+ t.string :member_phone
11
+ t.string :member_notes
12
12
 
13
13
  t.string :slug
14
14
 
data/lib/phcmemberspro/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Phcmemberspro
2
- VERSION = "83.0.0"
2
+ VERSION = "84.0.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcmemberspro
3
3
  version: !ruby/object:Gem::Version
4
- version: 83.0.0
4
+ version: 84.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-28 00:00:00.000000000 Z
11
+ date: 2019-05-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -703,6 +703,7 @@ files:
703
703
  - app/views/phcmemberspro/member/profiles/components/_profile_addresses_table.html.erb
704
704
  - app/views/phcmemberspro/member/profiles/components/_profile_audits_table.html.erb
705
705
  - app/views/phcmemberspro/member/profiles/components/_profile_header.html.erb
706
+ - app/views/phcmemberspro/member/profiles/components/_profile_information_table.html.erb
706
707
  - app/views/phcmemberspro/member/profiles/components/_profile_listings_table.html.erb
707
708
  - app/views/phcmemberspro/member/profiles/components/_profile_sidebar.html.erb
708
709
  - app/views/phcmemberspro/member/profiles/edit.html.erb