phcdevworks_accounts 3.0.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3815bb2d86b61c19ad6475d594eb3938c9c2c6cd87ed3adc0ae5d0f96ac43bc7
-  data.tar.gz: fbad6257af5dd2d5006356f515c85004bebc7e24c8d2efa12a4bcb7d5a9c8fd6
+  metadata.gz: b2093924da8575dc57bdaf811cddc71451d3878ce9792c59d0a6b8a664cda05d
+  data.tar.gz: bf612d14ae462d489c7037579097191518cf152acb9963359b64cb62ef7b3a69
 SHA512:
-  metadata.gz: 9013ad9d810463c03908b01b80bbdebce7d782685a341645b719c7a02d8536b9c56c6671a5eba88fe2e6d8f793f99550c3e067bb0085b8b8061fbe864ca89877
-  data.tar.gz: 31c423bf1715b0b11002e531f94bb7bb6bc3613a26626a809682588956d59c649b5135f5048a62842f04a50661f5ad06a8567aae0833c68d70f2c14c1ad63ee5
+  metadata.gz: 866a2386fe6b0754a6c1d468136786bb34b17e7e1df03a961c33ed9f4e926babd06eec5c98a6cda3cacba07151e3bf128fb0a20ec64e7acec0ed418781dc7358
+  data.tar.gz: 4375a693a0ebb9e4e37c0936b70436d1159907d23ef36de386d32762199125fe62264e61c97da5874e234b8b9abbdfb9c4872eec31e192a0044ff0893e53237b

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,44 +277,9 @@
             <!-- -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">Administration</li>
             <li class="has-sub">
                 <a href="javascript:;">
                     <b class="caret"></b>
@@ -329,33 +294,6 @@
         <% 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="has-sub">

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.0.5"
+    VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.2.0
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -413,7 +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/20210402042717_add_stripe_id_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

data/db/migrate/20210402042717_add_stripe_id_to_users.rb

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