solidus_backend 2.8.2 → 2.9.2

data/app/helpers/spree/admin/base_helper.rb

@@ -30,10 +30,16 @@ module Spree
         end
       end
 
-      def datepicker_field_value(date)
-        unless date.blank?
-          l(date, format: t('spree.date_picker.format', default: '%Y/%m/%d'))
+      def datepicker_field_value(date, with_time: false)
+        return if date.blank?
+
+        format = if with_time
+          t('spree.date_picker.format_with_time', default: '%Y/%m/%d %H:%M')
+        else
+          t('spree.date_picker.format', default: '%Y/%m/%d')
         end
+
+        l(date, format: format)
       end
 
       # @deprecated Render `spree/admin/shared/preference_fields/\#{preference_type}' instead

data/app/helpers/spree/admin/promotions_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    module PromotionsHelper
+      def admin_promotion_status(promotion)
+        return :active if promotion.active?
+        return :not_started if promotion.not_started?
+        return :expired if promotion.expired?
+
+        :inactive
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
-    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'button') %></li>
+    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'btn btn-primary') %></li>
   <% end %>
 <% end %>
 

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

@@ -8,22 +8,4 @@
   <li><%= link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment), class: 'btn btn-primary' %></li>
 <% end %>
 
-<table class='index' id='listing_log_entries'>
-  <% @log_entries.each do |entry| %>
-      <thead>
-        <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
-          <td colspan='2'>
-            <h4><i class='fa fa-<%= entry.parsed_details.success? ? 'check' : 'remove' %>'></i> <%= pretty_time(entry.created_at) %></h4>
-          </td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td><%= Spree::LogEntry.human_attribute_name(:details) %></td>
-          <td>
-            <pre><%= entry.parsed_details.message %></pre>
-          </td>
-        </tr>
-      </tbody>
-  <% end %>
-</table>
+<%= render 'spree/admin/payments/log_entries', log_entries: @log_entries %>

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

@@ -6,7 +6,7 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'button' %>
+      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'btn btn-primary' %>
     </span>
   </li>
   <% end %>

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

@@ -6,7 +6,7 @@
   <%= render partial: "spree/admin/orders/line_items", locals: { order: order } %>
 
   <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
-    <button class="js-add-line-item" disabled><%= t('spree.add_line_item') %></button>
+    <button class="js-add-line-item btn btn-primary" disabled><%= t('spree.add_line_item') %></button>
   <% end %>
 
   <%= render "spree/admin/orders/order_details", { order: order } %>

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

@@ -1,19 +1,16 @@
-<% if @payment.capture_events.exists? %>
-  <h3><%= plural_resource_name(Spree::PaymentCaptureEvent) %></h3>
-  <table class="index" id="capture_events">
-    <thead>
-      <tr data-hook="payments_header">
-        <th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
-        <th><%= t('spree.amount') %></th>
+<table class="index" id="capture_events">
+  <thead>
+    <tr data-hook="payments_header">
+      <th><%= Spree::PaymentCaptureEvent.human_attribute_name(:created_at) %></th>
+      <th class="text-right"><%= Spree::PaymentCaptureEvent.human_attribute_name(: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 class="text-right"><%= capture_event.display_amount %></td>
       </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>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-<% end %>
+    <% end %>
+  </tbody>
+</table>

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

@@ -48,7 +48,7 @@
         </td>
         <td class="actions">
           <div class="editing-show">
-            <%= link_to_with_icon 'save', t('spree.actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
+            <%= link_to_with_icon 'ok', t('spree.actions.save'), nil, no_text: true, class: "js-save", data: {action: 'save'} %>
             <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, class: "js-cancel", data: {action: 'cancel'} %>
           </div>
           <div class="editing-hide">

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

@@ -0,0 +1,29 @@
+<table class='index' id='listing_log_entries'>
+  <colgroup>
+    <col style="width: 30%" />
+    <col style="width: 60%" />
+    <col style="width: 10%" />
+  </colgroup>
+  <thead>
+    <tr>
+      <th><%= Spree::LogEntry.human_attribute_name(:created_at) %></th>
+      <th><%= Spree::LogEntry.human_attribute_name(:details) %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% log_entries.each do |entry| %>
+    <tr class="log_entry <%= entry.parsed_details.success? ? 'success' : 'fail' %>">
+      <td>
+        <%= pretty_time(entry.created_at) %>
+      </td>
+      <td>
+        <pre><%= entry.parsed_details.message %></pre>
+      </td>
+      <td class="text-right">
+        <i class='fa fa-<%= entry.parsed_details.success? ? 'check' : 'remove' %>'></i>
+      </td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>

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

@@ -8,15 +8,22 @@
   </span>
 <% end %>
 
-
-<% content_for :page_actions do %>
-  <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
-<% end %>
-
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.partial_name}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
 
 <div data-hook="amount" class="align-center">
   <h5><%= label_tag nil, Spree::Payment.human_attribute_name(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
 </div>
 
-<%= render 'spree/admin/payments/capture_events' %>
+<% if @payment.capture_events.any? %>
+  <fieldset class="no-border-bottom">
+    <legend><%= plural_resource_name(Spree::PaymentCaptureEvent) %></legend>
+    <%= render 'spree/admin/payments/capture_events' %>
+  </fieldset>
+<% end %>
+
+<% if @payment.log_entries.any? %>
+  <fieldset class="no-border-bottom">
+    <legend><%= plural_resource_name(Spree::LogEntry) %></legend>
+    <%= render 'spree/admin/payments/log_entries', log_entries: @payment.log_entries %>
+  </fieldset>
+<% end %>

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

@@ -26,7 +26,7 @@
       <div data-hook="admin_product_price_form_amount" class="col-4">
         <%= f.field_container :price do %>
           <%= f.label :price %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency_attr: :currency %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency_attr: :currency, currency: @price.currency %>
         <% end %>
       </div>
   </div>

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

@@ -7,7 +7,7 @@
   <% if can?(:create, Spree::ProductProperty) %>
     <ul class="tollbar inline-menu">
       <li>
-        <%= link_to_add_fields t('spree.add_product_properties'), 'tbody#product_properties', class: 'plus button' %>
+        <%= link_to_add_fields t('spree.add_product_properties'), 'tbody#product_properties', class: 'plus btn btn-primary' %>
       </li>
     </ul>
   <% end %>

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

@@ -32,11 +32,22 @@
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price do %>
           <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
-          <%= render "spree/admin/shared/number_with_currency", f: f,
-                     amount_attr: :price,
-                     required: Spree::Config.require_master_price,
-                     currency: Spree::Config.default_pricing_options.currency %>
-          <%= f.error_message_on :price %>
+
+          <% if f.object.new_record? || f.object.has_default_price? %>
+            <%= render "spree/admin/shared/number_with_currency",
+                       f: f,
+                       amount_attr: :price,
+                       required: Spree::Config.require_master_price,
+                       currency: Spree::Config.default_pricing_options.currency %>
+            <%= f.error_message_on :price %>
+          <% else %>
+            <span class="info">
+              <%= t('spree.product_without_default_price_info',
+                    default_currency: Spree::Config.default_pricing_options.currency) %>
+              <%= link_to t('spree.product_without_default_price_cta'),
+                          spree.admin_product_prices_url(@product) %>
+            </span>
+          <% end %>
         <% end %>
       </div>
 

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

@@ -6,7 +6,7 @@
   <% end %>
   <% if defined?(Spree::Frontend::Engine) %>
     <li id="view_product_link">
-      <%= link_to t('spree.view_product'), spree.product_path(@product), id: 'admin_view_product', class: 'btn btn-primary ml-2' %>
+      <%= link_to t('spree.view_product'), spree.product_path(@product), id: 'admin_view_product', class: 'btn btn-default ml-2' %>
     </li>
   <% end %>
 <% end %>

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

@@ -44,13 +44,13 @@
       <div id="starts_at_field" class="field">
         <%= f.label :starts_at %>
         <%= f.field_hint :starts_at %>
-        <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at), placeholder: t(".starts_at_placeholder"), class: 'datepicker datepicker-from fullwidth' %>
+        <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at, with_time: true), placeholder: t(".starts_at_placeholder"), class: 'datepicker datepicker-from fullwidth', data: { :'enable-time' => true, :'default-hour' => 0 } %>
       </div>
 
       <div id="expires_at_field" class="field">
         <%= f.label :expires_at %>
         <%= f.field_hint :expires_at %>
-        <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at), placeholder: t(".expires_at_placeholder"), class: 'datepicker datepicker-to fullwidth' %>
+        <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at, with_time: true), placeholder: t(".expires_at_placeholder"), class: 'datepicker datepicker-to fullwidth', data: { :'enable-time' => true, :'default-hour' => 0 } %>
       </div>
     </div>
   </div>

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

@@ -78,11 +78,11 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.take.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
-              <%= t(promotion.active?? :active : :inactive, scope: 'spree') %>
+              <%= t(admin_promotion_status(promotion), scope: 'spree.admin.promotion_status') %>
             </span>
           </td>
           <td>
@@ -92,10 +92,10 @@
             <%= promotion.usage_count %>
           </td>
           <td>
-            <%= promotion.starts_at.to_date.to_s(:short_date) if promotion.starts_at %>
+            <%= promotion.starts_at.to_s(:long) if promotion.starts_at %>
           </td>
           <td>
-            <%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %>
+            <%= promotion.expires_at.to_s(:long) if promotion.expires_at %>
           </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>

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

@@ -97,10 +97,10 @@
   <% end %>
   <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
-      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %>
+      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button btn btn-primary', method: 'post' } do %>
         <%= t('spree.reimburse') %>
       <% end %>
-      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-default' %>
     <% end %>
   </div>
 </fieldset>

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

@@ -5,9 +5,6 @@
 
 <title><%= admin_page_title %></title>
 
-<!-- Get "Open Sans" font from Google -->
-<link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
-
 <%= favicon_link_tag 'favicon.ico' %>
 <%= stylesheet_link_tag 'spree/backend/all', media: 'all', data: {turbolinks_track: 'reload'} %>
 <%= javascript_include_tag 'spree/backend/all', data: {turbolinks_track: 'reload'} %>

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

@@ -11,7 +11,7 @@
         <%= content %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div>
   </div>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields" class="row">
   <div data-hook="admin_shipping_method_form_name_field" class="col-5">
     <%= f.field_container :name do %>
-      <%= f.label :name %><br />
+      <%= f.label :name, class: 'required' %>
       <%= f.text_field :name, class: 'fullwidth' %>
       <%= error_message_on :shipping_method, :name %>
     <% end %>
@@ -9,32 +9,32 @@
 
   <div data-hook="admin_shipping_method_form_internal_name_field" class="col-5">
     <%= f.field_container :admin_name do %>
-      <%= f.label :admin_name %><br />
-      <%= f.text_field :admin_name, class: 'fullwidth', label: false  %>
+      <%= f.label :admin_name %>
+      <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :admin_name %>
     <% end %>
   </div>
 
   <div data-hook="admin_shipping_method_form_code" class="col-5">
     <%= f.field_container :code do %>
-      <%= f.label :code %><br />
-      <%= f.text_field :code, class: 'fullwidth', label: false  %>
+      <%= f.label :code %>
+      <%= f.text_field :code, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :code %>
     <% end %>
   </div>
 
   <div class="col-5">
     <%= f.field_container :carrier do %>
-      <%= f.label :carrier %><br />
-      <%= f.text_field :carrier, class: 'fullwidth', label: false  %>
+      <%= f.label :carrier %>
+      <%= f.text_field :carrier, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :carrier %>
     <% end %>
   </div>
 
   <div class="col-5">
     <%= f.field_container :service_level do %>
-      <%= f.label :service_level %><br />
-      <%= f.text_field :service_level, class: 'fullwidth', label: false  %>
+      <%= f.label :service_level %>
+      <%= f.text_field :service_level, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :service_level %>
     <% end %>
   </div>
@@ -49,7 +49,7 @@
 
   <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-10">
     <%= f.field_container :tracking_url do %>
-      <%= f.label :tracking_url %><br />
+      <%= f.label :tracking_url %>
       <%= f.text_field :tracking_url, class: 'fullwidth', placeholder: t('spree.tracking_url_placeholder') %>
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>

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

@@ -72,7 +72,7 @@
             </colgroup>
             <% variant.stock_items.each do |item| %>
               <% if @stock_item_stock_locations.include?(item.stock_location) %>
-                <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>">
+                <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>">
                   <%# This is rendered in JS %>
                 </tr>
               <% end %>

data/app/views/spree/admin/store_credits/edit_validity.html.erb

@@ -20,7 +20,7 @@
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button_tag t('spree.store_credit.actions.invalidate'), class: 'btn btn-primary' %>
-      <%= link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-default' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -7,7 +7,7 @@
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::StoreCredit) %>
-    <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button' %></li>
+    <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button btn btn-primary' %></li>
   <% end %>
 <% end %>
 

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

@@ -8,7 +8,7 @@
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <% if @store_credit.editable? && can?(:edit, @store_credit) %>
-    <li><%= link_to t('spree.admin.store_credits.change_amount'), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
+    <li><%= link_to t('spree.admin.store_credits.change_amount'), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button btn btn-primary' %></li>
   <% end %>
   <% if @store_credit.invalidateable? && can?(:invalidate, @store_credit) %>
     <li><%= link_to t('spree.invalidate'), edit_validity_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>

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

@@ -8,6 +8,7 @@
 
     <%= f.field_container :code do %>
       <%= f.label :code, class: 'required' %>
+      <%= f.field_hint :code %>
       <%= f.text_field :code, required: true, class: 'fullwidth' %>
       <%= f.error_message_on :code %>
     <% end %>