spree_backend 3.2.9 → 3.3.0.rc1

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

@@ -9,14 +9,14 @@
 
       <%= fields_for :store do |f| %>
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div class="form-group" data-hook="admin_general_setting_input_name">
               <%= f.label :name %>
               <%= f.text_field :name, class: 'form-control' %>
             </div>
           </div>
 
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div class="form-group" data-hook="admin_general_setting_input_seo_title">
               <%= f.label :seo_title %>
               <%= f.text_field :seo_title, class: 'form-control'  %>
@@ -25,14 +25,14 @@
         </div>
 
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div class="form-group" data-hook="admin_general_setting_input_meta_keywords">
               <%= f.label :meta_keywords %>
               <%= f.text_field :meta_keywords, class: 'form-control'  %>
             </div>
           </div>
 
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div class="form-group" data-hook="admin_general_setting_input_meta_description">
               <%= f.label :meta_description %>
               <%= f.text_field :meta_description, class: 'form-control'  %>
@@ -41,14 +41,14 @@
         </div>
 
         <div class="row">
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div class="form-group" data-hook="admin_general_setting_input_url">
               <%= f.label :url %>
               <%= f.text_field :url, class: 'form-control'  %>
             </div>
           </div>
 
-          <div class="col-md-6">
+          <div class="col-xs-12 col-md-6">
             <div class="form-group" data-hook="admin_general_setting_mail_from_address">
               <%= f.label :mail_from_address %>
               <%= f.text_field :mail_from_address, class: 'form-control'  %>
@@ -58,7 +58,7 @@
       <% end %>
 
       <div class="row">
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
           <%#-------------------------------------------------%>
           <%# Security settings                               %>
           <%#-------------------------------------------------%>
@@ -103,7 +103,7 @@
           </div>
 
         </div>
-        <div class="col-md-6">
+        <div class="col-xs-12 col-md-6">
 
           <%#-------------------------------------------------%>
           <%# Currency Settings                               %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_image_form_fields" class="row">
-  <div class="col-md-6">
+  <div class="col-xs-12 col-md-6">
     <div data-hook="file" class="form-group">
       <%= f.label :attachment, Spree.t(:filename) %>
       <%= f.file_field :attachment %>
@@ -9,7 +9,7 @@
       <%= f.select :viewable_id, @variants, {}, {class: 'select2'} %>
     </div>
   </div>
-  <div data-hook="alt_text" class="col-md-6">
+  <div data-hook="alt_text" class="col-xs-12 col-md-6">
     <div class="form-group">
       <%= f.label :alt, Spree.t(:alt_text) %>
       <%= f.text_area :alt, rows: 4, class: 'form-control' %>

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

@@ -11,11 +11,11 @@
     </div>
     <div class="panel-body">
       <div class="form-group">
-        <div data-hook="thumbnail" class="col-md-3 text-center">
+        <div data-hook="thumbnail" class="col-xs-12 col-md-3 text-center">
           <%= f.label Spree.t(:thumbnail) %>
           <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
         </div>
-        <div class="col-md-9">
+        <div class="col-xs-12 col-md-9">
           <%= render partial: 'form', locals: { f: f } %>
         </div>
 

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

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :images } %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %>
 
 <% content_for :page_title do %>
   <%= Spree.t(:new_image) %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_option_type_form_fields" 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" %>
@@ -7,7 +7,7 @@
     <% 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/option_types/index.html.erb

@@ -6,7 +6,7 @@
   <span id="new_ot_link">
     <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-success", icon: 'add', id: 'new_option_type_link' } %>
   </span>
-<% end %>
+<% end if can?(:create, Spree::OptionType) %>
 
 <div id="new_option_type"></div>
 
@@ -29,8 +29,8 @@
         <td><%= option_type.name %></td>
         <td class="presentation"><%= option_type.presentation %></td>
         <td class="actions actions-2 text-right">
-          <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) %>
-          <%= link_to_delete(option_type, no_text: true) %>
+          <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
+          <%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>
         </td>
       </tr>
     <% end %>
@@ -39,6 +39,6 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::OptionType)) %>,
-    <%= 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/orders/_line_items.html.erb

@@ -5,44 +5,46 @@
         <%= Spree.t(:order_line_items) %>
       </h1>
     </div>
-    <table class="table table-bordered line-items" data-hook="line-items">
-      <thead>
-        <tr>
-          <th colspan="2"><%= Spree.t(:name) %></th>
-          <th class="text-center"><%= Spree.t(:price) %></th>
-          <th class="text-center"><%= Spree.t(:quantity) %></th>
-          <th class="text-center"><%= Spree.t(:total_price) %></th>
-          <th class="orders-actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% order.line_items.each do |item| %>
-          <tr class="line-item" id="line-item-<%= item.id %>">
-            <td class="line-item-image image text-center">
-              <%= mini_image(item.variant) %>
-            </td>
-            <td class="line-item-name text-center">
-              <%= item.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
-            </td>
-            <td class="line-item-price text-center"><%= item.single_money.to_html %></td>
-            <td class="line-item-qty-show text-center">
-              <%= item.quantity %>
-            </td>
-            <td class="line-item-qty-edit is-hidden">
-              <%= number_field_tag :quantity, item.quantity, min: 0, class: "line_item_quantity form-control", size: 5 %>
-            </td>
-            <td class="line-item-total text-center"><%= line_item_shipment_price(item, item.quantity) %></td>
-            <td class="cart-line-item-delete actions actions-4 text-center" data-hook="cart_line_item_delete">
-              <% if can? :update, item %>
-                <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-default btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-                <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
-                <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-line-item btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
-                <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
-              <% end %>
-            </td>
+    <div class="table-responsive">
+      <table class="table table-bordered line-items" data-hook="line-items">
+        <thead>
+          <tr>
+            <th colspan="2"><%= Spree.t(:name) %></th>
+            <th class="text-center"><%= Spree.t(:price) %></th>
+            <th class="text-center"><%= Spree.t(:quantity) %></th>
+            <th class="text-center"><%= Spree.t(:total_price) %></th>
+            <th class="orders-actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
+        </thead>
+        <tbody>
+          <% order.line_items.each do |item| %>
+            <tr class="line-item" id="line-item-<%= item.id %>">
+              <td class="line-item-image image text-center">
+                <%= mini_image(item.variant) %>
+              </td>
+              <td class="line-item-name text-center">
+                <%= item.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+              </td>
+              <td class="line-item-price text-center"><%= item.single_money.to_html %></td>
+              <td class="line-item-qty-show text-center">
+                <%= item.quantity %>
+              </td>
+              <td class="line-item-qty-edit is-hidden">
+                <%= number_field_tag :quantity, item.quantity, min: 0, class: "line_item_quantity form-control", size: 5 %>
+              </td>
+              <td class="line-item-total text-center"><%= line_item_shipment_price(item, item.quantity) %></td>
+              <td class="cart-line-item-delete actions actions-4 text-center" data-hook="cart_line_item_delete">
+                <% if can? :update, item %>
+                  <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-default btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+                  <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
+                  <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-line-item btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+                  <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
   </div>
 <% end %>

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

@@ -16,95 +16,96 @@
     </h1>
   </div>
 
-  <table class="table table-bordered stock-contents" data-hook="stock-contents">
-    <thead>
-      <tr>
-        <th colspan="2"><%= Spree.t(:item_description) %></th>
-        <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
-        <th width="15%" class="text-center"><%= Spree.t(:quantity) %></th>
-        <th width="15%" class="text-center"><%= Spree.t(:total) %></th>
-        <th class="orders-actions actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
-      </tr>
-    </thead>
-
-    <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
-      <%= render 'spree/admin/orders/shipment_manifest', shipment: shipment %>
-
-      <% unless shipment.shipped? %>
-        <tr class="edit-method is-hidden total">
-          <td colspan="5">
-            <div class="field alpha five columns">
-              <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
-              <%= select_tag :selected_shipping_rate_id,
-                    options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
-                    { class: 'select2', data: {'shipment-number' => shipment.number } } %>
-            </div>
-          </td>
-          <td class="actions text-center">
-            <% if can? :update, shipment %>
-              <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-              <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
-            <% end %>
-          </td>
+  <div class="table-responsive">
+    <table class="table table-bordered stock-contents" data-hook="stock-contents">
+      <thead>
+        <tr>
+          <th colspan="2"><%= Spree.t(:item_description) %></th>
+          <th width="15%" class="text-center"><%= Spree.t(:price) %></th>
+          <th width="15%" class="text-center"><%= Spree.t(:quantity) %></th>
+          <th width="15%" class="text-center"><%= Spree.t(:total) %></th>
+          <th class="orders-actions actions text-center" data-hook="admin_order_form_line_items_header_actions"></th>
         </tr>
-        <% end %>
+      </thead>
+
+      <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
+        <%= render 'spree/admin/orders/shipment_manifest', shipment: shipment %>
 
-        <tr class="show-method total">
-          <% if rate = shipment.selected_shipping_rate %>
-            <td colspan="4">
-              <strong><%= rate.name %></strong>
+        <% unless shipment.shipped? %>
+          <tr class="edit-method is-hidden total">
+            <td colspan="5">
+              <div class="field alpha five columns">
+                <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
+                <%= select_tag :selected_shipping_rate_id,
+                      options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+                      { class: 'select2', data: {'shipment-number' => shipment.number } } %>
+              </div>
             </td>
-            <td class="total text-center">
-              <%= shipment.display_cost %>
+            <td class="actions text-center">
+              <% if can? :update, shipment %>
+                <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+                <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+              <% end %>
             </td>
-          <% else %>
-            <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+          </tr>
           <% end %>
 
-          <td class="actions text-center">
-            <% if( (can? :update, shipment) and !shipment.shipped?) %>
-              <%= link_to_with_icon 'edit', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-primary', data: {action: 'edit'}, no_text: true %>
+          <tr class="show-method total">
+            <% if rate = shipment.selected_shipping_rate %>
+              <td colspan="4">
+                <strong><%= rate.name %></strong>
+              </td>
+              <td class="total text-center">
+                <%= shipment.display_cost %>
+              </td>
+            <% else %>
+              <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
             <% end %>
-          </td>
-        </tr>
 
+            <td class="actions text-center">
+              <% if( (can? :update, shipment) and !shipment.shipped?) %>
+                <%= link_to_with_icon 'edit', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-primary', data: {action: 'edit'}, no_text: true %>
+              <% end %>
+            </td>
+          </tr>
 
-      <tr class="edit-tracking is-hidden total">
-        <td colspan="5">
-          <label><%= Spree.t(:tracking_number) %>:</label>
-          <%= text_field_tag :tracking, shipment.tracking, class: "form-control" %>
-        </td>
-        <td class="actions">
-          <% if can? :update, shipment %>
-            <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-            <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
-          <% end %>
-        </td>
-      </tr>
 
-      <% if order.special_instructions.present? %>
-        <tr class='special_instructions'>
+        <tr class="edit-tracking is-hidden total">
           <td colspan="5">
-            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+            <label><%= Spree.t(:tracking_number) %>:</label>
+            <%= text_field_tag :tracking, shipment.tracking, class: "form-control" %>
+          </td>
+          <td class="actions">
+            <% if can? :update, shipment %>
+              <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+              <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+            <% end %>
           </td>
         </tr>
-      <% end %>
 
-      <tr class="show-tracking total">
-        <td colspan="5" class="tracking-value">
-          <% if shipment.tracking.present? %>
-            <strong><%= Spree.t(:tracking) %>:</strong> <%= link_to_tracking(shipment, target: '_blank') %>
-          <% else %>
-            <%= Spree.t(:no_tracking_present) %>
-          <% end %>
-        </td>
-        <td class="actions text-center">
-          <% if can? :update, shipment %>
-            <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-tracking btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
-          <% end %>
-        </td>
-      </tr>
-    </tbody>
-  </table>
+        <% if order.special_instructions.present? %>
+          <tr class='special_instructions'>
+            <td colspan="5">
+              <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= order.special_instructions %>
+            </td>
+          </tr>
+        <% end %>
 
+        <tr class="show-tracking total">
+          <td colspan="5" class="tracking-value">
+            <% if shipment.tracking.present? %>
+              <strong><%= Spree.t(:tracking) %>:</strong> <%= link_to_tracking(shipment, target: '_blank') %>
+            <% else %>
+              <%= Spree.t(:no_tracking_present) %>
+            <% end %>
+          </td>
+          <td class="actions text-center">
+            <% if can? :update, shipment %>
+              <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-tracking btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

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

@@ -10,7 +10,7 @@
 
     <div class="panel-body">
       <div data-hook="customer_fields" class="row">
-        <div class="col-md-8">
+        <div class="col-xs-12 col-md-8">
           <div class="form-group">
             <%= f.label :email, Spree.t(:email) %>
             <% if can? :edit, @order.user %>
@@ -20,7 +20,7 @@
             <% end %>
           </div>
         </div>
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <strong><%= label_tag nil, Spree.t(:guest_checkout) %></strong>
             <% guest = @order.user.nil? %>
@@ -45,7 +45,7 @@
                   <%= Spree.t(:say_no) %>
                 <% end %>
               </div>
-              <%= hidden_field_tag :user_id, @order.user_id %>
+              <%= f.hidden_field :user_id, value: @order.user_id %>
             <% end %>
           </div>
         </div>
@@ -55,7 +55,7 @@
   </div>
 
   <div class="row">
-    <div data-hook="bill_address_wrapper" class="col-md-6">
+    <div data-hook="bill_address_wrapper" class="col-xs-12 col-md-6">
       <div class="panel panel-default">
         <div class="panel-heading">
           <h1 class="panel-title"><%= Spree.t(:billing_address) %></h1>
@@ -73,7 +73,7 @@
       </div>
     </div>
 
-    <div class="col-md-6" data-hook="ship_address_wrapper">
+    <div class="col-xs-12 col-md-6" data-hook="ship_address_wrapper">
       <div class="panel panel-default">
         <div class="panel-heading">
           <h1 class="panel-title"><%= Spree.t(:shipping_address) %></h1>

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

@@ -11,11 +11,11 @@
 
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="date-range-filter col-md-8">
+        <div class="date-range-filter col-xs-12 col-md-8">
           <div class="form-group">
             <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
             <div class="row no-padding-bottom">
-              <div class="col-md-6">
+              <div class="col-xs-12 col-md-6">
                 <div class="input-group">
                   <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
                   <span class="input-group-addon">
@@ -24,7 +24,7 @@
                 </div>
 
               </div>
-              <div class="col-md-6">
+              <div class="col-xs-12 col-md-6">
                 <div class="input-group">
                   <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
                   <span class="input-group-addon">
@@ -36,7 +36,7 @@
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
             <%= f.text_field :number_cont, class: 'form-control js-quick-search-target' %>
@@ -47,21 +47,21 @@
 
       <div class="row">
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_states.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
             <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, {include_blank: true}, class: 'select2 js-filterable' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
             <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, {include_blank: true}, class: 'select2 js-filterable' %>
@@ -72,21 +72,21 @@
 
       <div class="row">
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
             <%= f.text_field :bill_address_firstname_start, class: 'form-control' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
             <%= f.text_field :bill_address_lastname_start, class: 'form-control' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_email_cont, Spree.t(:email) %>
             <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
@@ -97,21 +97,21 @@
 
       <div class="row">
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
             <%= f.text_field :line_items_variant_sku_eq, class: 'form-control' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
           <div class="form-group">
             <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
             <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), {include_blank: true}, class: 'select2' %>
           </div>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-xs-12 col-md-4">
 
           <div class="form-group">
 
@@ -181,7 +181,7 @@
           </span>
         </td>
         <td>
-          <span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
+          <span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_states.#{order.state.downcase}") %></span>
           <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
         </td>
         <td>
@@ -210,7 +210,7 @@
         </td>
         <td><%= order.display_total.to_html %></td>
         <td class='actions actions-1' data-hook="admin_orders_index_row_actions">
-          <%= link_to_edit_url edit_admin_order_path(order), title: "admin_edit_#{dom_id(order)}", no_text: true %>
+          <%= link_to_edit_url edit_admin_order_path(order), title: "admin_edit_#{dom_id(order)}", no_text: true if can?(:edit, order) %>
         </td>
       </tr>
     <% end %>

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

@@ -2,7 +2,7 @@
 
   <div data-hook="payment_method" class="row">
 
-    <div class="col-md-4">
+    <div class="col-xs-12 col-md-4">
       <div id="preference-settings" data-hook class="form-group">
         <%= f.label :type, Spree.t(:provider) %>
         <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
@@ -41,7 +41,7 @@
       </div>
     </div>
 
-    <div class="col-md-8">
+    <div class="col-xs-12 col-md-8">
       <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
         <%= label_tag :payment_method_name, Spree.t(:name) %>
         <%= text_field :payment_method, :name, class: 'form-control' %>

data/app/views/spree/admin/payments/_list.html.erb

@@ -12,7 +12,7 @@
   </thead>
   <tbody>
     <% payments.each do |payment| %>
-      <tr id="<%= dom_id(payment) %>" data-hook="payments_row">
+      <tr id="<%= dom_id(payment) %>" data-hook="payments_row" data-number="<%= payment.number %>">
         <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
         <td><%= pretty_time(payment.created_at) %></td>
         <td class="amount text-center"><%= payment.display_amount %></td>

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

@@ -6,7 +6,7 @@
 <div class="panel-body">
   <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>
     <div data-hook="admin_stock_movements_form_fields" class="row">
-      <div class="col-md-2">
+      <div class="col-xs-12 col-md-2">
         <div class="form-group">
           <%= f.field_container :quantity do %>
             <%= f.label :quantity, Spree.t(:quantity) %>
@@ -14,7 +14,7 @@
           <% end %>
         </div>
       </div>
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <div class="form-group">
           <%= f.field_container :stock_location do %>
             <%= label_tag :stock_location_id, Spree.t(:stock_location) %>
@@ -24,7 +24,7 @@
         </div>
       </div>
 
-      <div class="col-md-5">
+      <div class="col-xs-12 col-md-5">
         <div class="form-group">
           <%= f.field_container :variant_id do %>
             <%= label_tag 'variant_id', Spree.t(:variant) %>