spree_backend 4.1.11 → 4.2.0.beta

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

@@ -3,10 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_payment_methods_link' %>
+  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
 <% end if can? :create, Spree::PaymentMethod %>
 
 <% if @payment_methods.any? %>
+<div class="table-responsive">
   <table class="table sortable" id='listing_payment_methods' data-hook data-sortable-link="<%= update_positions_admin_payment_methods_url %>">
     <thead>
       <tr data-hook="admin_payment_methods_index_headers">
@@ -18,16 +19,16 @@
         <th data-hook="admin_payment_methods_index_header_actions" class="actions"></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody id="sortVert">
       <% @payment_methods.each do |method|%>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td class="move-handle text-center">
             <% if can?(:edit, method) %>
-              <span class="icon icon-move handle"></span>
+              <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
             <% end %>
           </td>
           <td><%= method.name %></td>
-          <td><%= method.type %></td>
+          <td><%= method.type.split('::', 3).last %></td>
           <td class="text-center"><%= Spree.t(method.display_on) %></td>
           <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
@@ -38,6 +39,7 @@
       <% end %>
     </tbody>
   </table>
+  </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PaymentMethod)) %>,

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

@@ -1,19 +1,21 @@
 <% if @payment.capture_events.exists? %>
   <h3><%= Spree.t(:capture_events) %></h3>
-  <table class="table table-condensed table-bordered" id="capture_events">
-    <thead>
-      <tr data-hook="payments_header">
-        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-        <th><%= Spree.t(:amount) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @payment.capture_events.each do |capture_event| %>
-        <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row">
-          <td><%= pretty_time(capture_event.created_at) %></td>
-          <td><%= capture_event.display_amount %></td>
+  <div class="table-responsive">
+    <table class="table table-condensed table-bordered" id="capture_events">
+      <thead>
+        <tr data-hook="payments_header">
+          <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+          <th><%= Spree.t(:amount) %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>
+      </thead>
+      <tbody>
+        <% @payment.capture_events.each do |capture_event| %>
+          <tr id="<%= dom_id(capture_event) %>" data-hook="capture_events_row">
+            <td><%= pretty_time(capture_event.created_at) %></td>
+            <td><%= capture_event.display_amount %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+<% end %>

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

@@ -17,7 +17,7 @@
     <div class="payment-method-settings">
       <% @payment_methods.each do |method| %>
 
-        <div class="payment-methods" id="payment_method_<%= method.id %>">
+        <div class="payment-methods my-3" id="payment_method_<%= method.id %>">
           <% if method.source_required? %>
             <%=render partial: "spree/admin/payments/source_forms/#{method.method_type}",
                        locals: {

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

@@ -1,38 +1,40 @@
-<table class="table table-bordered" id='payments' data-order-id='<%= @order.number %>'>
-  <thead>
-    <tr data-hook="payments_header">
-      <th><%= Spree::Payment.human_attribute_name(:number) %></th>
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th class="text-center"><%= Spree.t(:amount) %></th>
-      <th class="text-center"><%= Spree.t(:payment_method) %></th>
-      <th class="text-center"><%= Spree.t(:transaction_id) %></th>
-      <th class="text-center"><%= Spree.t(:payment_state) %></th>
-      <th class="actions text-center"></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% payments.each do |payment| %>
-      <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>
-        <td class="text-center"><%= payment_method_name(payment) %></td>
-        <td class="text-center"><%= payment.transaction_id %></td>
-        <td class="text-center">
-          <span class="badge badge-<%= payment.state %>">
-            <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
-          </span>
-        </td>
-        <td class="actions actions-2 text-center">
-          <% payment.actions.each do |action| %>
-            <% if action == 'credit' %>
-              <%= link_to_with_icon('refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:create, Spree::Refund) %>
-            <% else %>
-              <%= link_to_with_icon(action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-outline-secondary btn-sm") if can?(action.to_sym, payment) %>
-            <% end %>
-          <% end %>
-        </td>
+<div class="table-responsive">
+  <table class="table table-bordered" id='payments' data-order-id='<%= @order.number %>'>
+    <thead>
+      <tr data-hook="payments_header">
+        <th><%= Spree::Payment.human_attribute_name(:number) %></th>
+        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th class="text-center"><%= Spree.t(:amount) %></th>
+        <th class="text-center"><%= Spree.t(:payment_method) %></th>
+        <th class="text-center"><%= Spree.t(:transaction_id) %></th>
+        <th class="text-center"><%= Spree.t(:payment_state) %></th>
+        <th class="actions text-center"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% payments.each do |payment| %>
+        <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>
+          <td class="text-center"><%= payment_method_name(payment) %></td>
+          <td class="text-center"><%= payment.transaction_id %></td>
+          <td class="text-center">
+            <span class="badge badge-<%= payment.state %>">
+              <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
+            </span>
+          </td>
+          <td class="actions actions-2 text-center no-wrap">
+            <% payment.actions.each do |action| %>
+              <% if action == 'credit' %>
+                <%= link_to_with_icon('exit.svg', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:create, Spree::Refund) %>
+              <% else %>
+                <%= link_to_with_icon(action + '.svg', Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-outline-secondary btn-sm") if can?(action.to_sym, payment) %>
+              <% end %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if @order.outstanding_balance? && can?(:create, Spree::Payment) %>
     <span id="new_payment_section">
-      <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), class: "btn-success", icon: 'add' %>
+      <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), class: "btn-success", icon: 'add.svg' %>
     </span>
   <% end %>
 <% end %>
@@ -19,8 +19,7 @@
 <% end %>
 
 <% if @payments.any? %>
-
-  <div data-hook="payment_list" class="mb-3">
+  <div data-hook="payment_list" class="mb-3 table-responsive">
     <%= render partial: 'list', locals: { payments: @payments } %>
   </div>
 

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

@@ -12,7 +12,7 @@
       <%= render partial: 'form', locals: { f: f } %>
 
       <div class="form-actions" data-hook="buttons">
-        <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right' : 'save' %>
+        <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right.svg' : 'save.svg' %>
       </div>
     </fieldset>
   <% end %>

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

@@ -12,7 +12,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file' %>
+  <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), icon: 'file.svg' %>
 <% end %>
 
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",

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

@@ -1,27 +1,33 @@
 <fieldset data-id="credit-card">
-  <div class="form-group" data-hook="previous_cards">
-    <ul>
-      <% if previous_cards.any? %>
-        <% previous_cards.each do |card| %>
-          <li>
-            <label>
-              <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %>
-            </label>
-          </li>
-        <% end %>
-        <li>
-          <label>
-            <%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %>
-          </label>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+<% if previous_cards.any? %>
+  <div class="card my-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5"><%= Spree.t(:previously_used_card) %></h1>
+    </div>
+      <div class="form-group previous_cards card-body mb-0" data-hook="previous_cards">
+        <ul class="m-0 p-0">
 
-  <div id="card_form<%= payment_method.id %>" class="margint" data-hook>
+            <% previous_cards.each do |card| %>
+              <li>
+                <label>
+                  <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.brand.upcase + ' - ' + card.display_number %>
+                </label>
+              </li>
+            <% end %>
+            <li>
+              <hr>
+              <label>
+                <%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %>
+              </label>
+            </li>
+        </ul>
+      </div>
+  </div>
+<% end %>
+  <div id="card_form<%= payment_method.id %>" class="margint row" data-hook>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
-    <div data-hook="card_number" class="form-group">
+    <div data-hook="card_number" class="form-group col-12">
       <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
       <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>
       <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
@@ -32,25 +38,19 @@
       </span>
     </div>
 
-    <div data-hook="card_name" class="form-group">
+    <div data-hook="card_name" class="form-group col-12">
       <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + required_span_tag) %>
       <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-control', maxlength: 19 %>
     </div>
 
-    <div data-hook="card_expiration" class="form-group">
+    <div data-hook="card_expiration" class="form-group col-6">
       <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + required_span_tag) %><br>
-      <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM / YY" %>
+      <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM/YYYY" %>
     </div>
 
-    <div data-hook="card_code" class="form-group">
+    <div data-hook="card_code" class="form-group col-6">
       <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + required_span_tag) %>
       <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-control cardCode', size: 5 %>
-      <a href="/content/cvv" class="info cvvLink" target="_blank">
-        (<%= Spree.t(:what_is_this) %>)
-      </a>
     </div>
-
-    <%= image_tag 'credit_cards/credit_card.gif', class: 'credit-card-image' %>
-
   </div>
 </fieldset>

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

@@ -1,21 +1,23 @@
 <fieldset data-hook="credit_card">
   <legend><%= Spree.t(:credit_card) %></legend>
-  <table class="table table-condensed table-bordered">
-    <tr>
-      <th width="20%"><%= Spree.t(:name_on_card) %>:</th>
-      <td><%= payment.source.name %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:card_type) %>:</th>
-      <td><%= payment.source.cc_type %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:card_number) %>:</th>
-      <td><%= payment.source.display_number %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:expiration) %>:</th>
-      <td><%= payment.source.month %>/<%= payment.source.year %></td>
-    </tr>
-  </table>
+  <div class="table-responsive">
+    <table class="table table-condensed table-bordered">
+      <tr>
+        <th width="20%"><%= Spree.t(:name_on_card) %>:</th>
+        <td><%= payment.source.name %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:card_type) %>:</th>
+        <td><%= payment.source.cc_type %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:card_number) %>:</th>
+        <td><%= payment.source.display_number %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:expiration) %>:</th>
+        <td><%= payment.source.month %>/<%= payment.source.year %></td>
+      </tr>
+    </table>
+  </div>
 </fieldset>

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

@@ -1,29 +1,31 @@
 <fieldset data-hook="store_credit">
   <legend><%= Spree.t(:store_credit_name) %></legend>
-  <table class="table table-condensed table-bordered">
-    <tr>
-      <th width="20%"><%= Spree.t(:used) %>:</th>
-      <td><%= payment.source.display_amount_used %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:amount) %>:</th>
-      <td><%= payment.source.display_amount %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:memo) %>:</th>
-      <td><%= payment.source.memo %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:type) %>:</th>
-      <td><%= payment.source.category_name %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:created_by) %>:</th>
-      <td><%= payment.source.created_by_email %></td>
-    </tr>
-    <tr>
-      <th><%= Spree.t(:issued_on) %>:</th>
-      <td><%= pretty_time(payment.source.created_at) %></td>
-    </tr>
-  </table>
+  <div class="table-responsive">
+    <table class="table table-condensed table-bordered">
+      <tr>
+        <th width="20%"><%= Spree.t(:used) %>:</th>
+        <td><%= payment.source.display_amount_used %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:amount) %>:</th>
+        <td><%= payment.source.display_amount %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:memo) %>:</th>
+        <td><%= payment.source.memo %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:type) %>:</th>
+        <td><%= payment.source.category_name %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:created_by) %>:</th>
+        <td><%= payment.source.created_by_email %></td>
+      </tr>
+      <tr>
+        <th><%= Spree.t(:issued_on) %>:</th>
+        <td><%= pretty_time(payment.source.created_at) %></td>
+      </tr>
+    </table>
+  </div>
 </fieldset>

data/app/views/spree/admin/prices/_variant_prices.html.erb

@@ -0,0 +1,43 @@
+<div class="panel-body no-padding-bottom panel-default  table-responsive">
+  <div id="variant_prices-table-wrapper">
+    <table class="table sortable">
+      <colgroup>
+        <col style="width: 15%" />
+        <col style="width: 30%" />
+        <col style="width: 15%" />
+        <col style="width: 20%" />
+        <col style="width: 20%" />
+      </colgroup>
+      <thead>
+        <tr data-hook="variant_prices_header">
+          <th><%= Spree.t(:options) %></th>
+          <th><%= Spree.t(:sku) %></th>
+          <th><%= Spree.t(:currency) %></th>
+          <th><%= Spree.t(:price) %></th>
+          <th><%= Spree.t(:compare_at_price) %></th>
+        </tr>
+      </thead>
+      <tbody id="variant-prices" data-hook="variant_prices_body">
+        <% supported_currencies_for_all_stores.each do |currency| %>
+          <% code  = currency.iso_code %>
+          <% @product.variants_including_master.each do |variant| %>
+            <% price = variant.price_in(code) %>
+            <tr id="variant_prices_row" data-hook="variant_prices_row">
+              <td class="panel">
+                <%= variant.is_master? ? Spree.t(:master) : variant.options_text.blank? ? Spree.t(:variant) : variant.options_text %>
+              </td>
+              <td class="panel-title"><%= variant.sku %></td>
+              <td><%= label_tag "vp[#{variant.id}][#{code}]", code %></td>
+              <td>
+                <%= text_field_tag "vp[#{variant.id}][#{code}][price]", (price && price.price ? price.display_amount.money : ''), class: 'form-control' %>
+              </td>
+              <td>
+                <%= text_field_tag "vp[#{variant.id}][#{code}][compare_at_price]", (price && price.compare_at_price ? price.display_compare_at_amount.money : ''), class: 'form-control' %>
+              </td>
+            </tr>
+          <% end %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,21 @@
+<%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :prices } %>
+
+<% content_for :page_actions do %>
+  <%= yield :page_actions %>
+  <%= product_preview_link(@product) %>
+<% end %>
+
+<form>
+  <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search"/>
+</form>
+
+<%= form_tag nil, { class: 'form-horizontal' } do %>
+  <div class="mt-3">
+    <%= render 'variant_prices', variant: @product.master %>
+  </div>
+  <div class="form-actions" data-hook="buttons">
+    <%= button Spree.t('actions.update'), 'update.svg' %>
+    <span class="or"><%= Spree.t(:or) %></span>
+    <%= button_link_to Spree.t('actions.cancel'), admin_product_path(@product), icon: 'delete.svg' %>
+  </div>
+<% end %>