phcmembers 64.1.0 → 65.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e053d460db74a80f9e0f5e3e9a69e21e4abe832c0a35bd84b9801b258d255784
-  data.tar.gz: c54064211474418428c78f5556f70b4681250227bb5318c26b0e5cdf94b95da9
+  metadata.gz: 4ee1e8297c5cf4e3e9c57afafc74ff23e7ec20971f5d6e1c17164bbe17703403
+  data.tar.gz: 1456820a648716382b824bba41a53618a2ade80d4e93af49e0c0705b53c21ebe
 SHA512:
-  metadata.gz: e11ab82bbb3117d85e4609308c43449c42ecf6eec5858fd0346ef8488320f208bdc0a3ea08a78936330421b54bfcc6d0a6afbaf1d1adbe53c41951e872f096fc
-  data.tar.gz: 8ab1a189fd327ce9fce36fd0844c9aa0813c7bceb5f7cf90adf7c153b0b7fe85bbadf8634237425826ad3de0d04cb5a2c500ec42f2640bdaed2239007e7c1992
+  metadata.gz: a8db099ce6fadc5ee41eae1757aafecc3ffac55573225bb10298f41330a70f62281d0249df032adde97b5d9df58f9589ead71477137ed1e3e0f35bb9b7a6dd13
+  data.tar.gz: 3ef414be16e0b3e6938b93259043e3472fa71a696fce3c902b374d71f00fe9cfee115b7184e99e108ea22194ed940c544941dadab9353b8b1d4da1a45a0f78d2

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/assets/stylesheets/phcmembers/application.scss

@@ -1,7 +1,2 @@
 // Load Admin Theme
 @import "phc_admin_theme_styles_four";
-
-div:empty {
-   display: none;
-}
-

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

@@ -3,13 +3,12 @@ require_dependency "phcmembers/application_controller"
 module Phcmembers
   class Api::V1::CategoriesController < ApplicationController
 
-    # Only Responds to API Requests & Skips Member Profile Info
-    skip_before_action :phcmembers_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/phcmembers/api/v1/listings_controller.rb

@@ -3,14 +3,14 @@ require_dependency "phcmembers/application_controller"
 module Phcmembers
   class Api::V1::ListingsController < ApplicationController
 
-    # Only Responds to API Requests & Skips Member Profile Info
+    # Only Responds to API
     skip_before_action :phcmembers_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/phcmembers/application_controller.rb

@@ -1,22 +1,22 @@
 module Phcmembers
-    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 Phcaccounts::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 Phccorehelpers::Engine.helpers
+    helper Phcmenus::Engine.helpers
+    helper Phctitleseo::Engine.helpers
+    helper Phcnotifi::Engine.helpers
+    helper Phcaccounts::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/phcmembers/directory/categories_controller.rb

@@ -9,47 +9,47 @@ module Phcmembers
     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.all
     end
 
-    # DETAILED - Directory Category
+    # SHOW
     def show
       @directory_category = Directory::Category.find(params[:id])
       @directory_category_versions = Phcmembers::CategoryVersions.where(item_id: @directory_category, item_type: 'Phcmembers::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
       if @directory_category.save
         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, :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, :flash => { :error => 'Category was successfully destroyed.' }

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

@@ -10,30 +10,30 @@ module Phcmembers
     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.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 = Phcmembers::AddressVersions.where(item_id: @member_address, item_type: 'Phcmembers::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)
@@ -45,7 +45,7 @@ module Phcmembers
       end
     end
 
-    # PATCH/PUT - Directory Listings
+    # UPDATE
     def update
       @profile = Member::Profile.find(params[:profile_id])
       if @member_address.update(member_address_params)
@@ -55,7 +55,7 @@ module Phcmembers
       end
     end
 
-    # DELETE - Directory Listings
+    # DELETE
     def destroy
       @profile = Member::Profile.find(params[:profile_id])
       @member_address = @profile.addresses.find(params[:id])

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

@@ -6,6 +6,7 @@ module Phcmembers
     # Security & Action Filters
     before_action :authenticate_user!
 
+    # INDEX
     def index
       @member_profile = Phcmembers::Member::Profile.all
       @member_listing = Phcmembers::Member::Listing.all

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

@@ -10,30 +10,30 @@ module Phcmembers
     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.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 = Phcmembers::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)
@@ -41,21 +41,21 @@ module Phcmembers
       if @member_listing.save
         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, :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])

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

@@ -10,27 +10,27 @@ module Phcmembers
     before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
     layout "phcmembers/member_profile", :only => [ :show ]
 
-    # INDEX - Member Profile
+    # INDEX
     def index
       @member_profiles = Member::Profile.all
     end
 
-    # DETAILED PROFILE - Member Profile
+    # SHOW
     def show
       @member_profile = Member::Profile.find(params[:id])
       @member_profile_versions = Phcmembers::ProfileVersions.where(item_id: @member_profile, item_type: 'Phcmembers::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
@@ -41,7 +41,7 @@ module Phcmembers
       end
     end
 
-    # PATCH/PUT - Member Profile
+    # UPDATE
     def update
       if @member_profile.update(member_profile_params)
         redirect_to member_profiles_url, :flash => { :success => 'Profile was successfully updated.' }
@@ -50,7 +50,7 @@ module Phcmembers
       end
     end
 
-    # DELETE - Member Profile
+    # DELETE
     def destroy
       @member_profile.destroy
       redirect_to member_profiles_url, :flash => { :error => 'Profile was successfully destroyed.' }

data/app/mailers/phcmembers/application_mailer.rb

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

data/app/models/phcmembers/address_versions.rb

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

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

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

data/app/models/phcmembers/member/address.rb

@@ -1,48 +1,39 @@
 module Phcmembers
   class Member::Address < ApplicationRecord
 
-		# Clean URL Initialize
-		extend FriendlyId
+    # Clean URL Initialize
+    extend FriendlyId
 
-		# Add Paper Trail
-		has_paper_trail :class_name => 'Phcmembers::AddressVersions'
+		# Paper Trail Initialize
+    has_paper_trail :class_name => 'Phcmembers::AddressVersions'
 
-		# Model Relationships
+    # Relationships
     belongs_to :profile, class_name: 'Phcmembers::Member::Profile'
 
-    # Validation for Form Fields
+    # Form Fields Validation
     validates :address_address_line_1,
-      presence: true,
-      length: { minimum: 2 }
+      presence: true
 
     validates :address_city,
-      length: { minimum: 3 }
+      presence: true
 
     validates :address_province,
-      presence: true,
-      length: { minimum: 2 }
+      presence: true
 
     validates :address_country,
-      presence: true,
-      length: { minimum: 2 }
+      presence: true
 
     validates :address_postal_code,
-      presence: true,
-      length: { minimum: 3 }
-
-    validates :address_type,
-      presence: true,
-      length: { minimum: 2 }
+      presence: true
 
     # Clean URL Define
-		friendly_id :phcmembers_address_slug, use: [:slugged, :finders]
-
-		# Define for Multiple Records
-		def phcmembers_address_slug
-			[
-				[:address_city, :address_province, :address_type]
-			]
-		end
+    friendly_id :phc_nice_url_slug, use: [:slugged, :finders]
+
+    def phc_nice_url_slug
+      [
+        [:address_city, :address_province, :address_type]
+      ]
+    end
 
   end
 end