phcmembers 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d16f09e9d6ba90e4e4510827acd4af8cd1a777
-  data.tar.gz: 89e118564c151ebfb80dd51adf0aea7aa7885a6f
+  metadata.gz: a2e6dcc56f5ba83bf4a47bd2e43280bab7d6d6b6
+  data.tar.gz: a831fc855f548419e64a88e67735c0272dd05aa3
 SHA512:
-  metadata.gz: dff8e4d4a5e7d239fec434f1bdd85ff08babde7d058bf43e37a7785295e0e35a044f90b8e1edb64a117837772bbe2bb106782066511e2c1e6ad8364a4f4fb30d
-  data.tar.gz: 6c52651a4fb69ff27825e8619e8d3489ae47f59a04b8acd1ac016566e5a9aaf0ac1d3beff2df3f9095f98eb74ed8c13fcb24d9275c392e9b6e5fc4de43f60368
+  metadata.gz: df53edb77e446b93e837f1612fd3da2271b053f8add0f8221891c6a0fed24b92e5a9b32162f1fe14784c44a283a71ace8e974d4b4a231dc24eba9dde16c3d02a
+  data.tar.gz: 85b5e24566b12c3bd0007cc03e29d1c00aff1621b5f36f175d3de7bdd2e7a6ddd3bc72579eb4ea6b3ef6b7f78fe0fff74f30e3719adf4db0f4362e01ae0864ac

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2016 BradPotts - PHCNetworks
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,8 +3,8 @@
 [![Issue Count](https://codeclimate.com/github/PHCNetworks/phc-members/badges/issue_count.svg)](https://codeclimate.com/github/PHCNetworks/phc-members)
 [![Gem Version](https://badge.fury.io/rb/phcmembers.svg)](https://badge.fury.io/rb/phcmembers)
   
-### PHCMembers(2) (Membership & Directory Engine) Documentation
-PHCMembers(2) is an open source membership and listing directory engine purpose built for PHCMembers application.  
+### PHCMembers(3) (Membership & Directory Engine) Documentation
+PHCMembers(3) is an open source membership and listing directory engine purpose built for PHCMembers application.  
   
 - Fast setup of membership and web directory modules.
 - Directory and listings manager with a web directory API.
@@ -14,7 +14,7 @@ PHCMembers(2) is an open source membership and listing directory engine purpose
   
 #### Step 1 - Add PHCMembers to your gemfile  
   
-	gem 'phcmembers', '~> 2.1', '>= 2.1.3'
+	gem 'phcmembers', '~> 2.2'
 	bundle exec install
   
 #### Step 2 - Add database migration files  
@@ -41,4 +41,4 @@ PHC-Members UI requires bootstrap and fontawesome to operate.
 #### Additional Info & Help  
   
 [Past Security Patch Notes](https://github.com/PHCNetworks/phc-members/wiki/Critical-Security-Updates)
-  
+  

data/Rakefile

@@ -1,5 +1,5 @@
 begin
-require 'bundler/setup'
+	require 'bundler/setup'
 
 rescue LoadError
 	puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
@@ -11,13 +11,23 @@ RDoc::Task.new(:rdoc) do |rdoc|
 	rdoc.rdoc_dir = 'rdoc'
 	rdoc.title    = 'Phcmembers'
 	rdoc.options << '--line-numbers'
-	rdoc.rdoc_files.include('README.rdoc')
+	rdoc.rdoc_files.include('README.md')
 	rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/test_app/Rakefile", __FILE__)
-
+APP_RAKEFILE = File.expand_path("../spec/testapp/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+	t.libs << 'lib'
+	t.libs << 'test'
+	t.pattern = 'test/**/*_test.rb'
+	t.verbose = false
+end
+
+task default: :test

data/app/assets/config/phcmembers_manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../javascripts/phcmembers .js
+//= link_directory ../stylesheets/phcmembers .scss

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

@@ -1,9 +0,0 @@
-// Main Container Margin
-.container {
-	padding-top: 40px;
-}
-
-// Text Alginment in Table Cells
-.table > tbody > tr > td {
-	vertical-align: middle;
-}

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

@@ -0,0 +1,23 @@
+/*
+ * 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_tree .
+ *= require_self
+ */
+
+// Bootstrap & Font Awesome
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "font-awesome";
+
+// Custom Alterations
+@import "custom";

data/app/controllers/phcmembers/api/directories_controller.rb

@@ -0,0 +1,18 @@
+require_dependency "phcmembers/application_controller"
+
+module Phcmembers
+	class Api::DirectoriesController < ApplicationController
+
+		# Directory Category API
+		def index
+			@directory_categories = Directory::Category.where(membership_id: membership_info.id).order('catname ASC')
+		end
+
+		# Directory Listing API
+		def show
+			category = Directory::Category.find(params[:category_id])
+			@directory_listings = category.catlists.where(membership_id: membership_info.id)
+		end
+
+	end
+end

data/app/controllers/phcmembers/application_controller.rb

@@ -1,7 +1,10 @@
 module Phcmembers
 	class ApplicationController < ActionController::Base
 
-		# Add Helpers
+		# Security Filters
+		protect_from_forgery with: :exception
+		
+		# Load Helpers
 		helper Phctitleseo::Engine.helpers
 		helper Phcnotifi::Engine.helpers
 

data/app/controllers/phcmembers/dashboard/mains_controller.rb

@@ -0,0 +1,19 @@
+require_dependency "phcmembers/application_controller"
+
+module Phcmembers
+	class Dashboard::MainsController < ApplicationController
+
+		# Dashboard Index
+		def index
+			@members_main = Phcmembers::Members::Main
+			@members_business = Phcmembers::Members::Business
+			@members_contact = Phcmembers::Members::Contact
+
+			@directory_category = Phcmembers::Directory::Category
+			@directory_catlists = Phcmembers::Directory::Listing
+		end
+
+		private
+
+	end
+end

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

@@ -4,17 +4,19 @@ module Phcmembers
 	class Directory::CategoriesController < ApplicationController
 
 		# Filters
-		layout 'layouts/phcmembers/directory/directory_all.html.erb'
-		before_filter :authenticate_user!, if: -> { defined?(Devise) }
+		before_action :set_paper_trail_whodunnit
 		before_action :set_directory_category, only: [:edit, :update, :destroy]
+		# layout 'layouts/phcmemberspro/directory/directory_all.html.erb'
 
 		# Directory Category Index
 		def index
-			@directory_categories = Directory::Category.all.order('catname ASC')
+			@directory_categories = Directory::Category.all
 		end
 
 		# Directory Category Details
 		def show
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Directory::Category')
+			@directory_category = Directory::Category.find(params[:id])
 		end
 
 		# New Directory Category
@@ -64,4 +66,4 @@ module Phcmembers
 		end
 
 	end
-end
+end

data/app/controllers/phcmembers/directory/listings_controller.rb

@@ -0,0 +1,71 @@
+require_dependency "phcmembers/application_controller"
+
+module Phcmembers
+	class Directory::ListingsController < ApplicationController
+
+		# Filters
+		before_action :set_paper_trail_whodunnit
+		before_action :set_directory_listing, only: [:show, :update, :destroy]
+		# layout 'layouts/phcmemberspro/directory/directory_all.html.erb'
+
+		# Directory Listing Index
+		def index
+			category = Directory::Category.find(params[:category_id])
+			@directory_listings = category.listings
+		end
+
+		# Show Directory Listing
+		def show
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Directory::Listing')
+			category = Directory::Category.find(params[:category_id])
+			@directory_listing = category.listings.find(params[:id])
+		end
+
+		# New Directory Listing
+		def new
+			category = Directory::Category.find(params[:category_id])
+			@directory_listing = category.listings.build
+		end
+
+		# Create Directory Listing Action
+		def create
+			@category = Directory::Category.find(params[:category_id])
+			@directory_listing = @category.listings.create(directory_listing_params)
+			if @directory_listing.save
+				redirect_to directory_category_listings_path, notice: 'Listing was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# Update Directory Listing Action
+		def update
+			if @directory_listing.update(directory_listing_params)
+				redirect_to directory_category_listings_path, notice: 'Listing was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# Delete Directory Listing
+		def destroy
+			@category = Directory::Category.find(params[:category_id])
+			@directory_listing = @category.listings.find(params[:id])
+			@directory_listing.destroy
+		  redirect_to directory_category_listings_path, notice: 'Listing was successfully destroyed.'
+		end
+
+		private
+		
+		# Common Callbacks
+		def set_directory_listing
+			@directory_listing = Directory::Listing.find(params[:id])
+		end
+
+		# Whitelists
+		def directory_listing_params
+			params.require(:directory_listing).permit(:business_id, :category_id, :main_id)
+		end
+
+	end
+end

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

@@ -0,0 +1,83 @@
+require_dependency "phcmembers/application_controller"
+
+module Phcmembers
+	class Members::BusinessesController < ApplicationController
+
+		# Filters
+		before_action :set_paper_trail_whodunnit
+		before_action :phc_member_mains_info
+		before_action :set_members_business, only: [:edit, :update, :destroy]
+		# layout 'layouts/phcmembers/members/members_all.html.erb'
+
+		# Member Members Business Information Index
+		def index
+			main = Members::Main.find(params[:main_id])
+			@members_businesses = main.businesses.order('mbcompanyname ASC')
+		end
+
+		# Detailed Member Contact Information
+		def show
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Members::Business')
+			main = Members::Main.find(params[:main_id])
+			@members_businesses = main.businesses.find(params[:id])
+		end
+
+		# New Member Members Business Information
+		def new
+			main = Members::Main.find(params[:main_id])
+			@members_business = main.businesses.build
+		end
+
+		# Edit Member Members Business Information
+		def edit
+			main = Members::Main.find(params[:main_id])
+			@members_business = main.businesses.find(params[:id])
+		end
+
+		# Create Action
+		def create
+			@main = Members::Main.find(params[:main_id])
+			@members_business = @main.businesses.create(members_business_params)
+			if @members_business.save
+				redirect_to members_main_businesses_path, notice: 'Members Business was successfully created.'
+				else
+					render :new
+			end
+		end
+
+		# Update Action
+		def update
+			if @members_business.update(members_business_params)
+				redirect_to members_main_businesses_path, notice: 'Members Business Information was successfully updated.'
+				else
+					render :edit
+			end
+		end
+
+		# Delete Action
+		def destroy
+			@main = Members::Main.find(params[:main_id])
+			@members_business = @main.businesses.find(params[:id])
+			@members_business.destroy
+				redirect_to members_main_businesses_path, notice: 'Members Business has been Deleted.'
+		end
+
+		private
+		
+		# Grab Member Information
+		def phc_member_mains_info  
+			@members_main = Members::Main.find(params[:main_id])
+		end
+
+		# Common Callbacks
+		def set_members_business
+			@members_business = Members::Business.find(params[:id])
+		end
+
+		# White List
+		def members_business_params
+			params.require(:members_business).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :main_id)
+		end
+
+	end
+end

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

@@ -4,25 +4,20 @@ module Phcmembers
 	class Members::ContactsController < ApplicationController
 
 		# Filters
-		layout 'layouts/phcmembers/members/members_all.html.erb'
-		before_filter :authenticate_user!, if: -> { defined?(Devise) }
-		before_action :set_members_contact, only: [:show, :edit, :update, :destroy]
-
-		# Add Member Contact Information 
+		before_action :set_paper_trail_whodunnit
 		before_action :phc_member_mains_info
-
-		def phc_member_mains_info  
-			@members_main = Members::Main.find(params[:main_id])
-		end
+		before_action :set_members_contact, only: [:show, :edit, :update, :destroy]
+		# layout 'layouts/phcmemberspro/members/members_all.html.erb'
 
 		# Member Contact Index
 		def index
 			main = Members::Main.find(params[:main_id])
-			@members_contact = main.contacts
+			@members_contacts = main.contacts.order('mcprovince ASC')
 		end
 
 		# Detailed Member Contact Information
 		def show
+			@versions = PaperTrail::Version.where(item_id: params[:id], item_type: 'Phcmembers::Members::Contact')
 			main = Members::Main.find(params[:main_id])
 			@members_contact = main.contacts.find(params[:id])
 		end
@@ -31,10 +26,6 @@ module Phcmembers
 		def new
 			main = Members::Main.find(params[:main_id])
 			@members_contact = main.contacts.build
-			respond_to do |format|
-				format.html # new.html.erb
-				format.xml  { render :xml => @members_contact }
-			end
 		end
 
 		# Edit Contact
@@ -48,7 +39,7 @@ module Phcmembers
 			@main = Members::Main.find(params[:main_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.'
+				redirect_to members_main_contacts_path, notice: 'Member contact was successfully created.'
 				else
 					render :new
 			end
@@ -68,11 +59,16 @@ module Phcmembers
 			@main = Members::Main.find(params[:main_id])
 			@members_contact = @main.contacts.find(params[:id])
 			@members_contact.destroy
-			redirect_to members_main_contacts_path, notice: 'Member contact information was successfully destroyed.'
+			redirect_to members_main_contacts_path, notice: 'Member contact was successfully destroyed.'
 		end
 
 		private
 
+		# Get Main Member Info
+		def phc_member_mains_info  
+			@members_main = Members::Main.find(params[:main_id])
+		end
+
 		# Common Callbacks
 		def set_members_contact
 			@members_contact = Members::Contact.find(params[:id])
@@ -80,7 +76,7 @@ module Phcmembers
 
 		# White List
 		def members_contact_params
-			params.require(:members_contact).permit(:mccontactname, :mccompanyname, :mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mcphone, :mcwebsite, :mcemail, :main_id)
+			params.require(:members_contact).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :main_id)
 		end
 
 	end