spree_backend 3.2.9 → 3.3.0.rc1

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

@@ -3,7 +3,7 @@
 
   <div class="row">
 
-    <div class="col-md-8" data-hook="admin_product_form_left">
+    <div class="col-xs-12 col-md-8" data-hook="admin_product_form_left">
       <div data-hook="admin_product_form_name">
         <%= f.field_container :name, class: ['form-group'] do %>
           <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', class: 'required')) %>
@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <div class="col-md-4" data-hook="admin_product_form_right">
+    <div class="col-xs-12 col-md-4" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', class: "required")) %>
@@ -69,14 +69,6 @@
         <% end %>
       </div>
 
-      <div data-hook="admin_product_form_promotionable">
-        <%= f.field_container :promotionable, class: ['form-group'] do %>
-          <%= f.label :promotionable, Spree.t(:promotionable) %>
-          <%= f.error_message_on :promotionable %>
-          <%= f.check_box :promotionable, class: 'form-control' %>
-        <% end %>
-      </div>
-
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants" class="well">
           <%= f.label :skus, Spree.t(:sku).pluralize %>
@@ -107,29 +99,37 @@
           <% end %>
         </div>
 
+        <div data-hook="admin_product_form_promotionable">
+          <%= f.field_container :promotionable, class: ['form-group'] do %>
+              <%= f.label :promotionable, Spree.t(:promotionable) %>
+              <%= f.error_message_on :promotionable %>
+              <%= f.check_box :promotionable, class: 'form-control' %>
+          <% end %>
+        </div>
+
         <div id="shipping_specs" class="row">
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="form-group">
               <%= f.label :weight, Spree.t(:weight) %>
               <%= f.text_field :weight, value: number_with_precision(@product.weight, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div id="shipping_specs_height_field" data-hook="admin_product_form_height" class="form-group">
               <%= f.label :height, Spree.t(:height) %>
               <%= f.text_field :height, value: number_with_precision(@product.height, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div id="shipping_specs_width_field" data-hook="admin_product_form_width" class="form-group">
               <%= f.label :width, Spree.t(:width) %>
               <%= f.text_field :width, value: number_with_precision(@product.width, precision: 2), size: 4, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="form-group">
               <%= f.label :depth, Spree.t(:depth) %>
               <%= f.text_field :depth, value: number_with_precision(@product.depth, precision: 2), size: 4, class: 'form-control' %>
@@ -139,8 +139,8 @@
       <% end %>
 
       <div data-hook="admin_product_form_shipping_categories">
-        <%= f.field_container :shipping_categories, class: ['form-group'] do %>
-          <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
+        <%= f.field_container :shipping_category, class: ['form-group'] do %>
+          <%= f.label :shipping_category_id, Spree.t(:shipping_category) %>
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :shipping_category %>
         <% end %>

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

@@ -12,19 +12,19 @@
     <%= search_form_for [:admin, @search] do |f| %>
       <%- locals = {f: f} %>
       <div data-hook="admin_products_index_search" class="row">
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= f.label :name_cont, Spree.t(:name) %>
             <%= f.text_field :name_cont, size: 15, class: "form-control js-quick-search-target" %>
           </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
             <%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control" %>
           </div>
         </div>
-        <div class="col-md-12">
+        <div class="col-xs-12 col-md-12">
           <div class="field checkbox">
             <label>
               <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
@@ -84,7 +84,7 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Product)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Product) %>!
   </div>
 <% end %>
 

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

@@ -9,13 +9,13 @@
   <fieldset data-hook="new_product">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-      <%= f.text_field :name, class: 'form-control title' %>
+      <%= f.text_field :name, class: 'form-control title', required: :required %>
       <%= f.error_message_on :name %>
     <% end %>
 
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
-        <div data-hook="new_product_sku" class="col-md-4">
+        <div data-hook="new_product_sku" class="col-xs-12 col-md-4">
           <%= f.field_container :sku, class: ['form-group'] do %>
             <%= f.label :sku, Spree.t(:sku) %>
             <%= f.text_field :sku, size: 16, class: 'form-control' %>
@@ -24,22 +24,22 @@
         </div>
       <% end %>
 
-      <div data-hook="new_product_prototype" class="col-md-4">
+      <div data-hook="new_product_prototype" class="col-xs-12 col-md-4">
         <%= f.field_container :prototype, class: ['form-group'] do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %>
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {include_blank: true}, {class: 'select2'} %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_price" class="col-md-4">
+      <div data-hook="new_product_price" class="col-xs-12 col-md-4">
         <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
-          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control' %>
+          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', required: :required %>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
 
-      <div data-hook="new_product_available_on" class="col-md-4">
+      <div data-hook="new_product_available_on" class="col-xs-12 col-md-4">
         <%= f.field_container :available_on, class: ['form-group'] do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
@@ -47,10 +47,10 @@
         <% end %>
       </div>
 
-      <div data-hook="new_product_shipping_category" class="col-md-4">
+      <div data-hook="new_product_shipping_category" class="col-xs-12 col-md-4">
         <%= f.field_container :shipping_category, class: ['form-group'] do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2', required: :required }) %>
           <%= f.error_message_on :shipping_category_id %>
         <% end %>
       </div>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add', class: 'btn-success' %>
-<% end %>
+<% end if can?(:create, Spree::PromotionCategory) %>
 
 <% if @promotion_categories.any? %>
   <table class="table">
@@ -19,8 +19,8 @@
           <td><%= promotion_category.name %></td>
           <td><%= promotion_category.code %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit promotion_category, no_text: true %>
-            <%= link_to_delete promotion_category, no_text: true %>
+            <%= link_to_edit promotion_category, no_text: true if can?(:edit, promotion_category) %>
+            <%= link_to_delete promotion_category, no_text: true if can?(:delete, promotion_category) %>
           </td>
         </tr>
       <% end %>

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

@@ -1,7 +1,7 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>
 
 <div class="row" id="general_fields" >
-  <div class="col-md-3">
+  <div class="col-xs-6 col-md-3">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name %>
       <%= f.text_field :name, class: 'form-control' %>
@@ -26,7 +26,7 @@
     <% end %>
   </div>
 
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= f.field_container :description, class: ['form-group'] do %>
       <%= f.label :description %>
       <%= f.text_area :description, rows: 7, class: 'form-control' %>
@@ -38,7 +38,7 @@
     <% end %>
   </div>
 
-  <div id="expiry_fields" class="col-md-3">
+  <div id="expiry_fields" class="col-xs-6 col-md-3">
     <%= f.field_container :usage_limit do %>
       <%= f.label :usage_limit %>
       <%= f.number_field :usage_limit, min: 0, class: 'form-control' %>

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

@@ -7,5 +7,5 @@
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>
 
-  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } %>
+  <%= render partial: "spree/admin/promotions/rules/#{type_name}", locals: { promotion_rule: promotion_rule, param_prefix: param_prefix } rescue nil %>
 </div>

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

@@ -1,6 +1,6 @@
 <div class="panel-body calculator-fields">
   <div class="row no-marginb">
-    <div class="form-group col-md-6 no-marginb">
+    <div class="form-group col-xs-12 col-md-6 no-marginb">
       <% field_name = "#{param_prefix}[calculator_type]" %>
       <%= label_tag field_name, Spree.t(:calculator) %>
       <%= select_tag field_name,
@@ -8,7 +8,7 @@
                      class: 'type-select select2' %>
     </div>
     <% unless promotion_action.new_record? %>
-      <div class="form-group col-md-6 no-marginb settings">
+      <div class="form-group col-xs-12 col-md-6 no-marginb settings">
         <% type_name = promotion_action.calculator.type.demodulize.underscore %>
         <% if lookup_context.exists?("fields",
             ["spree/admin/promotions/calculators/#{type_name}"], true) %>

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

@@ -1,6 +1,6 @@
 <div class="panel-body calculator-fields">
   <div class="row no-marginb">
-    <div class="form-group col-md-6 no-marginb">
+    <div class="form-group col-xs-12 col-md-6 no-marginb">
       <% field_name = "#{param_prefix}[calculator_type]" %>
       <%= label_tag field_name, Spree.t(:calculator) %>
       <%= select_tag field_name,
@@ -8,7 +8,7 @@
                     class: 'type-select select2' %>
     </div>
     <% unless promotion_action.new_record? %>
-      <div class="form-group col-md-6 no-marginb settings">
+      <div class="form-group col-xs-12 col-md-6 no-marginb settings">
         <% promotion_action.calculator.preferences.keys.map do |key| %>
           <% field_name = "#{param_prefix}[calculator_attributes][preferred_#{key}]" %>
           <%= label_tag field_name, Spree.t(key.to_s) %>

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

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

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

@@ -5,7 +5,7 @@
 
 <%= form_for @promotion, url: object_url, method: :put do |f| %>
   <div class="row">
-    <div class="col-md-12">
+    <div class="col-xs-12">
       <%= render partial: 'form', locals: { f: f } %>
       <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>
@@ -14,13 +14,13 @@
 <% end %>
 
 <div id="promotion-filters" class="row">
-  <div id="rules_container" class="col-md-6">
+  <div id="rules_container" class="col-xs-12 col-md-6">
     <div class="panel panel-default">
       <%= render partial: 'rules' %>
     </div>
   </div>
 
-  <div id="actions_container" class="col-md-6">
+  <div id="actions_container" class="col-xs-12 col-md-6">
     <div class="panel panel-default">
       <%= render partial: 'actions' %>
     </div>

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

@@ -4,13 +4,13 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-success", icon: 'add' %>
-<% end %>
+<% end if can?(:create, Spree::Promotion) %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_promotions_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= label_tag :q_name_cont, Spree.t(:name) %>
             <%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target" %>
@@ -22,7 +22,7 @@
           </div>
         </div>
 
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= label_tag :q_path_cont, Spree.t(:path) %>
             <%= f.text_field :path_cont, tabindex: 1, class: "form-control" %>
@@ -67,8 +67,8 @@
           <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" data-hook="admin_promotions_index_row_actions">
-            <%= link_to_edit promotion, no_text: true %>
-            <%= link_to_delete promotion, no_text: true %>
+            <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
+            <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
           </td>
         </tr>
       <% end %>
@@ -77,6 +77,6 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Promotion)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Promotion) %>!
   </div>
 <% end %>

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

@@ -1,10 +1,10 @@
 <div class="panel-body">
   <div class="row no-marginb">
-    <div class="form-group col-md-6 no-marginb">
+    <div class="form-group col-xs-12 col-md-6 no-marginb">
       <%= select_tag "#{param_prefix}[preferred_operator_min]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_min), { class: 'select2 select_item_total marginb' } %>
       <%= select_tag "#{param_prefix}[preferred_operator_max]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator_max), { class: 'select2 select_item_total' } %>
     </div>
-    <div class="form-group col-md-6 no-marginb">
+    <div class="form-group col-xs-12 col-md-6 no-marginb">
       <%= text_field_tag "#{param_prefix}[preferred_amount_min]", promotion_rule.preferred_amount_min, class: 'form-control marginb' %>
       <%= text_field_tag "#{param_prefix}[preferred_amount_max]", promotion_rule.preferred_amount_max, class: 'form-control' %>
     </div>

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

@@ -22,19 +22,19 @@
       <a class="js-remove-promo-rule-option-value delete pull-right">
         <span class="icon icon-delete"></span>
       </a>
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <label><%= Spree.t(:product) %></label>
       </div>
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <label><%= Spree.t(:option_values) %></label>
       </div>
       <div class="clearfix"></div>
     </div>
     <div class="panel-body row">
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
       </div>
-      <div class="col-md-6">
+      <div class="col-xs-12 col-md-6">
         <input class="js-promo-rule-option-value-option-values-select fullwidth" name="<%= param_prefix %>[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
       </div>
     </div>

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

@@ -1,12 +1,12 @@
 <div data-hook="admin_property_form" class="row">
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <%= f.field_container :presentation, class: ['form-group'] do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
       <%= f.text_field :presentation, class: 'form-control' %>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-success", icon: 'add', 'data-update' => 'new_property', id: 'new_property_link' } %>
-<% end %>
+<% end if can?(:create, Spree::Property) %>
 
 <% content_for :table_filter do %>
   <div data-hook="admin_property_sidebar">
@@ -13,14 +13,14 @@
       <%- locals = {f: f} %>
 
       <div class="row">
-        <div class="col col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div data-hook="admin_property_index_search" class="form-group">
             <%= f.label :name_cont, Spree.t(:name) %>
             <%= f.text_field :name_cont, class: "form-control js-quick-search-target" %>
           </div>
         </div>
 
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= f.label :presentation_cont, Spree.t(:presentation) %>
             <%= f.text_field :presentation_cont, class: "form-control" %>
@@ -51,8 +51,8 @@
           <td><%= property.name %></td>
           <td><%= property.presentation %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit(property, no_text: true) %>
-            <%= link_to_delete(property, no_text: true) %>
+            <%= link_to_edit(property, no_text: true) if can?(:edit, property) %>
+            <%= link_to_delete(property, no_text: true) if can?(:delete, property) %>
           </td>
         </tr>
       <% end %>
@@ -61,7 +61,7 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Property)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::OptionType) %>!
   </div>
 <% end %>
 

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
-<% end %>
+<% end if can?(:create, Spree::Prototype) %>
 
 <% if @prototypes.any? %>
   <table class="table" id='listing_prototypes' data-hook>
@@ -19,8 +19,8 @@
         <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
           <td><%= prototype.name %></td>
           <td class="actions actions-2 text-right">
-            <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') %>
-            <%= link_to_delete(prototype, no_text: true) %>
+            <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') if can?(:edit, prototype) %>
+            <%= link_to_delete(prototype, no_text: true) if can?(:delete, prototype) %>
           </td>
         </tr>
       <% end %>
@@ -29,6 +29,6 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Prototype)) %>,
-    <%= link_to Spree.t(:add_one), new_object_url %>!
+    <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Prototype) %>!
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_reimbursement_type_form_fields" class="row">
-  <div class="col-md-8">
+  <div class="col-xs-12 col-md-8">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class:'form-control' %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
   <%- if @reimbursement_type.new_record? %>
-    <div class="col-md-8">
+    <div class="col-xs-12 col-md-8">
       <%= f.field_container :type, class: ['form-group'] do %>
         <%= f.label :type, Spree.t(:type) %>
         <%= f.select :type, options_for_select(Spree::ReimbursementType::KINDS), {:include_blank => false}, { :class => 'select2' } %>
@@ -15,14 +15,14 @@
       <% end %>
     </div>
   <% end %>
-  <div class="col-md-5">
+  <div class="col-xs-12 col-md-5">
     <%= f.field_container :active, class: ['form-inline'] do %>
       <%= f.check_box :active, class: 'form-control' %>
       <%= f.label :active, Spree.t(:active) %>
       <%= f.error_message_on :active %>
     <% end %>
   </div>
-  <div class="col-md-5">
+  <div class="col-xs-12 col-md-5">
     <%= f.field_container :mutable, class: ['form-inline'] do %>
       <%= f.check_box :mutable, class: 'form-control' %>
       <%= f.label :mutable, Spree.t(:mutable) %>

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

@@ -96,7 +96,7 @@
         <%= Spree.t(:reimburse) %>
       <% end %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), icon: 'remove-sign' %>
+      <%= button_link_to Spree.t('actions.cancel'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), icon: 'remove-sign' %>
     <% end %>
   </div>
 </fieldset>

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

@@ -12,6 +12,8 @@
         <th><%= Spree.t(:product) %></th>
         <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:charged) %></th>
+        <th><%= Spree.t(:purchased_quantity) %></th>
+        <th><%= Spree.t(:return_quantity) %></th>
         <th><%= Spree.t(:pre_tax_refund_amount) %></th>
         <th><%= Spree.t(:reimbursement_type) %></th>
         <th><%= Spree.t(:exchange_for) %></th>
@@ -34,9 +36,19 @@
             <div class="variant-options"><%= inventory_unit.variant.options_text %></div>
           </td>
           <td><%= inventory_unit.state.humanize %></td>
-          <td>
+          <td class="charged-amount" data-charged-amount="<%= return_item.pre_tax_amount %>">
             <%= return_item.display_pre_tax_amount %>
           </td>
+          <td class="purchased-quantity">
+            <%= inventory_unit.quantity %>
+          </td>
+          <td>
+            <% if editable %>
+              <%= item_fields.number_field :return_quantity, { class: 'refund-quantity-input form-control' } %>
+            <% else %>
+              <%= return_item.return_quantity %>
+            <% end %>
+          </td>
           <td>
             <% if editable %>
               <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input form-control' } %>

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

@@ -6,7 +6,7 @@
   <div data-hook="admin_return_authorisations_index_filters">
     <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path do |f| %>
       <div class="row">
-        <div class="col-md-12">
+        <div class="col-xs-12">
           <div class="form-group">
             <%= f.label :number_cont, Spree.t(:number) %>
             <%= f.text_field :number_cont, class: "form-control js-quick-search-target" %>
@@ -49,7 +49,7 @@
           </td>
           <td><%= customer_return.display_pre_tax_total.to_html %></td>
           <td class="actions actions-1 text-right">
-            <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true %>
+            <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true if can?(:edit, customer_return) %>
           </td>
         </tr>
       <% end %>

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

@@ -7,10 +7,10 @@
     <%= link_to Spree.t(:all), spree.admin_return_authorizations_path %>
   </li>
   <li class="<%= "active" if params[:q][:state_eq] == "authorized" %>">
-    <%= link_to Spree.t(:authorized), params.to_h.merge({q: {state_eq: :authorized}}) %>
+    <%= link_to Spree.t(:authorized), params.merge({q: {state_eq: :authorized}}).permit! %>
   </li>
   <li class="<%= "active" if params[:q][:state_eq] == "canceled" %>">
-    <%= link_to Spree.t(:canceled), params.to_h.merge({q: {state_eq: :canceled}}) %>
+    <%= link_to Spree.t(:canceled), params.merge({q: {state_eq: :canceled}}).permit! %>
   </li>
 <% end %>
 
@@ -18,13 +18,13 @@
   <div data-hook="admin_return_authorisations_index_filters">
     <%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path do |f| %>
       <div class="row">
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= f.label :number_cont, Spree.t(:number) %>
             <%= f.text_field :number_cont, class: "form-control js-quick-search-target" %>
           </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
             <%= f.select :state_eq, Spree::ReturnAuthorization.state_machines[:state].states.collect {|s| [Spree.t("return_authorization_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2' %>
@@ -61,7 +61,7 @@
             <span class="label label-<%= return_authorization.state %>"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
           </td>
           <td class="actions actions-1 text-right">
-            <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true %>
+            <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
           </td>
         </tr>
       <% end %>

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

@@ -2,7 +2,7 @@
   <div class="content-header <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
     <div class="row">
       <% if content_for?(:page_title) %>
-        <h1 class="col-sm-<%= content_for?(:page_actions) ? '6' : '12'  %>">
+        <h1 class="col-xs-<%= content_for?(:page_actions) ? '6' : '12'  %>">
           <%= yield :page_title %>
           <% if content_for?(:page_title_small) %>
             <small><%= yield :page_title_small %></small>
@@ -11,7 +11,7 @@
       <% end %>
 
       <% if content_for?(:page_actions) %>
-        <div class="page-actions col-sm-6" data-hook="toolbar">
+        <div class="page-actions col-xs-6" data-hook="toolbar">
           <%= yield :page_actions %>
         </div>
       <% end %>