solidus_backend 3.3.4 → 3.4.0

data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb

@@ -54,7 +54,6 @@ colors = [
     used_for: 'Warnings actions.'
   }
 ]
-
 %>
 
 <div class="color-variables">

data/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb

@@ -22,4 +22,4 @@
   <dd>List</dd>
   <dt>Term</dt>
   <dd>Description</dd>
-</ul>
+</dl>

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

@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
 <% admin_breadcrumb(@tax_category.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

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

@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::TaxCategory)) %>
 
-
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
     <% if can?(:create, Spree::TaxCategory) %>
@@ -18,11 +17,11 @@
 <% if @tax_categories.any? %>
 <table class="index" id='listing_tax_categories' data-hook>
   <colgroup>
-    <col style="width: 20%" />
-    <col style="width: 10%" />
-    <col style="width: 40%" />
-    <col style="width: 15%" />
-    <col style="width: 15%" />
+    <col style="width: 20%">
+    <col style="width: 10%">
+    <col style="width: 40%">
+    <col style="width: 15%">
+    <col style="width: 15%">
   </colgroup>
   <thead>
     <tr data-hook="tax_header">
@@ -34,10 +33,11 @@
     </tr>
   </thead>
   <tbody>
-    <% @tax_categories.each do |tax_category|
-         @edit_url = edit_admin_tax_category_path(tax_category)
-         @delete_url = admin_tax_category_path(tax_category)
-    %>
+    <% @tax_categories.each do |tax_category| %>
+      <%
+        @edit_url = edit_admin_tax_category_path(tax_category)
+        @delete_url = admin_tax_category_path(tax_category)
+      %>
       <tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
         <td><%= tax_category.name %></td>
         <td><%= tax_category.tax_code %></td>
@@ -50,6 +50,7 @@
           <% if can?(:destroy, tax_category) %>
             <%= link_to_delete tax_category, no_text: true %>
           <% end %>
+        </td>
       </tr>
     <% end %>
   </tbody>

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

@@ -5,11 +5,9 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
 <% admin_breadcrumb(t('spree.new_tax_category')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 
-
 <%= render partial: 'spree/shared/error_messages', locals: { target: @tax_category } %>
 
 <%= form_for [:admin, @tax_category] do |f| %>

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

@@ -11,7 +11,7 @@
           <div data-hook="rate" class="field">
             <%= f.label :amount %>
             <%= f.text_field :amount, class: 'fullwidth' %>
-            <br/><span class="info"><%= t('spree.tax_rate_amount_explanation') %></span>
+            <br><span class="info"><%= t('spree.tax_rate_amount_explanation') %></span>
           </div>
           <div data-hook="included" class="field">
             <label>

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

@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
 <% admin_breadcrumb(@tax_rate.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

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

@@ -4,7 +4,6 @@
 <% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
 <% admin_breadcrumb(plural_resource_name(Spree::TaxRate)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::TaxRate) %>
     <li>
@@ -19,7 +18,7 @@
 
 <% content_for :table_filter do %>
   <%= search_form_for [:admin, @search], url: spree.admin_tax_rates_path do |f| %>
-    <div class= "row">
+    <div class="row">
       <div class="col-md-6">
         <div class="field">
           <%= f.label :zone_id_eq, Spree::Zone.model_name.human %>
@@ -68,10 +67,10 @@
       </tr>
     </thead>
     <tbody>
-      <% @tax_rates.each do |tax_rate|%>
+      <% @tax_rates.each do |tax_rate| %>
       <tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
-        <td><%=tax_rate.zone.try(:name) || t('spree.not_available') %></td>
-        <td><%=tax_rate.name %></td>
+        <td><%= tax_rate.zone.try(:name) || t('spree.not_available') %></td>
+        <td><%= tax_rate.name %></td>
         <td>
           <% if tax_rate.tax_categories.any? %>
             <%= tax_rate.tax_categories.map(&:name).join(", ") %>
@@ -79,11 +78,11 @@
             <%= t('spree.not_available') %>
           <% end %>
         </td>
-        <td><%=tax_rate.amount %></td>
-        <td><%=tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
-        <td><%=tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
-        <td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
-        <td><%=tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
+        <td><%= tax_rate.amount %></td>
+        <td><%= tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
+        <td><%= tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
+        <td><%= tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
+        <td><%= tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>
             <%= link_to_edit tax_rate, no_text: true %>

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

@@ -5,7 +5,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path) %>
 <% admin_breadcrumb(t('spree.new_tax_rate')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_inside_taxonomy_form" class="field align-center">
   <%= f.field_container :name do %>
-    <%= f.label :name, class: 'required' %><br />
+    <%= f.label :name, class: 'required' %><br>
     <%= error_message_on :taxonomy, :name, class: 'fullwidth title' %>
     <%= text_field :taxonomy, :name %>
   <% end %>

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

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
 <% admin_breadcrumb(@taxonomy.name) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <%= link_to t('spree.add_taxon'), spree.admin_taxonomies_path, class: 'add-taxon-button btn btn-primary' %>
@@ -18,6 +17,5 @@
     </div>
   </fieldset>
 
-
   <div id="taxonomy_tree" class="tree" data-taxonomy-id="<%= @taxonomy.id %>"></div>
 <% end %>

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

@@ -1,7 +1,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Taxonomy)) %>
 
-
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Taxonomy) %>
     <li>

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

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
 <% admin_breadcrumb(t('spree.new_taxonomy')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_inside_taxon_form" class="row">
   <div class="col-5">
     <%= f.field_container :name do %>
-      <%= f.label :name, class: 'required' %><br />
+      <%= f.label :name, class: 'required' %><br>
       <%= text_field :taxon, :name, class: 'fullwidth' %>
       <%= error_message_on :taxon, :name, class: 'fullwidth title' %>
     <% end %>
 
     <%= f.field_container :permalink_part do %>
-      <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br />
+      <%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br>
       <div class="input-group">
         <% if @taxon.parent %>
           <div class="input-group-prepend">
@@ -16,7 +16,7 @@
             </span>
           </div>
         <% end %>
-        <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br />
+        <%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br>
       </div>
     <% end %>
 
@@ -38,24 +38,24 @@
 
   <div class="col-5">
     <%= f.field_container :description do %>
-      <%= f.label :description %><br />
+      <%= f.label :description %><br>
       <%= f.text_area :description, class: 'fullwidth', rows: 6 %>
     <% end %>
   </div>
 
   <div class="col-10">
     <%= f.field_container :meta_title do %>
-      <%= f.label :meta_title %><br />
+      <%= f.label :meta_title %><br>
       <%= f.text_field :meta_title, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_description do %>
-      <%= f.label :meta_description %><br />
+      <%= f.label :meta_description %><br>
       <%= f.text_field :meta_description, class: 'fullwidth' %>
     <% end %>
 
     <%= f.field_container :meta_keywords do %>
-      <%= f.label :meta_keywords %><br />
+      <%= f.label :meta_keywords %><br>
       <%= f.text_field :meta_keywords, class: 'fullwidth' %>
     <% end %>
   </div>

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

@@ -1,6 +1,5 @@
 <% admin_breadcrumb(t('spree.taxon_edit')) %>
 
-
 <% content_for :page_actions do %>
   <li>
     <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-default' %>

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

@@ -7,7 +7,7 @@
   </legend>
 
   <div data-hook="admin_orders_index_search" class="col-4">
-    <input type='text' id='taxon_id' />
+    <input type='text' id='taxon_id'>
   </div>
 </fieldset>
 

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

@@ -68,7 +68,6 @@
         <%= f.error_message_on :password %>
       <% end %>
 
-
       <% if f.object.respond_to?(:password_confirmation) %>
         <%= f.field_container :password do %>
           <%= f.label :password_confirmation %>

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

@@ -1,26 +1,26 @@
 <% content_for :tabs do %>
   <nav>
     <ul class='tabs' data-hook="admin_user_tab_options">
-      <li<%== ' class="active"' if current == :account %>>
+      <li class="<%= 'active' if current == :account %>">
         <%= link_to t("spree.admin.user.account"), spree.edit_admin_user_path(@user) %>
       </li>
       <% if can?(:addresses, @user) %>
-        <li<%== ' class="active"' if current == :address %>>
+        <li class="<%= 'active' if current == :address %>">
           <%= link_to t("spree.admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:orders, @user) %>
-        <li<%== ' class="active"' if current == :orders %>>
+        <li class="<%= 'active' if current == :orders %>">
           <%= link_to t("spree.admin.user.order_history"), spree.orders_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:items, @user) %>
-        <li<%== ' class="active"' if current == :items %>>
+        <li class="<%= 'active' if current == :items %>">
           <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
         </li>
       <% end %>
       <% if can?(:show, @user.store_credits.new) %>
-        <li<%== ' class="active"' if current == :store_credits %>>
+        <li class="<%= 'active' if current == :store_credits %>">
           <%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
         </li>
       <% end %>

data/app/views/spree/admin/users/addresses.html.erb

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(plural_resource_name(Spree::Address)) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :address %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>

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

@@ -78,9 +78,9 @@
     </tr>
   </thead>
   <tbody>
-    <% @users.each do |user|%>
+    <% @users.each do |user| %>
       <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-        <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
+        <td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td>
         <td><%= user.spree_roles.map(&:name).to_sentence %></td>
         <td class="align-center"><%= link_to user.order_count, spree.orders_admin_user_path(user) %></td>
         <td class="align-center"><%= link_to user.display_lifetime_value, spree.items_admin_user_path(user) %></td>

data/app/views/spree/admin/users/items.html.erb

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(t('spree.admin.user.items_purchased')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :items %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
@@ -16,13 +15,13 @@
     <%# TODO add search interface %>
     <table class="stock-contents index" id="listing_items" data-hook="stock-contents">
       <colgroup>
-        <col style="width: 10%;" />
-        <col style="width: 10%;" />
-        <col style="width: 30%;" />
-        <col style="width: 8%;" />
-        <col style="width: 8%;" />
-        <col style="width: 10%;" />
-        <col style="width: 14%;" />
+        <col style="width: 10%;">
+        <col style="width: 10%;">
+        <col style="width: 30%;">
+        <col style="width: 8%;">
+        <col style="width: 8%;">
+        <col style="width: 10%;">
+        <col style="width: 14%;">
       </colgroup>
 
       <thead>
@@ -69,6 +68,7 @@
             </tr>
           <% end %>
         <% end %>
+      </tbody>
     </table>
   <% else %>
     <div class="no-objects-found">

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

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
 <% admin_breadcrumb(t('spree.admin.user.order_history')) %>
 
-
 <%= render 'spree/admin/users/sidebar' %>
 <%= render 'spree/admin/users/tabs', current: :orders %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
@@ -50,7 +49,7 @@
             </span>
           </td>
           <td>
-            <% if order.payment_state  %>
+            <% if order.payment_state %>
               <span class="pill pill-<%= order.payment_state %>">
                 <%= t(order.payment_state, scope: 'spree.payment_states') %>
               </span>

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

@@ -111,6 +111,4 @@
   </fieldset>
 </div>
 
-
-
 <div class="clear"></div>

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

@@ -2,11 +2,11 @@
 
 <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <colgroup>
-    <col style="width: 5%" />
-    <col style="width: 35%" />
-    <col style="width: 20%" />
-    <col style="width: 25%" />
-    <col style="width: 15%" />
+    <col style="width: 5%">
+    <col style="width: 35%">
+    <col style="width: 20%">
+    <col style="width: 25%">
+    <col style="width: 15%">
   </colgroup>
   <thead data-hook="variants_header">
     <tr>

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

@@ -3,10 +3,8 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
 <% admin_breadcrumb(@variant.options_text) %>
 
-
 <%= render partial: 'spree/shared/error_messages', locals: { target: @variant } %>
 
-
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset>
     <legend><%= t('.edit_variant') %></legend>

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

@@ -22,7 +22,7 @@
     <p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
       <%= t('spree.to_add_variants_you_must_first_define') %>
       <% if can?(:show, Spree::OptionType) %>
-        <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
+        <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path %>
       <% else %>
         <%= plural_resource_name(Spree::OptionType) %>
       <% end %>

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

@@ -3,15 +3,15 @@
 
     <div data-hook="admin_zone_form_fields">
       <fieldset class="no-border-bottom">
-        <legend align="center"><%= t('spree.general_settings')%></legend>
+        <legend align="center"><%= t('spree.general_settings') %></legend>
 
         <%= zone_form.field_container :name do %>
-          <%= zone_form.label :name %><br />
+          <%= zone_form.label :name %><br>
           <%= zone_form.text_field :name, class: 'fullwidth' %>
         <% end %>
 
         <%= zone_form.field_container :description do %>
-          <%= zone_form.label :description %><br />
+          <%= zone_form.label :description %><br>
           <%= zone_form.text_field :description, class: 'fullwidth' %>
         <% end %>
 
@@ -37,7 +37,7 @@
   </div>
   <div class="col-5">
 
-    <%= render partial: 'state_members', locals: { zone_form: zone_form }%>
+    <%= render partial: 'state_members', locals: { zone_form: zone_form } %>
     <%= render partial: 'country_members', locals: { zone_form: zone_form } %>
   </div>
 

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

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
 <% admin_breadcrumb(@zone.name) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

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

@@ -14,10 +14,10 @@
 <% if @zones.any? %>
   <table class="index" id='listing_zones' data-hook>
     <colgroup>
-      <col style="width: 30%" />
-      <col style="width: 40%" />
-      <col style="width: 15%" />
-      <col style="width: 15%" />
+      <col style="width: 30%">
+      <col style="width: 40%">
+      <col style="width: 15%">
+      <col style="width: 15%">
     </colgroup>
     <thead>
       <tr data-hook="zones_header">

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

@@ -2,7 +2,6 @@
 <% admin_breadcrumb(link_to plural_resource_name(Spree::Zone), spree.admin_zones_path) %>
 <% admin_breadcrumb(t('spree.new_zone')) %>
 
-
 <% content_for :page_actions do %>
 <% end %>
 

data/app/views/spree/layouts/admin_style_guide.html.erb

@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="<%= I18n.locale %>">
   <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
     <title>Solidus Style Guide</title>
 
     <%= stylesheet_link_tag "spree/backend/all", data: {turbolinks_track: 'reload'} %>

data/config/routes.rb

@@ -70,7 +70,7 @@ Spree::Core::Engine.routes.draw do
 
     delete '/product_properties/:id', to: "product_properties#destroy", as: :product_property
 
-    resources :orders, except: [:show] do
+    resources :orders do
       member do
         get :cart
         put :advance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.4
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement