phcmemberspro 87.0.0 → 88.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b7ecd73386baff70b8466e08557c816e6786179cb7d20e02732f3c3f68700c
-  data.tar.gz: 6063c079604b39596256ff2b379547337df4d13c03d0c5ce8faf7f4c46e2dc6b
+  metadata.gz: d33a3cb5f655f68bf5226812992122db0ba97ae25bf0e2bd85c2d5f9aee4f9e9
+  data.tar.gz: d1f70f4caeb997edc657728b2a350ca535adb3521bc194ce95b3ee9b8444f441
 SHA512:
-  metadata.gz: 72cd7c53fd4362f1fdd341e9396ad1e3e9f87d3ec716006b700e87304e974fac66b76fb2a91264aedc994203741c98b8a5bfafbfa37146b7d1f2fd8561fef331
-  data.tar.gz: ba9966b25ccc35ed1527060fc6f3cf800c9644ffa13717f9c95897b1b0e2ef51345a047f645bfc4ab48d17068557f34c3b223c928208366d2a5355170e114933
+  metadata.gz: 329c099a4a4799067590145d89ac2472ca759d6402fc72815ac9df6d8248761e0dd6a307c197d64bbc135db65b217eb681ecf2bbdf498307600daafdf5e55bdf
+  data.tar.gz: ff10f5b0a9cf67df358b0bac20f4207e39f3a4ebf2dd2971bcf93870858e3c9c63411a9b24b82dd993a997e8c9ce50b1af8b144084fc509de694b2afb9df2d5a

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012-2019 BradPotts - PHCNetco/PHCDevworks/PHCNetworks
+Copyright 2012-2019 BradPotts - PHCNetCo/PHCDevworks/PHCNetworks
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/phcmemberspro/api/v1/categories_controller.rb

@@ -3,13 +3,12 @@ require_dependency "phcmemberspro/application_controller"
 module Phcmemberspro
   class Api::V1::CategoriesController < ApplicationController
 
-    # Only Responds to API Requests & Skips Member Profile Info
-    skip_before_action :phcmemberspro_get_member_profile_info
+    # Only Responds to API
     respond_to :json
 
     # Directory Category API
     def index
-      @directory_categories = Directory::Category.where(org_id: current_user.org_id).order('catname ASC')
+      @directory_categories = Directory::Category.where(org_id: current_user.org_id).order('category_name ASC')
     end
 
   end

data/app/controllers/phcmemberspro/api/v1/listings_controller.rb

@@ -3,14 +3,14 @@ require_dependency "phcmemberspro/application_controller"
 module Phcmemberspro
   class Api::V1::ListingsController < ApplicationController
 
-    # Only Responds to API Requests & Skips Member Profile Info
+    # Only Responds to API
     skip_before_action :phcmemberspro_get_member_profile_info
     respond_to :json
 
     # Directory Listing API
     def index
       category = Directory::Category.find(params[:category_id])
-      @member_listings = category.listings.where(org_id: current_user.org_id)
+      @member_listings = category.listings.where(org_id: current_user.org_id).order('listing_company_name ASC')
     end
 
   end

data/app/controllers/phcmemberspro/application_controller.rb

@@ -1,22 +1,22 @@
 module Phcmemberspro
-    class ApplicationController < ActionController::Base
-    
-        # Security Filters
-        protect_from_forgery with: :exception
-    
-        # Load Requried Helper Files
-        helper Phccorehelpers::Engine.helpers
-        helper Phcmenus::Engine.helpers
-        helper Phctitleseo::Engine.helpers
-        helper Phcnotifi::Engine.helpers
-        helper Phcaccountspro::Engine.helpers
-    
-        # Papertrail Whodunnit Username
-        def user_for_paper_trail
-          current_user ? current_user.username : 'Public user'
-        end
+  class ApplicationController < ActionController::Base
 
-        private
+    # Security Filters
+    protect_from_forgery with: :exception
 
+    # Load Requried Helper Files
+    helper Phcaccountspro::Engine.helpers
+    helper Phccorehelpers::Engine.helpers
+    helper Phcmenus::Engine.helpers
+    helper Phctitleseo::Engine.helpers
+    helper Phcnotifi::Engine.helpers
+
+    # Papertrail Whodunnit Username
+    def user_for_paper_trail
+      current_user ? current_user.username : 'Public user'
     end
-end
+
+    private
+
+  end
+end

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

@@ -9,51 +9,50 @@ module Phcmemberspro
     before_action :set_paper_trail_whodunnit
     before_action :set_directory_category, only: [:show, :edit, :update, :destroy]
 
-    # INDEX - Directory Category
+    # INDEX
     def index
-      @directory_categories = Directory::Category.where(org_id: current_user.org_id)
+      @directory_categories = Directory::Category.all
     end
 
-    # DETAILED - Directory Category
+    # SHOW
     def show
       @directory_category = Directory::Category.find(params[:id])
       @directory_category_versions = Phcmemberspro::CategoryVersions.where(item_id: @directory_category, item_type: 'Phcmemberspro::Directory::Category')
     end
 
-    # NEW - Directory Category
+    # NEW
     def new
-    	@directory_category = Directory::Category.new
+      @directory_category = Directory::Category.new
     end
 
-    # EDIT - Directory Category
+    # EDIT
     def edit
     end
 
-    # POST - Directory Category
+    # CREATE
     def create
       @directory_category = Directory::Category.new(directory_category_params)
       @directory_category.user_id = current_user.id
-      @directory_category.org_id = current_user.org_id
       if @directory_category.save
-        redirect_to directory_categories_url, notice: 'Category was successfully created.'
+        redirect_to directory_categories_url, :flash => { :success => 'Category was successfully created.' }
       else
-          render :new
+        render :new
       end
     end
 
-    # PATCH/PUT - Directory Category
+    # UPDATE
     def update
       if @directory_category.update(directory_category_params)
-        redirect_to directory_categories_url, notice: 'Category was successfully updated.'
+        redirect_to directory_categories_url, :flash => { :success => 'Category was successfully updated.' }
       else
-          render :edit
+        render :edit
       end
     end
 
-    # DELETE - Directory Category
+    # DELETE
     def destroy
       @directory_category.destroy
-      redirect_to directory_categories_url, notice: 'Category was successfully destroyed.'
+      redirect_to directory_categories_url, :flash => { :error => 'Category was successfully destroyed.' }
     end
 
     private
@@ -65,7 +64,7 @@ module Phcmemberspro
 
     # Whitelist
     def directory_category_params
-      params.require(:directory_category).permit(:category_name, :slug, :user_id, :org_id)
+      params.require(:directory_category).permit(:category_name, :slug, :user_id)
     end
 
   end

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

@@ -10,58 +10,57 @@ module Phcmemberspro
     before_action :set_paper_trail_whodunnit
     before_action :set_member_address, only: [:show, :edit, :update, :destroy]
 
-    # INDEX - Directory Listings
+    # INDEX
     def index
       profile = Member::Profile.find(params[:profile_id])
-      @member_addresses = profile.addresses.where(org_id: current_user.org_id)
+      @member_addresses = profile.addresses.all
     end
 
-    # LISTINGS DETAILS - Directory Listings
+    # SHOW
     def show
       profile = Member::Profile.find(params[:profile_id])
       @member_address = profile.addresses.find(params[:id])
       @member_address_versions = Phcmemberspro::AddressVersions.where(item_id: @member_address, item_type: 'Phcmemberspro::Member::Address')
     end
 
-    # NEW - Directory Listings
+    # NEW
     def new
       profile = Member::Profile.find(params[:profile_id])
       @member_address = profile.addresses.build
     end
 
-    # EDIT - Directory Listings
+    # EDIT
     def edit
     end
 
-    # POST - Directory Listings
+    # CREATE
     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.org_id = current_user.org_id
       if @member_address.save
-        redirect_to member_profile_addresses_url, notice: 'Address was successfully created.'
+        redirect_to member_profile_addresses_url, :flash => { :success => 'Address was successfully created.' }
       else
         render :new
       end
     end
 
-    # PATCH/PUT - Directory Listings
+    # UPDATE
     def update
       @profile = Member::Profile.find(params[:profile_id])
       if @member_address.update(member_address_params)
-        redirect_to member_profile_addresses_url, notice: 'Address was successfully updated.'
+        redirect_to member_profile_addresses_url, :flash => { :success => 'Address was successfully updated.' }
       else
         render :edit
       end
     end
 
-    # DELETE - Directory Listings
+    # DELETE
     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.'
+      redirect_to member_profile_addresses_url, :flash => { :error => 'Listing was successfully destroyed.' }
     end
 
     private
@@ -73,7 +72,7 @@ module Phcmemberspro
 
     # Whitelist
     def member_address_params
-      params.require(:member_address).permit(:address_address_line_1, :address_address_line_2, :address_city, :address_province, :address_country, :address_postal_code, :address_type, :user_name, :profile_id, :slug, :user_id, :org_id)
+      params.require(:member_address).permit(:address_address_line_1, :address_address_line_2, :address_city, :address_province, :address_country, :address_postal_code, :address_type, :user_name, :profile_id, :slug, :user_id)
     end
 
   end

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

@@ -6,11 +6,12 @@ module Phcmemberspro
     # Security & Action Filters
     before_action :authenticate_user!
 
+    # INDEX
     def index
-      @member_profile = Phcmemberspro::Member::Profile.where(org_id: current_user.org_id)
-      @member_listing = Phcmemberspro::Member::Listing.where(org_id: current_user.org_id)
-      @member_address = Phcmemberspro::Member::Address.where(org_id: current_user.org_id)
-      @directory_category = Phcmemberspro::Directory::Category.where(org_id: current_user.org_id)
+      @member_profile = Phcmemberspro::Member::Profile.all
+      @member_listing = Phcmemberspro::Member::Listing.all
+      @member_address = Phcmemberspro::Member::Address.all
+      @directory_category = Phcmemberspro::Directory::Category.all
     end
 
   end

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

@@ -10,58 +10,57 @@ module Phcmemberspro
     before_action :set_paper_trail_whodunnit
     before_action :set_member_listing, only: [:show, :edit, :update, :destroy]
 
-    # INDEX - Directory Listings
+    # INDEX
     def index
       profile = Member::Profile.find(params[:profile_id])
-      @member_listings = profile.listings.where(org_id: current_user.org_id)
+      @member_listings = profile.listings.all
     end
 
-    # LISTINGS DETAILS - Directory Listings
+    # SHOW
     def show
       profile = Member::Profile.find(params[:profile_id])
       @meber_listing = profile.listings.find(params[:id])
-      @member_listing_versions = Phcmemberspro::ListingVersions.where(item_id: @member_listing, item_type: 'Phcmemberspro::Member::Listing')
+      @member_listing_versions = Phcmemberspro::ListingVersions.where(item_id: @member_listing, item_type: 'Phcmembers::Member::Listing')
     end
 
-    # NEW - Directory Listings
+    # NEW
     def new
       profile = Member::Profile.find(params[:profile_id])
       @member_listing = profile.listings.build
     end
 
-    # EDIT - Directory Listings
+    # EDIT
     def edit
     end
 
-    # POST - Directory Listings
+    # CREATE
     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.org_id = current_user.org_id
       if @member_listing.save
-        redirect_to member_profile_listings_url, notice: 'Listing was successfully created.'
+        redirect_to member_profile_listings_url, :flash => { :success => 'Listing was successfully created.' }
       else
-          render :new
+        render :new
       end
     end
 
-    # PATCH/PUT - Directory Listings
+    # UPDATE
     def update
       @profile = Member::Profile.find(params[:profile_id])
       if @member_listing.update(member_listing_params)
-        redirect_to member_profile_listings_url, notice: 'Listing was successfully updated.'
+        redirect_to member_profile_listings_url, :flash => { :success => 'Listing was successfully updated.' }
       else
-          render :edit
+        render :edit
       end
     end
 
-    # DELETE - Directory Listings
+    # DELETE
     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.'
+      redirect_to member_profile_listings_url, :flash => { :error => 'Listing was successfully destroyed.' }
     end
 
     private
@@ -73,7 +72,7 @@ module Phcmemberspro
 
     # Whitelist
     def member_listing_params
-      params.require(:member_listing).permit(:listing_company_name, :listing_contact_name, :listing_address_line_1, :listing_address_line_2, :listing_city, :listing_country, :listing_province, :listing_postal_code, :listing_phone, :listing_contact_email, :listing_website, :profile_id, :slug, :user_id, :org_id, category_ids: [])
+      params.require(:member_listing).permit(:listing_company_name, :listing_contact_name, :listing_address_line_1, :listing_address_line_2, :listing_city, :listing_country, :listing_province, :listing_postal_code, :listing_phone, :listing_contact_email, :listing_website, :profile_id, :slug, :user_id, category_ids: [])
     end
 
   end

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

@@ -10,51 +10,50 @@ module Phcmemberspro
     before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
     layout "phcmemberspro/member_profile", :only => [ :show ]
 
-    # INDEX - Member Profile
+    # INDEX
     def index
-      @member_profiles = Member::Profile.where(org_id: current_user.org_id)
+      @member_profiles = Member::Profile.all
     end
 
-    # DETAILED PROFILE - Member Profile
+    # SHOW
     def show
       @member_profile = Member::Profile.find(params[:id])
       @member_profile_versions = Phcmemberspro::ProfileVersions.where(item_id: @member_profile, item_type: 'Phcmemberspro::Member::Profile')
     end
 
-    # NEW FORM - Member Profile
+    # NEW
     def new
       @member_profile = Member::Profile.new
     end
 
-    # EDIT FORM - Member Profile
+    # EDIT
     def edit
     end
 
-    # POST - Member Profile
+    # CREATE
     def create
       @member_profile = Member::Profile.new(member_profile_params)
       @member_profile.user_id = current_user.id
-      @member_profile.org_id = current_user.org_id
       if @member_profile.save
-        redirect_to member_profiles_url, notice: 'Profile was successfully created.'
+        redirect_to member_profiles_url, :flash => { :success => 'Profile was successfully created.' }
       else
         render :new
       end
     end
 
-    # PATCH/PUT - Member Profile
+    # UPDATE
     def update
       if @member_profile.update(member_profile_params)
-        redirect_to member_profiles_url, notice: 'Profile was successfully updated.'
+        redirect_to member_profiles_url, :flash => { :success => 'Profile was successfully updated.' }
       else
         render :edit
       end
     end
 
-    # DELETE - Member Profile
+    # DELETE
     def destroy
       @member_profile.destroy
-      redirect_to member_profiles_url, notice: 'Profile was successfully destroyed.'
+      redirect_to member_profiles_url, :flash => { :error => 'Profile was successfully destroyed.' }
     end
 
     private
@@ -66,7 +65,7 @@ module Phcmemberspro
 
     # Whitelist
     def member_profile_params
-      params.require(:member_profile).permit(:member_first_name, :member_last_name, :member_title, :member_email, :member_phone, :member_notes, :slug, :user_id, :org_id)
+      params.require(:member_profile).permit(:member_first_name, :member_last_name, :member_title, :member_email, :member_phone, :member_notes, :slug, :user_id)
     end
 
   end

data/app/jobs/phcmemberspro/application_job.rb

@@ -1,4 +1,4 @@
-module Phcmemberspro
+module Phcmembers
   class ApplicationJob < ActiveJob::Base
   end
 end

data/app/mailers/phcmemberspro/application_mailer.rb

@@ -1,6 +1,6 @@
 module Phcmemberspro
   class ApplicationMailer < ActionMailer::Base
-    default from: ENV['PHC_MEMBERS_PRO_EMAIL_ADDRESS']
+    default from: 'from@example.com'
     layout 'mailer'
   end
 end

data/app/models/phcmemberspro/address_versions.rb

@@ -1,5 +1,5 @@
 module Phcmemberspro
-    class AddressVersions < PaperTrail::Version
-        self.table_name = :phcmemberspro_address_versions
-    end
+  class AddressVersions < PaperTrail::Version
+    self.table_name = :phcmemberspro_address_versions
+  end
 end

data/app/models/phcmemberspro/directory/category.rb

@@ -1,26 +1,24 @@
 module Phcmemberspro
 	class Directory::Category < ApplicationRecord
 
-		# Clean URL Initialize
+    # Clean URL Initialize
 		extend FriendlyId
 
-		# Paper_tail Initialize
+		# Paper Trail Initialize
 		has_paper_trail :class_name => 'Phcmemberspro::CategoryVersions'
 
-		# Relationships
+    # Relationships
 		has_and_belongs_to_many :listings, class_name: 'Phcmemberspro::Member::Listing', :join_table => 'categories_listings', :dependent => :destroy
 
+    # Form Fields Validation
 		validates :category_name,
-			length: { minimum: 3 }
-		
-		# Clean URL Define
-		friendly_id :phcmemberspro_category_slug, use: [:slugged, :finders]
+			presence: true
 
-		# Define for Multiple Records
-		def phcmemberspro_category_slug
-			[
-				[:org_id, :category_name]
-			]
+    # Clean URL Define
+		friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
+
+		def phc_nice_url_slug
+			[:category_name]
 		end
 
 	end