solidus_backend 2.7.4 → 2.8.0

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

@@ -25,7 +25,9 @@
       <% @inventory_units.each do |inventory_unit| %>
         <tr class="inventory-unit">
           <td class="inventory-unit-image">
-            <%= render 'spree/admin/shared/image', image: inventory_unit.variant.display_image, size: :mini %>
+            <%= render 'spree/admin/shared/image',
+              image: (inventory_unit.variant.gallery.images.first || inventory_unit.variant.product.gallery.images.first),
+              size: :mini %>
           </td>
           <td class="inventory-unit-name">
             <%= inventory_unit.variant.product.name %><br><%= "(" + variant_options(inventory_unit.variant) + ")" unless inventory_unit.variant.option_values.empty? %>

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

@@ -16,7 +16,7 @@
       title: image.alt,
       content: %{
         <div class='align-center'>
-          #{image_tag(image.attachment.url(:large))}
+          #{image_tag(image.url(:large))}
         </div>
       }.html_safe
     ) %>

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

@@ -3,7 +3,7 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @image } %>
 
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Image), admin_product_images_path(@product)) %>
-<% admin_breadcrumb(@image.attachment_file_name) %>
+<% admin_breadcrumb(@image.filename) %>
 
 
 <% content_for :page_actions do %>
@@ -12,12 +12,12 @@
 
 <%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
   <fieldset data-hook="edit_image">
-    <legend align="center"><%= @image.attachment_file_name%></legend>
+    <legend align="center"><%= @image.filename %></legend>
 
     <div class="row">
       <div data-hook="thumbnail" class="field col-2 align-center">
         <%= f.label t('spree.thumbnail') %><br>
-        <%= link_to image_tag(@image.attachment.url(:small)), @image.attachment.url(:product) %>
+        <%= link_to image_tag(@image.url(:small)), @image.url(:product) %>
       </div>
       <div class="col-10">
         <%= render partial: 'form', locals: { f: f } %>

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

@@ -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

@@ -13,13 +13,13 @@
       <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>
+            <h4><i class='fa fa-<%= entry.parsed_details.success? ? 'check' : 'remove' %>'></i> <%= pretty_time(entry.created_at) %></h4>
           </td>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <td>Message</td>
+          <td><%= Spree::LogEntry.human_attribute_name(:details) %></td>
           <td>
             <pre><%= entry.parsed_details.message %></pre>
           </td>

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/_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/products/_form.html.erb

@@ -82,6 +82,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') %>
@@ -102,13 +109,6 @@
             <% end %>
           </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| %>

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-primary 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 %>

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

@@ -6,7 +6,7 @@
 
       <% if can?(:update, @promotion) %>
         <div class="field">
-          <%= label_tag :promotion_rule_type, t('spree.add_rule_of_type') %>
+          <%= label_tag :promotion_rule_type, t('spree.discount_rules') %>
           <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), include_blank: t(:choose_promotion_rule, scope: 'spree'), class: 'custom-select fullwidth') %>
         </div>
         <div class="filter-actions actions">

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

@@ -6,7 +6,9 @@
 <% content_for :page_actions do %>
   <li>
     <% if can?(:display, Spree::PromotionCode) %>
-      <%= link_to t('spree.download_promotion_code_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
+      <%= 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' %>
     <% end %>
 
     <% if can?(:display, Spree::PromotionCodeBatch) %>

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

@@ -35,7 +35,7 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button_tag Spree::Refund.model_name.human, class: 'btn btn-primary' %>
+      <%= f.submit Spree::Refund.model_name.human, class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>

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

@@ -49,11 +49,18 @@
     <%= f.label :state_id, Spree::State.model_name.human %>
     <span id="<%= s_or_b %>state">
       <%= f.hidden_field :state_name, value: nil %>
+      <% states = f.object.country.try(:states).nil? ? [] : f.object.country.states %>
       <%= f.text_field :state_name,
-            style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
-           disabled: !f.object.country.states.empty?, class: 'fullwidth state_name js-state_name' %>
+            style: "display: #{states.empty? ? 'block' : 'none' };",
+            disabled: !states.empty?, class: 'fullwidth state_name js-state_name' %>
       <%= f.hidden_field :state_id, value: nil %>
-      <%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth js-state_id', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?} %>
+      <%= f.collection_select :state_id,
+            states.sort,
+            :id, :name,
+            { include_blank: true },
+            { class: 'custom-select fullwidth js-state_id',
+              style: "display: #{states.empty? ? 'none' : 'block' };",
+              disabled: states.empty? } %>
     </span>
   </div>
 

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
   <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
-  <%= link_to t('spree.actions.cancel'), collection_url, class: 'btn btn-primary' %>
+  <%= link_to t('spree.actions.cancel'), collection_url, class: 'button' %>
 </div>

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

@@ -8,6 +8,7 @@
 <!-- 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/_image.html.erb

@@ -1,7 +1,7 @@
 <% size ||= :mini %>
 
-<% if image && image.attachment? %>
-  <%= image_tag image.attachment(size) %>
+<% if image_url = image.try(:url, size) %>
+  <%= image_tag image_url %>
 <% else %>
   <span class="image-placeholder <%= size %>"></span>
 <% end %>

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

@@ -12,6 +12,6 @@
     <%= tab :taxonomies %>
   <% end %>
   <% if can? :admin, Spree::Taxon %>
-    <%= tab :taxons, label: :display_order %>
+    <%= tab :taxons, label: :display_order, match_path: '/taxons' %>
   <% end %>
 </ul>

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

@@ -16,6 +16,10 @@
       <% if can?(:display, Spree::AdjustmentReason) %>
         <%= settings_tab_item plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path %>
       <% end %>
+
+      <% if can?(:display, Spree::StoreCreditReason) %>
+        <%= settings_tab_item plural_resource_name(Spree::StoreCreditReason), spree.admin_store_credit_reasons_path %>
+      <% end %>
     </ul>
   </nav>
 <% end %>

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

@@ -8,12 +8,12 @@
   <% end %>
 
   <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
-    <%= tab :taxes, url: spree.admin_tax_categories_path %>
+    <%= tab :taxes, url: spree.admin_tax_categories_path, match_path: %r(tax_categories|tax_rates) %>
   <% end %>
 
   <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
-     can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
-    <%= tab :checkout, url: spree.admin_refund_reasons_path %>
+    can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
+    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons) %>
   <% end %>
 
   <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>

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

@@ -1,11 +1,12 @@
-<% Spree::Backend::Config.menu_items.each do |menu_item| %>
+<% Spree::Backend::Config.menu_items.sort_by { |item| item.position || Float::INFINITY }.each do |menu_item| %>
   <% if instance_exec(&menu_item.condition) %>
     <%=
       tab(
         *menu_item.sections,
         icon: menu_item.icon,
         label: menu_item.label,
-        url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url
+        url: menu_item.url.is_a?(Symbol) ? spree.public_send(menu_item.url) : menu_item.url,
+        match_path: menu_item.match_path,
       ) do
     %>
       <%- render partial: menu_item.partial if menu_item.partial %>

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

@@ -4,7 +4,7 @@
       <div class="field-block col-3">
         <div class="field">
           <%= label_tag nil, Spree::StockLocation.model_name.human %>
-          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: true, class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location') } %>
+          <%= select_tag :stock_location_id, options_from_collection_for_select(stock_locations, :id, :name, params[:stock_location_id]), { include_blank: t('spree.all'), class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location') } %>
         </div>
       </div>
       <div class="<%= if content_for?(:sidebar) then 'col-6' else 'col-9' end %>">