solidus_backend 2.7.4 → 2.8.0

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

@@ -1,34 +1,37 @@
+<% admin_layout "full-width" %>
+
 <%= paginate @variants, theme: "solidus_admin" %>
 
 <table class="index stock-table" id="listing_product_stock">
   <colgroup>
-    <col style="width: 50%" />
-    <col style="width: 20%" />
-    <col style="width: 10%" />
-    <col style="width: 5%" />
-    <col style="width: 5%" />
-    <col style="width: 10%" />
+    <col style="width: 30%">
+    <col style="width: 15%">
+    <col style="width: 14%">
+    <col style="width: 11%">
+    <col style="width: 11%">
+    <col style="width: 10%">
+    <col style="width: 9%">
   </colgroup>
   <thead>
     <tr>
       <th><%= t('spree.item') %></th>
-      <th><%= t('spree.options') %></th>
+      <th><%= Spree::Variant.model_name.human %></th>
       <th><%= Spree::StockLocation.model_name.human %></th>
-      <th><%= t('spree.backorderable_header') %></th>
-      <th><%= t('spree.count_on_hand') %></th>
+      <th class="align-center"><%= t('spree.backorderable_header') %></th>
+      <th class="align-center"><%= t('spree.count_on_hand') %></th>
+      <th><%= t('spree.modify_stock_count') %></th>
       <th class="actions"></th>
     </tr>
   </thead>
   <% variants.each do |variant| %>
-    <%- locations_without_items = @stock_item_stock_locations - variant.stock_items.flat_map(&:stock_location) %>
-    <%- display_add_row = locations_without_items.any? && can?(:create, Spree::StockItem) %>
-    <%- row_count = @stock_item_stock_locations.count + 2 %>
     <tbody class="variant-stock-items">
       <tr id="<%= spree_dom_id variant %>">
-        <td class="no-padding" rowspan="<%= row_count %>">
+        <td>
           <div class='variant-container'>
             <div class='variant-image'>
-              <%= render 'spree/admin/shared/image', image: variant.display_image(fallback: false), size: :small %>
+              <%= render 'spree/admin/shared/image',
+                image: variant.gallery.images.first,
+                size: :small %>
             </div>
             <div class='variant-details'>
               <table class='stock-variant-field-table'>
@@ -46,7 +49,7 @@
             </div>
           </div>
         </td>
-        <td rowspan="<%= row_count %>">
+        <td class="align-center">
           <table class='stock-variant-field-table'>
             <% variant.option_values.sort_by(&:option_type_name).each do |option_value| %>
               <tr>
@@ -58,30 +61,45 @@
             <% end %>
           </table>
         </td>
+        <td class="stock-location-items-cell" colspan="5">
+          <table class="stock-location-items-table">
+            <colgroup>
+              <col style="width: 25%" />
+              <col style="width: 20%" />
+              <col style="width: 20%" />
+              <col style="width: 20%" />
+              <col style="width: 15%" />
+            </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? %>">
+                  <%# This is rendered in JS %>
+                </tr>
+              <% end %>
+            <% end %>
+            <% locations_without_items = @stock_item_stock_locations - variant.stock_items.flat_map(&:stock_location) %>
+            <% if locations_without_items.any? && can?(:create, Spree::StockItem) %>
+              <tr class="js-add-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>">
+                <form>
+                  <td class='location-name-cell'>
+                    <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), class: 'custom-select', prompt: t('spree.add_to_stock_location'), id: "variant-stock-location-#{variant.id}" %>
+                  </td>
+                  <td class="align-center">
+                    <%= check_box_tag :backorderable, 'backorderable', false, id: "variant-backorderable-#{variant.id}" %>
+                  </td>
+                  <td>
+                    <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
+                  </td>
+                  <td></td>
+                  <td class="actions">
+                    <%= link_to_with_icon 'plus', t('spree.actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
+                  </td>
+                </form>
+              </tr>
+            <% end %>
+          </table>
+        </td>
       </tr>
-      <% 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 %>">
-            <%# This is rendered in JS %>
-          </tr>
-        <% end %>
-      <% end %>
-      <% if display_add_row %>
-        <tr class="js-add-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>">
-          <td class='location-name-cell'>
-            <%= select_tag :stock_location_id, options_from_collection_for_select(locations_without_items, :id, :name), { include_blank: true, class: 'custom-select', "data-placeholder" => t('spree.add_to_stock_location'), id: "variant-stock-location-#{variant.id}" } %>
-          </td>
-          <td class="align-center">
-            <%= check_box_tag :backorderable, 'backorderable', false, id: "variant-backorderable-#{variant.id}" %>
-          </td>
-          <td class="align-center">
-            <%= number_field_tag :count_on_hand, "", class: 'fullwidth', id: "variant-count-on-hand-#{variant.id}" %>
-          </td>
-          <td class="actions">
-            <%= link_to_with_icon 'plus', t('spree.actions.create'), '#', no_text: true, data: { action: 'add' }, class: "submit" %>
-          </td>
-        </tr>
-      <% end %>
     </tbody>
   <% end %>
 </table>

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

@@ -1,122 +1,134 @@
-<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form">
-  <fieldset class="no-border-bottom">
-    <legend><%= t('.general') %></legend>
-
-     <%= f.field_container :name do %>
-       <%= f.label :name, class: 'required' %><br />
-       <%= f.text_field :name, class: 'fullwidth', required: true %>
-     <% end %>
-
-     <%= f.field_container :code do %>
-       <%= f.label :code %>
-       <%= f.text_field :code, :class => 'fullwidth', :label => false %>
-     <% end %>
-
-     <%= f.field_container :admin_name do %>
-       <%= f.label :admin_name %>
-       <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
-     <% end %>
-  </fieldset>
-
-  <fieldset class="no-border-bottom">
-    <legend><%= t('.settings') %></legend>
-
-    <%= f.field_container :active do %>
-      <label>
-        <%= f.check_box :active %>
-        <%= Spree::StockLocation.human_attribute_name :active %>
-        <%= f.field_hint :active %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :default do %>
-      <label>
-        <%= f.check_box :default %>
-        <%= Spree::StockLocation.human_attribute_name :default %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :backorderable_default do %>
-      <label>
-        <%= f.check_box :backorderable_default %>
-        <%= Spree::StockLocation.human_attribute_name :backorderable_default %>
-        <%= f.field_hint :backorderable_default %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :propagate_all_variants do %>
-      <label>
-        <%= f.check_box :propagate_all_variants %>
-        <%= Spree::StockLocation.human_attribute_name :propagate_all_variants %>
-        <%= f.field_hint :propagate_all_variants %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :restock_inventory do %>
-      <label>
-        <%= f.check_box :restock_inventory %>
-        <%= Spree::StockLocation.human_attribute_name :restock_inventory %>
-        <%= f.field_hint :restock_inventory %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :fulfillable do %>
-      <label>
-        <%= f.check_box :fulfillable %>
-        <%= Spree::StockLocation.human_attribute_name :fulfillable %>
-        <%= f.field_hint :fulfillable %>
-      </label>
-    <% end %>
-
-    <%= f.field_container :check_stock_on_transfer do %>
-      <label>
-        <%= f.check_box :check_stock_on_transfer %>
-        <%= Spree::StockLocation.human_attribute_name :check_stock_on_transfer %>
-        <%= f.field_hint :check_stock_on_transfer %>
-      </label>
-    <% end %>
-  </fieldset>
-
-  <fieldset>
-    <legend><%= t('.address') %></legend>
-
-    <%= f.field_container :check_stock_on_transfer do %>
-      <%= f.label :address1 %>
-      <%= f.text_field :address1, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :address2 do %>
-      <%= f.label :address2 %>
-      <%= f.text_field :address2, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :city do %>
-      <%= f.label :city %>
-      <%= f.text_field :city, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :zipcode do %>
-      <%= f.label :zipcode %>
-      <%= f.text_field :zipcode, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :phone do %>
-      <%= f.label :phone %>
-      <%= f.phone_field :phone, class: 'fullwidth' %>
-    <% end %>
-
-    <%= f.field_container :country_id do %>
-      <%= f.label :country_id %>
-      <span id="country"><%= f.collection_select :country_id, available_countries(restrict_to_zone: nil), :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
-    <% end %>
-
-    <%= f.field_container :state do %>
-      <% country = f.object.country %>
-      <%= f.label :state_id %>
-      <span id="state" class="region">
-        <%= f.text_field :state_name, style: "display: none", class: 'fullwidth state_name js-state_name' %>
-        <%= f.collection_select :state_id, country ? country.states.sort : [], :id, :name, { include_blank: true }, {class: 'custom-select fullwidth js-state_id', style: "display: none" } %>
-      </span>
-    <% end %>
-  </fieldset>
+<div data-hook="admin_stock_locations_form_fields" class="js-addresses-form row">
+  <div class="col-md-6">
+    <fieldset class="no-border-bottom">
+      <legend><%= t('.general') %></legend>
+
+      <%= f.field_container :name do %>
+        <%= f.label :name, class: 'required' %><br />
+        <%= f.text_field :name, class: 'fullwidth', required: true %>
+      <% end %>
+
+      <%= f.field_container :code do %>
+        <%= f.label :code %>
+        <%= f.text_field :code, :class => 'fullwidth', :label => false %>
+      <% end %>
+
+      <%= f.field_container :admin_name do %>
+        <%= f.label :admin_name %>
+        <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <div class="col-md-6">
+    <fieldset class="no-border-bottom">
+      <legend><%= t('.address') %></legend>
+
+      <%= f.field_container :check_stock_on_transfer do %>
+        <%= f.label :address1 %>
+        <%= f.text_field :address1, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :address2 do %>
+        <%= f.label :address2 %>
+        <%= f.text_field :address2, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :city do %>
+        <%= f.label :city %>
+        <%= f.text_field :city, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :zipcode do %>
+        <%= f.label :zipcode %>
+        <%= f.text_field :zipcode, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :phone do %>
+        <%= f.label :phone %>
+        <%= f.phone_field :phone, class: 'fullwidth' %>
+      <% end %>
+
+      <%= f.field_container :country_id do %>
+        <%= f.label :country_id %>
+        <span id="country"><%= f.collection_select :country_id, available_countries(restrict_to_zone: nil), :id, :name, { include_blank: true }, { class: 'custom-select js-country_id fullwidth' } %></span>
+      <% end %>
+
+      <%= f.field_container :state do %>
+        <% country = f.object.country %>
+        <%= f.label :state_id %>
+        <span id="state" class="region">
+          <%= f.text_field :state_name, style: "display: none", class: 'fullwidth state_name js-state_name' %>
+          <%= f.collection_select :state_id, country ? country.states.sort : [], :id, :name, { include_blank: true }, {class: 'custom-select fullwidth js-state_id', style: "display: none" } %>
+        </span>
+      <% end %>
+    </fieldset>
+  </div>
+
+  <div class="col-md-12">
+    <fieldset class="no-border-bottom">
+      <legend><%= t('.settings') %></legend>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.field_container :active do %>
+            <label>
+              <%= f.check_box :active %>
+              <%= Spree::StockLocation.human_attribute_name :active %>
+              <%= f.field_hint :active %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :default do %>
+            <label>
+              <%= f.check_box :default %>
+              <%= Spree::StockLocation.human_attribute_name :default %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :backorderable_default do %>
+            <label>
+              <%= f.check_box :backorderable_default %>
+              <%= Spree::StockLocation.human_attribute_name :backorderable_default %>
+              <%= f.field_hint :backorderable_default %>
+            </label>
+          <% end %>
+        </div>
+
+        <div class="col-md-6">
+          <%= f.field_container :propagate_all_variants do %>
+            <label>
+              <%= f.check_box :propagate_all_variants %>
+              <%= Spree::StockLocation.human_attribute_name :propagate_all_variants %>
+              <%= f.field_hint :propagate_all_variants %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :restock_inventory do %>
+            <label>
+              <%= f.check_box :restock_inventory %>
+              <%= Spree::StockLocation.human_attribute_name :restock_inventory %>
+              <%= f.field_hint :restock_inventory %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :fulfillable do %>
+            <label>
+              <%= f.check_box :fulfillable %>
+              <%= Spree::StockLocation.human_attribute_name :fulfillable %>
+              <%= f.field_hint :fulfillable %>
+            </label>
+          <% end %>
+
+          <%= f.field_container :check_stock_on_transfer do %>
+            <label>
+              <%= f.check_box :check_stock_on_transfer %>
+              <%= Spree::StockLocation.human_attribute_name :check_stock_on_transfer %>
+              <%= f.field_hint :check_stock_on_transfer %>
+            </label>
+          <% end %>
+        </div>
+      </div>
+    </fieldset>
+  </div>
 </div>

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

@@ -19,6 +19,8 @@
 <%= render partial: 'spree/shared/error_messages', locals: { target: @stock_location } %>
 
 <%= form_for [:admin, @stock_location] do |f| %>
-  <%= render :partial => 'form', :locals => { :f => f } %>
-  <%= render :partial => 'spree/admin/shared/edit_resource_links' %>
+  <fieldset class="no-border-top">
+    <%= render 'form', f: f %>
+    <%= render 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
 <% end %>

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

@@ -0,0 +1,15 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
+<% admin_breadcrumb t('spree.settings') %>
+<% admin_breadcrumb t('spree.admin.tab.checkout') %>
+<% admin_breadcrumb link_to plural_resource_name(Spree::StoreCreditReason), spree.admin_store_credit_reasons_path %>
+<% admin_breadcrumb @object.name %>
+
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
+
+<%= form_for [:admin, @object] do |f| %>
+  <fieldset class='no-border-top' data-hook='edit_store_credit_reason'>
+    <%= render partial: 'spree/admin/store_credit_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,56 @@
+<%= render 'spree/admin/shared/settings_checkout_tabs' %>
+
+<% admin_breadcrumb(t('spree.settings')) %>
+<% admin_breadcrumb(t('spree.admin.tab.checkout')) %>
+<% admin_breadcrumb(plural_resource_name(Spree::StoreCreditReason)) %>
+
+<% content_for :page_actions do %>
+  <ul class='actions inline-menu'>
+    <li>
+      <%= link_to t('spree.new_adjustment_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+    </li>
+  </ul>
+<% end %>
+
+<% if @collection.any? %>
+  <table class='index' id='listing_store_credit_reasons'>
+    <colgroup>
+      <col style='width: 65%' />
+      <col style='width: 20%' />
+      <col style='width: 15%' />
+    </colgroup>
+    <thead>
+      <tr data-hook='store_credit_reasons_header'>
+        <th><%= Spree::StoreCreditReason.human_attribute_name(:name) %></th>
+        <th><%= Spree::StoreCreditReason.human_attribute_name(:state) %></th>
+        <th class='actions'></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @collection.each do |store_credit_reason| %>
+        <tr id='<%= spree_dom_id store_credit_reason %>' data-hook='store_credit_reason_row'>
+          <td>
+            <%= store_credit_reason.name %>
+          </td>
+          <td>
+            <span class="pill pill-<%= store_credit_reason.active? ? 'active' : 'inactive' %>">
+              <%= t(store_credit_reason.active? ? :active : :inactive, scope: 'spree') %>
+            </span>
+          </td>
+          <td class='actions'>
+            <%= link_to_edit store_credit_reason, no_text: true %>
+            <% if can?(:destroy, store_credit_reason) %>
+              <%= link_to_delete store_credit_reason, no_text: true %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class='no-objects-found'>
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: Spree::StoreCreditReason,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>