solidus_backend 2.1.1 → 2.2.0.beta1

data/app/controllers/spree/admin/refunds_controller.rb

@@ -20,7 +20,7 @@ module Spree
       end
 
       def refund_reasons
-        @refund_reasons ||= RefundReason.active.all
+        @refund_reasons ||= Spree::RefundReason.active.all
       end
 
       def build_resource

data/app/controllers/spree/admin/reimbursements_controller.rb

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class ReimbursementsController < ResourceController
+      helper 'spree/admin/reimbursement_type'
+      helper 'spree/admin/customer_returns'
       belongs_to 'spree/order', find_by: :number
 
       before_action :load_stock_locations, only: :edit
@@ -17,9 +19,9 @@ module Spree
 
       def build_resource
         if params[:build_from_customer_return_id].present?
-          customer_return = CustomerReturn.find(params[:build_from_customer_return_id])
+          customer_return = Spree::CustomerReturn.find(params[:build_from_customer_return_id])
 
-          Reimbursement.build_from_customer_return(customer_return)
+          Spree::Reimbursement.build_from_customer_return(customer_return)
         else
           super
         end

data/app/controllers/spree/admin/search_controller.rb

@@ -23,9 +23,9 @@ module Spree
       def products
         if params[:ids]
           # split here may be String#split or Array#split, so we must flatten the results
-          @products = Product.where(id: params[:ids].split(",").flatten)
+          @products = Spree::Product.where(id: params[:ids].split(",").flatten)
         else
-          @products = Product.ransack(params[:q]).result
+          @products = Spree::Product.ransack(params[:q]).result
         end
 
         @products = @products.distinct.page(params[:page]).per(params[:per_page])

data/app/controllers/spree/admin/shipping_methods_controller.rb

@@ -37,9 +37,9 @@ module Spree
       end
 
       def load_data
-        @available_zones = Zone.order(:name)
+        @available_zones = Spree::Zone.order(:name)
         @tax_categories = Spree::TaxCategory.order(:name)
-        @calculators = ShippingMethod.calculators.sort_by(&:name)
+        @calculators = Spree::ShippingMethod.calculators.sort_by(&:name)
       end
     end
   end

data/app/controllers/spree/admin/states_controller.rb

@@ -22,7 +22,7 @@ module Spree
       end
 
       def load_data
-        @countries = Country.order(:name)
+        @countries = Spree::Country.order(:name)
       end
     end
   end

data/app/controllers/spree/admin/stock_items_controller.rb

@@ -13,8 +13,8 @@ module Spree
       private
 
       def build_resource
-        variant = Variant.accessible_by(current_ability, :read).find(params[:variant_id])
-        stock_location = StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
+        variant = Spree::Variant.accessible_by(current_ability, :read).find(params[:variant_id])
+        stock_location = Spree::StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
         stock_location.stock_movements.build(stock_movement_params).tap do |stock_movement|
           stock_movement.originator = try_spree_current_user
           stock_movement.stock_item = stock_location.set_up_stock_item(variant)
@@ -34,7 +34,7 @@ module Spree
       end
 
       def load_product
-        @product = Product.accessible_by(current_ability, :read).friendly.find(params[:product_slug]) if params[:product_slug]
+        @product = Spree::Product.accessible_by(current_ability, :read).friendly.find(params[:product_slug]) if params[:product_slug]
       end
 
       def load_stock_management_data

data/app/controllers/spree/admin/stock_transfers_controller.rb

@@ -133,12 +133,12 @@ module Spree
         @source_location ||= if params.key?(:transfer_receive_stock)
                                nil
                              else
-                               StockLocation.find(params[:transfer_source_location_id])
+                               Spree::StockLocation.find(params[:transfer_source_location_id])
                              end
       end
 
       def destination_location
-        @destination_location ||= StockLocation.find(params[:transfer_destination_location_id])
+        @destination_location ||= Spree::StockLocation.find(params[:transfer_destination_location_id])
       end
 
       def adjust_inventory

data/app/controllers/spree/admin/store_credits_controller.rb

@@ -68,8 +68,8 @@ module Spree
       private
 
       def permitted_resource_params
-        params.require(:store_credit).permit([:amount, :category_id, :memo]).
-          merge(currency: Spree::Config[:currency], created_by: try_spree_current_user)
+        params.require(:store_credit).permit([:amount, :currency, :category_id, :memo]).
+          merge(created_by: try_spree_current_user)
       end
 
       def collection
@@ -105,6 +105,12 @@ module Spree
         flash[:error] = "#{Spree.t("admin.store_credits.unable_to_#{translation_key}")}: #{@store_credit.errors.full_messages.join(', ')}"
         render(template) && return
       end
+
+      def build_resource
+        parent.store_credits.build(
+          currency: Spree::Config[:currency]
+        )
+      end
     end
   end
 end

data/app/controllers/spree/admin/stores_controller.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Admin
+    class StoresController < Spree::Admin::ResourceController
+      def index
+        if Spree::Store.count == 1
+          redirect_to edit_admin_store_path(Spree::Store.first)
+        else
+          @stores = Spree::Store.all
+        end
+      end
+
+      private
+
+      def store_params
+        params.require(:store).permit(permitted_params)
+      end
+
+      def permitted_params
+        Spree::PermittedAttributes.store_attributes
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/tax_rates_controller.rb

@@ -6,9 +6,9 @@ module Spree
       private
 
       def load_data
-        @available_zones = Zone.order(:name)
-        @available_categories = TaxCategory.order(:name)
-        @calculators = TaxRate.calculators.sort_by(&:name)
+        @available_zones = Spree::Zone.order(:name)
+        @available_categories = Spree::TaxCategory.order(:name)
+        @calculators = Spree::TaxRate.calculators.sort_by(&:name)
       end
     end
   end

data/app/controllers/spree/admin/taxons_controller.rb

@@ -15,7 +15,7 @@ module Spree
       end
 
       def create
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxonomy = Spree::Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.build(params[:taxon])
         if @taxon.save
           respond_with(@taxon) do |format|
@@ -30,19 +30,19 @@ module Spree
       end
 
       def edit
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxonomy = Spree::Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.find(params[:id])
         @permalink_part = @taxon.permalink.split("/").last
       end
 
       def update
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
+        @taxonomy = Spree::Taxonomy.find(params[:taxonomy_id])
         @taxon = @taxonomy.taxons.find(params[:id])
         parent_id = params[:taxon][:parent_id]
         new_position = params[:taxon][:position]
 
         if parent_id
-          @taxon.parent = Taxon.find(parent_id.to_i)
+          @taxon.parent = Spree::Taxon.find(parent_id.to_i)
         end
 
         if new_position
@@ -65,7 +65,7 @@ module Spree
       end
 
       def destroy
-        @taxon = Taxon.find(params[:id])
+        @taxon = Spree::Taxon.find(params[:id])
         @taxon.destroy
         respond_with(@taxon) { |format| format.json { render json: '' } }
       end

data/app/controllers/spree/admin/users_controller.rb

@@ -148,15 +148,8 @@ module Spree
       end
 
       def set_roles
-        # FIXME: user_params permits the roles that can be set, if spree_role_ids is set.
-        # when submitting a user with no roles, the param is not present. Because users can be updated
-        # with some users being able to set roles, and some users not being able to set roles, we have to check
-        # if the roles should be cleared, or unchanged again here. The roles form should probably hit a seperate
-        # action or controller to remedy this.
-        if user_params[:spree_role_ids]
+        if user_params[:spree_role_ids] && can?(:manage, Spree::Role)
           @user.spree_roles = Spree::Role.where(id: user_params[:spree_role_ids])
-        elsif can?(:manage, Spree::Role)
-          @user.spree_roles = []
         end
       end
 

data/app/controllers/spree/admin/variants_controller.rb

@@ -1,14 +1,17 @@
 module Spree
   module Admin
     class VariantsController < ResourceController
+      helper 'spree/admin/products'
+
       belongs_to 'spree/product', find_by: :slug
       new_action.before :new_before
+      before_action :redirect_on_empty_option_values, only: [:new]
       before_action :load_data, only: [:new, :create, :edit, :update]
 
       # override the destroy method to set deleted_at value
       # instead of actually deleting the product.
       def destroy
-        @variant = Variant.find(params[:id])
+        @variant = Spree::Variant.find(params[:id])
         if @variant.destroy
           flash[:success] = Spree.t('notice_messages.variant_deleted')
         else
@@ -42,12 +45,16 @@ module Spree
       end
 
       def load_data
-        @tax_categories = TaxCategory.order(:name)
+        @tax_categories = Spree::TaxCategory.order(:name)
       end
 
       def variant_includes
         [{ option_values: :option_type }, :default_price]
       end
+
+      def redirect_on_empty_option_values
+        redirect_to admin_product_variants_url(params[:product_id]) if @product.empty_option_values?
+      end
     end
   end
 end

data/app/controllers/spree/admin/zones_controller.rb

@@ -17,9 +17,9 @@ module Spree
       end
 
       def load_data
-        @countries = Country.order(:name)
-        @states = State.order(:name)
-        @zones = Zone.order(:name)
+        @countries = Spree::Country.order(:name)
+        @states = Spree::State.order(:name)
+        @zones = Spree::Zone.order(:name)
       end
     end
   end

data/app/helpers/spree/admin/base_helper.rb

@@ -101,7 +101,8 @@ module Spree
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
         fields = object.preferences.keys.map { |key|
-          form.label("preferred_#{key}", Spree.t(key) + ": ") +
+          form.label("preferred_#{key}", Spree.t(key)) +
+            "<br />".html_safe +
             preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
         }
         safe_join(fields, "<br />".html_safe)

data/app/helpers/spree/admin/navigation_helper.rb

@@ -19,7 +19,7 @@ module Spree
 
         content_tag :ol, class: 'breadcrumb' do
           safe_join admin_breadcrumbs.map { |level|
-            content_tag(:li, level, class: "separator #{level == admin_breadcrumbs.last ? 'active' : ''}")
+            content_tag(:li, level, class: "breadcrumb-item #{level == admin_breadcrumbs.last ? 'active' : ''}")
           }
         end
       end
@@ -30,7 +30,7 @@ module Spree
         elsif content_for?(:page_title)
           content_for(:page_title)
         elsif admin_breadcrumbs.any?
-          strip_tags(admin_breadcrumbs.last)
+          admin_breadcrumbs.map{ |x| strip_tags(x) }.reverse.join(' - ')
         else
           Spree.t(controller.controller_name, default: controller.controller_name.titleize)
         end

data/app/models/spree/backend_configuration.rb

@@ -9,7 +9,7 @@ module Spree
                             :variants, :product_properties, :taxonomies,
                             :taxons]
     REPORT_TABS        ||= [:reports]
-    CONFIGURATION_TABS ||= [:configurations, :general_settings, :tax_categories,
+    CONFIGURATION_TABS ||= [:stores, :tax_categories,
                             :tax_rates, :zones, :countries, :states,
                             :payment_methods, :shipping_methods,
                             :shipping_categories, :stock_locations,
@@ -90,10 +90,10 @@ module Spree
         MenuItem.new(
           CONFIGURATION_TABS,
           'wrench',
-          condition: -> { can?(:admin, :general_settings) },
+          condition: -> { can?(:admin, Spree::Store) },
           label: :settings,
           partial: 'spree/admin/shared/settings_sub_menu',
-          url: :edit_admin_general_settings_path
+          url: :admin_stores_path
         ),
         MenuItem.new(
           PROMOTION_TABS,

data/app/views/spree/admin/adjustment_reasons/edit.html.erb

@@ -5,11 +5,11 @@
 <% admin_breadcrumb link_to plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path %>
 <% admin_breadcrumb @object.name %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @adjustment_reason] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'spree/admin/adjustment_reasons/shared/form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+    <%= render partial: 'spree/admin/adjustment_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/adjustment_reasons/index.html.erb

@@ -43,7 +43,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="col-xs-9 no-objects-found">
+  <div class="col-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::AdjustmentReason,
                  new_resource_url: new_object_url %>

data/app/views/spree/admin/adjustment_reasons/new.html.erb

@@ -8,11 +8,11 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @object } %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
 
 <%= form_for [:admin, @adjustment_reason] do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'spree/admin/adjustment_reasons/shared/form', :locals => { :f => f } %>
-    <%= render :partial => 'spree/admin/shared/new_resource_links' %>
+    <%= render partial: 'spree/admin/adjustment_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>
 <% end %>

data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb

@@ -1,13 +1,13 @@
 <div data-hook="admin_adjustment_reason_form_fields" class="row">
-  <div class="col-xs-3">
+  <div class="col-3">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
-      <%= f.text_field :name, :class => 'fullwidth' %>
+      <%= f.text_field :name, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :code do %>
       <%= f.label :code, class: 'required' %><br />
-      <%= f.text_field :code, :class => 'fullwidth' %>
+      <%= f.text_field :code, class: 'fullwidth' %>
     <% end %>
 
     <div class="checkbox">

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -13,11 +13,11 @@
   <td class='actions'>
     <% unless adjustment.finalized? %>
       <% if can?(:update, adjustment) %>
-        <%= link_to_edit adjustment, :no_text => true %>
+        <%= link_to_edit adjustment, no_text: true %>
       <% end %>
 
       <% if can?(:destroy, adjustment) %>
-        <%= link_to_delete adjustment, :no_text => true %>
+        <%= link_to_delete adjustment, no_text: true %>
       <% end %>
     <% end %>
   </td>

data/app/views/spree/admin/adjustments/_adjustments_table.html.erb

@@ -9,7 +9,7 @@
     </tr>
   </thead>
   <tbody>
-    <%= render :partial => "adjustment", :collection => @adjustments %>
+    <%= render partial: "adjustment", collection: @adjustments %>
     <tr data-hook="adjustment_buttons">
       <td class="align-center" colspan='4'>
         <% if can? :update, Spree::Adjustment %>

data/app/views/spree/admin/adjustments/_form.html.erb

@@ -1,7 +1,7 @@
 <div data-hook="admin_adjustment_form_fields">
   <div class="row">
 
-    <div class="col-xs-3">
+    <div class="col-3">
       <%= f.field_container :amount do %>
         <%= f.label :amount, class: 'required' %>
         <%= text_field :adjustment, :amount, class: 'fullwidth' %>
@@ -9,7 +9,7 @@
       <% end %>
     </div>
 
-    <div class="col-xs-6">
+    <div class="col-6">
       <%= f.field_container :label do %>
         <%= f.label :label, class: 'required' %>
         <%= text_field :adjustment, :label, class: 'fullwidth' %>
@@ -17,7 +17,7 @@
       <% end %>
     </div>
 
-    <div class="col-xs-3">
+    <div class="col-3">
       <%= f.field_container :label do %>
         <%= f.label :adjustment_reason_id %><br/>
         <%= f.collection_select(:adjustment_reason_id, reasons_for(@adjustment), :id, :name, {include_blank: true}, {"data-placeholder" => Spree.t(:select_a_reason), class: 'select2 fullwidth'}) %>

data/app/views/spree/admin/adjustments/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Adjustments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: 'Adjustments' } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_path(@order)) %>
 <% admin_breadcrumb("#{Spree.t('actions.edit')} #{Spree::Adjustment.model_name.human}") %>
@@ -6,14 +6,14 @@
 <% content_for :page_actions do %>
 <% end %>
 
-<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @adjustment } %>
-<%= form_for @adjustment, :url => admin_order_adjustment_path(@order, @adjustment), :method => :put do |f| %>
+<%= render partial: 'spree/shared/error_messages', locals: { target: @adjustment } %>
+<%= form_for @adjustment, url: admin_order_adjustment_path(@order, @adjustment), method: :put do |f| %>
   <fieldset class="no-border-top">
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div class="filter-actions actions" data-hook="buttons">
       <%= button Spree.t(:continue) %>
-      <%= link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), :class => 'button' %>
+      <%= link_to Spree.t('actions.cancel'), admin_order_adjustments_url(@order), class: 'button' %>
     </div>
   </fieldset>
 <% end %>