spree_backend 3.2.0.rc2 → 3.2.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8fb294832daffce21e70c27bc12b834957be005
-  data.tar.gz: de6c2e47bd64bafa45164025bc2fa7b8d67de16c
+  metadata.gz: 4c9c06ab26c459b2291545459a189f147a563053
+  data.tar.gz: f41457c74b12afaaa40fd67c1c673ca29a9a664b
 SHA512:
-  metadata.gz: af578629a32a95bbebda8d4058545258c453186d586b2a8ff67f67098f6abc1449687461e24d1d2f13c9e95952e8fc44164b95a8923082556199e75db493bc6c
-  data.tar.gz: 3480bae6bcb82f2d136bfaeaa346679f94428eea38240b5b5de3a6b7c03ee7071a25ede2cb3e1865ecfaa55492f8ac7084cceb276ec7420bbed04c2f33db17f8
+  metadata.gz: 72c551570df059276c8c00860a5df5ac331fe9e296dfe376e6c45e96cc64e3efff2312f3cefd40b6c411fe1aa28775012bf397ff84bd6fda9e5503ef7b583328
+  data.tar.gz: 90f76e7ba5c97b34c63d8273f685121bde35357ca473e8dfeb06cdca72585a67917eff15aea2001465e26df07c3918aa2bd7e18afc3d8a8621e353c9a1445e7a

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

@@ -32,8 +32,7 @@ module Spree
           @payment_method = PaymentMethod.find(params[:id])
         end
 
-        update_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        attributes = payment_method_params.merge(update_params)
+        attributes = payment_method_params.merge(preferences_params)
         attributes.each do |k,v|
           if k.include?("password") && attributes[k].blank?
             attributes.delete(k)
@@ -55,7 +54,7 @@ module Spree
       def collection
         @collection = super.order(position: :asc)
       end
-      
+
       def load_data
         @providers = Gateway.providers.sort{|p1, p2| p1.name <=> p2.name }
       end
@@ -71,6 +70,12 @@ module Spree
       def payment_method_params
         params.require(:payment_method).permit!
       end
+
+      def preferences_params
+        key = ActiveModel::Naming.param_key(@payment_method)
+        return {} unless params.key? key
+        params.require(key).permit!
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Spree
       before_action :load_order, only: [:index]
 
       def index
-        @state_changes = @order.state_changes.includes(:user)
+        @state_changes = @order.state_changes.includes(:user).order(created_at: :desc)
       end
 
       private

data/app/views/spree/admin/products/stock.html.erb

@@ -28,9 +28,9 @@
               <%= variant.sku_and_options_text %>
               <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
                 <div class="checkbox">
-                  <%= label_tag :track_inventory do %>
+                  <%= label_tag "track_inventory_#{ variant.id }" do %>
                     <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                                      class: 'track_inventory_checkbox' %>
+                                      class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
                     <%= Spree.t(:track_inventory) %>
                     <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
 			class: 'variant_track_inventory',

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

@@ -54,7 +54,7 @@
         <th><%= Spree.t(:usage_limit) %></th>
         <th><%= Spree.t(:promotion_uses) %></th>
         <th><%= Spree.t(:expiration) %></th>
-        <th class="actions"></th>
+        <th data-hook="admin_promotions_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
@@ -66,7 +66,7 @@
           <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit  %></td>
           <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
           <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
-          <td class="actions actions-2">
+          <td class="actions actions-2" data-hook="admin_promotions_index_row_actions">
             <%= link_to_edit promotion, no_text: true %>
             <%= link_to_delete promotion, no_text: true %>
           </td>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -52,7 +52,7 @@
     </span>
   </div>
 
-  <div class="form-group <%= "#{type}-row" %>">
+  <%= field_container f.object, :state, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :state_id, Spree.t(:state) %>
     <span id="<%= s_or_b %>state">
       <%= f.text_field :state_name,
@@ -60,7 +60,8 @@
             disabled: !f.object.country.states.empty?, class: 'form-control state_name' %>
       <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
     </span>
-  </div>
+    <%= error_message_on f.object, :state_id %>
+  <% end %>
 
   <%= field_container f.object, :phone, class: ["form-group", "#{type}-row"] do %>
     <%= f.label :phone, Spree.t(:phone) %>

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

@@ -1,7 +1,8 @@
 <%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :state_changes } %>
 
-<% content_for :page_title do %>
-  <%= plural_resource_name(Spree::StateChange) %>
+<% content_for :page_title do %>  
+  / <%= plural_resource_name(Spree::StateChange) %>
+  / <%= Spree::StateChange.human_attribute_name(:state_changes) %>
 <% end %>
 
 <% if @state_changes.any? %>
@@ -23,7 +24,10 @@
           <td><%= state_change.previous_state ? Spree.t(state_change.previous_state) : Spree.t(:previous_state_missing) %></td>
           <td><%= Spree.t(state_change.next_state) %></td>
           <td>
-            <%= link_to state_change.user.login, spree.admin_user_path(state_change.user) if state_change.user %>
+            <% if state_change.user %>
+              <% user_login = state_change.user.try(:login) || state_change.user.try(:email) %>
+              <%= link_to user_login, spree.admin_user_path(state_change.user) %>
+            <% end %>
           </td>
           <td>
             <%= pretty_time(state_change.created_at) %>

data/spec/controllers/spree/admin/payment_methods_controller_spec.rb

@@ -20,6 +20,21 @@ module Spree
       expect(payment_method.preferred_password).to eq("haxme")
     end
 
+    it 'saves payment method preferences on update' do
+      spree_put :update,
+                id: payment_method.id,
+                payment_method: {
+                  type: payment_method.class.to_s,
+                  name: 'Bogus'
+                },
+                gateway_with_password: {
+                  preferred_password: "abc"
+                }
+
+      payment_method.reload
+      expect(payment_method.preferred_password).to eq("abc")
+    end
+
     context "tries to save invalid payment" do
       it "doesn't break, responds nicely" do
         expect {

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

@@ -123,6 +123,7 @@ describe "Adjustments", type: :feature do
         end
       end
 
+      wait_for_ajax
       expect(page).to have_content(/Total: ?\$170\.00/)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc2
+  version: 3.2.0.rc3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-02-22 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.2.0.rc2
+        version: 3.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc2
+        version: 3.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc2
+        version: 3.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0.rc2
+        version: 3.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -638,7 +638,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.