phcmemberspro 8.6.3 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7840fb9b00b84a51312a277a501114849431fe
-  data.tar.gz: 1d0cbce37ebc003534f3d93df47c912f4b3f2247
+  metadata.gz: bb4432c8a5ae976563c8d7709871293cc561eb02
+  data.tar.gz: 4beda8b6fb781ac287aa19de5474862004ca747e
 SHA512:
-  metadata.gz: 081b11b8a2734c21ff019b973ddfe7127325621d836441690d2ed55a119a66b623471fea40beda24ffdd3574f77094c443292de1a5a899e99b1f6506e36260d1
-  data.tar.gz: b497047c379883b682c17af9cae35c160032471d5da832878cea4c1f222329f81ab448a2a94a79521ed5699dbdd97d6e73eda28c1952482d305c7bb2f88f72f8
+  metadata.gz: 9cfcc17b856444558e90991518776fc65782f06246b6ddc8013c7649f5421c8405601dffd6174845a9dfcfa295a26bbf2e9bff3d5d62ea29d3d2be372e32fcf6
+  data.tar.gz: 1af9bf6175bb933a3b0c43dd2b7b872de54b18310299a5348079573d7395851d30a076c26118bdcbe571e45186d27d7e46bedddd5a00e2c777ed162cf4b490fe

data/app/assets/javascripts/phcmemberspro/application.js

@@ -5,12 +5,9 @@
 // or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
 //
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
+// compiled file.
 //
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap-sprockets
-//= require_tree .
+//= require phc_admins_main

data/app/assets/stylesheets/phcmemberspro/_custom.scss

@@ -0,0 +1,38 @@
+	// Page Header Title
+	.page-title {
+		padding: 25px 0px 40px 0px;
+		font-size: 28px;
+		letter-spacing: -1px;
+		display: block;
+		color: #666;
+		margin: 0px 0px 15px 0px;
+		font-weight: 300;
+		// Title SubScript
+		small {
+			font-size: 14px;
+			letter-spacing: 0px;
+			font-weight: 300;
+			color: #888;
+		}
+	
+		.page-content-white &,
+		.page-container-bg-solid & {
+			color: #666;
+			margin-bottom: 20px;
+			margin-top: 20px;
+			small {
+				color: #666;
+			}
+		}
+	
+		.page-content-white & {
+			margin: 25px 0;
+			font-size: 24px;
+		}
+	}
+	
+	// Fix for Time in List
+	.feeds {
+		padding: 5px 5px 5px 5px;
+		font-size: 13px;
+	}

data/app/assets/stylesheets/phcmemberspro/application.scss

@@ -1,23 +1,18 @@
- /*
-* This is a manifest file that'll be compiled into application.css, which will include all the files
-* listed below.
-*
-* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
-* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
-*
-* You're free to add application-wide styles to this file and they'll appear at the bottom of the
-* compiled file so the styles you add here take precedence over styles defined in any styles
-* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
-* file per style scope.
-*
-*= require_tree .
-*= require_self
-*/
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
+ * files in this directory. Styles in this file should be added after the last require_* statement.
+ * It is generally better to create a new file per style scope.
+ *
+ *= require_self
+ */
 
-// Bootstrap & Font Awesome
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import "font-awesome";
-
-// Custom Alterations
-@import "custom";
+// Add PHCAdmins Styles
+@import "phc_admins_style";
+@import "custom"

data/app/controllers/phcmemberspro/application_controller.rb

@@ -1,42 +1,38 @@
 module Phcmemberspro
 	class ApplicationController < ActionController::Base
 
-		# Filter and Security
+		# Security Filters
 		before_filter :require_user
 		protect_from_forgery with: :exception
 
+		# Grab Member Information
+		def get_member_profile_info  
+			@members_profile_info = Member::Profile.find(params[:profile_id])
+		end
+
 		# AuthRocket User Helpers
 		def require_user
 			unless current_user
+				params.permit!
 				session[:last_url] = request.get? ? url_for(params) : url_for
 				redirect_to new_login_url
 			end
 		end
-	
+
 		def current_user
 			@_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
 		end
 		helper_method :current_user
-	
+
 		def new_login_url
-		ENV['AUTHROCKET_LOGIN_URL']
-			# $ar_login_url
+			ENV['AUTHROCKET_LOGIN_URL']
 		end
 		helper_method :new_login_url
 
-		# Add Helpers
-		helper Phcnotifi::Engine.helpers
+		# Load Helpers
 		helper Phctitleseo::Engine.helpers
-
-		# Resolve Layouts for Gem
-		def phcmemberspro_membersmain_layouts_resolver
-			case action_name
-			when "show"
-				"layouts/phcmemberspro/members/members_profile"
-			else
-				"layouts/phcmemberspro/members/members_all"
-			end
-		end
+		helper Phcnotifi::Engine.helpers
+		helper Phcaccountspro::Engine.helpers
 
 	end
 end

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

@@ -6,80 +6,69 @@ module Phcmemberspro
 		# Security & Action Filters
 		before_action :require_user
 		before_action :set_paper_trail_whodunnit
-		before_action :set_directory_category, only: [:edit, :update, :destroy]
-		layout 'layouts/phcmemberspro/directory/directory_all.html.erb'
+		before_action :set_directory_category, only: [:show, :edit, :update, :destroy]
 
-		# Directory Category Index
+		# INDEX - Directory Category
 		def index
 			@directory_categories = Directory::Category.where(oganization_id: membership_info.org_id)
 		end
 
-		# Directory Category Details
+		# DETAILED - Directory Category
 		def show
-			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
 			@directory_category = Directory::Category.find(params[:id])
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Directory::Category')
 		end
 
-		# New Directory Category
+		# NEW - Directory Category
 		def new
 			@directory_category = Directory::Category.new
 		end
 
-		# Edit Directory Category
+		# EDIT - Directory Category
 		def edit
 		end
 
-		# Create Action
+		# POST - Directory Category
 		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.'
+				redirect_to directory_categories_url, notice: 'Category was successfully created.'
 				else
 					render :new
 			end
 		end
 
-		# Update Action
+		# PATCH/PUT - Directory Category
 		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.'
+				redirect_to directory_categories_url, notice: 'Category was successfully updated.'
 				else
 					render :edit
 			end
 		end
 
-		# Delete Action
+		# DELETE - Directory Category
 		def destroy
 			@directory_category.destroy
-			redirect_to directory_categories_path, notice: 'Category was successfully destroyed.'
+			redirect_to directory_categories_url, notice: 'Category was successfully destroyed.'
 		end
 
 		private
 
-		# Grab User Session Key (For ID)
-		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_directory_category
 			@directory_category = Directory::Category.find(params[:id])
 		end
 
-		# whitelist
+		# Whitelist
 		def directory_category_params
-			params.require(:directory_category).permit(:catname, :user_id, :membership_id, :oganization_id)
+			params.require(:directory_category).permit(:catname)
 		end
 
 	end

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

@@ -0,0 +1,21 @@
+require_dependency "phcmemberspro/application_controller"
+
+module Phcmemberspro
+	class Directory::CategorylistingsController < ApplicationController
+
+		# Security & Action Filters
+		before_action :require_user
+		before_action :set_paper_trail_whodunnit
+		before_action :set_directory_category, only: [:show]
+
+		# INDEX - Directory Category/Listings
+		def index
+			@directory_categorylistings = Directory::Categorylisting.where(oganization_id: membership_info.org_id)
+		end
+
+		# DETAILED - Directory Category/Listings
+		def show
+		end
+
+	end
+end

data/app/controllers/phcmemberspro/member/addresses_controller.rb

@@ -0,0 +1,82 @@
+require_dependency "phcmemberspro/application_controller"
+
+module Phcmemberspro
+	class Member::AddressesController < ApplicationController
+
+		# Security & Action Filters
+		before_action :require_user
+		before_action :set_paper_trail_whodunnit
+		before_action :get_member_profile_info
+		before_action :set_member_address, only: [:show, :edit, :update, :destroy]
+
+		# INDEX - Directory Listings
+		def index
+			profile = Member::Profile.find(params[:profile_id])
+			@member_addresses = profile.addresses.where(oganization_id: membership_info.org_id)
+		end
+
+		# LISTINGS DETAILS - Directory Listings
+		def show
+			profile = Member::Profile.find(params[:profile_id])
+			@member_address = profile.addresses.find(params[:id])
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Member::Address')
+		end
+
+		# NEW - Directory Listings
+		def new
+			profile = Member::Profile.find(params[:profile_id])
+			@member_address = profile.addresses.build
+		end
+
+		# EDIT - Directory Listings
+		def edit
+		end
+
+		# POST - Directory Listings
+		def create
+			@profile = Member::Profile.find(params[:profile_id])
+			@member_address = @profile.addresses.create(member_address_params)
+			@member_address.user_id = current_user.id
+			@member_address.membership_id = membership_info.id
+			@member_address.oganization_id = membership_info.org_id
+			if @member_address.save
+				redirect_to member_profile_addresses_url, notice: 'Listing was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# PATCH/PUT - Directory Listings
+		def update
+			@member_address.user_id = current_user.id
+			@member_address.membership_id = membership_info.id
+			@member_address.oganization_id = membership_info.org_id
+			if @member_address.update(member_address_params)
+				redirect_to member_profile_addresses_url, notice: 'Listing was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# DELETE - Directory Listings
+		def destroy
+			@profile = Member::Profile.find(params[:profile_id])
+			@member_address = @profile.addresses.find(params[:id])
+			@member_address.destroy
+			redirect_to member_profile_addresses_url, notice: 'Listing was successfully destroyed.'
+		end
+
+		private
+
+		# Common Callbacks
+		def set_member_address
+			@member_address = Member::Address.find(params[:id])
+		end
+
+		# Whitelist
+		def member_address_params
+			params.require(:member_address).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :profile_id)
+		end
+
+	end
+end

data/app/controllers/phcmemberspro/member/listings_controller.rb

@@ -0,0 +1,84 @@
+require_dependency "phcmemberspro/application_controller"
+
+module Phcmemberspro
+	class Member::ListingsController < ApplicationController
+
+		# Security & Action Filters
+		before_action :require_user
+		before_action :set_paper_trail_whodunnit
+		before_action :get_member_profile_info
+		before_action :set_member_listing, only: [:show, :edit, :update, :destroy]
+
+		# INDEX - Directory Listings
+		def index
+			profile = Member::Profile.find(params[:profile_id])
+			@member_listings = profile.listings.where(oganization_id: membership_info.org_id)
+		end
+
+		# LISTINGS DETAILS - Directory Listings
+		def show
+			profile = Member::Profile.find(params[:profile_id])
+			@meber_listing = profile.listings.find(params[:id])
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmemberspro::Member::Listing')
+		end
+
+		# NEW - Directory Listings
+		def new
+			profile = Member::Profile.find(params[:profile_id])
+			@member_listing = profile.listings.build
+		end
+
+		# EDIT - Directory Listings
+		def edit
+		end
+
+		# POST - Directory Listings
+		def create
+			@profile = Member::Profile.find(params[:profile_id])
+			@member_listing = @profile.listings.create(member_listing_params)
+			@member_listing.user_id = current_user.id
+			@member_listing.membership_id = membership_info.id
+			@member_listing.oganization_id = membership_info.org_id
+			if @member_listing.save
+				@member_listing.categorylistings.build
+				redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# PATCH/PUT - Directory Listings
+		def update
+			@member_listing.user_id = current_user.id
+			@member_listing.membership_id = membership_info.id
+			@member_listing.oganization_id = membership_info.org_id
+			if @member_listing.update(member_listing_params)
+				@member_listing.categorylistings.build
+				redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# DELETE - Directory Listings
+		def destroy
+			@profile = Member::Profile.find(params[:profile_id])
+			@member_listing = @profile.listings.find(params[:id])
+			@member_listing.destroy
+			redirect_to member_profile_listings_url, notice: 'Listing was successfully destroyed.'
+		end
+
+		private
+
+		# Common Callbacks
+		def set_member_listing
+			@member_listing = Member::Listing.find(params[:id])
+		end
+
+		# Whitelist
+		def member_listing_params
+			params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :profile_id, category_ids: [])
+		end
+
+	end
+end