phcdevworks_core_modules 7.1.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa0c83f9c48f79ffb394c95854696e6da4311d4a1be67600255a1be0ad0454c6
-  data.tar.gz: 02125c3a9958784f819746434e21465616fc589b60ef7e18422773c557d10e2b
+  metadata.gz: fc7783d475d54e14b3a1be7b2e5b53351c4731a50b5cd146f00c3b14ac87f79c
+  data.tar.gz: afaad43b1b56bc8b169cfb6bfc110d21ae4993b6935c4615a9a9e102035e9d8b
 SHA512:
-  metadata.gz: a1d19b6a0d249794c0964dbe27915b9520f134764ad35d22e4eaad4d57305f5bfc25b48e9a6952d87b80bb03ab9f47bb518832c24cd742279c66ac1bbdf3876f
-  data.tar.gz: 152bd62135c727345012b8e0719d78a5542fe729070c8d87aa1543b40b6ad0aa806ed43736dba90766194912f708a84eff08ef86f6f576e007bc05b4f62d1d0e
+  metadata.gz: 8fbdcc7e39f9b295cabdad951d97404f5ba92027d1e194eb9519ccf61a701476817d7169f832eb4c555fc42f5cc95213fa5ade945845d17f6824b01a81d9bc61
+  data.tar.gz: 59f24bd7eca72e2f6ae69bf8626cc43a84aef68920db50a6aa96973f502fa9e800691fd3770887728799e27a107587cf09355e3d8cf952ba6d9ad65245f3c2d4

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,25 +277,87 @@
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
         <% end %>
 
+        <li class="nav-header">Administration</li>
+        <% if defined?phcdevworks_accounts_stripe && current_user && 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-stripe"></i>
+                    <span>Subscriptions</span>
+                </a>
+                <ul class="sub-menu">
+                    <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Subscription Index", 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>Plans</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 %>
+
         <% if current_user && current_user.admin? %>
             <!-- -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>
+                    <span>User Auth</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 && 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>Plan Settings</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>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>

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

@@ -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.1.2"
 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.1.2
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -376,6 +376,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