solidus_backend 2.0.3 → 2.1.0.beta1

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

@@ -11,57 +11,65 @@
 
 <div id="images" data-hook></div>
 
-<% unless @product.images.any? || @product.variant_images.any? %>
-  <div class="no-objects-found">
-    <%= Spree.t(:no_images_found) %>.
+<fieldset>
+  <legend align="center"><%= t(".upload_images") %></legend>
+
+  <div id="upload-zone">
+    <%= form_for [:admin, @product, Spree::Image.new],
+        :html => { :multipart => true, id: 'upload-form' } do |f| %>
+      <label class="upload">
+        <i class="fa fa-5x fa-cloud-upload"></i>
+        <p>
+          <span class="button"><%= t(".choose_files") %></span>
+        </p>
+        <p>
+          <%= t(".drag_and_drop") %>
+        </p>
+
+        <%= f.file_field :attachment, multiple: '', class: 'hidden' %>
+        <%= f.hidden_field :viewable_id, value: @product.master.id %>
+      </label>
+    <% end %>
   </div>
-<% else %>
-  <table class="index sortable" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
-    <colgroup>
-      <col style="width: 5%">
-      <col style="width: 10%">
+
+
+  <p id="filereader">File API &amp; FileReader API not supported</p>
+  <p id="formdata">XHR2's FormData is not supported</p>
+  <p id="progress">XHR2's upload progress isn't supported</p>
+
+  <div id="progress-zone" class="row"></div>
+</fieldset>
+
+<% no_images = @product.images.empty? && @product.variant_images.empty? %>
+
+<table class="index sortable <%= 'hidden' if no_images %>" id="images-table" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
+  <colgroup>
+    <col style="width: 5%">
+    <col style="width: 10%">
+    <% if @product.has_variants? %>
+      <col style="width: 25%">
+    <% end %>
+    <col style="width: 45%">
+    <col style="width: 15%">
+  </colgroup>
+  <thead>
+    <tr data-hook="images_header">
+      <th colspan="2"><%= Spree.t(:thumbnail) %></th>
       <% if @product.has_variants? %>
-        <col style="width: 25%">
+        <th><%= Spree::Variant.model_name.human %></th>
       <% end %>
-      <col style="width: 45%">
-      <col style="width: 15%">
-    </colgroup>
-    <thead>
-      <tr data-hook="images_header">
-        <th colspan="2"><%= Spree.t(:thumbnail) %></th>
-        <% if @product.has_variants? %>
-          <th><%= Spree::Variant.model_name.human %></th>
-        <% end %>
-        <th><%= Spree::Image.human_attribute_name(:alt) %></th>
-        <th class="actions"></th>
-      </tr>
-    </thead>
+      <th><%= Spree::Image.human_attribute_name(:alt) %></th>
+      <th class="actions"></th>
+    </tr>
+  </thead>
 
-    <tbody>
-      <% (@product.variant_images).each do |image| %>
-        <tr id="<%= spree_dom_id image %>" data-hook="images_row" class="<%= cycle('odd', 'even')%>">
-          <td class="no-border">
-            <% if can?(:update_positions, Spree::Image) %>
-              <span class="handle"></span>
-            <% end %>
-          </td>
-          <td>
-            <%= link_to image_tag(image.attachment.url(:mini)), image.attachment.url(:product) %>
-          </td>
-          <% if @product.has_variants? %>
-            <td><%= options_text_for(image) %></td>
-          <% end %>
-          <td><%= image.alt %></td>
-          <td class="actions">
-            <% if can?(:update, image) %>
-              <%= link_to_with_icon 'edit', Spree.t('actions.edit'), edit_admin_product_image_url(@product, image), :no_text => true, :data => {:action => 'edit'} %>
-            <% end %>
-            <% if can?(:destroy, image) %>
-              <%= link_to_delete image, { :url => admin_product_image_url(@product, image), :no_text => true } %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
+  <tbody>
+    <%= render partial: 'image_row', collection: @product.variant_images, as: :image %>
+  </tbody>
+</table>
+
+<% if no_images %>
+  <div class="no-objects-found">
+    <%= Spree.t(:no_images_found) %>.
+  </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_option_type_form_fields" class="align-center row">
-  <div class="alpha eight columns">
+  <div class="col-xs-6">
     <%= f.field_container :name do %>
       <%= f.label :name, class: 'required' %><br />
       <%= f.text_field :name, :class => "fullwidth" %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
 
-  <div class="omega eight columns">
+  <div class="col-xs-6">
     <%= f.field_container :presentation do %>
       <%= f.label :presentation, class: 'required' %><br />
       <%= f.text_field :presentation, :class => "fullwidth" %>

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

@@ -47,7 +47,7 @@
   </tbody>
 </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::OptionType,
                  new_resource_url: new_object_url %>

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

@@ -2,9 +2,11 @@
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:add_product) %></legend>
 
-    <div data-hook="add_product_name" class="field twelve columns alpha">
-      <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-      <%= text_field_tag :add_line_item_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+    <div class="col-xs-9">
+      <div data-hook="add_product_name" class="field">
+        <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
+        <%= text_field_tag :add_line_item_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+      </div>
     </div>
 
   </fieldset>

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

@@ -2,9 +2,11 @@
   <fieldset class="no-border-bottom">
     <legend align="center"><%= Spree.t(:add_product) %></legend>
 
-    <div data-hook="add_product_name" class="field twelve columns alpha">
-      <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
-      <%= text_field_tag :add_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+    <div class="col-xs-9">
+      <div data-hook="add_product_name" class="field">
+        <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
+        <%= text_field_tag :add_variant_id, "", :class => "variant_autocomplete fullwidth" %>
+      </div>
     </div>
 
   </fieldset>

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

@@ -1,7 +1,11 @@
 <% admin_breadcrumb(plural_resource_name(Spree::Shipment)) %>
 
 
-<% manifest_items = Spree::ShippingManifest.new(inventory_units: shipment.inventory_units.where(carton_id: nil)).items %>
+<%
+  manifest_items = Spree::ShippingManifest.new(
+    inventory_units: shipment.inventory_units.where(carton_id: nil),
+  ).items.sort_by { |item| item.line_item.created_at }
+%>
 
 <div id="<%= "shipment_#{shipment.id}" %>" class="js-shipment-edit" data-hook="admin_shipment_form">
   <fieldset class="no-border-bottom">
@@ -48,11 +52,15 @@
       <% unless shipment.shipped? %>
         <tr class="edit-method hidden total">
           <td colspan="5">
-            <div class="field alpha five columns">
-              <%= label_tag 'selected_shipping_rate_id', Spree::ShippingMethod.model_name.human %>
-              <%= 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 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+            <div class="row">
+              <div class="col-xs-4">
+                <div class="field">
+                  <%= label_tag 'selected_shipping_rate_id', Spree::ShippingMethod.model_name.human %>
+                  <%= 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 fullwidth', :data => {'shipment-number' => shipment.number } } %>
+                </div>
+              </div>
             </div>
           </td>
           <td class="actions">

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

@@ -17,7 +17,7 @@
 </div>
 
 <% if @order.payments.exists? && @order.is_risky? %>
-    <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+    <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
 <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>

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

@@ -4,21 +4,23 @@
 </fieldsset>
 
 <fieldset class="no-border-bottom no-border-top">
-  <div data-hook="bill_address_wrapper" class="alpha six columns">
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:billing_address) %></legend>
-      <% if order.bill_address %>
-        <%= render partial: 'spree/admin/shared/address', locals: {address: order.bill_address} %>
-      <% end %>
-    </fieldset>
-  </div>
+  <div class="row">
+    <div data-hook="bill_address_wrapper" class="col-xs-6">
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= Spree.t(:billing_address) %></legend>
+        <% if order.bill_address %>
+          <%= render partial: 'spree/admin/shared/address', locals: {address: order.bill_address} %>
+        <% end %>
+      </fieldset>
+    </div>
 
-  <div class="omega six columns" data-hook="ship_address_wrapper">
-    <fieldset class="no-border-bottom">
-      <legend align="center"><%= Spree.t(:shipping_address) %></legend>
-      <% if order.ship_address %>
-        <%= render partial: 'spree/admin/shared/address', locals: {address: order.ship_address} %>
-      <% end %>
-    </fieldset>
+    <div class="col-xs-6" data-hook="ship_address_wrapper">
+      <fieldset class="no-border-bottom">
+        <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+        <% if order.ship_address %>
+          <%= render partial: 'spree/admin/shared/address', locals: {address: order.ship_address} %>
+        <% end %>
+      </fieldset>
+    </div>
   </div>
 </fieldset>

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

@@ -4,13 +4,13 @@
     <legend align="center"><%= Spree.t(:account) %></legend>
 
     <div data-hook="customer_fields" class="row">
-      <div class="alpha eight columns">
+      <div class="col-xs-9">
         <div class="field">
           <%= f.label :email %>
           <%= f.email_field :email, :class => 'fullwidth' %>
         </div>
       </div>
-      <div class="omega four columns">
+      <div class="col-xs-3">
         <div class="field">
           <%= label_tag nil, Spree.t(:guest_checkout) %>
           <ul>
@@ -36,34 +36,36 @@
     </div>
   </fieldset>
 
-  <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| %>
-        <% 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 == @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">
+  <div class="row">
+    <div class="col-xs-6" data-hook="ship_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" } %>
+        <legend align="center"><%= Spree.t(:shipping_address) %></legend>
+        <%= f.fields_for :ship_address do |sa_form| %>
+          <% 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 == @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>
-  <% end %>
+
+    <% if Spree::Config[:order_bill_address_used] %>
+      <div class="col-xs-6" 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>
 
   <div class="clear"></div>
 

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

@@ -8,7 +8,7 @@
 <% end %>
 
 
-<main class="alpha eight columns">
+<main class="col-xs-5">
   <section>
     <%= content_tag :h4, Spree.t(:account) %>
     <%= Spree.t(:email) %>: <%= @order.email %><br>

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

@@ -14,7 +14,7 @@
 </div>
 
 <% if @order.payments.exists? && @order.is_risky? %>
-  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.order("created_at DESC").first %>
+  <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
 <% if can?(:update, Spree::Shipment) && can?(:update, @order) && @order.shipment_state != "shipped" %>

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

@@ -14,81 +14,88 @@
 <% content_for :table_filter do %>
   <div data-hook="admin_orders_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
-      <div class="field-block alpha four columns">
-        <div class="date-range-filter field">
-          <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
-          <div class="date-range-fields">
-            <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
-
-            <span class="range-divider">
-              <i class="fa fa-arrow-right"></i>
-            </span>
-
-            <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+      <div class="row">
+        <div class="field-block col-xs-3">
+          <div class="date-range-filter field">
+            <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
+            <div class="date-range-fields">
+              <%= f.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => params[:q][:created_at_gt], :placeholder => Spree.t(:start) %>
+
+              <span class="range-divider">
+                <i class="fa fa-arrow-right"></i>
+              </span>
+
+              <%= f.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => params[:q][:created_at_lt], :placeholder => Spree.t(:stop) %>
+            </div>
           </div>
-        </div>
 
-        <div class="field">
-          <%= label_tag :q_state_eq, Spree.t(:status) %>
-          <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
-        </div>
-
-        <div class="field">
-          <%= label_tag nil, Spree.t(:promotion) %>
-          <%= f.text_field :promotions_codes_value_cont, :size => 25 %>
-        </div>
+          <div class="field">
+            <%= label_tag :q_state_eq, Spree.t(:status) %>
+            <%= f.select :state_eq, Spree::Order.state_machines[:state].states.collect {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {:include_blank => true}, :class => 'select2' %>
+          </div>
 
-        <div class="field">
-          <%= label_tag nil, Spree.t(:shipment_number) %>
-          <%= f.text_field :shipments_number_cont %>
-        </div>
+          <div class="field">
+            <%= label_tag nil, Spree.t(:promotion) %>
+            <%= f.text_field :promotions_codes_value_cont, :size => 25 %>
+          </div>
 
-      </div>
+          <div class="field">
+            <%= label_tag nil, Spree.t(:shipment_number) %>
+            <%= f.text_field :shipments_number_cont %>
+          </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
-          <%= f.text_field :number_cont %>
         </div>
 
-        <div class="field">
-          <%= label_tag :q_email_cont, Spree.t(:email) %>
-          <%= f.text_field :email_cont %>
+        <div class="col-xs-6">
+          <div class="row">
+            <div class="col-xs-6">
+              <div class="field">
+                <%= label_tag :q_number_cont, Spree.t(:order_number, :number => '') %>
+                <%= f.text_field :number_cont %>
+              </div>
+
+              <div class="field">
+                <%= label_tag :q_email_cont, Spree.t(:email) %>
+                <%= f.text_field :email_cont %>
+              </div>
+            </div>
+
+            <div class="col-xs-6">
+              <div class="field">
+                <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
+                <%= f.text_field :bill_address_firstname_start, :size => 25 %>
+              </div>
+              <div class="field">
+                <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
+                <%= f.text_field :bill_address_lastname_start, :size => 25%>
+              </div>
+            </div>
+
+            <div class="col-xs-12">
+              <div class="field" data-hook="sku-select">
+                <%= label_tag :q_line_items_variant_id_in, Spree.t(:variant) %>
+                <%= f.text_field :line_items_variant_id_in, class: "variant_autocomplete fullwidth" %>
+              </div>
+            </div>
+          </div>
         </div>
-      </div>
 
-      <div class="four columns">
-        <div class="field">
-          <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
-          <%= f.text_field :bill_address_firstname_start, :size => 25 %>
-        </div>
-        <div class="field">
-          <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
-          <%= f.text_field :bill_address_lastname_start, :size => 25%>
-        </div>
-      </div>
+        <div class="col-xs-3">
+          <% if Spree::Store.count > 1 %>
+            <div class="field">
+              <%= label_tag nil, Spree.t(:store) %>
+              <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "select2" } %>
+            </div>
+          <% end %>
 
-      <div class="omega four columns">
-        <% if Spree::Store.count > 1 %>
-          <div class="field">
-            <%= label_tag nil, Spree.t(:store) %>
-            <%= f.select :store_id_eq, Spree::Store.all.map { |s| [s.name, s.id] }, { include_blank: true }, { class: "select2" } %>
+          <div class="field checkbox">
+            <label>
+              <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
+              <%= Spree.t(:show_only_complete_orders) %>
+            </label>
           </div>
-        <% end %>
-
-        <div class="field checkbox">
-          <label>
-            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
-            <%= Spree.t(:show_only_complete_orders) %>
-          </label>
         </div>
-      </div>
 
-      <div class="omega eight columns">
-        <div class="field" data-hook="sku-select">
-          <%= label_tag :q_line_items_variant_id_in, Spree.t(:variant) %>
-          <%= f.text_field :line_items_variant_id_in, class: "variant_autocomplete fullwidth" %>
-        </div>
       </div>
 
       <div class="clearfix"></div>
@@ -162,7 +169,7 @@
     </tbody>
   </table>
 <% else %>
-  <div class="alpha twelve columns no-objects-found">
+  <div class="col-xs-9 no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::Order,
                  new_resource_url: spree.new_admin_order_path %>

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

@@ -2,59 +2,65 @@
 
   <div data-hook="payment_method">
 
-    <div class="alpha four columns">
-      <div id="preference-settings">
-        <div class="field">
-          <%= f.label :type %>
-          <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth js-gateway-type'}) %>
-        </div>
+    <div class="row">
+      <div class="col-xs-3">
+        <div id="preference-settings">
+          <div class="field">
+            <%= f.label :type %>
+            <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type', :class => 'select2 fullwidth js-gateway-type'}) %>
+          </div>
 
-        <div class="field js-preference-source-wrapper">
-          <%= f.label :preference_source %>
-          <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'select2 fullwidth js-preference-source') %>
-        </div>
+          <div class="field js-preference-source-wrapper">
+            <%= f.label :preference_source %>
+            <%= f.select(:preference_source, [[Spree.t(:preference_source_none), nil]] + @object.class.available_preference_sources, {}, class: 'select2 fullwidth js-preference-source') %>
+          </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 %>
-        </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 %>
+          </div>
 
-        <div class="info warning js-gateway-settings-warning"><%= Spree.t(:provider_settings_warning) %></div>
-      </div>
-      <div data-hook="display" class="field">
-        <%= f.label :display_on %>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
-      </div>
-      <div data-hook="auto_capture" class="field">
-        <%= f.label :auto_capture %>
-        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2 fullwidth'}) %>
-      </div>
-      <div data-hook="active" class="field">
-        <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:active) %>
-        <ul>
-          <li>
-            <%= radio_button :payment_method, :active, true %>
-            <%= label_tag :payment_method_active_true, Spree.t(:say_yes) %>
-          </li>
-          <li>
-            <%= radio_button :payment_method, :active, false %>
-            <%= label_tag :payment_method_active_false, Spree.t(:say_no) %>
-          </li>
-        </ul>
+          <div class="info warning js-gateway-settings-warning"><%= Spree.t(:provider_settings_warning) %></div>
+        </div>
+        <div data-hook="available_to_user" class="field">
+          <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:available_to_users) %>
+          <%= f.check_box :available_to_users %>
+        </div>
+        <div data-hook="available_to_user" class="field">
+          <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:available_to_admin) %>
+          <%= f.check_box :available_to_admin %>
+        </div>
+        <div data-hook="auto_capture" class="field">
+          <%= f.label :auto_capture %>
+          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {:class => 'select2 fullwidth'}) %>
+        </div>
+        <div data-hook="active" class="field">
+          <%= label_tag nil, Spree::PaymentMethod.human_attribute_name(:active) %>
+          <ul>
+            <li>
+              <%= radio_button :payment_method, :active, true %>
+              <%= label_tag :payment_method_active_true, Spree.t(:say_yes) %>
+            </li>
+            <li>
+              <%= radio_button :payment_method, :active, false %>
+              <%= label_tag :payment_method_active_false, Spree.t(:say_no) %>
+            </li>
+          </ul>
+        </div>
       </div>
-    </div>
 
-    <div class="omega eight columns">
-      <div data-hook="name" class="field">
-        <%= f.label :name %>
-        <%= f.text_field :name, :class => 'fullwidth' %>
-      </div>
-      <div data-hook="description" class="field">
-        <%= f.label :description %>
-        <%= f.text_area :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+      <div class="col-xs-6">
+        <div data-hook="name" class="field">
+          <%= f.label :name %>
+          <%= f.text_field :name, :class => 'fullwidth' %>
+        </div>
+        <div data-hook="description" class="field">
+          <%= f.label :description %>
+          <%= f.text_area :description, {:cols => 60, :rows => 6, :class => 'fullwidth'} %>
+        </div>
       </div>
     </div>
   </div>