spree_backend 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d62e3e74918cc0fb8fd2a44ffa6607f6d7a287572cbe9babf81f47882ce8a3d0
-  data.tar.gz: cca019c472ef786fe7d706eaae189dede52524fa2d26c4fc2f2e33b9cced1a05
+  metadata.gz: d04215d2de0a86fa11317efd09b3c254427e4c75f164edf7b30025fd8b51a952
+  data.tar.gz: b44803c8f02239ec8822a301005db2d30929d847d7cf77fd3ba3b52a2d661a57
 SHA512:
-  metadata.gz: 58083d7dd7588a54b3d872d77f389ad21136274cb96cbb14994bd7a81c7919a3edc6c49d525afb73029a55ef89aec8c5b157568113acaea3691791679f2525a4
-  data.tar.gz: 63bac296530375223bd8523ce427d0145ebc6296389c9e5f894919da6df0107d41981bc84f4510556e139394f207a8428453da91b49501e577f8d740170e2bef
+  metadata.gz: 632f08517f0870c060a3d240e893b1ef2fff52ec6f79ecece0b4e4a9ea4dd2d3ef422f04aa695ae8594867dab34f5711bb233c41693f4f3bc7a62d3e040e53c4
+  data.tar.gz: 68b50bd16165b000965318cd54fb5a4590d7270d64687e751714223947d87494c201a226b0a43e357327e8e1bb8ed7d250b16f77c78989002f69691f7265ea58

data/app/assets/javascripts/spree/backend/handlebar_extensions.js

@@ -8,3 +8,10 @@ Handlebars.registerHelper('t', function (key) {
 Handlebars.registerHelper('edit_product_url', function (productId) {
   return Spree.routes.edit_product(productId)
 })
+Handlebars.registerHelper('name_or_presentation', function (optionValue) {
+  if (optionValue.name === 'color') {
+    return optionValue.name
+  } else {
+    return optionValue.presentation
+  }
+})

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

@@ -150,12 +150,24 @@ module Spree
       end
 
       def order_time(time)
+        return '' if time.blank?
+
         [I18n.l(time.to_date), time.strftime('%l:%M %p').strip].join(' ')
       end
 
       def required_span_tag
         content_tag(:span, ' *', class: 'required')
       end
+
+      def product_preview_link(product)
+        return unless frontend_available?
+
+        button_link_to(
+          Spree.t(:preview_product),
+          spree.product_url(product),
+          class: 'btn-outline-secondary', icon: 'eye-open', id: 'admin_preview_product', target: :blank
+        )
+      end
     end
   end
 end

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

@@ -1,6 +1,10 @@
 <%= render partial: 'spree/admin/shared/product_tabs', locals: { current: :images } %>
 
 <% content_for :page_actions do %>
+  <div class="page-actions col-6 pr-0" data-hook="toolbar">
+    <%= yield :page_actions %>
+  </div>
+  <%= product_preview_link(@product) %>
   <%= button_link_to(Spree.t(:new_image), spree.new_admin_product_image_url(@product), { class: "btn-success", icon: 'add', id: 'new_image_link' }) if can? :create, Spree::Image %>
 <% end %>
 

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

@@ -20,10 +20,10 @@
           <% order.line_items.each do |item| %>
             <tr class="line-item" id="line-item-<%= item.id %>">
               <td class="line-item-image image text-center">
-                <%= mini_image(item.variant) %>
+                <%= link_to mini_image(item.variant), edit_admin_product_path(item.variant.product) %>
               </td>
               <td class="line-item-name text-center">
-                <%= item.name %>
+                <%= link_to item.name, edit_admin_product_path(item.variant.product) %>
                 <br />
                 <%= "(#{item.options_text})" if item.options_text.present? %>
               </td>

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

@@ -1,11 +1,11 @@
 <% shipment.manifest.each do |item| %>
   <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
     <td class="item-image image text-center">
-      <%= mini_image(item.variant) %>
+      <%= link_to mini_image(item.variant), edit_admin_product_path(item.variant.product) %>
     </td>
 
     <td class="item-name">
-      <%= item.variant.product.name %>
+      <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %>
       <br />
       <%= "(#{item.variant.options_text})" if item.variant.options_text.present? %>
       <% if item.variant.sku.present? %>

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

@@ -2,6 +2,8 @@
 <%= render 'spree/admin/shared/error_messages', target: @product %>
 
 <% content_for :page_actions do %>
+  <%= product_preview_link(@product) %>
+
   <%= button_link_to(
     Spree.t(:add_product_properties),
     "javascript:;",

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

@@ -3,6 +3,9 @@
     <%= Spree.t(:add_stock) %>
   </h1>
 </div>
+<% content_for :page_actions do %>
+  <%= product_preview_link(@product) %>
+<% end %>
 <div class="card-body">
   <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>
     <div data-hook="admin_stock_movements_form_fields" class="row">

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

@@ -1,7 +1,5 @@
 <% content_for :page_actions do %>
-  <% if frontend_available? %>
-    <%= button_link_to Spree.t(:preview_product), product_url(@product), { class: "btn-outline-secondary", icon: 'eye-open', id: 'admin_preview_product', target: :_blank } %>
-  <% end %>
+  <%= product_preview_link(@product) %>
   <% if can?(:create, Spree::Product) %>
     <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add', id: 'admin_new_product' } %>
   <% end %>

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

@@ -2,7 +2,7 @@
   <div class="content-header <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
     <div class="row align-items-center  <%= if content_for?(:page_tabs) then "pb-0" else "border-bottom" end %> mb-4">
       <% if content_for?(:page_title) %>
-        <h1 class="h4 pl-0 mb-0 col-<%= content_for?(:page_actions) ? '6' : '12'  %>">
+        <h1 class="h4 pl-0 mb-0 col-<%= content_for?(:page_actions) ? '5' : '12'  %>">
           <%= yield :page_title %>
           <% if content_for?(:page_title_small) %>
             <small><%= yield :page_title_small %></small>
@@ -11,7 +11,7 @@
       <% end %>
 
       <% if content_for?(:page_actions) %>
-        <div class="page-actions col-6 pr-0" data-hook="toolbar">
+        <div class="page-actions col-7 pr-0" data-hook="toolbar">
           <%= yield :page_actions %>
         </div>
       <% end %>

data/app/views/spree/admin/variants/_autocomplete.js.erb

@@ -12,7 +12,7 @@
       <h5 class="variant-name media-heading h6 mb-0">{{variant.name}}</h5>
       {{#if variant.option_values}}
         {{#each variant.option_values}}
-          <strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br/>
+          <strong>{{this.option_type_presentation}}:</strong> {{name_or_presentation this}}<br/>
         {{/each}}
       {{/if}}
       <strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}

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

@@ -4,8 +4,13 @@
       <% @product.option_types.each do |option_type| %>
         <div class="form-group" data-hook="presentation">
           <%= label :new_variant, option_type.presentation %>
-          <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-            { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+          <% if option_type.name == 'color' %>
+            <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :name,
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+          <% else %>
+            <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+          <% end %>
         </div>
       <% end %>
 

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

@@ -59,6 +59,7 @@
   <% end %>
 <% else %>
   <% content_for :page_actions do %>
+    <%= product_preview_link(@product) %>
     <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
     <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter' } %>
   <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: bootstrap
   requirement: !ruby/object:Gem::Requirement