spree_backend 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdfac6051814d68e688db97aee16d9fee95fa568
-  data.tar.gz: 9878011e20e5a5c4274c744ce4dc10c6f9295338
+  metadata.gz: 0f7a3c77c32e65dbb87985040ca75f40d0e0f327
+  data.tar.gz: 75b2abe1f25585718df75ee767103549197ad6fd
 SHA512:
-  metadata.gz: 1523dc6e9d0b7bb472e6db23b6bd2f4b31893637f1fd32d6751ad98d1b65eabfea7deb323b4398c50222c52f97cb510ee535e30043f43b39a228569a64060fdf
-  data.tar.gz: 02adcd5eee07a05a02c136938c8c9fe802430e5fcdf9c8cbcbe0ac5b7d6a3d9b6ade195428de5cc570954b74e3284b929f1e1460e8a371f8dc61de831481dc58
+  metadata.gz: 43ec69aa6377070470ea0fd2ae5d1cd69e909d517a570f4787a2d1b774d49bfba5ea4909420186f871a22176067c8460a7731ea1f3f35dac26a2fbd049f37833
+  data.tar.gz: 704abf9631c214c94f4c1ddcf55ab9718dc0a50096e43e76d25882a4c8e8cd2f7f95377c8b09f4f510a1a5cb701e681b1e2298aa70b1f933154ec90dadc9114b

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
@@ -138,8 +138,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/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee

@@ -8,15 +8,15 @@ root.taxon_tree_menu = (obj, context) ->
   edit_url.setPath(edit_url.path() + '/' + obj.attr("id") + "/edit");
 
   create:
-    label: Spree.translations.add,
+    label: "<span class='icon icon-plus'></span> " + Spree.translations.add,
     action: (obj) -> context.create(obj)
   rename:
-    label: Spree.translations.rename,
+    label: "<span class='icon icon-pencil'></span> " + Spree.translations.rename,
     action: (obj) -> context.rename(obj)
   remove:
-    label: Spree.translations.remove,
+    label: "<span class='icon icon-trash'></span> " + Spree.translations.remove,
     action: (obj) -> context.remove(obj)
   edit:
     separator_before: true,
-    label: Spree.translations.edit,
+    label: "<span class='icon icon-cog'></span> " + Spree.translations.edit,
     action: (obj) -> window.location = edit_url.toString()

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

@@ -86,6 +86,8 @@ handle_delete = (e, data) ->
 
 root = exports ? this
 root.setup_taxonomy_tree = (taxonomy_id) ->
+  $taxonomy_tree = $("#taxonomy_tree")
+
   if taxonomy_id != undefined
     # this is defined within admin/taxonomies/edit
     root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path)
@@ -104,7 +106,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
               url: (e) ->
                 Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString()
           themes:
-            theme: "apple",
+            theme: "spree",
             url: Spree.url(Spree.routes.jstree_theme_path)
           strings:
             new_node: new_taxon,
@@ -130,7 +132,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
               taxon_tree_menu(obj, this)
           plugins: ["themes", "json_data", "dnd", "crrm", "contextmenu"]
 
-        $("#taxonomy_tree").jstree(conf)
+        $taxonomy_tree.jstree(conf)
           .bind("move_node.jstree", handle_move)
           .bind("remove.jstree", handle_delete)
           .bind("create.jstree", handle_create)
@@ -138,8 +140,8 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
           .bind "loaded.jstree", ->
             $(this).jstree("core").toggle_node($('.jstree-icon').first())
 
-    $("#taxonomy_tree a").on "dblclick", (e) ->
-      $("#taxonomy_tree").jstree("rename", this)
+    $taxonomy_tree.on "dblclick", "a", (e) ->
+      $taxonomy_tree.jstree("rename", this)
 
     # surpress form submit on enter/return
     $(document).keypress (e) ->

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

@@ -55,14 +55,20 @@ $(document).ready ->
             el.append(productTemplate({ product: product }))
 
   $('#taxon_products').on "click", ".js-delete-product", (e) ->
-    current_taxon_id = $("#taxon_id").val();
+    current_taxon_id = $("#taxon_id").val()
     product = $(this).parents(".product")
-    product_id = product.data("product-id");
-    product_taxons = String(product.data("taxons")).split(',').map(Number);
-    product_index = product_taxons.indexOf(parseFloat(current_taxon_id));
-    product_taxons.splice(product_index, 1);
+    product_id = product.data("product-id")
+    product_taxons = String(product.data("taxons")).split(',').map(Number)
+    product_index = product_taxons.indexOf(parseFloat(current_taxon_id))
+    product_taxons.splice(product_index, 1)
+    taxon_ids = if product_taxons.length > 0 then product_taxons else [""]
+
     $.ajax
-      url: Spree.routes.products_api + "/" + product_id + "?product[taxon_ids]=" + product_taxons + '&token=' + Spree.api_key,
+      url: Spree.routes.products_api + "/" + product_id
+      data:
+        product:
+          taxon_ids: taxon_ids
+        token: Spree.api_key
       type: "PUT",
       success: (data) ->
         product.fadeOut 400, (e) ->

data/app/assets/stylesheets/spree/backend/components/_main.scss

@@ -1,6 +1,7 @@
 #main-part {
+  padding: 15px 35px 0;
   &.sidebar-collapsed {
-    padding-left: 65px;
+    padding-left: 85px;
   }
 }
 

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/orders_controller.rb

@@ -128,7 +128,7 @@ module Spree
       private
         def order_params
           params[:created_by_id] = try_spree_current_user.try(:id)
-          params.permit(:created_by_id)
+          params.permit(:created_by_id, :user_id)
         end
 
         def load_order

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/controllers/spree/admin/search_controller.rb

@@ -1,9 +1,11 @@
 module Spree
   module Admin
     class SearchController < Spree::Admin::BaseController
+      respond_to :json
+      layout false
+
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
       before_action :check_json_authenticity, only: :index
-      respond_to :json
 
       # TODO: Clean this up by moving searching out to user_class_extensions
       # And then JSON building with something like Active Model Serializers

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

@@ -1,12 +1,6 @@
 module Spree
   module Admin
     class TaxonomiesController < ResourceController
-      respond_to :json, only: [:get_children]
-
-      def get_children
-        @taxons = Taxon.find(params[:parent_id]).children
-      end
-
       private
 
       def location_after_save

data/app/helpers/spree/admin/base_helper.rb

@@ -118,10 +118,10 @@ module Spree
       def preference_fields(object, form)
         return unless object.respond_to?(:preferences)
         object.preferences.keys.map{ |key|
-
+        if object.has_preference?(key)
           form.label("preferred_#{key}", Spree.t(key) + ": ") +
             preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
-
+        end
         }.join("<br />").html_safe
       end
 

data/app/views/spree/admin/adjustments/edit.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current =>  Spree.t(:adjustments) } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:edit) %> <%= Spree.t(:adjustment) %>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: Spree.t(:adjustments)} %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments} %>
 
 <% content_for :page_title do %>
    / <%= plural_resource_name(Spree::Adjustment) %>
@@ -10,7 +10,7 @@
 
 <% if @adjustments.present? %>
   <div class="panel panel-default">
-    <%= render :partial => 'adjustments_table' %>
+    <%= render partial: 'adjustments_table' %>
   </div>
 <% else %>
   <div class="alert alert-warning">
@@ -23,7 +23,7 @@
     <div class="form-group">
       <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code), class: "form-control" %>
     </div>
-    <%= button Spree.t(:add_coupon_code), 'plus', 'submit', :id => "add_coupon_code" %>
+    <%= button Spree.t(:add_coupon_code), 'plus', 'submit', id: "add_coupon_code" %>
   </div>
 <% end %>
 

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

@@ -1,19 +1,19 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:adjustments) } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :adjustments } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:new_adjustment) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @adjustment } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @adjustment } %>
 
-<%= form_for @adjustment, :url => admin_order_adjustments_path do |f| %>
+<%= form_for @adjustment, url: admin_order_adjustments_path do |f| %>
   <fieldset>
-    <%= render :partial => 'form', :locals => { :f => f } %>
+    <%= render partial: 'form', locals: { f: f } %>
 
     <div class="form-actions" data-hook="buttons">
       <%= button Spree.t(:continue), 'save' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), :icon => 'delete' %>
+      <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_adjustments_url(@order), icon: 'delete' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:customer_return) %> #<%= @customer_return.number %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::CustomerReturn) %>

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

@@ -1,12 +1,12 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => Spree.t(:customer_returns) } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :customer_returns } %>
 
 <% content_for :page_title do %>
   / <%= Spree.t(:new_customer_return) %>
 <% end %>
 
-<% if @rma_return_items.any? || @new_return_items.any? %>
+<% if @rma_return_items.any? %>
 
-  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @customer_return } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @customer_return } %>
 
   <%= form_for [:admin, @order, @customer_return] do |f| %>
     <fieldset class="no-border-top">
@@ -22,29 +22,17 @@
           <% end %>
         </fieldset>
 
-        <fieldset>
-          <legend><%= 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="alert alert-info no-objects-found">
-              <%= Spree.t(:none) %>
-            </div>
-          <% end %>
-        </fieldset>
-
         <%= f.field_container :stock_location, class: ['form-group'] 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', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location_id %>
         <% end %>
-
       </div>
 
       <div class="form-actions" data-hook="buttons">
         <%= button Spree.t(:create), 'save' %>
         <span class="or"><%= Spree.t(:or) %></span>
-        <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_customer_returns_url(@order), :icon => 'delete' %>
+        <%= button_link_to Spree.t('actions.cancel'), spree.admin_order_customer_returns_url(@order), icon: 'delete' %>
       </div>
     </fieldset>
   <% end %>

data/app/views/spree/admin/images/edit.html.erb

@@ -1,8 +1,8 @@
-<%= render :partial => 'spree/admin/shared/product_tabs', :locals => { :current => 'Images' } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :images } %>
 
-<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @image } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @image } %>
 
-<%= form_for [:admin, @product, @image], :html => { :multipart => true } do |f| %>
+<%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
   <div data-hook="edit_image" class="panel panel-default">
     <div class="panel-heading">
       <h1 class="panel-title">
@@ -16,13 +16,13 @@
           <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
         </div>
         <div class="col-md-9">
-          <%= render :partial => 'form', :locals => { :f => f } %>
+          <%= render partial: 'form', locals: { f: f } %>
         </div>
 
         <div class="form-actions" data-hook="buttons">
           <%= button Spree.t('actions.update'), 'save' %>
           <span class="or"><%= Spree.t(:or) %></span>
-          <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), :id => 'cancel_link', :icon => 'delete' %>
+          <%= button_link_to Spree.t('actions.cancel'), spree.admin_product_images_url(@product), id: 'cancel_link', icon: 'delete' %>
         </div>
       </div>
     </div>

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Images' } %>
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :images } %>
 
 <% content_for :page_actions do %>
   <%= button_link_to(Spree.t(:new_image), spree.new_admin_product_image_url(@product), { class: "btn-success", icon: 'add', id: 'new_image_link' }) if can? :create, Spree::Image %>

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

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/order_tabs', locals: { current: 'Payments' }%>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments }%>
 
 <% content_for :page_title do %>
   /
@@ -8,7 +8,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'file' %>
+  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file' %>
 <% end %>
 
 <table class="table" id='listing_log_entries'>

data/app/views/spree/admin/option_types/edit.html.erb

@@ -23,8 +23,8 @@
     <table class="table table-condensed table-bordered sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
       <thead data-hook="option_header">
         <tr>
-          <th colspan="2"><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:display) %></th>
+          <th colspan="2"><%= Spree.t(:name) %> <span class="required">*</span></th>
+          <th><%= Spree.t(:display) %> <span class="required">*</span></th>
           <th class="actions"></th>
         </tr>
       </thead>

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

@@ -9,7 +9,7 @@
   <div class="panel-body">
     <div data-hook="add_product_name" class="form-group">
       <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_line_item_variant_id, "", :class => "variant_autocomplete" %>
+      <%= hidden_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete fullwidth-input" %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -10,7 +10,7 @@
   <div class="panel-body">
     <div data-hook="add_product_name">
       <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_variant_id, "", :class => "variant_autocomplete" %>
+      <%= hidden_field_tag :add_variant_id, "", class: "variant_autocomplete fullwidth-input" %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -3,21 +3,21 @@
     <%= event_links %>
   <% end %>
   <% if can?(:resend, @order) %>
-    <%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'envelope' %>
+    <%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post, icon: 'envelope' %>
   <% end %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Cart' } %>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :cart } %>
 
 <div data-hook="admin_order_edit_header">
-  <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @order } %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>
 </div>
 
 <% if @order.payments.exists? && @order.considered_risky? %>
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
 <% end %>
 
-<%= render :partial => 'add_line_item' if can?(:update, @order) %>
+<%= render partial: 'add_line_item' if can?(:update, @order) %>
 
 <% if @order.line_items.empty? %>
   <div class="alert alert-warning">
@@ -27,7 +27,7 @@
 
 <div data-hook="admin_order_edit_form">
   <div id="order-form-wrapper">
-    <%= render :partial => 'line_items_edit_form', :locals => { :order => @order } %>
+    <%= render partial: 'line_items_edit_form', locals: { order: @order } %>
   </div>
 </div>