phcmemberspro 6.8.14 → 6.8.15

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 21d80256f1f250d5bf7d032ae431feb628419f32
4
- data.tar.gz: e3e85a6ce9936a3a91f75b57b0a5151804abd856
3
+ metadata.gz: 0ae3ff0b0706157cebb0df266fcf3cfaf7baa56d
4
+ data.tar.gz: b38756eff6bed177cb7cfcaeb5fd9e08d94ca1a4
5
5
  SHA512:
6
- metadata.gz: d9ac3d354a72a017536a51bf3b9541ce83d4eb8ed7a2fda139f250155abbfc80121fe64070765dd7b96339201fe8ad960daa54c273fc7cca6af38755cf84366e
7
- data.tar.gz: 8d4fc9b5fb54a15496bf0ff157e9b157024b353f37a098a74833456b1e21f78cc022b09076c33a70dd5011330b67b3e32490c1fd3b39dffac8cfea0b3efbddfe
6
+ metadata.gz: e8d97c4536cdb8cf63ab5745a717ad49564d24d71a39e2afd8ed082f85433e232322daa163afe0667082bdf53bdd369b789f415dd089b548154b0fac62293bd9
7
+ data.tar.gz: ca9d404130f59307620bf9908a26e36fcb674dd15083fc8ad9e2b83f677c52265c6fb68643a43f0470d5546d706e04950717c8abb419baacf317b49a38a58b59
@@ -18,6 +18,7 @@ module Phcmemberspro
18
18
 
19
19
  # Detailed Member Contact Information
20
20
  def show
21
+ @versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Members::Contact')
21
22
  main = Members::Main.find(params[:main_id])
22
23
  @members_contact = main.contacts.find(params[:id])
23
24
  end
@@ -39,8 +39,8 @@
39
39
  <ul class="list-group">
40
40
  <% @directory_categories.each do |directory_category| %>
41
41
  <li class="list-group-item">
42
- <span class="badge badge-default badge-roundless"><%= @directory_listings.count(:all) %></span>
43
- <%= directory_category.catname %>
42
+ <span class="badge badge-default badge-roundless"><%= directory_category.listings.count %></span></span>
43
+ <%= link_to directory_category.catname, directory_category %>
44
44
  </li>
45
45
  <% end %>
46
46
  </ul>
@@ -0,0 +1,29 @@
1
+ <p>
2
+ <strong>Address Line 1:</strong>
3
+ <%= @members_contact.mcaddressl1 %>
4
+ </p>
5
+
6
+ <p>
7
+ <strong>Address Line 2:</strong>
8
+ <%= @members_contact.mcaddressl2 %>
9
+ </p>
10
+
11
+ <p>
12
+ <strong>City:</strong>
13
+ <%= @members_contact.mccity %>
14
+ </p>
15
+
16
+ <p>
17
+ <strong>Province:</strong>
18
+ <%= @members_contact.mcprovince %>
19
+ </p>
20
+
21
+ <p>
22
+ <strong>Country:</strong>
23
+ <%= @members_contact.mccountry %>
24
+ </p>
25
+
26
+ <p>
27
+ <strong>PostalCode:</strong>
28
+ <%= @members_contact.mcpostalcode %>
29
+ </p>
@@ -0,0 +1,25 @@
1
+ <div class="scroller" style="height: 320px;" data-always-visible="1" data-rail-visible1="0" data-handle-color="#D7DCE2">
2
+ <ul class="feeds">
3
+ <% @versions.each do |version| %>
4
+ <li>
5
+ <div class="col1">
6
+ <div class="cont">
7
+ <div class="cont-col1">
8
+ <div class="label label-sm label-success">
9
+ <i class="fa fa-bell-o"></i>
10
+ </div>
11
+ </div>
12
+ <div class="cont-col2">
13
+ <div class="desc">
14
+ <strong>EVENT #<%= version.id %></strong> - <i> <%= l(version.created_at, format: "%-d/%m/%Y") %> </i> - Event: <%= version.event.capitalize %> Member
15
+ </div>
16
+ </div>
17
+ </div>
18
+ </div>
19
+ <div class="col2">
20
+ <div class="date"> <%= l(version.created_at, format: "%H:%M %Z") %> </div>
21
+ </div>
22
+ </li>
23
+ <% end %>
24
+ </ul>
25
+ </div>
@@ -48,7 +48,6 @@
48
48
  <th>Country</th>
49
49
  <th>PostalCode</th>
50
50
  <th>Type</th>
51
- <th></th>
52
51
  </tr>
53
52
  </thead>
54
53
  <tbody>
@@ -61,11 +60,6 @@
61
60
  <td><%= link_to members_contact.mccountry, members_main_contact_path(members_contact.main, members_contact) %></td>
62
61
  <td><%= link_to members_contact.mcpostalcode, members_main_contact_path(members_contact.main, members_contact) %></td>
63
62
  <td><%= link_to members_contact.mctype, members_main_contact_path(members_contact.main, members_contact) %></td>
64
- <td>
65
- <%= link_to members_main_contact_path(members_contact.main, members_contact), class: "btn blue-chambray btn-xs btn-outline sbold uppercase" do %>
66
- <i class="fa fa-share"></i> ADDRESS DETAILS
67
- <% end %>
68
- </td>
69
63
  </tr>
70
64
  <% end %>
71
65
  </tbody>
@@ -31,43 +31,27 @@
31
31
  <span class="caption-subject bold uppercase"><%= yield(:phc_title_tagline) %></span>
32
32
  </div>
33
33
  <div class="actions">
34
+ <%= link_to edit_members_main_contact_path, class: "btn btn-circle blue-chambray" do %>
35
+ <i class="fa fa-pencil-square-o"></i> Edit Address
36
+ <% end %>
37
+ <%= link_to members_main_contact_path, class: "btn btn-circle red-mint" do %>
38
+ <i class="fa fa-trash-o"></i> Delete Address
39
+ <% end %>
34
40
  </div>
35
41
  </div>
36
42
 
37
43
  <div class="portlet-body">
38
-
39
- <p>
40
- <strong>Address Line 1:</strong>
41
- <%= @members_contact.mcaddressl1 %>
42
- </p>
43
-
44
- <p>
45
- <strong>Address Line 2:</strong>
46
- <%= @members_contact.mcaddressl2 %>
47
- </p>
48
-
49
- <p>
50
- <strong>City:</strong>
51
- <%= @members_contact.mccity %>
52
- </p>
53
-
54
- <p>
55
- <strong>Province:</strong>
56
- <%= @members_contact.mcprovince %>
57
- </p>
58
-
59
- <p>
60
- <strong>Country:</strong>
61
- <%= @members_contact.mccountry %>
62
- </p>
63
-
64
- <p>
65
- <strong>PostalCode:</strong>
66
- <%= @members_contact.mcpostalcode %>
67
- </p>
68
-
44
+ <div class="row">
45
+ <div class="col-lg-6">
46
+ <%= render 'phcmemberspro/members/contacts/components/_contact_address' %>
47
+ </div>
48
+ <div class="col-lg-6">
49
+ <%= render 'phcmemberspro/members/contacts/components/_contact_audits' %>
50
+ </div>
51
+ </div>
69
52
  </div>
53
+
70
54
  </div>
71
55
 
72
56
  </div>
73
- </div>
57
+ </div>
@@ -11,30 +11,7 @@
11
11
  </div>
12
12
  </div>
13
13
  <div class="portlet-body">
14
- <div class="row number-stats margin-bottom-30">
15
- <div class="col-md-6 col-sm-6 col-xs-6">
16
- <div class="stat-left">
17
- <div class="stat-chart">
18
- <div id="sparkline_bar"></div>
19
- </div>
20
- <div class="stat-number">
21
- <div class="title"> Total </div>
22
- <div class="number"> </div>
23
- </div>
24
- </div>
25
- </div>
26
- <div class="col-md-6 col-sm-6 col-xs-6">
27
- <div class="stat-right">
28
- <div class="stat-chart">
29
- <div id="sparkline_bar2"></div>
30
- </div>
31
- <div class="stat-number">
32
- <div class="title"> New </div>
33
- <div class="number"> </div>
34
- </div>
35
- </div>
36
- </div>
37
- </div>
14
+
38
15
  </div>
39
16
  </div>
40
17
  </div>
@@ -44,7 +44,6 @@
44
44
  <th>Last Name</th>
45
45
  <th>Email</th>
46
46
  <th>Phone</th>
47
- <th></th>
48
47
  </tr>
49
48
  </thead>
50
49
  <tbody>
@@ -62,11 +61,6 @@
62
61
  <td class="highlight">
63
62
  <%= link_to members_main.mphone, members_main %>
64
63
  </td>
65
- <td class="highlight">
66
- <%= link_to members_main, class: "btn blue-chambray btn-xs btn-outline sbold uppercase" do %>
67
- <i class="fa fa-share"></i> VIEW PROFILE
68
- <% end %>
69
- </td>
70
64
  </tr>
71
65
  <% end %>
72
66
  </tbody>
@@ -41,7 +41,7 @@ Phcmemberspro::Engine.routes.draw do
41
41
 
42
42
  # Directory Routes
43
43
  resources :mains
44
-
44
+
45
45
  resources :categories do
46
46
  resources :listings
47
47
  end
@@ -1,3 +1,3 @@
1
1
  module Phcmemberspro
2
- VERSION = "6.8.14"
2
+ VERSION = "6.8.15"
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: 6.8.14
4
+ version: 6.8.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - BradPotts
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-12 00:00:00.000000000 Z
11
+ date: 2016-06-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -511,6 +511,8 @@ files:
511
511
  - app/views/phcmemberspro/members/businesses/show.html.erb
512
512
  - app/views/phcmemberspro/members/contacts/_form.html.erb
513
513
  - app/views/phcmemberspro/members/contacts/_formpatch.html.erb
514
+ - app/views/phcmemberspro/members/contacts/components/_contact_address.html.erb
515
+ - app/views/phcmemberspro/members/contacts/components/_contact_audits.html.erb
514
516
  - app/views/phcmemberspro/members/contacts/edit.html.erb
515
517
  - app/views/phcmemberspro/members/contacts/index.html.erb
516
518
  - app/views/phcmemberspro/members/contacts/new.html.erb