spree_backend 3.6.6 → 3.7.0.rc1

data/app/assets/javascripts/spree/backend/variant_management.js

@@ -0,0 +1,14 @@
+$(function () {
+  $('.track_inventory_checkbox').on('click', function () {
+    $(this).siblings('.variant_track_inventory').val($(this).is(':checked'))
+    $(this).parents('form').submit()
+  })
+  $('.toggle_variant_track_inventory').on('submit', function () {
+    $.ajax({
+      type: this.method,
+      url: this.action,
+      data: $(this).serialize()
+    })
+    return false
+  })
+})

data/app/assets/javascripts/spree/backend/zone.js

@@ -0,0 +1,44 @@
+$(function () {
+  var countryBased = $('#country_based')
+  var stateBased = $('#state_based')
+  countryBased.click(show_country)
+  stateBased.click(show_state)
+  if (countryBased.is(':checked')) {
+    show_country()
+  } else if (stateBased.is(':checked')) {
+    show_state()
+  } else {
+    show_state()
+    stateBased.click()
+  }
+})
+// eslint-disable-next-line camelcase
+function show_country () {
+  $('#state_members :input').each(function () {
+    $(this).prop('disabled', true)
+  })
+  $('#state_members').hide()
+  $('#zone_members :input').each(function () {
+    $(this).prop('disabled', true)
+  })
+  $('#zone_members').hide()
+  $('#country_members :input').each(function () {
+    $(this).prop('disabled', false)
+  })
+  $('#country_members').show()
+}
+// eslint-disable-next-line camelcase
+function show_state () {
+  $('#country_members :input').each(function () {
+    $(this).prop('disabled', true)
+  })
+  $('#country_members').hide()
+  $('#zone_members :input').each(function () {
+    $(this).prop('disabled', true)
+  })
+  $('#zone_members').hide()
+  $('#state_members :input').each(function () {
+    $(this).prop('disabled', false)
+  })
+  $('#state_members').show()
+}

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

@@ -3,9 +3,9 @@ module Spree
     class CountriesController < ResourceController
       private
 
-        def collection
-          super.order(:name)
-        end
+      def collection
+        super.order(:name)
+      end
     end
   end
 end

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

@@ -57,6 +57,7 @@ module Spree
 
         @customer_return.return_items = return_items_params.map do |item_params|
           next unless item_params.delete('returned') == '1'
+
           return_item = item_params[:id] ? Spree::ReturnItem.find(item_params[:id]) : Spree::ReturnItem.new
           return_item.attributes = item_params
           return_item

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

@@ -10,6 +10,7 @@ module Spree
       def update
         params.each do |name, value|
           next unless Spree::Config.has_preference? name
+
           Spree::Config[name] = value
         end
 

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

@@ -24,7 +24,7 @@ module Spree
         if params[:q][:created_at_gt].present?
           params[:q][:created_at_gt] = begin
                                          Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
-                                       rescue
+                                       rescue StandardError
                                          ''
                                        end
         end
@@ -32,7 +32,7 @@ module Spree
         if params[:q][:created_at_lt].present?
           params[:q][:created_at_lt] = begin
                                          Time.zone.parse(params[:q][:created_at_lt]).end_of_day
-                                       rescue
+                                       rescue StandardError
                                          ''
                                        end
         end
@@ -119,7 +119,7 @@ module Spree
       end
 
       def open_adjustments
-        adjustments = @order.all_adjustments.closed
+        adjustments = @order.all_adjustments.finalized
         adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
@@ -127,7 +127,7 @@ module Spree
       end
 
       def close_adjustments
-        adjustments = @order.all_adjustments.open
+        adjustments = @order.all_adjustments.not_finalized
         adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 

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

@@ -72,6 +72,7 @@ module Spree
       def preferences_params
         key = ActiveModel::Naming.param_key(@payment_method)
         return {} unless params.key? key
+
         params.require(key).permit!
       end
     end

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

@@ -27,7 +27,8 @@ module Spree
 
         begin
           if @payment_method.store_credit?
-            payments = @order.add_store_credit_payments
+            Spree::Checkout::AddStoreCredit.call(order: @order)
+            payments = @order.payments.store_credits.valid
           else
             @payment ||= @order.payments.build(object_params)
             if @payment.payment_method.source_required? && params[:card].present? && params[:card] != 'new'
@@ -90,7 +91,7 @@ module Spree
       def load_data
         @amount = params[:amount] || load_order.total
         @payment_methods = @order.collect_backend_payment_methods
-        if @payment and @payment.payment_method
+        if @payment&.payment_method
           @payment_method = @payment.payment_method
         else
           @payment_method = @payment_methods.find { |payment_method| payment_method.id == params[:payment][:payment_method_id].to_i } if params[:payment]

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

@@ -107,6 +107,7 @@ module Spree
 
       def collection
         return @collection if @collection.present?
+
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= '1'
         params[:q][:not_discontinued] ||= '1'
@@ -123,7 +124,6 @@ module Spree
         # This is to include all products and not just deleted products.
         @search = @collection.ransack(params[:q].reject { |k, _v| k.to_s == 'deleted_at_null' })
         @collection = @search.result.
-                      distinct_by_product_ids(params[:q][:s]).
                       includes(product_includes).
                       page(params[:page]).
                       per(params[:per_page] || Spree::Config[:admin_products_per_page])
@@ -132,6 +132,7 @@ module Spree
 
       def create_before
         return if params[:product][:prototype_id].blank?
+
         @prototype = Spree::Prototype.find(params[:product][:prototype_id])
       end
 
@@ -139,6 +140,7 @@ module Spree
         # note: we only reset the product properties if we're receiving a post
         #       from the form on that tab
         return unless params[:clear_product_properties]
+
         params[:product] ||= {}
       end
 

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

@@ -33,6 +33,7 @@ module Spree
 
       def collection
         return @collection if defined?(@collection)
+
         params[:q] ||= HashWithIndifferentAccess.new
         params[:q][:s] ||= 'id desc'
 

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

@@ -9,6 +9,7 @@ module Spree
 
       def collection
         return @collection if @collection.present?
+
         # params[:q] can be blank upon pagination
         params[:q] = {} if params[:q].blank?
 

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

@@ -32,16 +32,16 @@ module Spree
                                          Time.zone.now.beginning_of_month
                                        else
                                          begin
-                                            Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day
-                                         rescue
-                                            Time.zone.now.beginning_of_month
+                                           Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day
+                                         rescue StandardError
+                                           Time.zone.now.beginning_of_month
                                          end
                                        end
 
         if params[:q] && !params[:q][:completed_at_lt].blank?
           params[:q][:completed_at_lt] = begin
                                            Time.zone.parse(params[:q][:completed_at_lt]).end_of_day
-                                         rescue
+                                         rescue StandardError
                                            ''
                                          end
         end

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

@@ -113,6 +113,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def resource
     return @resource if @resource
+
     parent_model_name = parent_data[:model_name] if parent_data
     @resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name, object_name
   end
@@ -176,6 +177,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   def collection
     return parent.send(controller_name) if parent_data.present?
+
     if model_class.respond_to?(:accessible_by) &&
         !current_ability.has_block?(params[:action], model_class)
       model_class.accessible_by(current_ability, action)
@@ -212,7 +214,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def object_url(object = nil, options = {})
-    target = object ? object : @object
+    target = object || @object
     if parent_data.present?
       spree.send "admin_#{resource.model_name}_#{resource.object_name}_url", parent, target, options
     else

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

@@ -29,7 +29,7 @@ module Spree
         unassociated_inventory_units = all_inventory_units - associated_inventory_units
 
         new_return_items = unassociated_inventory_units.map do |new_unit|
-          Spree::ReturnItem.new(inventory_unit: new_unit).tap(&:set_default_pre_tax_amount)
+          Spree::ReturnItem.new(inventory_unit: new_unit, return_authorization: @return_authorization).tap(&:set_default_pre_tax_amount)
         end
 
         @form_return_items = (@return_authorization.return_items + new_return_items).sort_by(&:inventory_unit_id)

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

@@ -15,6 +15,7 @@ module Spree
 
       def collection(resource)
         return @collection if @collection.present?
+
         params[:q] ||= {}
 
         @collection = resource.all

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

@@ -20,6 +20,7 @@ module Spree
 
       def set_shipping_category
         return true if params['shipping_method'][:shipping_categories].blank?
+
         @shipping_method.shipping_categories = Spree::ShippingCategory.where(id: params['shipping_method'][:shipping_categories])
         @shipping_method.save
         params[:shipping_method].delete(:shipping_categories)
@@ -27,6 +28,7 @@ module Spree
 
       def set_zones
         return true if params['shipping_method'][:zones].blank?
+
         @shipping_method.zones = Spree::Zone.where(id: params['shipping_method'][:zones])
         @shipping_method.save
         params[:shipping_method].delete(:zones)

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

@@ -62,8 +62,7 @@ module Spree
       protected
 
       def permitted_store_credit_params
-        params.require(:store_credit).permit(permitted_store_credit_attributes).
-          merge(currency: Spree::Config[:currency])
+        params.require(:store_credit).permit(permitted_store_credit_attributes)
       end
 
       private

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

@@ -54,7 +54,8 @@ module Spree
         @search = Spree::Order.includes(
           line_items: {
             variant: [:product, { option_values: :option_type }]
-          }).ransack(params[:q].merge(user_id_eq: @user.id))
+          }
+        ).ransack(params[:q].merge(user_id_eq: @user.id))
         @orders = @search.result.page(params[:page])
       end
 
@@ -80,6 +81,7 @@ module Spree
 
       def collection
         return @collection if @collection.present?
+
         @collection = super
         @search = @collection.ransack(params[:q])
         @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_users_per_page])

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

@@ -108,15 +108,16 @@ module Spree
                             size: 10,
                             class: 'input_string form-control'
                           }
-        end
+                        end
 
         field_options.merge!(readonly: options[:readonly],
                              disabled: options[:disabled],
-                             size:     options[:size])
+                             size: options[:size])
       end
 
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
+
         fields = object.preferences.keys.map do |key|
           if object.has_preference?(key)
             form.label("preferred_#{key}", Spree.t(key) + ': ') +
@@ -127,9 +128,11 @@ module Spree
       end
 
       # renders hidden field and link to remove record using nested_attributes
-      def link_to_icon_remove_fields(f)
-        url = f.object.persisted? ? [:admin, f.object] : '#'
-        link_to_with_icon('delete', '', url, class: 'spree_remove_fields btn btn-sm btn-danger', data: { action: 'remove' }, title: Spree.t(:remove)) + f.hidden_field(:_destroy)
+      def link_to_icon_remove_fields(form)
+        url = form.object.persisted? ? [:admin, form.object] : '#'
+        css_class = 'spree_remove_fields btn btn-sm btn-danger'
+        title = Spree.t(:remove)
+        link_to_with_icon('delete', '', url, class: css_class, data: { action: 'remove' }, title: title) + form.hidden_field(:_destroy)
       end
 
       def spree_dom_id(record)

data/app/helpers/spree/admin/{general_settings_helper.rb → currency_helper.rb}

@@ -1,12 +1,13 @@
 module Spree
   module Admin
-    module GeneralSettingsHelper
-      def currency_options
+    module CurrencyHelper
+      def currency_options(selected_value = nil)
+        selected_value ||= Spree::Config[:currency]
         currencies = ::Money::Currency.table.map do |_code, details|
           iso = details[:iso_code]
           [iso, "#{details[:name]} (#{iso})"]
         end
-        options_from_collection_for_select(currencies, :first, :last, Spree::Config[:currency])
+        options_from_collection_for_select(currencies, :first, :last, selected_value)
       end
     end
   end

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

@@ -163,14 +163,6 @@ module Spree
         icon_name ? content_tag(:i, '', class: icon_name) : ''
       end
 
-      def icon(icon_name)
-        ActiveSupport::Deprecation.warn(<<-EOS, caller)
-         Admin::NavigationHelper#icon was renamed to Admin::NavigationHelper#spree_icon
-         and will be removed in Spree 3.6. Please update your code to avoid problems after update
-        EOS
-        spree_icon(icon_name)
-      end
-
       # Override: Add disable_with option to prevent multiple request on consecutive clicks
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name

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

@@ -6,6 +6,7 @@ module Spree
         links = []
         events.sort.each do |event|
           next unless order.send("can_#{event}?")
+
           label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
           links << button_link_to(
             label.capitalize,
@@ -60,7 +61,7 @@ module Spree
           'P' => 'Not Processed',
           'S' => 'Issuer indicates that CVV2 data should be present on the card, but the merchant has indicated data is not present on the card',
           'U' => 'Issuer has not certified for CVV2 or Issuer has not provided Visa with the CVV2 encryption keys',
-          ''  => 'Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered'
+          '' => 'Transaction failed because wrong CVV2 number was entered or no CVV2 number was entered'
         }
       end
     end

data/app/models/spree/admin/resource.rb

@@ -26,6 +26,7 @@ module Spree
 
       def object_name
         return @object_name if @object_name
+
         sub_namespace = sub_namespace_parts.join('_')
         sub_namespace = "#{sub_namespace}_" unless sub_namespace.empty?
         "#{sub_namespace}#{@controller_name.singularize}"

data/app/views/spree/admin/orders/_line_items.html.erb

@@ -23,7 +23,9 @@
                 <%= mini_image(item.variant) %>
               </td>
               <td class="line-item-name text-center">
-                <%= item.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+                <%= item.name %>
+                <br />
+                <%= "(#{item.options_text})" if item.options_text.present? %>
               </td>
               <td class="line-item-price text-center"><%= item.single_money.to_html %></td>
               <td class="line-item-qty-show text-center">

data/app/views/spree/admin/orders/_shipment_manifest.html.erb

@@ -5,7 +5,9 @@
     </td>
 
     <td class="item-name">
-      <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+      <%= item.variant.product.name %>
+      <br />
+      <%= "(#{item.variant.options_text})" if item.variant.options_text.present? %>
       <% if item.variant.sku.present? %>
         <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
       <% end %>

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

@@ -17,7 +17,7 @@
             <div class="row no-padding-bottom">
               <div class="col-xs-12 col-md-6">
                 <div class="input-group">
-                  <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
+                  <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control js-filterable', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
                   <span class="input-group-addon">
                     <i class="icon icon-calendar"></i>
                   </span>
@@ -26,7 +26,7 @@
               </div>
               <div class="col-xs-12 col-md-6">
                 <div class="input-group">
-                  <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
+                  <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control js-filterable', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
                   <span class="input-group-addon">
                     <i class="icon icon-calendar"></i>
                   </span>
@@ -39,7 +39,7 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
-            <%= f.text_field :number_cont, class: 'form-control js-quick-search-target' %>
+            <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
           </div>
         </div>
 
@@ -75,14 +75,14 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
-            <%= f.text_field :bill_address_firstname_start, class: 'form-control' %>
+            <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
-            <%= f.text_field :bill_address_lastname_start, class: 'form-control' %>
+            <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
           </div>
         </div>
 
@@ -100,21 +100,28 @@
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
-            <%= f.text_field :line_items_variant_sku_eq, class: 'form-control' %>
+            <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2' %>
+            <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
           </div>
         </div>
 
         <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_store_id_in, Spree.t(:store) %>
-            <%= f.select :store_id_in, Spree::Store.order("#{Spree::Store.table_name}.name").pluck(:name, :id), { include_blank: true }, class: 'select2' %>
+            <%= f.select :store_id_in, Spree::Store.order("#{Spree::Store.table_name}.name").pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          </div>
+        </div>
+
+        <div class="col-xs-12 col-md-4">
+          <div class="form-group">
+            <%= label_tag :q_channel_eq, Spree.t(:channel) %>
+            <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2 js-filterable' %>
           </div>
         </div>