solidus_backend 2.7.4 → 2.9.2

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 %>
 
@@ -37,7 +37,7 @@
   <div id="progress-zone" class="row"></div>
 </fieldset>
 
-<% no_images = @product.images.empty? && @product.variant_images.empty? %>
+<% no_images = @product.gallery.images.empty? %>
 
 <table class="index sortable inline-editable-table <%= 'hidden' if no_images %>" id="images-table" data-hook="images_table" data-sortable-link="<%= update_positions_admin_product_images_url(@product) %>">
   <colgroup>
@@ -63,7 +63,7 @@
   </thead>
 
   <tbody>
-    <%= render partial: 'image_row', collection: @product.variant_images, as: :image %>
+    <%= render partial: 'image_row', collection: @product.gallery.images, as: :image %>
   </tbody>
 </table>
 

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? ? 'ok-circle' : 'remove-sign' %>'></i> <%= pretty_time(entry.created_at) %></h4>
-          </td>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>Message</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/_carton_manifest.html.erb

@@ -1,7 +1,9 @@
 <% carton.manifest_for_order(order).each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
-      <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
+      <%= render 'spree/admin/shared/image',
+        image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+        size: :mini %>
     </td>
     <td class="item-name">
       <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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/orders/_shipment_manifest.html.erb

@@ -4,7 +4,9 @@
       data-variant-id="<%= item.variant.id %>"
       >
     <td class="item-image align-center">
-      <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
+      <%= render 'spree/admin/shared/image',
+        image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+        size: :mini %>
     </td>
     <td class="item-name">
       <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -9,10 +9,11 @@
 
     <tbody>
       <% order.line_items.each do |item| %>
-
         <tr class="line-item" id="line-item-<%= item.id %>">
           <td class="line-item-image">
-            <%= mini_image(item.variant) %>
+            <%= render 'spree/admin/shared/image',
+              image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+              size: :mini %>
           </td>
           <td class="line-item-name">
             <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -1,7 +1,9 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image">
-      <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
+      <%= render 'spree/admin/shared/image',
+        image: (item.variant.gallery.images.first || item.variant.product.gallery.images.first),
+        size: :mini %>
     </td>
     <td class="item-name">
       <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -10,7 +10,7 @@
 <% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter_title do %>
-  <%= t('spree.search') %>
+  <%= t('spree.filter') %>
 <% end %>
 
 <% content_for :table_filter do %>

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>
 
@@ -82,6 +93,13 @@
         <% end %>
       </div>
 
+      <div data-hook="admin_product_form_sku">
+        <%= f.field_container :sku do %>
+          <%= f.label :sku, t('spree.master_sku') %>
+          <%= f.text_field :sku, size: 16 %>
+        <% end %>
+      </div>
+
       <% if @product.has_variants? %>
         <div data-hook="admin_product_form_multiple_variants">
           <%= f.label :skus, t('spree.skus') %>
@@ -103,13 +121,6 @@
           </div>
         </div>
       <% else %>
-        <div data-hook="admin_product_form_sku">
-          <%= f.field_container :sku do %>
-            <%= f.label :sku, Spree::Variant.human_attribute_name(:sku) %>
-            <%= f.text_field :sku, size: 16 %>
-          <% end %>
-        </div>
-
         <div id="shipping_specs" class="row">
           <% [:height, :width, :depth, :weight].each_with_index do |field, index| %>
             <div id="shipping_specs_<%= field %>_field" class="col-6">

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

@@ -4,6 +4,11 @@
       <%= link_to t('spree.new_product'), new_object_url, id: 'admin_new_product', class: 'btn btn-primary' %>
     </li>
   <% 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-default ml-2' %>
+    </li>
+  <% end %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: 'Product Details' } %>

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

@@ -74,7 +74,9 @@
       <% @collection.each do |product| %>
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows">
             <td><%= product.sku %></td>
-            <td class="align-center"><%= render 'spree/admin/shared/image', image: product.display_image, size: :mini %></td>
+            <td class="align-center">
+              <%= render 'spree/admin/shared/image', image: product.gallery.images.first, size: :mini %>
+            </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="align-right"><%= product.display_price.to_html %></td>
             <td class="actions" data-hook="admin_products_index_row_actions">

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

@@ -1,5 +1,5 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
-<% admin_breadcrumb(Spree::PromotionCategory.model_name.human(count: :many)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::PromotionCategory)) %>
 
 
 <% content_for :page_actions do %>

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

@@ -37,7 +37,7 @@
                 number_of_codes: promotion_code_batch.number_of_codes
               ) %>
               <%= link_to(
-                t('spree.download_promotion_code_list'),
+                t('spree.download_promotion_codes_list'),
                 admin_promotion_promotion_code_batch_download_path(
                   promotion_code_batch_id: promotion_code_batch.id,
                   format: :csv

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

@@ -4,7 +4,11 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
+    <% if can?(:create, Spree::PromotionCode) %>
+      <%= link_to t('spree.create_promotion_code'), new_admin_promotion_promotion_code_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
+    <% end %>
+
+    <%= link_to t('spree.download_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
   </li>
 <% end %>
 

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

@@ -0,0 +1,31 @@
+<% admin_breadcrumb link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path %>
+<% admin_breadcrumb link_to(@promotion.name, spree.edit_admin_promotion_path(@promotion)) %>
+<% admin_breadcrumb plural_resource_name(Spree::PromotionCode) %>
+
+<% content_for :page_actions do %>
+  <li>
+    <%= link_to t('spree.view_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
+
+    <%= link_to t('spree.download_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
+  </li>
+<% end %>
+
+<%= form_for [:admin, @promotion, @promotion_code], method: :post do |f| %>
+  <fieldset class="no-border-top">
+    <%= render partial: 'spree/shared/error_messages', locals: { target: @promotion_code } %>
+
+    <div class="row">
+      <div class="col-4">
+        <%= f.field_container :value do %>
+          <%= f.label :value, class: 'required' %>
+          <%= f.text_field :value, class: 'fullwidth', required: true %>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="form-buttons filter-actions actions" data-hook="buttons">
+      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_promotion_promotion_codes_url(@promotion), class: 'button' %>
+    </div>
+  </fieldset>
+<% end %>

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

@@ -6,7 +6,7 @@
       <legend align="center"><%= t('spree.promotion_actions') %></legend>
       <% if can?(:update, @promotion) %>
         <div class="field">
-          <%= label_tag :action_type, t('spree.add_action_of_type')%>
+          <%= label_tag :action_type, t('spree.adjustment_type')%>
           <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth' %>
         </div>
         <div class="filter-actions actions">

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

@@ -18,5 +18,5 @@
   <div class="field">
     <%= f.label :path %>
     <%= f.text_field :path, class: "fullwidth" %>
-  </p>
+  </div>
 <% end %>

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

@@ -1,7 +1,5 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @promotion } %>
-<fieldset class="form-group no-border-bottom">
-  <legend><%= t '.general' %></legend>
-
+<fieldset class="form-group no-border-bottom no-border-top">
   <div class="row">
     <div id="general_fields" class="col-9">
       <div class="row">
@@ -14,6 +12,9 @@
           <%= f.field_container :description do %>
             <%= f.label :description %><br />
             <%= f.text_area :description, rows: 7, class: 'fullwidth' %>
+            <span class="info">
+              <%= t('spree.character_limit') %>
+            </span>
           <% end %>
 
           <%= f.field_container :category do %>
@@ -43,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>