spree_backend 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d66b5d26cfa4ae38fe8681bea1a28383fc734681
-  data.tar.gz: 08484ecf9094fd841dfb2ab5f3d831f473c533bd
+  metadata.gz: cd53e6c39454defcfdc16122be6d38b21cd60ca8
+  data.tar.gz: 6a3e9ebb4b838cc72862b336cbc6bf5b43d467eb
 SHA512:
-  metadata.gz: 7018f4e61a2db7c7b3d5283526610ef38ebc7803f5fd5e94b515311a713bea750510e49d238910c4efab63d99f2694b85f11624d6e03204bc03be636afe3f8a2
-  data.tar.gz: 222bd1b2aaf5844266ae88910c24d24b6939e945a445a004c518e9660b05e45e9c43d59addf5124c1d7232a82be5e7008bb6afdb0994c30690c4e4ccb053002f
+  metadata.gz: 13ccc8fddb1910cdf4568841793c96d0f9fa5d2ac28e2a3b35711369cbb40c9aed0b0ae492013817f8a002909b59ec725649b164e377be0383269f56db1842fe
+  data.tar.gz: f913deeb7fc1c5680719a3683dbdc46db3773d32a1dfda08167baa5b8b9d1a985ede084b43fb9a3189719aed4de9bf172be6553baa17f3ab4996947cd2526e8d

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

@@ -32,17 +32,15 @@ module Spree
           if @order.completed?
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
-
-             redirect_to admin_order_payments_path(@order)
           else
             #This is the first payment (admin created order)
             until @order.completed?
               @order.next!
             end
             flash[:success] = Spree.t(:new_order_completed)
-            redirect_to edit_admin_order_url(@order)
           end
 
+          redirect_to admin_order_payments_path(@order)
         rescue Spree::Core::GatewayError => e
           flash[:error] = "#{e.message}"
           redirect_to new_admin_order_payment_path(@order)

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

@@ -9,7 +9,7 @@
       <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
       <% if shipment.ready? and can? :update, shipment %>
         -
-        <%= link_to 'ship', '#', :class => 'ship button icon-arrow-right', :data => {'shipment-number' => shipment.number} %>
+        <%= link_to Spree.t(:ship), '#', :class => 'ship button icon-arrow-right', :data => {'shipment-number' => shipment.number} %>
       <% end %>
     </legend>
   </fieldset>

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
-  <div class="alpha six columns">
+  <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
 
-  <div class="omega six columns">
+  <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
     <%= f.field_container :display_on do %>
       <%= f.label :display_on, Spree.t(:display) %><br />
       <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
@@ -16,7 +16,7 @@
   </div>
 
   <div class="alpha omega twelve columns">
-    <div class="alpha six columns">
+    <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
       <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %><br />
         <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
@@ -25,7 +25,7 @@
     </div>
   </div>
 
-  <div class="alpha twelve columns">
+  <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />
       <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
@@ -54,9 +54,10 @@
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:zones) %></legend>
       <%= f.field_container :zones do %>
+        <% shipping_method_zones = @shipping_method.zones.to_a %>
         <% Spree::Zone.all.each do |zone| %>
           <%= label_tag do %>
-            <%= check_box_tag('shipping_method[zones][]', zone.id, @shipping_method.zones.include?(zone)) %>
+            <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
             <%= zone.name %>
           <% end %>
           <br>

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

@@ -29,7 +29,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.each do |shipping_method|%>
+      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>

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

@@ -42,7 +42,7 @@
 <% else %>
   <div class="alpha twelve columns no-objects-found">
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/stock_movement')) %>,
-    <%= link_to Spree.t(:add_one), spree.new_admin_stock_movement_path %>!
+    <%= link_to Spree.t(:add_one), spree.new_admin_stock_location_stock_movement_path(@stock_location) %>!
   </div>
 <% end %>
 

data/config/routes.rb

@@ -125,7 +125,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resources :reports, :only => [:index, :show] do
+    resources :reports, :only => [:index] do
       collection do
         get :sales_total
         post :sales_total
@@ -142,7 +142,6 @@ Spree::Core::Engine.add_routes do
       end
     end
 
-    resources :stock_movements
     resources :stock_items, :only => [:create, :update, :destroy]
     resources :tax_rates
     resource  :tax_settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-05-15 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.1.6
+        version: 2.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.6
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -510,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.