phcmemberspro 82.0.0 → 82.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81eede0f35d9158b8efe16b10119a0f2e0dd984dcac377cb2d89ad42bb89ae6
-  data.tar.gz: cfa17ccf0de9e6ce36159b22c6d1aa7a42ba152ef92c34f17a239638dbcd11ed
+  metadata.gz: 3f0b1247bdc5168006fc78c10856c3e21427858d006daf9ee35150efd3af17fc
+  data.tar.gz: 308dccaa4c27c7cbced1f7c8a5b8a7c17ca73979c9d98760e3158e40f12fcea4
 SHA512:
-  metadata.gz: e6b6b7b11f1232d133535b6275f6a0903393b68fd31ac3b303e307574284bbf2aef56a9811e72e59d9290cd7182a1ab65a1e3b81c24f774748c2b8cd8e48b883
-  data.tar.gz: af683f86c91dfd44de26542ecd09336fe051f5772e983f523ab4d3b8b1f9c81dbde4b1a1cacff8cbb0ee5bab7ac5d21e540720ffef29d64f38c1249162bfe864
+  metadata.gz: 488e562f6a1cede141deff1e1f52e6c642dd8cfd2b16e579774473488ec67c9abbc21d755fdc5eb68a80827c3bc35e003c2f7200b3715c409870cffa2133b68d
+  data.tar.gz: a308d3570bf9e575b4b34897b0d597dd9681a2a0823a8589b2eb735882b6cf038a9fdf08fd63cc9ec42779d57e319cb2c9ae40ed1dacf4e9a1ad6d0fa6fac09f

data/app/controllers/phcmemberspro/application_controller.rb

@@ -1,28 +1,22 @@
 module Phcmemberspro
-  class ApplicationController < ActionController::Base
-
-    # Action Filters
-    before_action :phcmemberspro_get_member_profile_info
-
-    # Security Filters
-    protect_from_forgery with: :exception
-
-    # Load Helpers
-    helper Phctitleseo::Engine.helpers
-    helper Phcnotifi::Engine.helpers
-    helper Phcaccountspro::Engine.helpers
+    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
 
-    # Papertrail Whodunnit Username
-    def user_for_paper_trail
-      current_user ? current_user.username : 'Public user'
-    end
+        private
 
-    private
-    
-    # Grab Member Information
-    def phcmemberspro_get_member_profile_info
-      @members_profile_info = Member::Profile.find(params[:profile_id])
     end
-
-  end
-end
+end

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

@@ -4,7 +4,6 @@ module Phcmemberspro
   class Directory::CategoriesController < ApplicationController
 
     # Security & Action Filters
-    skip_before_action :phcmemberspro_get_member_profile_info
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_directory_category, only: [:show, :edit, :update, :destroy]

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

@@ -2,8 +2,10 @@ require_dependency "phcmemberspro/application_controller"
 
 module Phcmemberspro
   class Member::AddressesController < ApplicationController
-
-    # Security & Action Filters
+    
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::ApplicationHelper
+    before_action :phcmemberspro_get_member_profile_info
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_member_address, only: [:show, :edit, :update, :destroy]

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

@@ -4,7 +4,6 @@ module Phcmemberspro
   class Member::DashboardsController < ApplicationController
 
     # Security & Action Filters
-    skip_before_action :phcmemberspro_get_member_profile_info
     before_action :authenticate_user!
 
     def index

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

@@ -3,7 +3,9 @@ require_dependency "phcmemberspro/application_controller"
 module Phcmemberspro
   class Member::ListingsController < ApplicationController
 
-    # Security & Action Filters
+    # Include Core Helpers, Security & Action Filters
+    include Phccorehelpers::ApplicationHelper
+    before_action :phcmemberspro_get_member_profile_info
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_member_listing, only: [:show, :edit, :update, :destroy]

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

@@ -4,7 +4,6 @@ module Phcmemberspro
   class Member::ProfilesController < ApplicationController
 
     # Security, Layouts & Action Filters
-    skip_before_action :phcmemberspro_get_member_profile_info
     before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_member_profile, only: [:show, :edit, :update, :destroy]
@@ -39,8 +38,8 @@ module Phcmemberspro
       @member_profile.org_id = current_user.org_id
       if @member_profile.save
         redirect_to member_profiles_url, notice: 'Profile was successfully created.'
-        else
-          render :new
+      else
+        render :new
       end
     end
 
@@ -50,8 +49,8 @@ module Phcmemberspro
       @member_profile.org_id = current_user.org_id
       if @member_profile.update(member_profile_params)
         redirect_to member_profiles_url, notice: 'Profile was successfully updated.'
-        else
-          render :edit
+      else
+        render :edit
       end
     end
 

data/app/helpers/phcmemberspro/application_helper.rb

@@ -1,14 +1,4 @@
 module Phcmemberspro
   module ApplicationHelper
-
-    # Add Active to Menu
-    def is_active_controller(controller_name)
-      params[:controller] == controller_name ? "active open selected" : nil
-    end
-
-    def is_active_action(action_name)
-      params[:action] == action_name ? "active" : nil
-    end
-
   end
 end

data/lib/phcmemberspro/engine.rb

@@ -19,6 +19,8 @@ module Phcmemberspro
 		require 'phcadmin7'
 		
 		# PHC Helper Dependencies
+		require 'phccorehelpers'
+		require 'phcmenus'
 		require 'phcnotifi'
 		require 'phctitleseo'
 		
@@ -57,6 +59,8 @@ module Phcmemberspro
 		# Load Requried Helper Files
 		config.to_prepare do
 			Phcaccountspro::ApplicationController.helper(ApplicationHelper)
+			Phccorehelpers::ApplicationController.helper(ApplicationHelper)
+			Phcmenus::ApplicationController.helper(ApplicationHelper)
 			Phcnotifi::ApplicationController.helper(ApplicationHelper)
 			Phctitleseo::ApplicationController.helper(ApplicationHelper)
 		end

data/lib/phcmemberspro/version.rb

@@ -1,3 +1,3 @@
 module Phcmemberspro
-  VERSION = "82.0.0"
+  VERSION = "82.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcmemberspro
 version: !ruby/object:Gem::Version
-  version: 82.0.0
+  version: 82.1.0
 platform: ruby
 authors:
 - BradPotts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-07 00:00:00.000000000 Z
+date: 2019-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,6 +226,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: phccorehelpers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: phcmenus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: phcnotifi
   requirement: !ruby/object:Gem::Requirement
@@ -428,14 +456,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '67.0'
+        version: '67.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '67.0'
+        version: '67.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement