spree_backend 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d57f178042c46cfcdd62e5121f58b08dbe32ddd
-  data.tar.gz: b6a0065d22c99caab100c7f469c54077809564d7
+  metadata.gz: 07d6da4a39570959b8010649ff1ef18040859ae7
+  data.tar.gz: c03bc5c2165dedf0d2c7d7a88c0c7b34839a5de7
 SHA512:
-  metadata.gz: 16dc7c6f89970df817eaf3ee07f819ec7a8d16498f2944b8dc071c70667c7b6161d6da7744aac1a7e707ea3d4a4c1a40419f744642f170aac11293ec90b3a7de
-  data.tar.gz: d1c7af18013088ccd43d361d50683d7edc0120294c4559e7d4e8f9e9430d866e7c968db5ba3d12e23188a7fc6d46efafa1d7122e7b58c69f6e6415ecfb96f1a9
+  metadata.gz: 66f8d1c6d29305a975e5b2fb0b3c76f0430e46fc73c19520f9fea93eb91dfcc6e943ad12b595a99c77e0178f057c34ffdb9b23075bf4a0d8758f3ee055c31232
+  data.tar.gz: 89f93de4b2b15a2e43e360204ccf4eb0afa633b325649520ce149b40deb8883e15ba61ed2541856b0c6f038e9c0c1d58f77c376b56d2bbcf810e0888a78133ef

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

@@ -2,7 +2,7 @@ $(@).ready( ->
   $('[data-hook=general_settings_clear_cache] #clear_cache').click ->
     $.ajax
       type: 'POST'
-      url: '/admin/general_settings/clear_cache'
+      url: Spree.routes.clear_cache
       success: ->
         show_flash 'success', "Cache was flushed."
       error: (msg) ->

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

@@ -12,9 +12,9 @@ $(document).ready(function() {
     $('.payment_methods_radios').click(
       function() {
         $('.payment-methods').hide();
-        $('.payment-methods input').prop('disabled', true);
+        $('.payment-methods :input').prop('disabled', true);
         if (this.checked) {
-          $('#payment_method_' + this.value + ' input').prop('disabled', false);
+          $('#payment_method_' + this.value + ' :input').prop('disabled', false);
           $('#payment_method_' + this.value).show();
         }
       }
@@ -23,11 +23,11 @@ $(document).ready(function() {
     $('.payment_methods_radios').each(
       function() {
         if (this.checked) {
-          $('#payment_method_' + this.value + ' input').prop('disabled', false);
+          $('#payment_method_' + this.value + ' :input').prop('disabled', false);
           $('#payment_method_' + this.value).show();
         } else {
           $('#payment_method_' + this.value).hide();
-          $('#payment_method_' + this.value + ' input').prop('disabled', true);
+          $('#payment_method_' + this.value + ' :input').prop('disabled', true);
         }
 
         if ($("#card_new" + this.value).is("*")) {

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

@@ -21,9 +21,9 @@
 //= require spree/backend/spree-select2
 //= require_tree .
 
-
 Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
 Spree.routes.classifications_api = Spree.pathFor('api/classifications')
+Spree.routes.clear_cache = Spree.pathFor('admin/general_settings/clear_cache')
 Spree.routes.option_type_search = Spree.pathFor('api/option_types')
 Spree.routes.orders_api = Spree.pathFor('api/orders')
 Spree.routes.product_search = Spree.pathFor('api/products')

data/app/assets/stylesheets/spree/backend/globals/_variables.scss

@@ -4,7 +4,7 @@
 
 // Fonts
 //--------------------------------------------------------------
-$base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif;
+$base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif !default;
 
 // Colors
 //--------------------------------------------------------------

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

@@ -10,7 +10,7 @@ module Spree
 
       def show
         session[:return_to] ||= request.referer
-        redirect_to( :action => :edit )
+        redirect_to action: :edit
       end
 
       def index
@@ -31,10 +31,11 @@ module Spree
           flash[:success] = flash_message_for(@object, :successfully_updated)
           respond_with(@object) do |format|
             format.html { redirect_to location_after_save }
-            format.js   { render :layout => false }
+            format.js   { render layout: false }
           end
         else
-          # Stops people submitting blank slugs, causing errors when they try to update the product again
+          # Stops people submitting blank slugs, causing errors when they try to
+          # update the product again
           @product.slug = @product.slug_was if @product.slug.blank?
           invoke_callbacks(:update, :fails)
           respond_with(@object)
@@ -66,7 +67,7 @@ module Spree
       end
 
       def stock
-        @variants = @product.variants
+        @variants = @product.variants.includes(*variant_stock_includes)
         @variants = [@product.master] if @variants.empty?
         @stock_locations = StockLocation.accessible_by(current_ability, :read)
         if @stock_locations.empty?
@@ -77,59 +78,67 @@ module Spree
 
       protected
 
-        def find_resource
-          Product.with_deleted.friendly.find(params[:id])
-        end
+      def find_resource
+        Product.with_deleted.friendly.find(params[:id])
+      end
 
-        def location_after_save
-          spree.edit_admin_product_url(@product)
-        end
+      def location_after_save
+        spree.edit_admin_product_url(@product)
+      end
 
-        def load_data
-          @taxons = Taxon.order(:name)
-          @option_types = OptionType.order(:name)
-          @tax_categories = TaxCategory.order(:name)
-          @shipping_categories = ShippingCategory.order(:name)
-        end
+      def load_data
+        @taxons = Taxon.order(:name)
+        @option_types = OptionType.order(:name)
+        @tax_categories = TaxCategory.order(:name)
+        @shipping_categories = ShippingCategory.order(:name)
+      end
 
-        def collection
-          return @collection if @collection.present?
-          params[:q] ||= {}
-          params[:q][:deleted_at_null] ||= "1"
-
-          params[:q][:s] ||= "name asc"
-          @collection = super
-          @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null) == '0'
-          # @search needs to be defined as this is passed to search_form_for
-          @search = @collection.ransack(params[:q])
-          @collection = @search.result.
-                distinct_by_product_ids(params[:q][:s]).
-                includes(product_includes).
-                page(params[:page]).
-                per(Spree::Config[:admin_products_per_page])
-
-          @collection
-        end
+      def collection
+        return @collection if @collection.present?
+        params[:q] ||= {}
+        params[:q][:deleted_at_null] ||= "1"
 
-        def create_before
-          return if params[:product][:prototype_id].blank?
-          @prototype = Spree::Prototype.find(params[:product][:prototype_id])
+        params[:q][:s] ||= "name asc"
+        @collection = super
+        if params[:q].delete(:deleted_at_null) == '0'
+          @collection = @collection.with_deleted
         end
+        # @search needs to be defined as this is passed to search_form_for
+        @search = @collection.ransack(params[:q])
+        @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])
+
+        @collection
+      end
 
-        def update_before
-          # 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
+      def create_before
+        return if params[:product][:prototype_id].blank?
+        @prototype = Spree::Prototype.find(params[:product][:prototype_id])
+      end
 
-        def product_includes
-          [{ :variants => [:images], :master => [:images, :default_price]}]
-        end
+      def update_before
+        # 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
 
-        def clone_object_url resource
-          clone_admin_product_url resource
-        end
+      def product_includes
+        [{ variants: [:images], master: [:images, :default_price] }]
+      end
 
+      def clone_object_url(resource)
+        clone_admin_product_url resource
+      end
+
+      private
+
+      def variant_stock_includes
+        [:images, stock_items: :stock_location, option_values: :option_type]
+      end
     end
   end
 end

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

@@ -6,6 +6,8 @@ module Spree
 
       helper_method :refund_reasons
 
+      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :create
+
       private
 
       def location_after_save
@@ -26,6 +28,11 @@ module Spree
           refund.amount = refund.payment.credit_allowed
         end
       end
+
+      def spree_core_gateway_error(error)
+        flash[:error] = error.message
+        render :new
+      end
     end
   end
 end

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

@@ -5,6 +5,8 @@ module Spree
 
       before_action :load_simulated_refunds, only: :edit
 
+      rescue_from Spree::Core::GatewayError, with: :spree_core_gateway_error, only: :perform
+
       def perform
         @reimbursement.perform!
         redirect_to location_after_save
@@ -33,6 +35,11 @@ module Spree
       def load_simulated_refunds
         @reimbursement_objects = @reimbursement.simulate
       end
+
+      def spree_core_gateway_error(error)
+        flash[:error] = error.message
+        redirect_to edit_admin_order_reimbursement_path(parent, @reimbursement)
+      end
     end
   end
 end

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

@@ -70,12 +70,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   end
 
   def update_positions
-    params[:positions].each do |id, index|
-      model_class.find(id).update_attributes(:position => index)
+    ActiveRecord::Base.transaction do
+      params[:positions].each do |id, index|
+        model_class.find(id).set_list_position(index)
+      end
     end
 
     respond_to do |format|
-      format.js  { render :text => 'Ok' }
+      format.js  { render text: 'Ok' }
     end
   end
 

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -29,7 +29,8 @@
           <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
         </td>
         <td class="align-center">
-          <%= return_item.exchange_variant.try(:options_text) %>
+          <%= return_item.exchange_variant.try(:exchange_name) %>
+        <td>
         </td>
         <td class="align-center">
           <%= return_item.acceptance_status_errors %>

data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb

@@ -35,7 +35,7 @@
           <%= return_item.display_pre_tax_amount %>
         </td>
         <td class="align-center">
-          <%= return_item.exchange_variant.try(:options_text) %>
+          <%= return_item.exchange_variant.try(:exchange_name) %>
         </td>
       </tr>
     <% end %>

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

@@ -21,17 +21,15 @@
       </td>
     <% end %>
     <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
-    <% unless shipment.shipped? %>
-      <td class="cart-item-delete actions" data-hook="cart_item_delete">
-        <% if can? :update, item %>
-          <%= link_to '', '#', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
-          <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
-          <% if shipment.order.shipped_shipments.count == 0 %>
-            <%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
-            <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
-          <% end %>
+    <td class="cart-item-delete actions" data-hook="cart_item_delete">
+      <% if !shipment.shipped? && can?(:update, item.line_item) %>
+        <%= link_to '', '#', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
+        <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
+        <% if shipment.order.shipped_shipments.count == 0 %>
+          <%= link_to '', '#', :class => 'split-item icon_link fa fa-arrows-h no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
+          <%= link_to '', '#', :class => 'delete-item fa fa-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
         <% end %>
-      </td>
-    <% end %>
+      <% end %>
+    </td>
   </tr>
 <% end %>

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

@@ -1,11 +1,11 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Payments' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: "Payments" } %>
 
-<% content_for :page_actions do %>  
+<% content_for :page_actions do %>
   <% if @order.outstanding_balance? %>
     <li id="new_payment_section">
       <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), :icon => 'plus' %>
     </li>
-  <% end %>  
+  <% end %>
   <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,17 +1,19 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <td class="no-border">
-    <span class="handle"></span>
-    <%= f.hidden_field :id %>
+    <% if f.object.persisted? %>
+      <span class="handle"></span>
+      <%= f.hidden_field :id %>
+    <% end %>
   </td>
   <td class='property_name'>
-    <%= f.text_field :property_name, :class => 'autocomplete' %>
+    <%= f.text_field :property_name, class: 'autocomplete' %>
   </td>
   <td class='value'>
     <%= f.text_field :value %>
   </td>
   <td class="actions">
     <% if f.object.persisted? %>
-      <%= link_to_delete f.object, :no_text => true %>
+      <%= link_to_delete f.object, no_text: true %>
     <% end %>
   </td>
 </tr>

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

@@ -51,9 +51,9 @@
             </td>
             <td class="align-center">
               <% if return_item.exchange_processed? %>
-                <%= return_item.exchange_variant.options_text %>
+                <%= return_item.exchange_variant.exchange_name %>
               <% else %>
-                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :options_text, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
+                <%= item_fields.collection_select :exchange_variant_id, return_item.eligible_exchange_variants, :id, :exchange_name, { include_blank: true }, { class: "select2 fullwidth return-item-exchange-selection" } %>
               <% end %>
             </td>
           </tr>

data/app/views/spree/admin/reimbursements/show.html.erb

@@ -38,7 +38,7 @@
             <%= reimbursement_type_name(return_item.override_reimbursement_type) %>
           </td>
           <td>
-            <%= return_item.exchange_variant.try(:options_text) %>
+            <%= return_item.exchange_variant.try(:exchange_name) %>
           </td>
           <td class="align-center">
             <%= return_item.display_pre_tax_amount %>

data/app/views/spree/admin/shared/_destroy.js.erb

@@ -1,6 +1,6 @@
 <% success = flash.discard(:success)
 if success %>
-  show_flash('success', "<%= success %>")
+  show_flash('success', "<%= j success %>")
 <% end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w( jquery-ui/* )
+Rails.application.config.assets.precompile += %w( jquery-ui/* logo/spree_50.png )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.5.9.1
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -559,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.