spree_backend 3.0.10 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34893ade454f9c8b3c5532fb4c8797ca6764dc4e
-  data.tar.gz: e5a82d124459cdb245f6be5bde93fbbd70957713
+  metadata.gz: 72f29c266e31ffa57b06e31e539805843fd76f6b
+  data.tar.gz: 783e730217fa4b781cf3943da4f3e11d4b84dc04
 SHA512:
-  metadata.gz: 5b8865a55bd4afcac15e2be3e56c7ad4f38ac9cca73a2fa8103b8eef3e90d176e4846fdb3032381cce6a7c9ea9c2d5dee610dd5cf3ea7bfd29cb6ac1f11e5f37
-  data.tar.gz: d569d3854e03168b6f68040556be0f7c975ec9e77680c669e06bcb8e837b0283b02a1f529a2e14cce6969808dcd7bd7b4baa13c1d1863105d412d7737444f06c
+  metadata.gz: 436b9616f06b71d298ba59c69ed05b2cbdbc2c9b606d58e506dd0a5424c8eb2fea8eebf3d1ab1e2e9981974f20b9892f9d5bb2e010aa39a8cc917c741115f888
+  data.tar.gz: 48da0978b94d953e2007c97b090fd05fe8db10fa7d010d5406cb7815cc6119a52e195e827980b62d1f088f14d4f323d201fb72c909e79785a7fe10b14aaf1c81

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

@@ -1,4 +1,6 @@
+//= require modernizr
 //= require bootstrap-sprockets
+//= require handlebars
 //= require jquery
 //= require jquery.cookie
 //= require jquery.jstree/jquery.jstree
@@ -6,9 +8,10 @@
 //= require jquery-ui/datepicker
 //= require jquery-ui/sortable
 //= require jquery-ui/autocomplete
-//= require modernizr
+//= require select2
 //= require underscore-min.js
 //= require velocity
+
 //= require spree
 //= require spree/backend/spree-select2
 //= require spree/backend/address_states
@@ -47,30 +50,30 @@
 //= require spree/backend/variant_management
 //= require spree/backend/zone
 
-Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
-Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
-Spree.routes.classifications_api = Spree.pathFor('api/classifications')
-Spree.routes.option_type_search = Spree.pathFor('api/option_types')
-Spree.routes.option_value_search = Spree.pathFor('api/option_values')
-Spree.routes.orders_api = Spree.pathFor('api/orders')
-Spree.routes.products_api = Spree.pathFor('api/products')
-Spree.routes.product_search = Spree.pathFor('admin/search/products')
-Spree.routes.shipments_api = Spree.pathFor('api/shipments')
-Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
-Spree.routes.stock_locations_api = Spree.pathFor('api/stock_locations')
-Spree.routes.taxon_products_api = Spree.pathFor('api/taxons/products')
-Spree.routes.taxons_search = Spree.pathFor('api/taxons')
-Spree.routes.user_search = Spree.pathFor('admin/search/users')
-Spree.routes.variants_api = Spree.pathFor('api/variants')
+Spree.routes.clear_cache = Spree.adminPathFor('general_settings/clear_cache')
+Spree.routes.checkouts_api = Spree.pathFor('api/v1/checkouts')
+Spree.routes.classifications_api = Spree.pathFor('api/v1/classifications')
+Spree.routes.option_type_search = Spree.pathFor('api/v1/option_types')
+Spree.routes.option_value_search = Spree.pathFor('api/v1/option_values')
+Spree.routes.orders_api = Spree.pathFor('api/v1/orders')
+Spree.routes.products_api = Spree.pathFor('api/v1/products')
+Spree.routes.product_search = Spree.adminPathFor('search/products')
+Spree.routes.shipments_api = Spree.pathFor('api/v1/shipments')
+Spree.routes.checkouts_api = Spree.pathFor('api/v1/checkouts')
+Spree.routes.stock_locations_api = Spree.pathFor('api/v1/stock_locations')
+Spree.routes.taxon_products_api = Spree.pathFor('api/v1/taxons/products')
+Spree.routes.taxons_search = Spree.pathFor('api/v1/taxons')
+Spree.routes.user_search = Spree.adminPathFor('search/users')
+Spree.routes.variants_api = Spree.pathFor('api/v1/variants')
 
 Spree.routes.edit_product = function(product_id) {
-  return Spree.pathFor('admin/products/' + product_id + '/edit')
+  return Spree.adminPathFor('products/' + product_id + '/edit')
 }
 
 Spree.routes.payments_api = function(order_id) {
-  return Spree.pathFor('api/orders/' + order_id + '/payments')
+  return Spree.pathFor('api/v1/orders/' + order_id + '/payments')
 }
 
 Spree.routes.stock_items_api = function(stock_location_id) {
-  return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
+  return Spree.pathFor('api/v1/stock_locations/' + stock_location_id + '/stock_items')
 }

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

@@ -1,13 +1,3 @@
-//= require_self
-//= require spree/backend/handlebar_extensions
-//= require spree/backend/variant_autocomplete
-//= require spree/backend/taxon_autocomplete
-//= require spree/backend/option_type_autocomplete
-//= require spree/backend/user_picker
-//= require spree/backend/product_picker
-//= require spree/backend/option_value_picker
-//= require spree/backend/taxons
-
 /**
 This is a collection of javascript functions and whatnot
 under the spree namespace that do stuff we find helpful.
@@ -192,8 +182,8 @@ jQuery(function($) {
     }
   });
 
-  // Make flash messages dissapear
-  setTimeout('$(".alert-auto-dissapear").slideUp()', 5000);
+  // Make flash messages disappear
+  setTimeout('$(".alert-auto-disappear").slideUp()', 5000);
 
 });
 
@@ -201,12 +191,12 @@ jQuery(function($) {
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
 show_flash = function(type, message) {
-  var flash_div = $('.flash.' + type);
+  var flash_div = $('.alert-' + type);
   if (flash_div.length == 0) {
     flash_div = $('<div class="alert alert-' + type + '" />');
     $('#content').prepend(flash_div);
   }
-  flash_div.html(message).show().delay(5000).slideUp();
+  flash_div.html(message).show().delay(10000).slideUp();
 }
 
 
@@ -292,9 +282,12 @@ $(document).ready(function(){
         },
         dataType: 'script',
         success: function(response) {
-          el.parents("tr").fadeOut('hide', function() {
-            $(this).remove();
-          });
+          var $flash_element = $('.alert-success');
+          if ($flash_element.length) {
+            el.parents("tr").fadeOut('hide', function() {
+              $(this).remove();
+            });
+          }
         },
         error: function(response, textStatus, errorThrown) {
           show_flash('error', response.responseText);

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

@@ -1,4 +1,3 @@
-//= require handlebars
 Handlebars.registerHelper("t", function(key) {
   if (Spree.translations[key]) {
     return Spree.translations[key]
@@ -6,4 +5,3 @@ Handlebars.registerHelper("t", function(key) {
     console.error("No translation found for " + key + ". Does it exist within spree/admin/shared/_translations.html.erb?")
   }
 });
-

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

@@ -26,8 +26,7 @@ $.fn.productAutocomplete = function (options) {
       data: function (term, page) {
         return {
           q: {
-            name_cont: term,
-            sku_cont: term
+            name_or_master_sku_cont: term,
           },
           m: 'OR',
           token: Spree.api_key

data/app/assets/javascripts/spree/backend/spree-select2.js

@@ -1,4 +1,3 @@
-//= require select2
 jQuery(function($) {
   // Make select beautiful
   $('select.select2').select2({

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

@@ -12,6 +12,7 @@ var set_taxon_select = function(selector){
       initSelection: function (element, callback) {
         var url = Spree.url(Spree.routes.taxons_search, {
           ids: element.val(),
+          without_children: true,
           token: Spree.api_key
         });
         return $.getJSON(url, null, function (data) {

data/app/assets/javascripts/spree/backend/taxons.js.coffee

@@ -45,13 +45,18 @@ $(document).ready ->
         id: e.val,
         token: Spree.api_key
       success: (data) ->
-        el.empty();
+        el.empty()
         if data.products.length == 0
           $('#taxon_products').html("<div class='alert alert-info'>" + Spree.translations.no_results + "</div>")
         else
           for product in data.products
             if product.master.images[0] != undefined && product.master.images[0].small_url != undefined
               product.image = product.master.images[0].small_url
+            else
+              for variant in product.variants
+                if variant.images[0] != undefined && variant.images[0].small_url != undefined
+                  product.image = variant.images[0].small_url
+                  break
             el.append(productTemplate({ product: product }))
 
   $('#taxon_products').on "click", ".js-delete-product", (e) ->

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

@@ -9,6 +9,7 @@
 .label-success,
 .label-sold,
 .label-open
+.label-authorized
 {
   background-color: $brand-success;
 

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

@@ -7,6 +7,21 @@
     line-height: 38px;
   }
 
+  &.with-page-tabs {
+    border-bottom: 0;
+    margin-bottom: 6px;
+    padding-bottom: 0;
+
+    h1 {
+      margin-bottom: 8px;
+    }
+
+    .nav-tabs {
+      padding-left: 15px;
+      padding-top: 15px;
+    }
+  }
+
   .page-actions {
     text-align: right;
 

data/app/assets/stylesheets/spree/backend/shared/_base.scss

@@ -2,6 +2,10 @@ body {
   padding-top: $navbar-height + 2px;
 }
 
+.table-wrapper {
+  overflow: auto;
+}
+
 .row {
   padding: 0 0 15px 0;
 }
@@ -14,4 +18,8 @@ body {
 @each $side in top bottom left right {
   .no-margin-#{$side}  { margin-#{side}: 0; }
   .no-padding-#{$side} { padding-#{side}: 0; }
-}
+}
+
+.alert-error {
+  @extend .alert-danger;
+}

data/app/assets/stylesheets/spree/backend/shared/_forms.scss

@@ -51,4 +51,8 @@ input.form-control {
 
 .checkbox > .help-block {
   margin-top: 0;
-}
+}
+
+.display-inline {
+  display: inline;
+}

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

@@ -13,7 +13,7 @@ module Spree
       before_action :find_adjustment, only: [:destroy, :edit, :update]
 
       def index
-        @adjustments = @order.all_adjustments.order("created_at ASC")
+        @adjustments = @order.all_adjustments.order(created_at: :asc)
       end
 
       private
@@ -24,7 +24,7 @@ module Spree
       end
 
       def update_totals
-        @order.reload.update!
+        @order.reload.update_with_updater!
       end
 
       # Override method used to create a new instance to correctly

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

@@ -10,10 +10,11 @@ module Spree
       create.fails  :load_form_data
 
       def edit
-        @pending_return_items = @customer_return.return_items.select(&:pending?)
-        @accepted_return_items = @customer_return.return_items.select(&:accepted?)
-        @rejected_return_items = @customer_return.return_items.select(&:rejected?)
-        @manual_intervention_return_items = @customer_return.return_items.select(&:manual_intervention_required?)
+        returned_items = @customer_return.return_items
+        @pending_return_items = returned_items.select(&:pending?)
+        @accepted_return_items = returned_items.select(&:accepted?)
+        @rejected_return_items = returned_items.select(&:rejected?)
+        @manual_intervention_return_items = returned_items.select(&:manual_intervention_required?)
         @pending_reimbursements = @customer_return.reimbursements.select(&:pending?)
 
         super

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

@@ -38,7 +38,7 @@ module Spree
 
         def set_available_option_types
           @available_option_types = if @product.option_type_ids.any?
-            OptionType.where('id NOT IN (?)', @product.option_type_ids)
+            OptionType.where.not(id: @product.option_type_ids)
           else
             OptionType.all
           end

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

@@ -4,7 +4,7 @@ module Spree
       def destroy
         option_value = Spree::OptionValue.find(params[:id])
         option_value.destroy
-        render :text => nil
+        render text: nil
       end
     end
   end

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

@@ -3,6 +3,7 @@ module Spree
     module Orders
       class CustomerDetailsController < Spree::Admin::BaseController
         before_action :load_order
+        before_action :load_user, only: :update, unless: :guest_checkout?
 
         def show
           edit
@@ -20,37 +21,53 @@ module Spree
 
         def update
           if @order.update_attributes(order_params)
-            if params[:guest_checkout] == "false"
-              @order.associate_user!(Spree.user_class.find(params[:user_id]), @order.email.blank?)
+            @order.associate_user!(@user, @order.email.blank?) unless guest_checkout?
+            @order.next unless @order.complete?
+            @order.refresh_shipment_rates(Spree::ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
+
+            if @order.errors.empty?
+              flash[:success] = Spree.t('customer_details_updated')
+              redirect_to edit_admin_order_url(@order)
+            else
+              render action: :edit
             end
-            @order.next
-            @order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_FRONT_AND_BACK_END)
-            flash[:success] = Spree.t('customer_details_updated')
-            redirect_to edit_admin_order_url(@order)
           else
             render action: :edit
           end
-
         end
 
         private
-          def order_params
-            params.require(:order).permit(
-              :email,
-              :use_billing,
-              bill_address_attributes: permitted_address_attributes,
-              ship_address_attributes: permitted_address_attributes
-            )
-          end
 
-          def load_order
-            @order = Order.includes(:adjustments).friendly.find(params[:order_id])
-          end
+        def order_params
+          params.require(:order).permit(
+            :email,
+            :use_billing,
+            bill_address_attributes: permitted_address_attributes,
+            ship_address_attributes: permitted_address_attributes
+          )
+        end
+
+        def load_order
+          @order = Order.includes(:adjustments).friendly.find(params[:order_id])
+        end
+
+        def model_class
+          Spree::Order
+        end
 
-          def model_class
-            Spree::Order
+        def load_user
+          @user = (Spree.user_class.find_by(id: params[:user_id]) ||
+            Spree.user_class.find_by(email: order_params[:email]))
+
+          unless @user
+            flash.now[:error] = Spree.t(:user_not_found)
+            render :edit
           end
+        end
 
+        def guest_checkout?
+          params[:guest_checkout] == 'true'
+        end
       end
     end
   end

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

@@ -34,9 +34,9 @@ module Spree
           params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
         end
 
-        @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
+        @search = Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
 
-        # lazyoading other models here (via includes) may result in an invalid query
+        # lazy loading other models here (via includes) may result in an invalid query
         # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
         # see https://github.com/spree/spree/pull/3919
         @orders = @search.result(distinct: true).
@@ -72,7 +72,7 @@ module Spree
 
       def update
         if @order.update_attributes(params[:order]) && @order.line_items.present?
-          @order.update!
+          @order.update_with_updater!
           unless @order.completed?
             # Jump to next step if order is not completed.
             redirect_to admin_order_customer_path(@order) and return
@@ -81,7 +81,7 @@ module Spree
           @order.errors.add(:line_items, Spree.t('errors.messages.blank')) if @order.line_items.empty?
         end
 
-        render :action => :edit
+        render action: :edit
       end
 
       def cancel
@@ -110,7 +110,7 @@ module Spree
       end
 
       def open_adjustments
-        adjustments = @order.all_adjustments.where(state: 'closed')
+        adjustments = @order.all_adjustments.closed
         adjustments.update_all(state: 'open')
         flash[:success] = Spree.t(:all_adjustments_opened)
 
@@ -118,7 +118,7 @@ module Spree
       end
 
       def close_adjustments
-        adjustments = @order.all_adjustments.where(state: 'open')
+        adjustments = @order.all_adjustments.open
         adjustments.update_all(state: 'closed')
         flash[:success] = Spree.t(:all_adjustments_closed)
 

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

@@ -13,7 +13,7 @@ module Spree
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
-          flash[:success] = Spree.t(:successfully_created, :resource => Spree.t(:payment_method))
+          flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method))
           redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:create, :fails)
@@ -27,7 +27,7 @@ module Spree
         if @payment_method['type'].to_s != payment_method_type
           @payment_method.update_columns(
             type: payment_method_type,
-            updated_at: Time.now,
+            updated_at: Time.current,
           )
           @payment_method = PaymentMethod.find(params[:id])
         end
@@ -42,7 +42,7 @@ module Spree
 
         if @payment_method.update_attributes(attributes)
           invoke_callbacks(:update, :after)
-          flash[:success] = Spree.t(:successfully_updated, :resource => Spree.t(:payment_method))
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method))
           redirect_to edit_admin_payment_method_path(@payment_method)
         else
           invoke_callbacks(:update, :fails)