phcdevworks_accounts 3.0.4 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e16f70391b389d6427707887237b467995710bbc9dbc1827dd9aa92d302b393
-  data.tar.gz: a2c8fa10b554897a7ffc735451069bc1a4d6d0bc630a046c7cb039daeb05f635
+  metadata.gz: f6315d5f5baa05787f1ed1281e3a555e99d834b3dac019a1a33498c3b605052e
+  data.tar.gz: ad76c5ffeea3c921bff37507a0ad731222054a8457b2517aae3d71a72a9617a8
 SHA512:
-  metadata.gz: 3e0ea8708c0a06602fc1d16da94df17ab3e996d07ac61cc2a9d8f216b4057434944808b6d09d5565d2173e718dda5ce048056b80aec5ab85c1e29b1333d05289
-  data.tar.gz: 95cd11384fa56bbd68443032a225988dc3ade2be48cce01bd0a8c6e12cae6325bf820c7908dfbc4b1fed0b87b9c420a969f7c4fffc8ef278b4d6c47a7adf3cca
+  metadata.gz: 01ee9f22630a96de5f857036aa430096bb4c80b9c29f6fb1372ee01d06405eee5226ed00c0456d47d50dc777826770d90baa511dfe757fcd59f960bda33bf889
+  data.tar.gz: 2315010b2e5c7d071d5dfe94fe6058e240b88a112738b4b2dfd5cbd8d0b6458b7c452b3b96f76578d973466c6aef04417c1300b672223ef0c2b74ccbf4546bf0

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/views/layouts/phcdevworks_accounts/components/backend/sidebars/_side_menu.html.erb

@@ -277,25 +277,25 @@
             <!-- -PHC- Sidebar - Sidebar Navigation - PHCDevworks Core Modules -->
         <% end %>
 
+        <li class="nav-header">Administration</li>
         <% 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 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/app/views/phcdevworks_accounts/admin/pages/users_list.html.erb

@@ -47,7 +47,7 @@
 						<tbody>
                             <% @admin_users.each do |user| %>
                                 <td><%= user.username %></td>
-                                <td><%= user.email %> <%= user.email %></td>
+                                <td><%= user.firstname %> <%= user.lastname %></td>
                                 <td><%= user.email %></td>
                             <% end %>
 						</tbody>

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.4"
+    VERSION = "3.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phcdevworks_accounts
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.2
 platform: ruby
 authors:
 - PHCDevworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-04-08 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