phcdevworks_core_modules 7.1.1 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa0c83f9c48f79ffb394c95854696e6da4311d4a1be67600255a1be0ad0454c6
-  data.tar.gz: 02125c3a9958784f819746434e21465616fc589b60ef7e18422773c557d10e2b
+  metadata.gz: 79308c277f2cf2443d802ab4d7a0575ccd6d31ea7d2151d935c3b07733c80d5f
+  data.tar.gz: 30485fb3521ad77fb56f8afef31dd4319b2dc2d56e5738e54bdf059e00624be9
 SHA512:
-  metadata.gz: a1d19b6a0d249794c0964dbe27915b9520f134764ad35d22e4eaad4d57305f5bfc25b48e9a6952d87b80bb03ab9f47bb518832c24cd742279c66ac1bbdf3876f
-  data.tar.gz: 152bd62135c727345012b8e0719d78a5542fe729070c8d87aa1543b40b6ad0aa806ed43736dba90766194912f708a84eff08ef86f6f576e007bc05b4f62d1d0e
+  metadata.gz: 9fd9ae0ec8b1542c8b3397d6da6c461688217f7484a75d0572d37ffc86578048751d714b8bc7956bb2388ec4f7b78990800597c9a5d56944680a37c72f6fa4f1
+  data.tar.gz: 84b19a40af48981459e1c1b51e00ba01dd052b904e9c205a2372e29cc3975cc40001df2ab414a7cd4f5d3990f986efe22fb3ef626610fc2918ce2da105a52517

data/app/models/phcdevworks_core_modules/affiliate/link.rb

@@ -4,6 +4,14 @@ module PhcdevworksCoreModules
     # Clean URL Initialize
     extend FriendlyId
 
+    # Validations
+    validates :affiliate_link_name, presence: true
+    validates :affiliate_link_button_text, presence: false
+    validates :affiliate_link_url, presence: true
+    validates :affiliate_link_original_url, presence: false
+
+
+
     # Paper Trail Initialize
     has_paper_trail versions: {class_name: "PhcdevworksCoreModules::AffiliateLinkVersions"}
 

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

@@ -277,30 +277,92 @@
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
         <% end %>
 
-        <% if current_user && current_user.admin? %>
+        <% if current_user and current_user.admin? %>
+            <li class="nav-header">Administration</li>
+            <% if defined?phcdevworks_accounts_stripe and current_user.admin? %>
+                <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
+                <li class="has-sub">
+                    <a href="javascript:;">
+                        <b class="caret"></b>
+                        <i class="fab fa-cc-visa"></i>
+                        <span>Accounting</span>
+                    </a>
+                    <ul class="sub-menu">
+                        <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Invoices", phcdevworks_accounts_stripe.admin_invoices_path) %></li>
+                        <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Subscriptions", phcdevworks_accounts_stripe.admin_subscriptions_path) %></li>
+                    </ul>
+                </li>
+                <li class="has-sub">
+                    <a href="javascript:;">
+                        <b class="caret"></b>
+                        <i class="fad fa-money-check-alt"></i>
+                        <span>Services</span>
+                    </a>
+                    <ul class="sub-menu">
+                        <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/products#admin_products_list") %>"><%= link_to("Product List", phcdevworks_accounts_stripe.admin_products_path) %></li>
+                    </ul>
+                </li>
+                <li class="has-sub">
+                    <a href="javascript:;">
+                        <b class="caret"></b>
+                        <i class="fad fa-users"></i>
+                        <span>Customers</span>
+                    </a>
+                    <ul class="sub-menu">
+                        <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/customers#admin_customer_list") %>"><%= link_to("Customer List", phcdevworks_accounts_stripe.admin_customers_path) %></li>
+                    </ul>
+                </li>
+                <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
+            <% end %>
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
-            <li class="nav-header">User Administration</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-user"></i>
-                    <span>Admin</span>
+                    <i class="fad fa-user-lock"></i>
+                    <span>User Logins</span>
                 </a>
                 <ul class="sub-menu">
                     <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_all_path %></li>
                 </ul>
             </li>
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
-            <% end %>
-    
-            <% if current_user %>
+        <% end %>
+
+        <li class="nav-header">Your Account</li>
+        <% if defined?phcdevworks_accounts_stripe and current_user %>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
+            <li class="has-sub">
+                <a href="javascript:;">
+                    <b class="caret"></b>
+                    <i class="fad fa-money-check-alt"></i>
+                    <span>Your Subscription</span>
+                </a>
+                <ul class="sub-menu">
+                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Your Subscription", phcdevworks_accounts_stripe.user_subscription_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/products#admin_product_list") %>"><%= link_to("Switch Subscriptions", phcdevworks_accounts_stripe.user_subscription_path) %></li>
+                </ul>
+            </li>
+            <li class="has-sub">
+                <a href="javascript:;">
+                    <b class="caret"></b>
+                    <i class="fad fa-file-invoice"></i>
+                    <span>Your Invoices</span>
+                </a>
+                <ul class="sub-menu">
+                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/user/invoices#admin_customer_list") %>"><%= link_to("Current Invoice", phcdevworks_accounts_stripe.user_invoices_path) %></li>
+                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/user/invoices#admin_customer_list") %>"><%= link_to("Past Invoices", phcdevworks_accounts_stripe.admin_customers_path) %></li>
+                </ul>
+            </li>
+            <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
+        <% end %>
+
+        <% if current_user %>
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts User Options -->
-            <li class="nav-header">Your Account</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
                     <i class="fad fa-user"></i>
-                    <span>Accounts Settings</span>
+                    <span>Login Settings</span>
                 </a>
                 <ul class="sub-menu">
                     <li class="<%= phc_menu_active_controller("phcdevworks_accounts/user/edit") %>"><%= link_to "Settings", phcdevworks_accounts.edit_user_registration_path %></li>

data/config/routes.rb

@@ -1,5 +1,8 @@
 PhcdevworksCoreModules::Engine.routes.draw do
 
+  namespace :affiliate do
+    resources :links
+  end
     # Routes for Posts
     namespace :post do
         resources :categories, class_name: 'Post::Category'

data/config/spring.rb

@@ -0,0 +1,2 @@
+ Spring.application_root = './spec/test_app'
+  

data/lib/phcdevworks_core_modules/engine.rb

@@ -29,7 +29,7 @@ module PhcdevworksCoreModules
         # Mailer Dependencies
         require "mail_form"
 
-        # Load User Accounts
+        # Load Required PHC Plugins
         require "phcdevworks_accounts"
 
         # Engine Namespace
@@ -40,6 +40,7 @@ module PhcdevworksCoreModules
             g.test_framework :rspec
             g.fixture_replacement :factory_bot
             g.factory_bot dir: 'spec/factories'
+            g.factory_bot suffix: "factory"
         end
 
     end

data/lib/phcdevworks_core_modules/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksCoreModules
-  VERSION = "7.1.1"
+  VERSION = "7.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_core_modules
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.2.1
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,14 +240,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: phcdevworks_accounts_stripe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +390,7 @@ files:
 - app/views/phcdevworks_core_modules/post/categories/new.html.erb
 - app/views/phcdevworks_core_modules/post/categories/show.html.erb
 - config/routes.rb
+- config/spring.rb
 - db/migrate/20170517064427_create_phcdevworks_core_modules_post_category_versions.rb
 - db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb
 - db/migrate/20200705225433_create_phcdevworks_core_modules_marketing_optimization_versions.rb