phcmemberspro 8.6.3 → 9.0.0

data/app/views/phcmemberspro/member/profiles/components/_profile_sidebar.html.erb

@@ -0,0 +1,65 @@
+<div class="portlet light profile-sidebar-portlet">
+	<!-- SIDEBAR USERPIC -->
+	<div class="profile-userpic">
+		<%= image_tag @member_profile.gravatar_url, :class => 'img-responsive' %>
+	</div>
+	<!-- END SIDEBAR USERPIC -->
+	<!-- SIDEBAR USER TITLE -->
+	<div class="profile-usertitle">
+		<div class="profile-usertitle-name">
+			<%= @member_profile.mfirstname + ' ' + @member_profile.mlastname %>
+		</div>
+		<div class="profile-usertitle-job">
+			<%= @member_profile.mtitle %>
+		</div>
+	</div>
+	<!-- END SIDEBAR USER TITLE -->
+	<!-- SIDEBAR BUTTONS -->
+	<div class="profile-userbuttons">
+		<div class="btn-group">
+			<%= link_to 'Update Member', edit_member_profile_path(@member_profile), class: "btn blue-hoki" %>
+			<%= link_to 'Delete Member', @member_profile, method: :delete, data: { confirm: 'Are you sure? Removing a member will delete all records, including business information and any member directory connections.' }, class: "btn red-mint" %>
+		</div>
+	</div>
+	<!-- END SIDEBAR BUTTONS -->
+	<!-- SIDEBAR MENU -->
+	<div class="profile-usermenu">
+		<ul class="nav">
+			<li>
+				<%= link_to member_profile_listings_path(@member_profile) do %>
+					<i class="icon-briefcase"></i> Member Listings
+				<% end %>
+			</li>
+			<li>
+				<%= link_to member_profile_addresses_path(@member_profile) do %>
+					<i class="icon-envelope-letter"></i> Member Addresses
+				<% end %>
+			</li>
+		</ul>
+	</div>
+</div>
+<div class="portlet light ">
+	<!-- STATS -->
+	<div class="row list-separated profile-stat">
+		<div class="col-md-4 col-sm-4 col-xs-6">
+			<div class="uppercase profile-stat-title"> <%= @member_profile.addresses.count(:all) %> </div>
+			<div class="uppercase profile-stat-text"> <%= "Contact".pluralize(2) %> </div>
+		</div>
+		<div class="col-md-4 col-sm-4 col-xs-6">
+			<div class="uppercase profile-stat-title"> <%= @member_profile.listings.count(:all) %> </div>
+			<div class="uppercase profile-stat-text"> <%= "Business".pluralize(2) %> </div>
+		</div>
+		<div class="col-md-4 col-sm-4 col-xs-6">
+		</div>
+	</div>
+	<!-- STATS -->
+	<div>
+		<h4 class="profile-desc-title">Member Notes</h4>
+		<div class="margin-top-20 profile-desc-link">
+			<%= mail_to @member_profile.memail do %>
+				<i class="fa fa-envelope"></i>
+				<%= @member_profile.memail %> 
+			<% end %>
+		</div>
+	</div>
+</div>

data/app/views/phcmemberspro/{members/mains → member/profiles}/edit.html.erb

@@ -1,25 +1,24 @@
 <!-- Title System -->
-<% phc_title "PHCMembers - Members Manager" %>
-<% phc_title_tagline "Update Member Information for " + @members_main.mfirstname + " " + @members_main.mlastname %>
+<% phc_title "Members Manager" %>
+<% phc_title_tagline "Update Member Information for " + @member_profile.mfirstname + " " + @member_profile.mlastname %>
 
+<!-- Page Header -->
 <div class="page-bar">
-
-	<!-- Bread Crumbs -->
+	<!-- Bread Crumb -->
 	<ul class="page-breadcrumb">
-		<li><%= link_to "Home", members_root_path %><i class="fa fa-circle"></i></li>
-		<li><%= link_to "Members List", members_mains_path %><i class="fa fa-circle"></i></li>
+		<li><%= link_to "Home", member_root_path %><i class="fa fa-circle"></i></li>
+		<li><%= link_to "Members List", member_profiles_path %><i class="fa fa-circle"></i></li>
 		<li class="active"><%= yield(:phc_title_tagline) %></li>
 	</ul>
-
+	<div class="page-toolbar">
+	</div>
 </div>
-
-<!-- Page Title -->
-<h3 class="page-title">
-	<%= yield(:phc_title) %> </br>
+<h1 class="page-title">
+	<%= yield(:phc_title) %>
 	<small><%= yield(:phc_title_tagline) %></small>
-</h3>
+</h1>
 
-<!-- Main Content -->
+<!-- Page Content -->
 <div class="row">
 	<div class="col-lg-12">
 
@@ -34,8 +33,9 @@
 			</div>
 
 			<div class="portlet-body">
-				<%= render 'form' %>
+				<%= render 'form', member_profile: @member_profile %>
 			</div>
+
 		</div>
 
 	</div>

data/app/views/phcmemberspro/{members/mains → member/profiles}/index.html.erb

@@ -1,25 +1,23 @@
 <!-- Title System -->
-<% phc_title "PHCMembers - Members Manager" %>
-<% phc_title_tagline "Members Main Index" %>
+<% phc_title "Members Manager" %>
+<% phc_title_tagline "Members List" %>
 
+<!-- Page Header -->
 <div class="page-bar">
-
-	<!-- Bread Crumbs -->
+	<!-- Bread Crumb -->
 	<ul class="page-breadcrumb">
-		<li><%= link_to "Home", members_root_path %><i class="fa fa-circle"></i></li>
-		<li><%= link_to "Members List", members_mains_path %><i class="fa fa-circle"></i></li>
+		<li><%= link_to "Dashboard", member_root_path %><i class="fa fa-circle"></i></li>
 		<li class="active"><%= yield(:phc_title_tagline) %></li>
 	</ul>
-
+	<div class="page-toolbar">
+	</div>
 </div>
-
-<!-- Page Title -->
-<h3 class="page-title">
-	<%= yield(:phc_title) %> </br>
+<h1 class="page-title">
+	<%= yield(:phc_title) %>
 	<small><%= yield(:phc_title_tagline) %></small>
-</h3>
+</h1>
 
-<!-- Main Content -->
+<!-- Page Content -->
 <div class="row">
 	<div class="col-lg-12">
 
@@ -30,7 +28,7 @@
 					<span class="caption-subject bold uppercase">Main Members List</span>
 				</div>
 				<div class="actions">
-					<%= link_to new_members_main_path, class: "btn blue-chambray" do %>
+					<%= link_to new_member_profile_path, class: "btn blue-chambray" do %>
 						<i class="fa fa-plus"></i> Create a New Member
 					<% end %>
 				</div>
@@ -48,12 +46,12 @@
 							</tr>
 						</thead>
 						<tbody>
-							<% @members_mains.each do |members_main| %>
+							<% @member_profiles.each do |member_profile| %>
 								<tr>
-									<td class="highlight"><%= link_to members_main.mfirstname, members_main %></td>
-									<td class="highlight"><%= link_to members_main.mlastname, members_main %></td>
-									<td class="highlight"><%= link_to members_main.memail, members_main %></td>
-									<td class="highlight"><%= link_to members_main.mphone, members_main %></td>
+									<td class="highlight"><%= link_to member_profile.mfirstname, member_profile %></td>
+									<td class="highlight"><%= link_to member_profile.mlastname, member_profile %></td>
+									<td class="highlight"><%= link_to member_profile.memail, member_profile %></td>
+									<td class="highlight"><%= link_to member_profile.mphone, member_profile %></td>
 								</tr>
 							<% end %>
 						</tbody>

data/app/views/phcmemberspro/{members/mains → member/profiles}/new.html.erb

@@ -1,25 +1,24 @@
 <!-- Title System -->
-<% phc_title "PHCMembers - Members Manager" %>
+<% phc_title "Members Manager" %>
 <% phc_title_tagline "Create a New Member" %>
 
+<!-- Page Header -->
 <div class="page-bar">
-
-	<!-- Bread Crumbs -->
+	<!-- Bread Crumb -->
 	<ul class="page-breadcrumb">
-		<li><%= link_to "Home", members_root_path %><i class="fa fa-circle"></i></li>
-		<li><%= link_to "Members List", members_mains_path %><i class="fa fa-circle"></i></li>
+		<li><%= link_to "Home", member_root_path %><i class="fa fa-circle"></i></li>
+		<li><%= link_to "Members List", member_profiles_path %><i class="fa fa-circle"></i></li>
 		<li class="active"><%= yield(:phc_title_tagline) %></li>
 	</ul>
-
+	<div class="page-toolbar">
+	</div>
 </div>
-
-<!-- Page Title -->
-<h3 class="page-title">
-	<%= yield(:phc_title) %> </br>
+<h1 class="page-title">
+	<%= yield(:phc_title) %>
 	<small><%= yield(:phc_title_tagline) %></small>
-</h3>
+</h1>
 
-<!-- Main Content -->
+<!-- Page Content -->
 <div class="row">
 	<div class="col-lg-12">
 
@@ -34,8 +33,9 @@
 			</div>
 
 			<div class="portlet-body">
-				<%= render 'form' %>
+				<%= render 'form', member_profile: @member_profile %>
 			</div>
+
 		</div>
 
 	</div>

data/app/views/phcmemberspro/member/profiles/show.html.erb

@@ -0,0 +1,31 @@
+<!-- Title System -->
+<% phc_title "Members Manager" %>
+<% phc_title_tagline "Create a New Member" %>
+
+<!-- Page Header -->
+<div class="page-bar">
+	<!-- Bread Crumb -->
+	<ul class="page-breadcrumb">
+		<li><%= link_to "Home", member_root_path %><i class="fa fa-circle"></i></li>
+		<li><%= link_to "Members List", member_profiles_path %><i class="fa fa-circle"></i></li>
+		<li class="active"><%= yield(:phc_title_tagline) %></li>
+	</ul>
+	<div class="page-toolbar">
+	</div>
+</div>
+<h1 class="page-title">
+	<%= yield(:phc_title) %>
+	<small><%= yield(:phc_title_tagline) %></small>
+</h1>
+
+<!-- Main Content -->
+<div class="row">
+	<div class="col-md-12">
+		<div class="profile-sidebar">
+			<%= render 'phcmemberspro/member/profiles/components/profile_sidebar' %>
+		</div>
+		<div class="profile-content">
+			<%= render 'phcmemberspro/member/profiles/components/profile_main' %>
+		</div>
+	</div>
+</div>

data/config/routes.rb

@@ -1,7 +1,7 @@
 Phcmemberspro::Engine.routes.draw do
 
 	# Dashboard (Engine Root)
-	get 'dashboard/mains/index', :path => "dashboard"
+	root 'dashboard/mains/index', :path => "dashboard"
 
 	# Application API
 	namespace :api do
@@ -15,34 +15,31 @@ Phcmemberspro::Engine.routes.draw do
 
 	# Application Client Backend
 
-	namespace :members do
+	# Members Section
+	namespace :member do
 
 		# Members Main Index
-		root 'mains#index'
+		root 'profiles#index'
 
 		# Member Routes
-		resources :mains do
-
-			# Member Routes
-			resources :businesses
-			resources :contacts
-			
-			# Auto Complete Routes
-			get :autocomplete_members_contact_mccompanyname, :on => :collection
-
+		resources :profiles, class_name: 'Phcmemberspro::Member::Profile' do
+			resources :listings, class_name: 'Phcmemberspro::Member::Listing'
+			resources :addresses, class_name: 'Phcmemberspro::Member::Address'
 		end
 
 	end
 
+	# Directory Section
 	namespace :directory do
 
 		# Members Main Index
 		root 'categories#index'
 
-		resources :categories do
-			resources :listings
-		end
-
+		resources :categories, class_name: 'Phcmemberspro::Directory::Category'
+		resources :categorylistings, class_name: 'Phcmemberspro::Directory::Categorylisting'
 	end
+	
+	# Mount Account Routes
+	mount Phcaccountspro::Engine, :at => '/'
 
 end

data/db/migrate/{20160711040328_create_phcmemberspro_directory_categories.rb → 20160728230720_create_phcmemberspro_directory_categories.rb}

@@ -1,16 +1,14 @@
-class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration
+class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration[5.0]
 	def change
 		create_table :phcmemberspro_directory_categories do |t|
 
 			t.string :catname
-			
-			t.references :business, index: true
 
 			t.string :user_id
 			t.string :membership_id
 			t.string :oganization_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end

data/db/migrate/20160728230830_create_phcmemberspro_directory_categorylistings.rb

@@ -0,0 +1,16 @@
+class CreatePhcmembersproDirectoryCategorylistings < ActiveRecord::Migration[5.0]
+	def change
+		create_table :phcmemberspro_directory_categorylistings do |t|
+
+			t.references :category
+			t.references :listing
+
+			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
+
+			t.timestamps
+
+		end
+	end
+end

data/db/migrate/{20160711040205_create_phcmemberspro_members_contacts.rb → 20160728230901_create_phcmemberspro_member_addresses.rb}

@@ -1,6 +1,6 @@
-class CreatePhcmembersproMembersContacts < ActiveRecord::Migration
+class CreatePhcmembersproMemberAddresses < ActiveRecord::Migration[5.0]
 	def change
-		create_table :phcmemberspro_members_contacts do |t|
+		create_table :phcmemberspro_member_addresses do |t|
 
 			t.string :mcaddressl1
 			t.string :mcaddressl2
@@ -10,14 +10,14 @@ class CreatePhcmembersproMembersContacts < ActiveRecord::Migration
 			t.string :mcpostalcode
 			t.string :mctype
 
-			t.references :main, index: true
+			t.references :profile
 
 			t.string :user_id
 			t.string :membership_id
 			t.string :oganization_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end
-end
+end

data/db/migrate/{20160711040139_create_phcmemberspro_members_businesses.rb → 20160728231011_create_phcmemberspro_member_listings.rb}

@@ -1,6 +1,6 @@
-class CreatePhcmembersproMembersBusinesses < ActiveRecord::Migration
+class CreatePhcmembersproMemberListings < ActiveRecord::Migration[5.0]
 	def change
-		create_table :phcmemberspro_members_businesses do |t|
+		create_table :phcmemberspro_member_listings do |t|
 
 			t.string :mbcompanyname
 			t.string :mbcontactname
@@ -14,14 +14,14 @@ class CreatePhcmembersproMembersBusinesses < ActiveRecord::Migration
 			t.string :mbcontactemail
 			t.string :mbwebsite
 
-			t.references :main, index: true
+			t.references :profile
 
 			t.string :user_id
 			t.string :membership_id
 			t.string :oganization_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end
-end
+end

data/db/migrate/{20160711040108_create_phcmemberspro_members_mains.rb → 20160728231036_create_phcmemberspro_member_profiles.rb}

@@ -1,6 +1,6 @@
-class CreatePhcmembersproMembersMains < ActiveRecord::Migration
+class CreatePhcmembersproMemberProfiles < ActiveRecord::Migration[5.0]
 	def change
-		create_table :phcmemberspro_members_mains do |t|
+		create_table :phcmemberspro_member_profiles do |t|
 
 			t.string :mfirstname
 			t.string :mlastname
@@ -9,16 +9,12 @@ class CreatePhcmembersproMembersMains < ActiveRecord::Migration
 			t.string :mphone
 			t.string :mnotes
 
-			t.string :smtwitter
-			t.string :smfacebook
-			t.string :smlinkedin
-
 			t.string :user_id
 			t.string :membership_id
 			t.string :oganization_id
 
-			t.timestamps null: false
+			t.timestamps
 
 		end
 	end
-end
+end

data/lib/phcmemberspro/engine.rb

@@ -6,6 +6,8 @@ module Phcmemberspro
 		require 'paper_trail'
 
 		# Main Dependencies
+		require 'phcadmins'
+		require 'phcaccountspro'
 		require 'phcnotifi'
 		require 'phctitleseo'
 		

data/lib/phcmemberspro/version.rb

@@ -1,3 +1,3 @@
 module Phcmemberspro
-	VERSION = "8.6.3"
+	VERSION = "9.0.0"
 end