spree_backend 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93aa8c41b9f20cc22bf8d50aab4bb85286fafc72
-  data.tar.gz: d507d1ed2be8bdb5d57727a19553153708358323
+  metadata.gz: 2d801c5f1b0396e899a96ed4f58d18bcfb90c468
+  data.tar.gz: 90e9ad63e4997b01b32b22a193615b821f0c55ce
 SHA512:
-  metadata.gz: 80d9cfb7b4882f5a7dec84c07eb0a057268fd180aea92be01ed953b06fc7d0fd9d8723af94495774be94755bddfd1c1c9374ab21c1de12e9fbd9e5888958da7a
-  data.tar.gz: 405a2c39b6b873e5c2c9d2d0c0f40e1a5b5d40cdbaea43010c72671d6b91a425682728c3c801e7ea607bfe8659e658dbd95c7d47f1b9ff50ed111856e89cf715
+  metadata.gz: b38d0855b707ffc57db08422e2de4fa0f57e398225ed138ed982a6bb681d0cccbc75112744d5c56d16486b87fe33fa18e6be365843a6f64ca0307fed8e720f14
+  data.tar.gz: 7fc64de8301dc03fe4a87903def2f09ad71c2baac23fd9cbe31f6333e7bec603fada85a1f4242d8373225255d68320d6170b1bd29dd469440260feba52c3c7d4

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

@@ -288,7 +288,9 @@ $(document).ready(function(){
           authenticity_token: AUTH_TOKEN
         },
         success: function(response) {
-          el.parents("tr").fadeOut('hide');
+          el.parents("tr").fadeOut('hide', function() {
+            $(this).remove();
+          });
         },
         error: function(response, textStatus, errorThrown) {
           show_flash('error', response.responseText);

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

@@ -1,13 +1,15 @@
 $(@).ready( ->
   $('[data-hook=general_settings_clear_cache] #clear_cache').click ->
-    $.ajax
-      type: 'POST'
-      url: Spree.routes.clear_cache
-      success: ->
-        show_flash 'success', "Cache was flushed."
-      error: (msg) ->
-        if msg.responseJSON["error"]
-          show_flash 'error', msg.responseJSON["error"]
-        else
-          show_flash 'error', "There was a problem while flushing cache."
+    response = confirm(Spree.translations.are_you_sure)
+    if response
+      $.ajax
+        type: 'POST'
+        url: Spree.routes.clear_cache
+        success: ->
+          show_flash 'success', "Cache was flushed."
+        error: (msg) ->
+          if msg.responseJSON["error"]
+            show_flash 'error', msg.responseJSON["error"]
+          else
+            show_flash 'error', "There was a problem while flushing cache."
 )

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

@@ -17,6 +17,8 @@ module Spree
       end
 
       def new
+        # Move order to payment state in order to capture tax generated on shipments
+        @order.next if @order.can_go_to_state?('payment')
         @payment = @order.payments.build
       end
 

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

@@ -10,7 +10,7 @@ module Spree
       def fire
         @return_authorization.send("#{params[:e]}!")
         flash[:success] = Spree.t(:return_authorization_updated)
-        redirect_back fallback_location: spree.admin_return_authorization_url(@return_authorization)
+        redirect_to :back
       end
 
       private

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

@@ -16,9 +16,12 @@ module Spree
 
       def create
         @stock_movement = stock_location.stock_movements.build(stock_movement_params)
-        @stock_movement.save
-        flash[:success] = flash_message_for(@stock_movement, :successfully_created)
-        redirect_to admin_stock_location_stock_movements_path(stock_location)
+        if @stock_movement.save
+          flash[:success] = flash_message_for(@stock_movement, :successfully_created)
+          redirect_to admin_stock_location_stock_movements_path(stock_location)
+        else
+          render :new
+        end
       end
 
       private

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

@@ -49,6 +49,7 @@ module Spree
         ensure_unused_store_credit
 
         if @store_credit.destroy
+          flash[:success] = flash_message_for(@store_credit, :successfully_removed)
           respond_with(@store_credit) do |format|
             format.html { redirect_to admin_user_store_credits_path(@user) }
             format.js { render_js_for_destroy }

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

@@ -25,7 +25,7 @@
         <%= f.field_container :stock_location, class: ['form-group'] do %>
           <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
           <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
-          <%= f.error_message_on :stock_location_id %>
+          <%= f.error_message_on :stock_location %>
         <% end %>
       </div>
 

data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb

@@ -1,7 +1,9 @@
 <div class="panel-body calculator-fields">
   <% promotion_action.promotion_action_line_items.each do |item| %>
-    <strong><%= item.quantity %> x <%= item.name %></strong>
-    <%= item.variant.options_text %>
+    <% variant = item.variant %>
+
+    <strong><%= item.quantity %> x <%= variant.name %></strong>
+    <%= variant.options_text %>
   <% end %>
 
   <% if promotion_action.promotion_action_line_items.empty? %>

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

@@ -70,7 +70,7 @@
   <%= f.field_container :stock_location, class: ['form-group'] do %>
     <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
     <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
-    <%= f.error_message_on :stock_location_id %>
+    <%= f.error_message_on :stock_location %>
   <% end %>
 
   <%= f.field_container :reason, class: ['form-group'] do %>

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

@@ -2,6 +2,7 @@
   Spree.translations = <%==
   { abbr_day_names:           I18n.t(:abbr_day_names, scope: :date),
     add:                      Spree.t(:add),
+    are_you_sure:             Spree.t(:are_you_sure),
     are_you_sure_delete:      Spree.t(:are_you_sure_delete),
     bill_address:             Spree.t(:bill_address),
     cancel:                   Spree.t(:cancel,  scope: :actions),

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

@@ -42,26 +42,33 @@
   </div>
 <% end %>
 
-<table class="table" id="listing_users" data-hook>
-  <thead>
-    <tr data-hook="admin_users_index_headers">
-      <th>
-        <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
-      </th>
-      <th data-hook="admin_users_index_header_actions" class="actions"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @users.each do |user|%>
-      <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-        <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
-        <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
-          <%= link_to_edit user, no_text: true %>
-          <%= link_to_delete user, no_text: true %>
-        </td>
+<% if @users.any? %>
+  <table class="table" id="listing_users" data-hook>
+    <thead>
+      <tr data-hook="admin_users_index_headers">
+        <th>
+          <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
+        </th>
+        <th data-hook="admin_users_index_header_actions" class="actions"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% @users.each do |user|%>
+        <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
+          <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
+          <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
+            <%= link_to_edit user, no_text: true %>
+            <%= link_to_delete user, no_text: true %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::User)) %>,
+    <%= link_to Spree.t(:add_one), new_object_url %>!
+  </div>
+<% end %>
 
 <%= paginate @users %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-03 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.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement