Merge pull request #140 from marcrohloff/remove-usage-of-spree-user

Use Spree.user_class instead of Spree::User to allow for custom user classes
solidusio · Jul 30, 2020 · dadc35a · dadc35a
2 parents 1afd169 + 916ce43
commit dadc35a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/views/spree/admin/subscriptions/_form.html.erb b/app/views/spree/admin/subscriptions/_form.html.erb
@@ -6,7 +6,7 @@
       <% if f.object.new_record? %>
         <div class="field">
           <%= f.label :user_id, I18n.t('spree.user'), class: "required" %>
-          <%= f.collection_select :user_id,  Spree::User.all, :id, :email, {}, class: "select2 fullwidth" %>
+          <%= f.collection_select :user_id,  Spree.user_class.all, :id, :email, {}, class: "select2 fullwidth" %>
         </div>
       <% end %>
 

diff --git a/app/views/spree/admin/subscriptions/index.html.erb b/app/views/spree/admin/subscriptions/index.html.erb
@@ -50,7 +50,7 @@
       <div class="row">
         <div class="field-block col-4">
           <div class="field">
-            <%= label_tag :q_user_email_cont, Spree::User.human_attribute_name(:email) %>
+            <%= label_tag :q_user_email_cont, Spree.user_class.human_attribute_name(:email) %>
             <%= f.text_field :user_email_cont, size: 25 %>
           </div>
         </div>

diff --git a/lib/solidus_subscriptions/processor.rb b/lib/solidus_subscriptions/processor.rb
@@ -22,7 +22,7 @@ def batched_users_to_be_processed
         subscriptions = SolidusSubscriptions::Subscription.arel_table
         installments = SolidusSubscriptions::Installment.arel_table
 
-        ::Spree::User.
+        ::Spree.user_class.
           joins(:subscriptions).
           joins(
             subscriptions.