solidus_backend 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19e43bc690cae1fd3d31bf43d19a84913c5a362f
-  data.tar.gz: 28eb88ebb395e74c2749dd64bddc7d38c757d59b
+  metadata.gz: 0147cf8388db75d478f5335739307297255bfbe7
+  data.tar.gz: 19ede418b138fe3f2ee52212780a874876344f8e
 SHA512:
-  metadata.gz: 9d6abcd850e647d41c9429d5b73b04aff715a364c2501e5fb7203cdbe7a8366587037c8c7b98b5069117b310be3d048733df5f029fdf8c2b2be54c3bc28b8f54
-  data.tar.gz: af36c277c5df47747c78193f357668ff30b2909b59fcedcb11cc11a8c8850749676f624a7331088524f2afa54924542cff1e35f5ad105ae5ddf41a1718a53671
+  metadata.gz: 5836d8ac5c63e5d7b192167484a8ab9b18ca05f365e8de30477fd33ee6024710ff077f764a5bcfc363ef43fd89d1cc2cfdde528cfefaeff45fb6a65a729d1428
+  data.tar.gz: 04da95b14aafdaa6ecf847c7a60f999cf488b90e565d41a96176c0a84e91c7eaf0be25aff7e61080d2bd3b3929dc9e791611b9fb9620c56eafa22742f42d7e75

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

@@ -0,0 +1,21 @@
+$ ->
+  $gateway_type = $('select.js-gateway-type')
+  $preference_source = $('select.js-preference-source')
+
+  original_gtwy_type = $gateway_type.val()
+  original_preference_source = $preference_source.val()
+  render = ->
+    gateway_type = $gateway_type.val()
+    preference_source = $preference_source.val()
+
+    $('.js-preference-source-wrapper').toggle(gateway_type == original_gtwy_type)
+    if gateway_type == original_gtwy_type && preference_source == original_preference_source
+      $('.js-gateway-settings').show()
+      $('.js-gateway-settings-warning').hide()
+    else
+      $('.js-gateway-settings').hide()
+      $('.js-gateway-settings-warning').show()
+
+  $gateway_type.change(render)
+  $preference_source.change(render)
+  render()

data/app/assets/javascripts/spree/backend/shipments.js.erb

@@ -160,9 +160,13 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
         data: {
           variant_id: variant_id,
           quantity: new_quantity,
+        },
+        success: function(response) {
+          window.location.reload();
+        },
+        error: function(response) {
+          show_flash('error', response.responseJSON.message);
         }
-      }).done(function( msg ) {
-        window.location.reload();
       });
     }
 }

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

@@ -1,25 +1,27 @@
-handle_ajax_error = (XMLHttpRequest, textStatus, errorThrown) ->
-  $.jstree.rollback(last_rollback)
-  $("#ajax_error").show().html("<strong>" + server_error + "</strong><br />" + taxonomy_tree_error)
+base_url = null
+
+tree_error_handler = (data) ->
+  rollback = data.rlbk
+  (XMLHttpRequest, textStatus, errorThrown) ->
+    $.jstree.rollback(rollback)
+    $("#ajax_error").show().html("<strong>#{server_error}</strong><br />" + taxonomy_tree_error)
 
 handle_move = (e, data) ->
-  last_rollback = data.rlbk
   position = data.rslt.cp
   node = data.rslt.o
   new_parent = data.rslt.np
 
   url = "#{base_url}/#{node.prop("id")}"
   Spree.ajax
-    type: "POST",
+    type: "PUT",
     dataType: "json",
     url: url,
-    data: ({_method: "put", "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
-    error: handle_ajax_error
+    data: ({"taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
+    error: tree_error_handler(data)
 
   true
 
 handle_create = (e, data) ->
-  last_rollback = data.rlbk
   node = data.rslt.obj
   name = data.rslt.name
   position = data.rslt.position
@@ -28,61 +30,50 @@ handle_create = (e, data) ->
   Spree.ajax
     type: "POST",
     dataType: "json",
-    url: base_url.toString(),
+    url: base_url,
     data: {
       "taxon[name]": name,
       "taxon[parent_id]": new_parent.prop("id"),
       "taxon[child_index]": position,
-      token: Spree.api_key
     },
-    error: handle_ajax_error,
+    error: tree_error_handler(data)
     success: (data,result) ->
       node.prop('id', data.id)
 
 handle_rename = (e, data) ->
-  last_rollback = data.rlbk
   node = data.rslt.obj
   name = data.rslt.new_name
 
   url = "#{base_url}/#{node.prop("id")}"
 
   Spree.ajax
-    type: "POST",
+    type: "PUT",
     dataType: "json",
     url: url,
     data: {
-      _method: "put",
       "taxon[name]": name,
     },
-    error: handle_ajax_error
+    error: tree_error_handler(data)
 
 handle_delete = (e, data) ->
-  last_rollback = data.rlbk
   node = data.rslt.obj
   delete_url = "#{base_url}/#{node.prop("id")}"
-  jConfirm Spree.translations.are_you_sure_delete, Spree.translations.confirm_delete, (r) ->
-    if r
-      Spree.ajax
-        type: "POST",
-        dataType: "json",
-        url: delete_url.toString(),
-        data: {
-          _method: "delete",
-          token: Spree.api_key
-        },
-        error: handle_ajax_error
-    else
-      $.jstree.rollback(last_rollback)
-      last_rollback = null
-
-root = exports ? this
-root.setup_taxonomy_tree = (taxonomy_id) ->
+  if confirm(Spree.translations.are_you_sure_delete)
+    Spree.ajax
+      type: "DELETE",
+      dataType: "json",
+      url: delete_url,
+      error: tree_error_handler(data)
+  else
+    $.jstree.rollback(data.rlbk)
+
+@setup_taxonomy_tree = (taxonomy_id) ->
   if taxonomy_id != undefined
     # this is defined within admin/taxonomies/edit
-    root.base_url = Spree.routes.taxonomy_taxons_path
+    base_url = Spree.routes.taxonomy_taxons_path
 
     Spree.ajax
-      url: Spree.url(base_url.path().replace("/taxons", "/jstree")).toString(),
+      url: base_url.replace("/taxons", "/jstree"),
       success: (taxonomy) ->
         last_rollback = null
 
@@ -90,6 +81,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
           json_data:
             data: taxonomy,
             ajax:
+              headers: { "X-Spree-Token": Spree.api_key }
               url: (e) ->
                 "#{base_url}/#{e.prop('id')}/jstree"
           themes:
@@ -126,11 +118,3 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
           .bind("rename.jstree", handle_rename)
           .bind "loaded.jstree", ->
             $(this).jstree("core").toggle_node($('.jstree-icon').first())
-
-    $("#taxonomy_tree a").on "dblclick", (e) ->
-      $("#taxonomy_tree").jstree("rename", this)
-
-    # surpress form submit on enter/return
-    $(document).keypress (e) ->
-      if e.keyCode == 13
-        e.preventDefault()

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

@@ -7,7 +7,6 @@
 //= require modernizr
 //= require jquery.cookie
 //= require jquery.jstree/jquery.jstree
-//= require jquery.alerts/jquery.alerts
 //= require jquery.powertip
 //= require jquery.vAlign
 //= require equalize

data/app/assets/stylesheets/spree/backend.css

@@ -3,8 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
 
- *= require jquery.alerts/jquery.alerts
- *= require jquery.alerts/jquery.alerts.spree
  *= require responsive-tables
  *= require normalize
  *= require skeleton

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

@@ -55,13 +55,6 @@ module Spree
           Spree::Backend::Config[:locale]
         end
 
-        def can_not_transition_without_customer_info
-          unless @order.billing_address.present?
-            flash[:notice] = Spree.t(:fill_in_customer_info)
-            redirect_to edit_admin_order_customer_url(@order)
-          end
-        end
-
         def lock_order
           OrderMutex.with_lock!(@order) { yield }
         rescue Spree::OrderMutex::LockFailed => e

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

@@ -64,7 +64,7 @@ module Spree
       end
 
       def edit
-        can_not_transition_without_customer_info
+        require_ship_address
 
         unless @order.completed?
           @order.refresh_shipment_rates
@@ -197,6 +197,13 @@ module Spree
           flash[:error] = Spree.t(:insufficient_stock_for_order)
           redirect_to cart_admin_order_url(@order)
         end
+
+        def require_ship_address
+          if @order.ship_address.nil?
+            flash[:notice] = Spree.t(:fill_in_customer_info)
+            redirect_to edit_admin_order_customer_url(@order)
+          end
+        end
     end
   end
 end

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

@@ -5,7 +5,7 @@ module Spree
       before_filter :load_payment, :except => [:create, :new, :index, :fire]
       before_filter :load_payment_for_fire, :only => :fire
       before_filter :load_data
-      before_filter :can_not_transition_without_customer_info
+      before_filter :require_bill_address, only: [:index]
 
       respond_to :html
 
@@ -102,6 +102,13 @@ module Spree
       def model_class
         Spree::Payment
       end
+
+      def require_bill_address
+        if Spree::Config[:order_bill_address_used] && @order.bill_address.nil?
+          flash[:notice] = Spree.t(:fill_in_customer_info)
+          redirect_to edit_admin_order_customer_url(@order)
+        end
+      end
     end
   end
 end

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

@@ -12,8 +12,16 @@ module Spree
       def admin_root_redirect_path
         if can?(:display, Spree::Order) && can?(:admin, Spree::Order)
           spree.admin_orders_path
-        else
+        elsif can?(:admin, :dashboards) && can?(:home, :dashboards)
           spree.home_admin_dashboards_path
+        else
+          # Invoke the unauthorized redirect, which will ideally go to the login controller
+          # of the users chosen authorization implimentation. For devise this is /admin/login.
+          #
+          # This is done so devise redirects back to this controller, instead of the one specified
+          # below, so this controller can use the user that is required for the path to
+          # be calculated.
+          raise CanCan::AccessDenied
         end
       end
     end

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

@@ -7,12 +7,15 @@ module Spree
         { translation_key: :name, attr_name: :name }
       ]
 
-      before_filter :load_stock_locations, only: [:index, :new]
+      before_filter :load_readable_stock_locations, only: :index
+      before_filter :load_transferable_stock_locations, only: :new
       before_filter :load_variant_display_attributes, only: [:receive, :edit, :show, :tracking_info]
       before_filter :load_destination_stock_locations, only: :edit
       before_filter :ensure_access_to_stock_location, only: :create
       before_filter :ensure_receivable_stock_transfer, only: :receive
 
+      create.before :authorize_transfer_attributes!
+
       def receive
         @received_items = @stock_transfer.transfer_items.received
       end
@@ -93,12 +96,30 @@ module Spree
 
       private
 
-      def load_stock_locations
-        @stock_locations = Spree::StockLocation.accessible_by(current_ability, :index)
+      def authorize_transfer_attributes!
+        duplicate = @object.dup
+        duplicate.assign_attributes(permitted_resource_params)
+        authorize! :create, duplicate
+      end
+
+      def accessible_stock_locations
+        Spree::StockLocation.accessible_by(current_ability, :index)
+      end
+
+      def transferable_stock_locations
+        accessible_stock_locations.accessible_by(current_ability, :transfer)
+      end
+
+      def load_readable_stock_locations
+        @stock_locations = accessible_stock_locations
+      end
+
+      def load_transferable_stock_locations
+        @stock_locations = transferable_stock_locations
       end
 
       def load_destination_stock_locations
-        @destination_stock_locations = load_stock_locations.where.not(id: @stock_transfer.source_location_id)
+        @destination_stock_locations = transferable_stock_locations.where.not(id: @stock_transfer.source_location_id)
       end
 
       def load_variant_display_attributes

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

@@ -29,7 +29,10 @@ module Spree
           flash[:success] = Spree.t(:created_successfully)
           redirect_to edit_admin_user_url(@user)
         else
-          redirect_to new_admin_user_url
+          load_roles
+          load_stock_locations
+
+          render :new, status: :unprocessable_entity
         end
       end
 

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

@@ -25,7 +25,7 @@
       <% @inventory_units.each do |inventory_unit| %>
         <tr class="inventory-unit">
           <td class="inventory-unit-image">
-            <%= mini_image(inventory_unit.variant) %>
+            <%= image_tag inventory_unit.variant.display_image.attachment(:mini) %>
           </td>
           <td class="inventory-unit-name">
             <%= inventory_unit.variant.product.name %><br><%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>

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

@@ -1,7 +1,7 @@
 <% carton.manifest_for_order(order).each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
-      <%= mini_image(item.variant) %>
+      <%= image_tag item.variant.display_image.attachment(:mini) %>
     </td>
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -18,7 +18,7 @@
     <tbody>
       <% order.line_items.each do |item| %>
         <%= content_tag :tr, class: 'line-item', id: "line-item-#{item.id}", data: { line_item_id: item.id } do %>
-          <td class="line-item-image"><%= mini_image(item.variant) %></td>
+          <td class="line-item-image"><%= image_tag item.variant.display_image.attachment(:mini) %></td>
           <td class="line-item-name">
             <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
             <% if item.variant.sku.present? %>

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

@@ -1,7 +1,7 @@
 <% shipment_manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
-      <%= mini_image(item.variant) %>
+      <%= image_tag item.variant.display_image.attachment(:mini) %>
     </td>
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -2,7 +2,7 @@
     <% if can?(:fire, @order) %>
         <li><%= event_links %></li>
     <% end %>
-    <% if can?(:resend, @order) %>
+    <% if can?(:resend, @order) && @order.completed? %>
         <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), :method => :post, :icon => 'email' %></li>
     <% end %>
     <% if can?(:admin, Spree::Order) %>

data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb

@@ -1,7 +1,7 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
-      <%= mini_image(item.variant) %>
+      <%= image_tag item.variant.display_image.attachment(:mini) %>
     </td>
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -36,31 +36,35 @@
     </div>
   </fieldset>
 
-  <div data-hook="bill_address_wrapper" class="alpha six columns">
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:billing_address) %></legend>
-      <%= f.fields_for :bill_address do |ba_form| %>
-        <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
-      <% end %>
-    </fieldset>
-  </div>
-
-  <div class="omega six columns" data-hook="ship_address_wrapper">
+  <div class="alpha six columns" data-hook="ship_address_wrapper">
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:shipping_address) %></legend>
       <%= f.fields_for :ship_address do |sa_form| %>
-        <div class="field" style="position: absolute;margin-top: -15px;right: 0;">
-          <span data-hook="use_billing">
-            <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
-            <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
-          </span>
-        </div>
+        <% if Spree::Config[:order_bill_address_used] %>
+          <div class="field" style="position: absolute;margin-top: -15px;left: 0;">
+            <span data-hook="use_billing">
+              <%= check_box_tag 'order[use_billing]', '1', ((@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address)) %>
+              <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+            </span>
+          </div>
+        <% end %>
 
         <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => sa_form, :type => 'shipping' } %>
       <% end %>
     </fieldset>
   </div>
 
+  <% if Spree::Config[:order_bill_address_used] %>
+    <div class="omega six columns" data-hook="bill_address_wrapper">
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= Spree.t(:billing_address) %></legend>
+        <%= f.fields_for :bill_address do |ba_form| %>
+          <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => ba_form, :type => "billing" } %>
+        <% end %>
+      </fieldset>
+    </div>
+  <% end %>
+
   <div class="clear"></div>
 
   <div class="form-buttons filter-actions actions" data-hook="buttons">

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

@@ -2,7 +2,7 @@
   <% if can?(:fire, @order) %>
     <li><%= event_links %></li>
   <% end %>
-  <% if can?(:resend, @order) %>
+  <% if can?(:resend, @order) && @order.completed? %>
     <li><%= button_link_to Spree.t(:resend), resend_admin_order_url(@order), method: :post, icon: 'email' %></li>
   <% end %>
   <% if can?(:admin, Spree::Order) %>

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

@@ -3,17 +3,26 @@
   <div data-hook="payment_method">
 
     <div class="alpha four columns">
-      <div id="preference-settings" data-hook class="field">
-        <%= f.label :type, Spree.t(:provider) %>
-        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth'}) %>
+      <div id="preference-settings">
+        <div class="field">
+          <%= f.label :type, Spree.t(:provider) %>
+          <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth js-gateway-type'}) %>
+        </div>
 
-        <% unless @object.new_record? %>
-          <%= preference_fields(@object, f) %>
+        <div class="field js-preference-source-wrapper">
+          <%= label_tag :preference_source, 'Preference Source' %>
+          <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'select2 fullwidth js-preference-source') %>
+        </div>
 
-          <% if @object.respond_to?(:preferences) %>
-            <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
+        <div class="gateway-settings js-gateway-settings">
+          <% if @object.preference_source.present? %>
+            <%= Spree.t :preference_source_using, name: @object.preference_source %>
+          <% elsif !@object.new_record? %>
+            <%= preference_fields(@object, f) %>
           <% end %>
-        <% end %>
+        </div>
+
+        <div class="info warning js-gateway-settings-warning"><%= Spree.t(:provider_settings_warning) %></div>
       </div>
       <div data-hook="environment" class="field">
         <%= label_tag :payment_method_environment, Spree.t(:environment) %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -52,5 +52,13 @@
     </div>
 
     <div class="clear"></div>
+
+    <%= label_tag "card_address#{payment_method.id}", Spree.t(:billing_address) %>
+    <% address = @order.bill_address || @order.ship_address || Spree::Address.build_default %>
+    <%= fields_for "#{param_prefix}[address_attributes]", address do |f| %>
+      <%= render :partial => 'spree/admin/shared/address_form', :locals => { :f => f, :type => "billing" } %>
+    <% end %>
+
+    <div class="clear"></div>
   </div>
 </fieldset>

data/app/views/spree/admin/payments/source_views/_storecredit.html.erb

@@ -0,0 +1,21 @@
+<fieldset data-hook="store-credit">
+  <legend align="center"><%= Spree.t(:store_credit, scope: :store_credit) %></legend>
+
+  <div class="row">
+    <div class="alpha six columns">
+      <dl>
+        <dt><%= Spree.t(:category) %>:</dt>
+        <dd><%= payment.source.category.name%></dd>
+
+        <dt><%= Spree.t(:memo) %>:</dt>
+        <dd><%= payment.source.memo %></dd>
+
+        <dt><%= Spree.t(:created_by) %>:</dt>
+        <dd><%= payment.source.created_by.email %></dd>
+
+        <dt><%= Spree.t(:issued_on, scope: [:admin, :store_credits]) %>:</dt>
+        <dd><%= l payment.source.created_at.to_date %></dd>
+      </dl>
+    </div>
+  </div>
+</fieldset>

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

@@ -78,7 +78,7 @@
       <% @collection.each do |product| %>
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td class="align-center"><%= product.sku rescue '' %></td>
-            <td class="align-center"><%= mini_image(product) %></td>
+            <td class="align-center"><%= image_tag product.display_image.attachment(:mini) %></td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="align-center"><%= product.display_price.to_html rescue '' %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">

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

@@ -3,9 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li>
-    <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
-  </li>
+  <% if can?(:create, Spree::PromotionCategory) %>
+    <li>
+      <%= button_link_to Spree.t(:new_promotion_category), spree.new_admin_promotion_category_path, :icon => 'plus' %>
+    </li>
+  <% end %>
 <% end %>
 
 <%= render 'spree/admin/shared/promotion_sub_menu' %>
@@ -27,8 +29,12 @@
         <td><%= promotion_category.name %></td>
         <td><%= promotion_category.code%></td>
         <td class="actions">
-          <%= link_to_edit promotion_category, :no_text => true %>
-          <%= link_to_delete promotion_category, :no_text => true %>
+          <% if can?(:update, promotion_category) %>
+            <%= link_to_edit promotion_category, :no_text => true %>
+          <% end %>
+          <% if can?(:destroy, promotion_category) %>
+            <%= link_to_delete promotion_category, :no_text => true %>
+          <% end %>
         </td>
       </tr>
     <% end %>

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

@@ -93,8 +93,12 @@
           <td class="align-center"><%= Spree.t(:current_promotion_usage, :count => promotion.usage_count) %></td>
           <td class="align-center"><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
           <td class="actions">
-            <%= link_to_edit promotion, :no_text => true %>
-            <%= link_to_delete promotion, :no_text => true %>
+            <% if can?(:update, promotion) %>
+              <%= link_to_edit promotion, :no_text => true %>
+            <% end %>
+            <% if can?(:destroy, promotion) %>
+              <%= link_to_delete promotion, :no_text => true %>
+            <% end %>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/promotions/rules/_nth_order.html.erb

@@ -0,0 +1,7 @@
+<div class="field alpha four columns">
+  <%= Spree.t(:form_text, scope: "promotion_rule_types.nth_order")  %>
+</div>
+
+<div class="field omega four columns">
+  <%= number_field_tag "#{param_prefix}[preferred_nth_order]", promotion_rule.preferred_nth_order, :class => 'fullwidth' %>
+</div>

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

@@ -21,7 +21,6 @@
 <%= render "spree/admin/shared/translations" %>
 
 <%= javascript_tag do -%>
-  jQuery.alerts.dialogClass = 'spree';
   var AUTH_TOKEN = "<%= form_authenticity_token %>";
   Spree.api_key = "<%= try_spree_current_user.try(:spree_api_key) %>";
   Spree.env = "<%= Rails.env %>";

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

@@ -1,3 +1,5 @@
-<%= link_to_with_icon 'edit', Spree.t('actions.edit'), '#', no_text: true, data: { action: 'edit', id: resource.id } if can?(:edit, resource) %>
-<%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'green', id: resource.id) if can?(:edit, resource) %>
-<%= link_to_with_icon 'void', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'red', id: resource.id } if can?(:edit, resource) %>
+<% if can?(:update, resource) %>
+  <%= link_to_with_icon 'edit', Spree.t('actions.edit'), '#', no_text: true, data: { action: 'edit', id: resource.id } %>
+  <%= link_to_with_icon 'check', Spree.t('actions.update'), '#', no_text: true, data: update_data.merge(action: 'green', id: resource.id) %>
+  <%= link_to_with_icon 'void', Spree.t('actions.cancel'), '#', no_text: true, data: { action: 'red', id: resource.id } %>
+<% end %>

data/app/views/spree/admin/stock_items/_stock_management.html.erb

@@ -32,7 +32,7 @@
         <td class="align-center no-padding" rowspan="<%= row_count %>">
           <div class='variant-container'>
             <div class='variant-image'>
-              <%= image_tag(variant.display_image.attachment(:small)) %>
+              <%= image_tag(variant.display_image(fallback: false).attachment(:small)) %>
             </div>
             <div class='variant-details'>
               <table class='stock-variant-field-table'>