solidus_backend 1.0.7 → 1.1.0.beta1

data/app/assets/stylesheets/spree/backend/components/_messages.scss

@@ -25,14 +25,17 @@
   }
 }
 
-.flash, .alert {
+.flash-wrapper {
   position: fixed;
   top: 0;
   left: 0;
   width: 100%;
+  z-index: 1000;
+}
+
+.flash {
   padding: 16px;
   text-align: center;
-  z-index: 1000;
   font-size: 120%;
   color: $color-1;
   font-weight: $font-weight-bold;
@@ -51,4 +54,4 @@
   }
 
   &.error a { color: very-light($color-error, 10) }
-}
+}

data/app/assets/stylesheets/spree/backend/sections/_promotions.scss

@@ -34,6 +34,22 @@
     margin-bottom: 0;
   }
 
+  .promo-rule-option-value {
+    position: relative;
+    padding-bottom: 10px;
+
+    .remove {
+      cursor: pointer;
+      position: absolute;
+      right: 10px;
+      top: 10px;
+
+      &:hover {
+        color: #c60f13;
+      }
+    }
+  }
+
   .tier {
     position: relative;
     padding-bottom: 10px;

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

@@ -7,7 +7,7 @@ module Spree
 
       before_action :authorize_admin
 
-      protected
+      private
 
         def action
           params[:action].to_sym

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

@@ -14,7 +14,7 @@ module Spree
         end
       end
 
-      protected
+      private
 
         def location_after_save
           if @option_type.created_at == @option_type.updated_at
@@ -24,8 +24,6 @@ module Spree
           end
         end
 
-
-      private
         def load_product
           @product = Product.find_by_param!(params[:product_id])
         end

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -9,7 +9,7 @@ module Spree
         end
 
         def edit
-          country_id = Address.default.country.id
+          country_id = Country.default.id
           @order.build_bill_address(:country_id => country_id) if @order.bill_address.nil?
           @order.build_ship_address(:country_id => country_id) if @order.ship_address.nil?
 

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

@@ -145,23 +145,23 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver_now
+        OrderMailer.confirm_email(@order.id, true).deliver_later
         flash[:success] = Spree.t(:order_email_resent)
 
         redirect_to :back
       end
 
       def open_adjustments
-        adjustments = @order.all_adjustments.where(state: 'closed')
-        adjustments.update_all(state: 'open')
+        adjustments = @order.all_adjustments.finalized
+        adjustments.each(&:unfinalize!)
         flash[:success] = Spree.t(:all_adjustments_opened)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end
 
       def close_adjustments
-        adjustments = @order.all_adjustments.where(state: 'open')
-        adjustments.update_all(state: 'closed')
+        adjustments = @order.all_adjustments.not_finalized
+        adjustments.each(&:finalize!)
         flash[:success] = Spree.t(:all_adjustments_closed)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
@@ -169,16 +169,11 @@ module Spree
 
       private
         def order_params
-          params.merge!(extra_order_params)
-          params.permit(extra_order_params.keys)
-        end
-
-        def extra_order_params
           {
             created_by_id: try_spree_current_user.try(:id),
             frontend_viewable: false,
             store_id: current_store.try(:id)
-          }
+          }.with_indifferent_access
         end
 
         def load_order

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

@@ -4,8 +4,10 @@ module Spree
       belongs_to 'spree/product', :find_by => :slug
       before_action :find_properties
       before_action :setup_property, only: :index, if: -> { can?(:create, model_class) }
+      before_action :setup_variant_property_rules, only: :index
 
       private
+
         def find_properties
           @properties = Spree::Property.pluck(:name)
         end
@@ -13,6 +15,13 @@ module Spree
         def setup_property
           @product.product_properties.build
         end
+
+        def setup_variant_property_rules
+          @option_types = @product.variant_option_values_by_option_type
+          @option_value_ids = (params[:ovi] || []).reject(&:blank?).map(&:to_i)
+          @variant_property_rule = @product.find_variant_property_rule(@option_value_ids) || @product.variant_property_rules.build
+          @variant_property_rule.values.build if can?(:create, Spree::VariantPropertyRuleValue)
+        end
     end
   end
 end

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

@@ -25,6 +25,11 @@ module Spree
         if params[:product][:option_type_ids].present?
           params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
         end
+        if updating_variant_property_rules?
+          params[:product][:variant_property_rules_attributes].each do |index, param_attrs|
+            param_attrs[:option_value_ids] = param_attrs[:option_value_ids].split(',')
+          end
+        end
         invoke_callbacks(:update, :before)
         if @object.update_attributes(permitted_resource_params)
           invoke_callbacks(:update, :after)
@@ -66,14 +71,23 @@ module Spree
         redirect_to edit_admin_product_url(@new)
       end
 
-      protected
+      private
 
       def find_resource
         Product.with_deleted.friendly.find(params[:id])
       end
 
       def location_after_save
-        spree.edit_admin_product_url(@product)
+        if updating_variant_property_rules?
+          url_params = {}
+          url_params[:ovi] = []
+          params[:product][:variant_property_rules_attributes].each do |index, param_attrs|
+            url_params[:ovi] += param_attrs[:option_value_ids]
+          end
+          spree.admin_product_product_properties_url(@product, url_params)
+        else
+          spree.edit_admin_product_url(@product)
+        end
       end
 
       def load_data
@@ -122,16 +136,17 @@ module Spree
         clone_admin_product_url resource
       end
 
-      private
-
       def variant_stock_includes
         [:images, stock_items: :stock_location, option_values: :option_type]
       end
 
-
       def variant_scope
         @product.variants
       end
+
+      def updating_variant_property_rules?
+        params[:product][:variant_property_rules_attributes].present?
+      end
     end
   end
 end

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

@@ -24,7 +24,8 @@ module Spree
         end
       end
 
-      protected
+      private
+
         def load_bulk_code_information
           @promotion_builder = Spree::PromotionBuilder.new(
             base_code: @promotion.codes.first.try!(:value),

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

@@ -3,6 +3,7 @@ module Spree
     class ReimbursementsController < ResourceController
       belongs_to 'spree/order', find_by: :number
 
+      before_action :load_stock_locations, only: :edit
       before_action :load_simulated_refunds, only: :edit
 
       rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :perform
@@ -32,6 +33,25 @@ module Spree
         end
       end
 
+      # We don't currently have a real Reimbursement "new" page. And the only
+      # built-in way to create reimburesments via Solidus admin is from the
+      # customer returns admin page via a button that supplies the
+      # "build_from_customer_return" parameter. The "edit" page is not
+      # suitable for use here for that reason as well.
+      # Perhaps we should add a reimbursement new page of some sort.
+      def render_after_create_error
+        flash.keep
+        if request.referer
+          redirect_to request.referer
+        else
+          redirect_to admin_url
+        end
+      end
+
+      def load_stock_locations
+        @stock_locations = Spree::StockLocation.active
+      end
+
       def load_simulated_refunds
         @reimbursement_objects = @reimbursement.simulate
       end

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

@@ -100,7 +100,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     end
   end
 
-  protected
+  private
 
     class << self
       attr_accessor :parent_data

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

@@ -19,6 +19,7 @@ module Spree
         load_return_items
         load_reimbursement_types
         load_return_reasons
+        load_stock_locations
       end
 
       # To satisfy how nested attributes works we want to create placeholder ReturnItems for
@@ -41,6 +42,10 @@ module Spree
       def load_return_reasons
         @reasons = Spree::ReturnReason.reasons_for_return_items(@return_authorization.return_items)
       end
+
+      def load_stock_locations
+        @stock_locations = Spree::StockLocation.order_default.active
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Spree
         redirect_to admin_root_redirect_path
       end
 
-      protected
+      private
 
       def admin_root_redirect_path
         if can?(:display, Spree::Order) && can?(:admin, Spree::Order)

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

@@ -14,10 +14,8 @@ module Spree
           @users = Spree.user_class.ransack({
             :m => 'or',
             :email_start => params[:q],
-            :ship_address_firstname_start => params[:q],
-            :ship_address_lastname_start => params[:q],
-            :bill_address_firstname_start => params[:q],
-            :bill_address_lastname_start => params[:q]
+            :addresses_firstname_start => params[:q],
+            :addresses_lastname_start => params[:q]
           }).result.limit(10)
         end
       end

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

@@ -11,7 +11,7 @@ module Spree
         end
       end
 
-      protected
+      private
 
         def location_after_save
           admin_country_states_url(@country)

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

@@ -49,7 +49,7 @@ module Spree
           @stock_locations = Spree::StockLocation.accessible_by(current_ability, :read)
           @stock_item_stock_locations = params[:stock_location_id].present? ? @stock_locations.where(id: params[:stock_location_id]) : @stock_locations
           @variant_display_attributes = self.class.variant_display_attributes
-          @variants = Spree::Core::Search::Variant.new(params[:variant_search_term], scope: variant_scope).results
+          @variants = Spree::Config.variant_search_class.new(params[:variant_search_term], scope: variant_scope).results
           @variants = @variants.includes(:images, stock_items: :stock_location, product: :variant_images)
           @variants = @variants.includes(option_values: :option_type)
           @variants = @variants.order(id: :desc).page(params[:page]).per(params[:per_page] || Spree::Config[:orders_per_page])

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

@@ -7,8 +7,7 @@ module Spree
         { translation_key: :name, attr_name: :name }
       ]
 
-      before_filter :load_readable_stock_locations, only: :index
-      before_filter :load_transferable_stock_locations, only: :new
+      before_filter :load_transferable_stock_locations, only: [:index, :new]
       before_filter :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
       before_filter :load_destination_stock_locations, only: :edit
       before_filter :ensure_access_to_stock_location, only: :create
@@ -52,7 +51,7 @@ module Spree
         end
       end
 
-      protected
+      private
 
       def collection
         params[:q] = params[:q] || {}
@@ -94,24 +93,14 @@ module Spree
         end
       end
 
-      private
-
       def authorize_transfer_attributes!
         duplicate = @object.dup
         duplicate.assign_attributes(permitted_resource_params)
         authorize! :create, duplicate
       end
 
-      def accessible_stock_locations
-        Spree::StockLocation.accessible_by(current_ability, :index)
-      end
-
       def transferable_stock_locations
-        accessible_stock_locations.accessible_by(current_ability, :transfer)
-      end
-
-      def load_readable_stock_locations
-        @stock_locations = accessible_stock_locations
+        Spree::StockLocation.accessible_by(current_ability, :transfer)
       end
 
       def load_transferable_stock_locations

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

@@ -89,7 +89,7 @@ module Spree
         Spree.user_class
       end
 
-      protected
+      private
 
         def collection
           return @collection if @collection.present?
@@ -108,7 +108,6 @@ module Spree
           end
         end
 
-      private
         def user_params
           attributes = permitted_user_attributes | [
             ship_address_attributes: permitted_address_attributes,
@@ -135,7 +134,7 @@ module Spree
           when 'basic'
             collection.map { |u| { 'id' => u.id, 'name' => u.email } }.to_json
           else
-            address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id]
+            address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id, :country_iso]
             includes = { :only => address_fields , :include => { :state => { :only => :name }, :country => { :only => :name } } }
 
             collection.to_json(:only => [:id, :email], :include =>

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

@@ -0,0 +1,7 @@
+module Spree
+  module Admin
+    class VariantPropertyRuleValuesController < ResourceController
+      belongs_to 'spree/product', find_by: :slug
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module Spree
         end
       end
 
-      protected
+      private
 
         def new_before
           @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',

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

@@ -7,7 +7,7 @@ module Spree
         @zone.zone_members.build
       end
 
-      protected
+      private
 
         def collection
           params[:q] ||= {}

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

@@ -2,9 +2,8 @@ module Spree
   module Admin
     module AdjustmentsHelper
       def adjustment_state(adjustment)
-        state = adjustment.state.to_sym
-        icon = { closed: 'lock', open: 'unlock' }
-        content_tag(:span, '', class: "fa fa-#{ icon[state] }")
+        icon = adjustment.finalized? ? 'lock' : 'unlock'
+        content_tag(:span, '', class: "fa fa-#{icon}")
       end
 
       def display_adjustable(adjustable)
@@ -27,15 +26,11 @@ module Spree
         parts << variant.product.name
         parts << "(#{variant.options_text})" if variant.options_text.present?
         parts << line_item.display_total
-        safe_join(parts, "<br />".html_safe)
+        parts.join("<br>").html_safe
       end
 
       def display_shipment(shipment)
-        parts = [
-          "#{Spree.t(:shipment)} ##{shipment.number}",
-          shipment.display_cost
-        ]
-        safe_join(parts, "<br />".html_safe)
+        "#{Spree.t(:shipment)} ##{shipment.number}<br>#{shipment.display_cost}".html_safe
       end
 
       def display_order(order)