phcdevworks_core_modules 7.1.1 → 7.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/phcdevworks_core_modules/affiliate/link.rb +8 -0
  3. data/app/views/layouts/phcdevworks_core_modules/components/backend/sidebars/_side_menu.html.erb +71 -9
  4. data/config/routes.rb +3 -0
  5. data/config/spring.rb +2 -0
  6. data/lib/phcdevworks_core_modules/engine.rb +2 -1
  7. data/lib/phcdevworks_core_modules/version.rb +1 -1
  8. metadata +19 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fa0c83f9c48f79ffb394c95854696e6da4311d4a1be67600255a1be0ad0454c6
4
- data.tar.gz: 02125c3a9958784f819746434e21465616fc589b60ef7e18422773c557d10e2b
3
+ metadata.gz: 79308c277f2cf2443d802ab4d7a0575ccd6d31ea7d2151d935c3b07733c80d5f
4
+ data.tar.gz: 30485fb3521ad77fb56f8afef31dd4319b2dc2d56e5738e54bdf059e00624be9
5
5
  SHA512:
6
- metadata.gz: a1d19b6a0d249794c0964dbe27915b9520f134764ad35d22e4eaad4d57305f5bfc25b48e9a6952d87b80bb03ab9f47bb518832c24cd742279c66ac1bbdf3876f
7
- data.tar.gz: 152bd62135c727345012b8e0719d78a5542fe729070c8d87aa1543b40b6ad0aa806ed43736dba90766194912f708a84eff08ef86f6f576e007bc05b4f62d1d0e
6
+ metadata.gz: 9fd9ae0ec8b1542c8b3397d6da6c461688217f7484a75d0572d37ffc86578048751d714b8bc7956bb2388ec4f7b78990800597c9a5d56944680a37c72f6fa4f1
7
+ data.tar.gz: 84b19a40af48981459e1c1b51e00ba01dd052b904e9c205a2372e29cc3975cc40001df2ab414a7cd4f5d3990f986efe22fb3ef626610fc2918ce2da105a52517
data/app/models/phcdevworks_core_modules/affiliate/link.rb CHANGED
@@ -4,6 +4,14 @@ module PhcdevworksCoreModules
4
4
  # Clean URL Initialize
5
5
  extend FriendlyId
6
6
 
7
+ # Validations
8
+ validates :affiliate_link_name, presence: true
9
+ validates :affiliate_link_button_text, presence: false
10
+ validates :affiliate_link_url, presence: true
11
+ validates :affiliate_link_original_url, presence: false
12
+
13
+
14
+
7
15
  # Paper Trail Initialize
8
16
  has_paper_trail versions: {class_name: "PhcdevworksCoreModules::AffiliateLinkVersions"}
9
17
 
data/app/views/layouts/phcdevworks_core_modules/components/backend/sidebars/_side_menu.html.erb CHANGED
@@ -277,30 +277,92 @@
277
277
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
278
278
  <% end %>
279
279
 
280
- <% if current_user && current_user.admin? %>
280
+ <% if current_user and current_user.admin? %>
281
+ <li class="nav-header">Administration</li>
282
+ <% if defined?phcdevworks_accounts_stripe and current_user.admin? %>
283
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
284
+ <li class="has-sub">
285
+ <a href="javascript:;">
286
+ <b class="caret"></b>
287
+ <i class="fab fa-cc-visa"></i>
288
+ <span>Accounting</span>
289
+ </a>
290
+ <ul class="sub-menu">
291
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Invoices", phcdevworks_accounts_stripe.admin_invoices_path) %></li>
292
+ <li class="<%= phc_menu_active_controller("phcdevworks_accounts_stripe/admin/subscriptions#admin_subscription_list") %>"><%= link_to("Subscriptions", phcdevworks_accounts_stripe.admin_subscriptions_path) %></li>
293
+ </ul>
294
+ </li>
295
+ <li class="has-sub">
296
+ <a href="javascript:;">
297
+ <b class="caret"></b>
298
+ <i class="fad fa-money-check-alt"></i>
299
+ <span>Services</span>
300
+ </a>
301
+ <ul class="sub-menu">
302
+ <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>
303
+ </ul>
304
+ </li>
305
+ <li class="has-sub">
306
+ <a href="javascript:;">
307
+ <b class="caret"></b>
308
+ <i class="fad fa-users"></i>
309
+ <span>Customers</span>
310
+ </a>
311
+ <ul class="sub-menu">
312
+ <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>
313
+ </ul>
314
+ </li>
315
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
316
+ <% end %>
281
317
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
282
- <li class="nav-header">User Administration</li>
283
318
  <li class="has-sub">
284
319
  <a href="javascript:;">
285
320
  <b class="caret"></b>
286
- <i class="fad fa-user"></i>
287
- <span>Admin</span>
321
+ <i class="fad fa-user-lock"></i>
322
+ <span>User Logins</span>
288
323
  </a>
289
324
  <ul class="sub-menu">
290
325
  <li class="<%= phc_menu_active_controller("phcdevworks_accounts/admin/users") %>"><%= link_to "User List", phcdevworks_accounts.admin_users_all_path %></li>
291
326
  </ul>
292
327
  </li>
293
328
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts Admin Options -->
294
- <% end %>
295
-
296
- <% if current_user %>
329
+ <% end %>
330
+
331
+ <li class="nav-header">Your Account</li>
332
+ <% if defined?phcdevworks_accounts_stripe and current_user %>
333
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
334
+ <li class="has-sub">
335
+ <a href="javascript:;">
336
+ <b class="caret"></b>
337
+ <i class="fad fa-money-check-alt"></i>
338
+ <span>Your Subscription</span>
339
+ </a>
340
+ <ul class="sub-menu">
341
+ <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>
342
+ <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>
343
+ </ul>
344
+ </li>
345
+ <li class="has-sub">
346
+ <a href="javascript:;">
347
+ <b class="caret"></b>
348
+ <i class="fad fa-file-invoice"></i>
349
+ <span>Your Invoices</span>
350
+ </a>
351
+ <ul class="sub-menu">
352
+ <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>
353
+ <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>
354
+ </ul>
355
+ </li>
356
+ <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Accounts Stripe -->
357
+ <% end %>
358
+
359
+ <% if current_user %>
297
360
  <!-- -PHC- Sidebar - Sidebar Navigation - PHCAccounts User Options -->
298
- <li class="nav-header">Your Account</li>
299
361
  <li class="has-sub">
300
362
  <a href="javascript:;">
301
363
  <b class="caret"></b>
302
364
  <i class="fad fa-user"></i>
303
- <span>Accounts Settings</span>
365
+ <span>Login Settings</span>
304
366
  </a>
305
367
  <ul class="sub-menu">
306
368
  <li class="<%= phc_menu_active_controller("phcdevworks_accounts/user/edit") %>"><%= link_to "Settings", phcdevworks_accounts.edit_user_registration_path %></li>
data/config/routes.rb CHANGED
@@ -1,5 +1,8 @@
1
1
  PhcdevworksCoreModules::Engine.routes.draw do
2
2
 
3
+ namespace :affiliate do
4
+ resources :links
5
+ end
3
6
  # Routes for Posts
4
7
  namespace :post do
5
8
  resources :categories, class_name: 'Post::Category'
data/config/spring.rb ADDED
@@ -0,0 +1,2 @@
1
+ Spring.application_root = './spec/test_app'
2
+
data/lib/phcdevworks_core_modules/engine.rb CHANGED
@@ -29,7 +29,7 @@ module PhcdevworksCoreModules
29
29
  # Mailer Dependencies
30
30
  require "mail_form"
31
31
 
32
- # Load User Accounts
32
+ # Load Required PHC Plugins
33
33
  require "phcdevworks_accounts"
34
34
 
35
35
  # Engine Namespace
@@ -40,6 +40,7 @@ module PhcdevworksCoreModules
40
40
  g.test_framework :rspec
41
41
  g.fixture_replacement :factory_bot
42
42
  g.factory_bot dir: 'spec/factories'
43
+ g.factory_bot suffix: "factory"
43
44
  end
44
45
 
45
46
  end
data/lib/phcdevworks_core_modules/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PhcdevworksCoreModules
2
- VERSION = "7.1.1"
2
+ VERSION = "7.2.1"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: phcdevworks_core_modules
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.1
4
+ version: 7.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - PHCDevworks
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-03-07 00:00:00.000000000 Z
11
+ date: 2021-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -240,14 +240,28 @@ dependencies:
240
240
  requirements:
241
241
  - - "~>"
242
242
  - !ruby/object:Gem::Version
243
- version: '3.0'
243
+ version: '3.1'
244
244
  type: :runtime
245
245
  prerelease: false
246
246
  version_requirements: !ruby/object:Gem::Requirement
247
247
  requirements:
248
248
  - - "~>"
249
249
  - !ruby/object:Gem::Version
250
- version: '3.0'
250
+ version: '3.1'
251
+ - !ruby/object:Gem::Dependency
252
+ name: phcdevworks_accounts_stripe
253
+ requirement: !ruby/object:Gem::Requirement
254
+ requirements:
255
+ - - "~>"
256
+ - !ruby/object:Gem::Version
257
+ version: 0.1.6
258
+ type: :runtime
259
+ prerelease: false
260
+ version_requirements: !ruby/object:Gem::Requirement
261
+ requirements:
262
+ - - "~>"
263
+ - !ruby/object:Gem::Version
264
+ version: 0.1.6
251
265
  - !ruby/object:Gem::Dependency
252
266
  name: factory_bot_rails
253
267
  requirement: !ruby/object:Gem::Requirement
@@ -376,6 +390,7 @@ files:
376
390
  - app/views/phcdevworks_core_modules/post/categories/new.html.erb
377
391
  - app/views/phcdevworks_core_modules/post/categories/show.html.erb
378
392
  - config/routes.rb
393
+ - config/spring.rb
379
394
  - db/migrate/20170517064427_create_phcdevworks_core_modules_post_category_versions.rb
380
395
  - db/migrate/20200705223718_create_phcdevworks_core_modules_marketing_optimizations.rb
381
396
  - db/migrate/20200705225433_create_phcdevworks_core_modules_marketing_optimization_versions.rb