phcdevworks_accounts 3.1.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a142c0aaf0e4e1fc0f097bf81a8afcb3a5654f88f80e2b8f74094668428b0a6
-  data.tar.gz: bdde23435054b4a9574ce5b3fba5efcce15399549f66065d0abe0eff62e311aa
+  metadata.gz: de586027378f7a02c9c8007e4963b7279c3c49361cd3e1203f6dcbec6d4fc19a
+  data.tar.gz: adc5bbfe8783182cbb1378d8a9678d44618fe4f747d2ab5c2e9acd6bf8253a55
 SHA512:
-  metadata.gz: 25c7d235bd5a608bb6fd33705eeed169b49680257d00dbb66cc5183d2f0bd13673e78f7d53bf7a1151602c1780ece55f077bf0c43b3c0d0907c811a328a0fe3f
-  data.tar.gz: 905636dfd8eff5e83df1e76fea7214c3f8c3d3e285a7d33042bfb9c1ffbd957877618dd71c65aef40062cf9c55d26b17d94c4db3fe69b27b88335348c8465f0b
+  metadata.gz: 013c6a26916f4352859b13c6692cf411792ca9a35026be37148167c3090703c2fd4156b5d8d770e29a9a63fdb1b3bc952146998b92f01690fb1586654fdde4c1
+  data.tar.gz: 45601f4f7000e5efb402d33f23c94c10e9f0326cab1d1fec2eae506653840fc8fdd5e5fd6489e760b09970ee873caf2291feb717ffe921c5879cd16664f31998

data/app/controllers/phcdevworks_accounts/application_controller.rb

@@ -16,7 +16,7 @@ module PhcdevworksAccounts
 
         # Whitelist Additional Fields
         def phcdevworks_accounts_permitted_parameters
-            added_attrs = [:username, :firstname, :lastname, :email, :terms_of_service, :password, :password_confirmation, :remember_me]
+            added_attrs = [:username, :firstname, :lastname, :email, :terms_of_service, :payments_customer_id, :payments_subscription_id, :payments_plan_id, :password, :password_confirmation, :remember_me]
             devise_parameter_sanitizer.permit :sign_up, keys: added_attrs
             devise_parameter_sanitizer.permit :account_update, keys: added_attrs
         end

data/app/controllers/users/omniauth_callbacks_controller.rb

@@ -9,7 +9,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   # end
 
   # More info at:
-  # https://github.com/plataformatec/devise#omniauth
+  # https://github.com/heartcombo/devise#omniauth
 
   # GET|POST /resource/auth/twitter
   # def passthru

data/app/controllers/users/registrations_controller.rb

@@ -1,64 +1,74 @@
 # frozen_string_literal: true
 
 class Users::RegistrationsController < Devise::RegistrationsController
+  # before_action :configure_sign_up_params, only: [:create]
+  # before_action :configure_account_update_params, only: [:update]
+  after_action :phcdevworks_accounts_payments_add_customer, :only => :create, if: -> {defined?(PhcdevworksAccountsStripe)}
 
-    # before_action :configure_sign_up_params, only: [:create]
-    # before_action :configure_account_update_params, only: [:update]
+  # GET /resource/sign_up
+  # def new
+  #   super
+  # end
 
-    # GET /resource/sign_up
-    # def new
-    #   super
-    # end
+  # POST /resource
+  def create
+    super
+  end
 
-    # POST /resource
-    # def create
-    #   super
-    # end
+  # GET /resource/edit
+  # def edit
+  #   super
+  # end
 
-    # GET /resource/edit
-    # def edit
-    #   super
-    # end
+  # PUT /resource
+  # def update
+  #   super
+  # end
 
-    # PUT /resource
-    # def update
-    #   super
-    # end
+  # DELETE /resource
+  # def destroy
+  #   super
+  # end
 
-    # DELETE /resource
-    # def destroy
-    #   super
-    # end
+  # GET /resource/cancel
+  # Forces the session data which is usually expired after sign
+  # in to be expired now. This is useful if the user wants to
+  # cancel oauth signing in/up in the middle of the process,
+  # removing all OAuth session data.
+  # def cancel
+  #   super
+  # end
 
-    # GET /resource/cancel
-    # Forces the session data which is usually expired after sign
-    # in to be expired now. This is useful if the user wants to
-    # cancel oauth signing in/up in the middle of the process,
-    # removing all OAuth session data.
-    # def cancel
-    #   super
-    # end
+  # protected
 
-    # protected
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_sign_up_params
+  #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
+  # end
 
-    # If you have extra params to permit, append them to the sanitizer.
-    # def configure_sign_up_params
-    #   devise_parameter_sanitizer.permit(:sign_up, keys: [:attribute])
-    # end
+  # If you have extra params to permit, append them to the sanitizer.
+  # def configure_account_update_params
+  #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
+  # end
 
-    # If you have extra params to permit, append them to the sanitizer.
-    # def configure_account_update_params
-    #   devise_parameter_sanitizer.permit(:account_update, keys: [:attribute])
-    # end
+  # The path used after sign up.
+  # def after_sign_up_path_for(resource)
+  #   super(resource)
+  # end
 
-    # The path used after sign up.
-    # def after_sign_up_path_for(resource)
-    #   super(resource)
-    # end
+  # The path used after sign up for inactive accounts.
+  # def after_inactive_sign_up_path_for(resource)
+  #   super(resource)
+  # end
 
-    # The path used after sign up for inactive accounts.
-    # def after_inactive_sign_up_path_for(resource)
-    #   super(resource)
-    # end
+  def phcdevworks_accounts_payments_add_customer
+    if resource.valid?
+      phcdevworks_accounts_customer = Stripe::Customer.create({
+        email: current_user.email, name: current_user.firstname + " " + current_user.lastname
+      })
+      @user.payments_customer_id = phcdevworks_accounts_customer.id
+      @user.save
+    end
+  end
 
 end

data/app/models/phcdevworks_accounts/user.rb

@@ -14,7 +14,10 @@ module PhcdevworksAccounts
 
     # Include default devise modules. Others available are:
     # :trackable, :confirmable, :lockable and :omniauthable
-    devise :database_authenticatable, :registerable, :recoverable, :rememberable,  :validatable, :timeoutable
+    devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable, :timeoutable
+
+    # Validations
+    validates :username, :presence => true, :uniqueness => true
 
     private
 

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

@@ -277,14 +277,49 @@
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
         <% end %>
 
-        <li class="nav-header">Administration</li>
         <% if current_user && current_user.admin? %>
+            <li class="nav-header">Administration</li>
+            <% if defined?phcdevworks_accounts_stripe %>
+                <!-- -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="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
-                    <i class="fad fa-user"></i>
-                    <span>User Auth</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>
@@ -294,13 +329,40 @@
         <% 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>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="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/app/views/phcdevworks_accounts/admin/pages/users_list.html.erb

@@ -46,9 +46,11 @@
 
 						<tbody>
                             <% @admin_users.each do |user| %>
-                                <td><%= user.username %></td>
-                                <td><%= user.firstname %> <%= user.lastname %></td>
-                                <td><%= user.email %></td>
+                            	<tr>
+	                                <td><%= user.username %></td>
+	                                <td><%= user.firstname %> <%= user.lastname %></td>
+	                                <td><%= user.email %></td>
+                                </tr>
                             <% end %>
 						</tbody>
 

data/app/views/users/registrations/new.html.erb

@@ -67,7 +67,7 @@
                     <label class="control-label">Password Confirmation <span class="text-danger">*</span></label>
                     <div class="row m-b-15">
                         <div class="col-md-12">
-                            <%= form.password_field :password, autocomplete: "off", placeholder: "Confirm your Password", class: "form-control" %>
+                            <%= form.password_field :password_confirmation, autocomplete: "off", placeholder: "Confirm your Password", class: "form-control" %>
                         </div>
                     </div>
 

data/config/routes.rb

@@ -10,9 +10,10 @@ PhcdevworksAccounts::Engine.routes.draw do
     match "/admin/user/:id", to: "admin/pages#user_profile", via: "get"
 
     # User Routes
-    devise_for :users, {
-        class_name: "PhcdevworksAccounts::User",
-        module: :devise
+    devise_for :users, class_name: "PhcdevworksAccounts::User",
+        module: :devise, 
+        controllers: {
+            registrations: 'users/registrations'
     }
 
 end

data/db/migrate/20210407121952_add_customer_id_to_users.rb

@@ -0,0 +1,7 @@
+class AddCustomerIdToUsers < ActiveRecord::Migration[6.1]
+    def change
+
+        add_column :phcdevworks_accounts_users, :payments_customer_id, :string
+
+    end
+end

data/lib/phcdevworks_accounts/version.rb

@@ -1,3 +1,3 @@
 module PhcdevworksAccounts
-    VERSION = "3.1.0"
+    VERSION = "3.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.2
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -413,6 +413,7 @@ files:
 - db/migrate/20191012060241_add_userinfo_to_users.rb
 - db/migrate/20191012060308_add_role_to_users.rb
 - db/migrate/20191012060324_add_tos_to_users.rb
+- db/migrate/20210407121952_add_customer_id_to_users.rb
 - lib/phcdevworks_accounts.rb
 - lib/phcdevworks_accounts/engine.rb
 - lib/phcdevworks_accounts/version.rb