spree_backend 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcbd551866127def2ce22052598f7fcf370413aa
-  data.tar.gz: 3369fa4fd61ff70cd119fe77f8ea9a7bcfda2d8d
+  metadata.gz: 75a87af9401db21789596e5d8e90ccffcced22c9
+  data.tar.gz: 3a4af68b7b456debe896962441b00cb60c97873e
 SHA512:
-  metadata.gz: 19202bbc2305e285572cfb55d5bff615abc5654e00d345c33a4529833a2e53a8830a5ab04522736c91cabfa144c5dee6b3cb41493e8206fc7b89ade1eba6757f
-  data.tar.gz: 776d88e54e47aabd84fb6380a5e12de5221cbbfc15851025df7715b69d220bc1271b3166ac82960c7d845e229b30d3b031840081e90c7ac1b67d64f2668699bf
+  metadata.gz: 14477d8d2975b5e0aa3c119cd13eae05b410afa9814e37467b6383c520f8ebcc6ab2511a399784fc5b5347ae293a44ff01e0309fb240dba0b421170f3eec8d12
+  data.tar.gz: aaa19e8071e3344a03e7a4a46f482a1583dff2af72d067c7208450dbd752667e5469b01cbeb1f5b1c6754a4d9b4f36b7db52f38de36cd223d60fcb366b051d36

data/app/assets/javascripts/spree/backend/payments/edit.js.coffee

@@ -7,9 +7,9 @@ jQuery ($) ->
       @json = $.getJSON @url.toString(), (data) =>
         @data = data
 
-    if_pending: (callback) ->
+    if_editable: (callback) ->
       @json.done (data) ->
-        callback() if data.state is 'pending'
+        callback() if data.state in ['checkout', 'pending']
 
     update: (attributes, success) ->
       jqXHR = $.ajax
@@ -142,8 +142,8 @@ jQuery ($) ->
       separator = Spree.translations.currency_separator
       amount.replace(///[^\d#{separator}]///g, '')
 
-  # Attach ShowPaymentView to each pending payment in the table
+  # Attach ShowPaymentView to each editable payment in the table
   $('.admin tr[data-hook=payments_row]').each ->
     $el = $(@)
     payment = new Payment($el.prop('id').match(/\d+$/))
-    payment.if_pending -> new ShowPaymentView($el, payment)
+    payment.if_editable -> new ShowPaymentView($el, payment)

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

@@ -44,7 +44,7 @@ module Spree
 
       def load_form_data
         return_items = @order.inventory_units.map(&:current_or_new_return_item).reject(&:customer_return_id)
-        @rma_return_items, @new_return_items = return_items.partition(&:return_authorization_id)
+        @rma_return_items = return_items.select(&:return_authorization_id)
       end
 
       def permitted_resource_params

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

@@ -100,17 +100,20 @@ module Spree
 
         params[:q][:s] ||= "name asc"
         @collection = super
-        if params[:q].delete(:deleted_at_null) == '0'
+        # Don't delete params[:q][:deleted_at_null] here because it is used in view to check the
+        # checkbox for 'q[deleted_at_null]'. This also messed with pagination when deleted_at_null is checked.
+        if params[:q][: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])
+        # Temporarily remove params[:q][:deleted_at_null] from params[:q] to ransack products.
+        # 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])
-
         @collection
       end
 

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

@@ -8,7 +8,7 @@
   <li><%= button_link_to Spree.t(:back_to_customer_return_list), spree.admin_order_customer_returns_url(@order), :icon => 'arrow-left' %></li>
 <% end %>
 
-<% if @rma_return_items.any? || @new_return_items.any? %>
+<% if @rma_return_items.any? %>
 
   <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @customer_return } %>
   <%= form_for [:admin, @order, @customer_return] do |f| %>
@@ -23,21 +23,11 @@
           <% end %>
         </fieldset>
 
-        <fieldset class='no-border-bottom'>
-          <legend align='center'><%= Spree.t(:other_items_in_other) %></legend>
-          <% if @new_return_items.any? %>
-            <%= render partial: 'return_item_selection', locals: {f: f, return_items: @new_return_items} %>
-          <% else %>
-            <div class="alpha twelve columns no-objects-found"><%= Spree.t(:none) %></div>
-          <% end %>
-        </fieldset>
-
         <%= f.field_container :stock_location do %>
           <%= f.label :stock_location, Spree.t(:stock_location) %>
           <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2 fullwidth', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>
-
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">

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

@@ -27,7 +27,6 @@
   </table>
 <% else %>
   <div class="alpha twelve columns no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/reimbursement_type')) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/reimbursement_type')) %>
   </div>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-20 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.7
+        version: 2.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.7
+        version: 2.4.8
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.7
+        version: 2.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.7
+        version: 2.4.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,6 @@ files:
 - app/assets/javascripts/spree/backend/promotions.js
 - app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee
 - app/assets/javascripts/spree/backend/returns/return_item_selection.js
-- app/assets/javascripts/spree/backend/select_payments.js.coffee
 - app/assets/javascripts/spree/backend/shipments.js.erb
 - app/assets/javascripts/spree/backend/spree-select2.js.erb
 - app/assets/javascripts/spree/backend/states.js

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

@@ -1,7 +0,0 @@
-$ ->
-  if $('.new_payment').is('*')
-    $('.payment-method-settings fieldset').addClass('hidden').first().removeClass('hidden')
-    $('input[name="payment[payment_method_id]"]').click ()->
-      $('.payment-method-settings fieldset').addClass('hidden')
-      id = $(this).parents('li').data('id')
-      $("fieldset[data-id='#{id}']").removeClass('hidden')