phcmemberspro 83.0.0 → 84.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d596f78b1fa79e41c2291b4ba252244e7a22af8688f5c622e64560d7cc775392
-  data.tar.gz: f984c5bece05ff20b879d10408118b799ddc77147703926f772fa43f118d7158
+  metadata.gz: 0cb54d0b5f7e0d39cf2c411397ed4b732b19ddd98ec6ce944a5f00185426a967
+  data.tar.gz: 40a2651b28f0764d516ed671bf9f982cc5a9dc8d1cd2526d3f9ad88e01ca60ec
 SHA512:
-  metadata.gz: 10413aa26decd8ec476f8afd6893246dfcbdfa7a3fa366e3581338c1cb5d747ff387ad78dbc1b2e7450cfd20ea95ecadcc6560c76d7c640c73030daacbf3b51a
-  data.tar.gz: 8fbbfca293189930f17c2b2701f3e0f7e8b8724e1016b7e2523786606ea202226eaedecc03b1711062292231d5258e621db7b322c529322d207b3d7400ad5a47
+  metadata.gz: 321f9774702b9936024df62be00c0321a05d87adcae8d9df6ec7a9577a7eeae7286da7eafc9c2811545cb54176f8675b4edb495e98d33ca1593137fd35e7a753
+  data.tar.gz: 59288f9aa3a48d51c81ce600493e361099125feb7305e59a35a6677f0b64cb755c65010ed1de018a517325c3b57aaadaae877b4d8f31b368d58d6e3439f0c3fc

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

@@ -65,7 +65,7 @@ module Phcmemberspro
 
     # Whitelist
     def directory_category_params
-      params.require(:directory_category).permit(:catname, :slug, :user_id, :org_id)
+      params.require(:directory_category).permit(:category_name, :slug, :user_id, :org_id)
     end
 
   end

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

@@ -40,7 +40,7 @@ module Phcmemberspro
       @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: 'Listing was successfully created.'
+        redirect_to member_profile_addresses_url, notice: 'Address was successfully created.'
       else
         render :new
       end
@@ -50,7 +50,7 @@ module Phcmemberspro
     def update
       @profile = Member::Profile.find(params[:profile_id])
       if @member_address.update(member_address_params)
-        redirect_to member_profile_addresses_url, notice: 'Listing was successfully updated.'
+        redirect_to member_profile_addresses_url, notice: 'Address was successfully updated.'
       else
         render :edit
       end
@@ -73,7 +73,7 @@ module Phcmemberspro
 
     # Whitelist
     def member_address_params
-      params.require(:member_address).permit(:mcaddressl1, :mcaddressl2, :mccity, :mcprovince, :mccountry, :mcpostalcode, :mctype, :user_name, :profile_id, :slug, :user_id, :org_id)
+      params.require(:member_address).permit(:address_addressl1, :address_addressl2, :address_city, :address_province, :address_country, :address_postalcode, :address_type, :user_name, :profile_id, :slug, :user_id, :org_id)
     end
 
   end

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

@@ -73,7 +73,7 @@ module Phcmemberspro
 
     # Whitelist
     def member_listing_params
-      params.require(:member_listing).permit(:mbcompanyname, :mbcontactname, :mbaddressl1, :mbaddressl2, :mbcity, :mbcountry, :mbprovince, :mbpostalcode, :mbphone, :mbcontactemail, :mbwebsite, :profile_id, :slug, :user_id, :org_id, category_ids: [])
+      params.require(:member_listing).permit(:listing_companyname, :listing_contactname, :listing_addressl1, :listing_addressl2, :listing_city, :listing_country, :listing_province, :listing_postalcode, :listing_phone, :listing_contactemail, :listing_website, :profile_id, :slug, :user_id, :org_id, category_ids: [])
     end
 
   end

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

@@ -66,7 +66,7 @@ module Phcmemberspro
 
     # Whitelist
     def member_profile_params
-      params.require(:member_profile).permit(:mfirstname, :mlastname, :mtitle, :memail, :mphone, :mnotes, :slug, :user_id, :org_id)
+      params.require(:member_profile).permit(:member_firstname, :member_lastname, :member_title, :member_email, :member_phone, :member_notes, :slug, :user_id, :org_id)
     end
 
   end

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

@@ -11,26 +11,26 @@ module Phcmemberspro
     belongs_to :profile, class_name: 'Phcmemberspro::Member::Profile'
 
     # Validation for Form Fields
-    validates :mcaddressl1,
+    validates :address_addressl1,
       presence: true,
       length: { minimum: 2 }
 
-    validates :mccity,
+    validates :address_city,
       length: { minimum: 3 }
 
-    validates :mcprovince,
+    validates :address_province,
       presence: true,
       length: { minimum: 2 }
 
-    validates :mccountry,
+    validates :address_country,
       presence: true,
       length: { minimum: 2 }
 
-    validates :mcpostalcode,
+    validates :address_postalcode,
       presence: true,
       length: { minimum: 3 }
 
-    validates :mctype,
+    validates :address_type,
       presence: true,
       length: { minimum: 2 }
 
@@ -40,14 +40,9 @@ module Phcmemberspro
 		# Define for Multiple Records
 		def phcmemberspro_address_slug
 			[
-				[:org_id, :mcaddressl1, :mccity, :mcprovince]
+				[:org_id, :address_addressl1, :address_city, :address_province]
 			]
 		end
 
-    def country_name
-      country = ISO3166::Country[country_code]
-      country.translations[I18n.locale.to_s] || country.mccountry
-    end
-
   end
 end

data/app/models/phcmemberspro/member/listing.rb

@@ -12,53 +12,53 @@ module Phcmemberspro
     has_and_belongs_to_many :categories, class_name: 'Phcmemberspro::Directory::Category', :join_table => 'categories_listings'
     
     # Validation for Form Fields
-    validates :mbcompanyname,
+    validates :listing_companyname,
       presence: true,
       length: { minimum: 2 }
     
-    validates :mbcontactname,
+    validates :listing_contactname,
       presence: true,
       length: { minimum: 2 }
     
-    validates :mbaddressl1,
+    validates :listing_addressl1,
       length: { minimum: 3 }
     
-    validates :mbcity,
+    validates :listing_city,
       presence: true,
       length: { minimum: 3 }
     
-    validates :mbcountry,
+    validates :listing_country,
       presence: true,
       length: { minimum: 2 }
     
-    validates :mbprovince,
+    validates :listing_province,
       presence: true,
       length: { minimum: 2 }
     
-    validates :mbpostalcode,
+    validates :listing_postalcode,
       presence: true,
       length: { minimum: 3 }
     
-    validates :mbcontactemail,
+    validates :listing_contactemail,
     	presence: true,
     	length: { minimum: 3 },
     	format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
     
-    validates :mbwebsite,
+    validates :listing_website,
     	presence: true,
     	length: { minimum: 6 }
     
-    validates :mbphone,
+    validates :listing_phone,
     	presence: true,
-    	format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
+    	format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Member Format: ***-***-****" }
     
     # Clean URL Define
-    friendly_id :phcmemberspro_listings_slug, use: [:slugged, :finders]
+    friendly_id :phcmelisting_erspro_listings_slug, use: [:slugged, :finders]
     
     # Define for Multiple Records
-    def phcmemberspro_listings_slug
+    def phcmelisting_erspro_listings_slug
     	[
-    		[:org_id, :mbcompanyname, :mbcontactname]
+    		[:org_id, :listing_companyname, :listing_contactname]
     	]
     end
 

data/app/models/phcmemberspro/member/profile.rb

@@ -9,30 +9,30 @@ module Phcmemberspro
 
     # Gravatar
     include Gravtastic
-    gravtastic :memail
+    gravtastic :member_email
 
     # Model Relationships
     has_many :addresses, class_name: 'Phcmemberspro::Member::Address'
     has_many :listings, class_name: 'Phcmemberspro::Member::Listing'
 
     # Validation for Form Fields
-    validates :mfirstname,
+    validates :member_firstname,
       presence: true,
       length: { minimum: 1 }
 
-    validates :mlastname,
+    validates :member_lastname,
       presence: true,
       length: { minimum: 1 }
 
-    validates :mtitle,
+    validates :member_title,
       length: { minimum: 2 }
 
-    validates :memail,
+    validates :member_email,
       presence: true,
       length: { minimum: 6 },
       format: { with: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/, message: "Please follow this Email format: *****@********.***" }
 
-    validates :mphone,
+    validates :member_phone,
       presence: true,
       format: { with: /\A(\+\d{1,2}\s)?\(?\d{3}\)?[\s.-]?\d{3}[\s.-]?\d{4}\z/, message: "Please Follow this Phone Number Format: ***-***-****" }
 
@@ -42,7 +42,7 @@ module Phcmemberspro
     # Define for Multiple Records
     def phcmemberspro_profiles_slug
       [
-        [:org_id, :mfirstname, :mlastname]
+        [:org_id, :member_firstname, :member_lastname]
       ]
     end
 

data/app/views/layouts/phcmemberspro/application.html.erb

@@ -2,25 +2,27 @@
 <html>
 <head>
 
-  <% phc_seo_title "PHCMembers(Pro) DMS" %>
-  <% phc_seo_description "Membership & Directory Management System by PHCDevworks" %>
+  <!-- SEO System -->
+  <% phc_seo_title "PHCMembers by PHCDevworks" %>
+  <% phc_seo_description "Application to Manage Member Information and Business Directory Listings " %>
+  <!-- SEO System -->
 
-  <!-- -PHC- SEO and Site Description -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!-- SEO and Site Description -->
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <title><%= yield(:phc_seo_title) %></title>
   <meta name="description" content="<%= yield(:phc_seo_description) %>">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
-  <link rel="canonical" href="http://phcmembers.com">
-  <!-- -PHC- SEO and Site Description -->
-  
-  <!-- -PHC- Security -->
+  <link rel="canonical" href="http://phcdevworks.com">
+  <!-- SEO and Site Description -->
+
+  <!-- Rails Security Tags -->
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  <!-- -PHC- Security -->
-  
-  <!-- -PHC- CSS -->
+  <!-- Rails Security Tags -->
+
+  <!-- CSS Styles -->
   <%= stylesheet_link_tag 'phcmemberspro/application', media: 'all', 'data-turbolinks-track': 'reload' %>
-  <!-- -PHC- CSS -->
+  <!-- CSS Styles -->
 
   <!-- Font -->
   <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
@@ -30,7 +32,8 @@
 <body>
 
   <!-- Page Container -->
-  <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
+  <div id="page-container" class="page-container fade page-sidebar-fixed page-header-fixed">
+
     <!-- Page Header -->
     <div id="header" class="header navbar-default">
       <%= render 'layouts/phcmemberspro/components/backend/navigation/top_menu' %>
@@ -51,7 +54,7 @@
     <!-- Page Content -->
 
     <!-- Footer Content -->
-    <div id="footer" class="footer">
+    <div id="footer" class="footer mb-4">
       <%= render 'layouts/phcmemberspro/components/backend/footer/footer' %>
     </div>
     <!-- Footer Content -->
@@ -65,16 +68,17 @@
   </div>
   <!-- Page Container -->
 
-  <!-- Requried JavaScripts -->
+  <!-- JavaScript -->
   <%= javascript_include_tag "phcmemberspro/application", 'data-turbolinks-track': 'reload' %>
-  <script src="https://cdn.ckeditor.com/4.10.0/full/ckeditor.js"></script>
+  <!-- JavaScript -->
 
+  <!-- JavaScript Loader -->
   <script>
 		$(document).ready(function() {
 			App.init();
 		});
 	</script>
-  <!-- Requried JavaScripts -->
+  <!-- JavaScript Loader -->
 
 </body>
-</html>
+</html>

data/app/views/layouts/phcmemberspro/components/backend/sidebars/_side_menu.html.erb

@@ -47,8 +47,8 @@
           <span>Article Posts</span>
         </a>
         <ul class="sub-menu">
-          <li class="<%= phc_menus_active_controller('phcpresspro/article/posts') %>"><%= link_to('Article Index', phcpresspro.article_posts_path) %></li>
-          <li class="<%= phc_menus_active_controller('phcpresspro/article/posts#new') %>"><%= link_to('New Aritcle', phcpresspro.new_article_post_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcpresspro/article/posts') %>"><%= link_to 'Article Index', phcpresspro.article_posts_path %></li>
+          <li class="<%= phc_menus_active_controller('phcpresspro/article/posts#new') %>"><%= link_to 'New Aritcle', phcpresspro.new_article_post_path %></li>
         </ul>
       </li>
       <li class="has-sub">
@@ -58,8 +58,8 @@
           <span>Article Categories</span>
         </a>
         <ul class="sub-menu">
-          <li class="<%= phc_menus_active_controller('phcpresspro/article/categories') %>"><%= link_to('Category Index', phcpresspro.article_categories_path) %></li>
-          <li class="<%= phc_menus_active_controller('phcpresspro/article/categories#new') %>"><%= link_to('New Category', phcpresspro.new_article_category_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcpresspro/article/categories') %>"><%= link_to 'Category Index', phcpresspro.article_categories_path %></li>
+          <li class="<%= phc_menus_active_controller('phcpresspro/article/categories#new') %>"><%= link_to 'New Category', phcpresspro.new_article_category_path %></li>
         </ul>
       </li>
       <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
@@ -75,8 +75,8 @@
           <span>Member's Data</span>
         </a>
         <ul class="sub-menu">
-          <li class="<%= phc_menus_active_controller('phcmemberspro/member/profiles') %>"><%= link_to('Profile Index', phcmemberspro.member_profiles_path) %></li>
-          <li class="<%= phc_menus_active_controller('phcmemberspro/member/profiles#new') %>"><%= link_to('New Member Profile', phcmemberspro.new_member_profile_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcmemberspro/member/profiles') %>"><%= link_to 'Profile Index', phcmemberspro.member_profiles_path %></li>
+          <li class="<%= phc_menus_active_controller('phcmemberspro/member/profiles#new') %>"><%= link_to 'New Member Profile', phcmemberspro.new_member_profile_path %></li>
         </ul>
       </li>
       <li class="has-sub">
@@ -86,8 +86,36 @@
           <span>Member's Directory</span>
         </a>
         <ul class="sub-menu">
-          <li class="<%= phc_menus_active_controller('phcmemberspro/directory/categories') %>"><%= link_to('Directory Index', phcmemberspro.directory_categories_path) %></li>
-          <li class="<%= phc_menus_active_controller('phcmemberspro/directory/categories#new') %>"><%= link_to('New Directory Listing', phcmemberspro.new_directory_category_path) %></li>
+          <li class="<%= phc_menus_active_controller('phcmemberspro/directory/categories') %>"><%= link_to 'Directory Index', phcmemberspro.directory_categories_path %></li>
+          <li class="<%= phc_menus_active_controller('phcmemberspro/directory/categories#new') %>"><%= link_to 'New Directory Listing', phcmemberspro.new_directory_category_path %></li>
+        </ul>
+      </li>
+      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+    <% end %>
+
+    <% if defined?phcreallistingspro %>
+      <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
+      <li class="nav-header">Listing Management</li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-store-alt"></i>
+          <span>Property Listings</span>
+        </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phcreallistingspro/property/listings') %>"><%= link_to 'Listing Index', phcreallistingspro.property_listings_path %></li>
+          <li class="<%= phc_menus_active_controller('phcreallistingspro/property/listings#new') %>"><%= link_to 'New Listing', phcreallistingspro.new_property_listing_path %></li>
+        </ul>
+      </li>
+      <li class="has-sub">
+        <a href="javascript:;">
+          <b class="caret"></b>
+          <i class="fas fa-list-alt"></i>
+          <span>Listing Features</span>
+        </a>
+        <ul class="sub-menu">
+          <li class="<%= phc_menus_active_controller('phcreallistingspro/property/listings') %>"><%= link_to 'Features Index', phcreallistingspro.property_features_path %></li>
+          <li class="<%= phc_menus_active_controller('phcreallistingspro/property/listings#new') %>"><%= link_to 'New Features', phcreallistingspro.new_property_feature_path %></li>
         </ul>
       </li>
       <!-- Sidebar - Sidebar Navigation - PHCPress(Pro) -->
@@ -133,8 +161,8 @@
           <span>Accounts Dashboard</span>
         </a>
         <ul class="sub-menu">
-          <li class="<%= phc_menus_active_controller('phcaccountspro/admin/edit') %>"><%= link_to('Settings', phcaccountspro.edit_user_registration_path) %></li>
-          <li class="<%= phc_menus_active_controller('phcaccountspro/admin/new') %>"><%= link_to('Logout', phcaccountspro.destroy_user_session_path, method: :delete) %></li>
+          <li class="<%= phc_menus_active_controller('phcaccountspro/admin/edit') %>"><%= link_to 'Settings', phcaccountspro.edit_user_registration_path %></li>
+          <li class="<%= phc_menus_active_controller('phcaccountspro/admin/new') %>"><%= link_to 'Logout', phcaccountspro.destroy_user_session_path, method: :delete %></li>
         </ul>
       </li>
       <!-- Sidebar - Sidebar Navigation - PHCAccountsPro -->

data/app/views/layouts/phcmemberspro/member_profile.html.erb

@@ -2,25 +2,27 @@
 <html>
 <head>
 
-  <% phc_seo_title "PHCMembers(Pro) DMS" %>
-  <% phc_seo_description "Membership & Directory Management System by PHCDevworks" %>
+  <!-- SEO System -->
+  <% phc_seo_title "PHCMembers by PHCDevworks" %>
+  <% phc_seo_description "Application to Manage Member Information and Business Directory Listings " %>
+  <!-- SEO System -->
 
-  <!-- -PHC- SEO and Site Description -->
+  <!-- SEO and Site Description -->
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title><%= yield(:phc_seo_title) %></title>
   <meta name="description" content="<%= yield(:phc_seo_description) %>">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" >
-  <link rel="canonical" href="http://phcmembers.com">
-  <!-- -PHC- SEO and Site Description -->
+  <link rel="canonical" href="http://phcdevworks.com">
+  <!-- SEO and Site Description -->
 
-  <!-- -PHC- Security -->
+  <!-- Rails Security Tags -->
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  <!-- -PHC- Security -->
+  <!-- Rails Security Tags -->
 
-  <!-- -PHC- CSS -->
+  <!-- CSS Styles -->
   <%= stylesheet_link_tag 'phcmemberspro/application', media: 'all', 'data-turbolinks-track': 'reload' %>
-  <!-- -PHC- CSS -->
+  <!-- CSS Styles -->
 
   <!-- Font -->
   <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400%7CRaleway:300,400,500,600,700%7CLato:300,400,400italic,600,700"/>
@@ -30,7 +32,7 @@
 <body>
 
   <!-- Page Container -->
-  <div id="page-container" class="fade page-sidebar-fixed page-header-fixed">
+  <div id="page-container" class="page-container fade page-sidebar-fixed page-header-fixed">
 
     <!-- Page Header -->
     <div id="header" class="header navbar-default">
@@ -52,7 +54,7 @@
     <!-- Page Content -->
 
     <!-- Footer Content -->
-    <div id="footer" class="footer">
+    <div id="footer" class="footer mb-4">
       <%= render 'layouts/phcmemberspro/components/backend/footer/footer' %>
     </div>
     <!-- Footer Content -->
@@ -66,16 +68,17 @@
   </div>
   <!-- Page Container -->
 
-  <!-- Requried JavaScripts -->
+  <!-- JavaScript -->
   <%= javascript_include_tag "phcmemberspro/application", 'data-turbolinks-track': 'reload' %>
-  <script src="https://cdn.ckeditor.com/4.10.0/full/ckeditor.js"></script>
+  <!-- JavaScript -->
 
+  <!-- JavaScript Loader -->
   <script>
 		$(document).ready(function() {
 			App.init();
 		});
 	</script>
-  <!-- Requried JavaScripts -->
+  <!-- JavaScript Loader -->
 
 </body>
 </html>