spree_backend 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 462c24c0ea7bcd330a6eeaf3e8f27dae6d0cc954
-  data.tar.gz: 1a9790046c08cfcf4b89c48011da4fbbf53dc055
+  metadata.gz: 8e5508c1e6162bbbfd4ef16977be9cbc9270f1c4
+  data.tar.gz: 4dd10a908bc145ea65564b4fd9d2ab1284e6fa98
 SHA512:
-  metadata.gz: 491105783d07bc80c285e9651071ead3444b1972997b1c9cc5d4271c5260e7a70f4ae96181375956497b1d8eb7d27f4ffa12ed0468573c08266b17361b6228a6
-  data.tar.gz: 1ef421f821223485b55ea00d3d5a2d7e973942b2a8de53f83838aa4227853ed34d1e051be28fda8c15a3f3707d6f41c86e8ba27ecd0a3e4e4b1e040b1f04e9ee
+  metadata.gz: 013d4b32776f0e76d02b7ebaebeabd8aca422f7d6e0c0d4be77ccb30aebff372ebcbfd67668e5c6d7390afb60779892de4ac5c88e0e024066026ca341b58be4e
+  data.tar.gz: 2989e5377557f6b2ac1b1ecd5e91efd8dd826d629a75200afc960220d5cab2736eb4b281f429fd692e388bf811df2b27fe60fb8e0bec10a7e47f211873e601dd

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

@@ -105,6 +105,7 @@ module Spree
         return @collection if @collection.present?
         params[:q] ||= {}
         params[:q][:deleted_at_null] ||= "1"
+        params[:q][:discontinue_on_null] ||= "1"
 
         params[:q][:s] ||= "name asc"
         @collection = super

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:promotion_categories), spree.admin_promotion_categories_url %> /
+  <%= link_to plural_resource_name(Spree::PromotionCategory), spree.admin_promotion_categories_url %> /
   <%= Spree.t(:new_promotion_category) %>
 <% end %>
 

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -20,9 +20,9 @@
     <% @totals.each do |key, row| %>
       <tr>
         <td><%= key %></td>
-        <td><%= row[:item_total].format %></td>
-        <td><%= row[:adjustment_total].format %></td>
-        <td><%= row[:sales_total].format %></td>
+        <td><%= Spree::Money.new(row[:item_total], { currency: key }) %></td>
+        <td><%= Spree::Money.new(row[:adjustment_total], { currency: key }) %></td>
+        <td><%= Spree::Money.new(row[:sales_total], { currency: key }) %></td>
       </tr>
     <% end %>
   </tbody>

data/spec/features/admin/orders/payments_spec.rb

@@ -85,6 +85,7 @@ describe 'Payments', type: :feature, js: true do
       expect(page).to have_content('successfully created!')
 
       click_icon(:capture)
+      wait_for_ajax
       expect(find('#payment_status').text).to eq('paid')
 
       expect(page).not_to have_selector('#new_payment_section')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement