phcmemberspro 5.4.2 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f5df0e3724710692ca1785899bcbf7a36b7365
-  data.tar.gz: ee117977bf98faaa6971da40a4c4d7187c002e4d
+  metadata.gz: f87aa61cd72a6f7691e6f989d9d2672fe14c08c6
+  data.tar.gz: ff30f82de3a78bbc2b504191a2d4d4dd5d12e8f3
 SHA512:
-  metadata.gz: 6ae5b539d383eae9063a1c15305bae9e96000fc6817c133b4b9899e0bc9c7baf28845e4c5221ca70b5844d151db1b88b489bf57cd0aa57ac50967eb9cc8e78b1
-  data.tar.gz: af50db52855ca06a5d00d35b4868dcee7aece52c0e93882901bd75aa298d168fc6f0ae0d0b10c9d25bb92fea42a921efe3c70a9803d78c05e62d7039cba0d06b
+  metadata.gz: 253ee2627e623eddd334422df5603eeeac28c38f07dfda8a1c2dc1bf27bee910224dd20f50660f2d98473535971434acd64df4bc0444efb116d0db8634d90d9c
+  data.tar.gz: 20be16b5e20c43383b867d765b294ca4848116c1a28911fafd71a769f86e286d76fae60291bd51b1ca9c13acafd57a41814786f21a74cc7668ad2bd759a3f43b

data/app/controllers/phcmemberspro/directory/categories_controller.rb

@@ -10,7 +10,7 @@ module Phcmemberspro
 
 		# Directory Category Index
 		def index
-			@directory_categories = Directory::Category.where(user_id: current_user.id)
+			@directory_categories = Directory::Category.where(membership_id: membership_info.id)
 		end
 
 		# Directory Category Details
@@ -30,6 +30,8 @@ module Phcmemberspro
 		def create
 			@directory_category = Directory::Category.new(directory_category_params)
 			@directory_category.user_id = current_user.id
+			@directory_category.membership_id = membership_info.id
+			@directory_category.oganization_id = membership_info.org_id
 			if @directory_category.save
 				redirect_to directory_categories_path, notice: 'Category was successfully created.'
 				else
@@ -40,6 +42,8 @@ module Phcmemberspro
 		# Update Action
 		def update
 			@directory_category.user_id = current_user.id
+			@directory_category.membership_id = membership_info.id
+			@directory_category.oganization_id = membership_info.org_id
 			if @directory_category.update(directory_category_params)
 				redirect_to directory_categories_path, notice: 'Category was successfully updated.'
 				else
@@ -60,6 +64,11 @@ module Phcmemberspro
 			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
 		end
 
+		# Get Current User from Above and Get Membership Info
+		def membership_info
+		    AuthRocket::Membership.all(user_id: current_user.id).first
+		end
+
 		# Common Callbacks
 		def set_directory_category
 			@directory_category = Directory::Category.find(params[:id])
@@ -67,7 +76,7 @@ module Phcmemberspro
 
 		# whitelist
 		def directory_category_params
-			params.require(:directory_category).permit(:catname, :user_id)
+			params.require(:directory_category).permit(:catname, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/app/controllers/phcmemberspro/directory/catlists_controller.rb

@@ -14,7 +14,7 @@ module Phcmemberspro
 		# Directory Listing Index
 		def index
 			category = Directory::Category.find(params[:category_id])
-			@directory_catlists = category.catlists.where(user_id: current_user.id)
+			@directory_catlists = category.catlists.where(membership_id: membership_info.id)
 		end
 
 		# Show Directory Listing
@@ -41,8 +41,10 @@ module Phcmemberspro
 
 		# Create Directory Listing Action
 		def create
-			@category = Directory::Category.find(params[:category_id])
 			@directory_catlist.user_id = current_user.id
+			@directory_catlist.membership_id = membership_info.id
+			@directory_catlist.oganization_id = membership_info.org_id
+			@category = Directory::Category.find(params[:category_id])
 			@directory_catlist = @category.catlists.create(directory_catlist_params)
 			respond_to do |format|
 				if @directory_catlist.save
@@ -57,6 +59,9 @@ module Phcmemberspro
 
 		# Update Directory Listing Action
 		def update
+			@directory_catlist.user_id = current_user.id
+			@directory_catlist.membership_id = membership_info.id
+			@directory_catlist.oganization_id = membership_info.org_id
 			respond_to do |format|
 				if @directory_catlist.update(directory_catlist_params)
 					format.html { redirect_to directory_category_catlists_path, notice: 'Comment for Directorycategory was Successfully Updated.' }
@@ -91,6 +96,11 @@ module Phcmemberspro
 			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
 		end
 
+		# Get Current User from Above and Get Membership Info
+		def membership_info
+		    AuthRocket::Membership.all(user_id: current_user.id).first
+		end
+
 		# Common Callbacks
 		def set_directory_catlist
 			@directory_catlist = Directory::Catlist.find(params[:id])
@@ -98,7 +108,7 @@ module Phcmemberspro
 
 		# Whitelists
 		def directory_catlist_params
-			params.require(:directory_catlist).permit(:business_id, :category_id, :user_id)
+			params.require(:directory_catlist).permit(:business_id, :category_id, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/app/controllers/phcmemberspro/members/businesses_controller.rb

@@ -14,7 +14,7 @@ module Phcmemberspro
 		# Member Members Business Information Index
 		def index
 			main = Members::Main.find(params[:main_id])
-			@members_businesses = main.businesses.where(user_id: current_user.id).order('mbcompanyname ASC')
+			@members_businesses = main.businesses.where(membership_id: membership_info.id).order('mbcompanyname ASC')
 		end
 
 		# Detailed Member Contact Information
@@ -43,6 +43,8 @@ module Phcmemberspro
 		def create
 			@main = Members::Main.find(params[:main_id])
 			@members_business.user_id = current_user.id
+			@members_business.membership_id = membership_info.id
+			@members_business.oganization_id = membership_info.org_id
 			@members_business = @main.businesses.create(members_business_params)
 			if @members_business.save
 				redirect_to members_main_businesses_path, notice: 'Members Business Information was successfully created.'
@@ -53,6 +55,9 @@ module Phcmemberspro
 
 		# Update Action
 		def update
+			@members_business.user_id = current_user.id
+			@members_business.membership_id = membership_info.id
+			@members_business.oganization_id = membership_info.org_id
 			if @members_business.update(members_business_params)
 				redirect_to members_main_businesses_path, notice: 'Members Business Information was successfully updated.'
 				else
@@ -79,7 +84,12 @@ module Phcmemberspro
 		def current_user
 			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
 		end
-		
+
+		# Get Current User from Above and Get Membership Info
+		def membership_info
+		    AuthRocket::Membership.all(user_id: current_user.id).first
+		end
+
 		# Common Callbacks
 		def set_members_business
 			@members_business = Members::Business.find(params[:id])
@@ -87,7 +97,7 @@ module Phcmemberspro
 
 		# White List
 		def members_business_params
-			params.require(:members_business).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :main_id, :user_id)
+			params.require(:members_business).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :main_id, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/app/controllers/phcmemberspro/members/contacts_controller.rb

@@ -14,7 +14,7 @@ module Phcmemberspro
 		# Member Contact Index
 		def index
 			main = Members::Main.find(params[:main_id])
-			@members_contacts = main.contacts.where(user_id: current_user.id).order('mcprovince ASC')
+			@members_contacts = main.contacts.where(membership_id: membership_info.id).order('mcprovince ASC')
 		end
 
 		# Detailed Member Contact Information
@@ -43,6 +43,8 @@ module Phcmemberspro
 		def create
 			@main = Members::Main.find(params[:main_id])
 			@members_contact.user_id = current_user.id
+			@members_contact.membership_id = membership_info.id
+			@members_contact.oganization_id = membership_info.org_id
 			@members_contact = @main.contacts.create(members_contact_params)
 			if @members_contact.save
 				redirect_to members_main_contacts_path, notice: 'Member contact information was successfully created.'
@@ -53,6 +55,9 @@ module Phcmemberspro
 
 		# Update Action
 		def update
+			@members_contact.user_id = current_user.id
+			@members_contact.membership_id = membership_info.id
+			@members_contact.oganization_id = membership_info.org_id
 			if @members_contact.update(members_contact_params)
 				redirect_to members_main_contacts_path, notice: 'Member contact information was successfully updated.'
 				else
@@ -80,6 +85,11 @@ module Phcmemberspro
 			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
 		end
 
+		# Get Current User from Above and Get Membership Info
+		def membership_info
+		    AuthRocket::Membership.all(user_id: current_user.id).first
+		end
+
 		# Common Callbacks
 		def set_members_contact
 			@members_contact = Members::Contact.find(params[:id])
@@ -87,7 +97,7 @@ module Phcmemberspro
 
 		# White List
 		def members_contact_params
-			params.require(:members_contact).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :main_id, :user_id)
+			params.require(:members_contact).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :main_id, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/app/controllers/phcmemberspro/members/mains_controller.rb

@@ -10,7 +10,7 @@ module Phcmemberspro
 
 		# Member Profile List
 		def index
-			@members_mains = Members::Main.where(user_id: current_user.id)
+			@members_mains = Members::Main.where(membership_id: membership_info.id)
 		end
 
 		# Detailed Member Profile
@@ -28,8 +28,10 @@ module Phcmemberspro
 
 		# Create Member Profile Action
 		def create
-			@members_main = Members::Main.new(members_main_params)
 			@members_main.user_id = current_user.id
+			@members_main.membership_id = membership_info.id
+			@members_main.oganization_id = membership_info.org_id
+			@members_main = Members::Main.new(members_main_params)
 			if @members_main.save
 				redirect_to members_mains_path, notice: 'Member profile has been successfully created.'
 				else
@@ -39,6 +41,9 @@ module Phcmemberspro
 
 		# Update Member Profile Action
 		def update
+			@members_main.user_id = current_user.id
+			@members_main.membership_id = membership_info.id
+			@members_main.oganization_id = membership_info.org_id
 			if @members_main.update(members_main_params)
 				redirect_to members_mains_path, notice: 'Member profile has been successfully updated.'
 				else
@@ -59,6 +64,11 @@ module Phcmemberspro
 			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
 		end
 
+		# Get Current User from Above and Get Membership Info
+		def membership_info
+		    AuthRocket::Membership.all(user_id: current_user.id).first
+		end
+
 		# Common Callbacks
 		def set_members_main
 			@members_main = Members::Main.find(params[:id])
@@ -66,7 +76,7 @@ module Phcmemberspro
 
 		# White List
 		def members_main_params
-			params.require(:members_main).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :smfacebook, :smtwitter, :smlinkedin, :user_id)
+			params.require(:members_main).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :smfacebook, :smtwitter, :smlinkedin, :user_id, :membership_id, :oganization_id)
 		end
 
 	end

data/db/migrate/20160227150117_create_phcmemberspro_members_mains.rb

@@ -14,6 +14,8 @@ class CreatePhcmembersproMembersMains < ActiveRecord::Migration
 			t.string :smlinkedin
 
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
 			t.timestamps null: false
 

data/db/migrate/20160227194651_create_phcmemberspro_members_contacts.rb

@@ -12,6 +12,8 @@ class CreatePhcmembersproMembersContacts < ActiveRecord::Migration
 			t.string :mctype
 			t.references :main, index: true
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
 			t.timestamps null: false
 

data/db/migrate/20160227205022_create_phcmemberspro_directory_categories.rb

@@ -5,6 +5,8 @@ class CreatePhcmembersproDirectoryCategories < ActiveRecord::Migration
 			t.string :catname
 			
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
 			t.timestamps null: false
 

data/db/migrate/20160227212144_create_phcmemberspro_directory_catlists.rb

@@ -7,6 +7,8 @@ class CreatePhcmembersproDirectoryCatlists < ActiveRecord::Migration
 			t.integer :business_id
 
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
 			t.timestamps null: false
 

data/db/migrate/20160514030803_create_phcmemberspro_members_businesses.rb

@@ -18,6 +18,8 @@ class CreatePhcmembersproMembersBusinesses < ActiveRecord::Migration
 			
 			t.references :main, index: true
 			t.string :user_id
+			t.string :membership_id
+			t.string :oganization_id
 
 			t.timestamps null: false
 

data/lib/phcmemberspro/version.rb

@@ -1,3 +1,3 @@
 module Phcmemberspro
-	VERSION = "5.4.2"
+	VERSION = "6.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmemberspro
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 6.0.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-04 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -416,10 +416,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.53'
-description: PHCMembersPro(5) is an open source rails engine custom built for enterprise
-  use.
+description: PHCMembersPro(6) membership & directories engine purpose built for PHCNetworks
+  Enterprise use.
 email:
-- info@phcnetworks.net
+- developers@phcnetworks.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -502,7 +502,7 @@ files:
 - lib/phcmemberspro/engine.rb
 - lib/phcmemberspro/version.rb
 - lib/tasks/phcmembers_tasks.rake
-homepage: https://phcnetworks.net
+homepage: https://www.phcnetworks.net/enterprise
 licenses:
 - GPL-3.0
 metadata: {}