solidus_backend 2.7.4 → 2.9.2

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

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

@@ -0,0 +1,18 @@
+<%= 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(t('spree.new_store_credit_reason')) %>
+
+<% content_for :page_actions do %>
+<% end %>
+
+<%= render partial: 'spree/shared/error_messages', locals: { target: @object } %>
+
+<%= form_for [:admin, @object] do |f| %>
+  <fieldset class='no-border-top'>
+    <%= render partial: 'spree/admin/store_credit_reasons/shared/form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb

@@ -0,0 +1,15 @@
+<div data-hook='admin_named_type_form_fields' class='row'>
+  <div class='col-3'>
+    <%= f.field_container :name do %>
+      <%= f.label :name, class: 'required' %><br />
+      <%= f.text_field :name, class: 'fullwidth' %>
+    <% end %>
+
+    <div class='checkbox'>
+      <label>
+        <%= f.check_box :active %>
+        <%= t('spree.active') %>
+      </label>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/store_credits/_store_credit_reason_field.html.erb

@@ -0,0 +1,7 @@
+<%= f.field_container :reason do %>
+  <%= f.label :store_credit_reason, t('spree.reason'), class: 'required' %>
+  <%= select_tag :store_credit_reason_id, options_from_collection_for_select(@store_credit_reasons, :id, :name),
+    include_blank: t('spree.choose_reason'), class: 'custom-select fullwidth',
+    placeholder: t('spree.admin.store_credits.select_amount_store_credit_reason') %>
+  <%= f.error_message_on :store_credit_reason %>
+<% end %>

data/app/views/spree/admin/store_credits/edit_amount.html.erb

@@ -23,7 +23,7 @@
         <% end %>
       </div>
       <div class="col-6">
-        <%= render 'update_reason_field', f: f %>
+        <%= render 'store_credit_reason_field', f: f %>
       </div>
     </div>
     <%= render 'spree/admin/shared/edit_resource_links',

data/app/views/spree/admin/store_credits/edit_validity.html.erb

@@ -15,12 +15,12 @@
     <legend align="center"><%= t('spree.admin.store_credits.invalidate_store_credit') %></legend>
     <div data-hook="admin_store_credit_form_fields" class="row">
       <div class="col-12">
-        <%= render partial: 'update_reason_field', locals: { f: f } %>
+        <%= render partial: 'store_credit_reason_field', locals: { f: f } %>
       </div>
     </div>
     <div class="form-buttons filter-actions actions" data-hook="buttons">
       <%= button_tag t('spree.store_credit.actions.invalidate'), class: 'btn btn-primary' %>
-      <%= link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_user_store_credit_path(@user, @store_credit), class: 'btn btn-default' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -7,7 +7,7 @@
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::StoreCredit) %>
-    <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button' %></li>
+    <li><%= link_to t('spree.admin.store_credits.add'), new_admin_user_store_credit_path(@user), class: 'button btn btn-primary' %></li>
   <% end %>
 <% end %>
 

data/app/views/spree/admin/store_credits/show.html.erb

@@ -8,7 +8,7 @@
 <%= render 'spree/admin/users/tabs', current: :store_credits %>
 <% content_for :page_actions do %>
   <% if @store_credit.editable? && can?(:edit, @store_credit) %>
-    <li><%= link_to t('spree.admin.store_credits.change_amount'), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
+    <li><%= link_to t('spree.admin.store_credits.change_amount'), edit_amount_admin_user_store_credit_path(@user, @store_credit), class: 'button btn btn-primary' %></li>
   <% end %>
   <% if @store_credit.invalidateable? && can?(:invalidate, @store_credit) %>
     <li><%= link_to t('spree.invalidate'), edit_validity_admin_user_store_credit_path(@user, @store_credit), class: 'button' %></li>
@@ -84,7 +84,7 @@
         <th><%= t('spree.admin.store_credits.created_by') %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:amount_remaining) %></th>
-        <th><%= Spree::StoreCreditUpdateReason.human_attribute_name(:name) %></th>
+        <th><%= Spree::StoreCreditReason.human_attribute_name(:name) %></th>
       </tr>
     </thead>
     <tbody>
@@ -98,7 +98,7 @@
           <td><%= store_credit_event_originator_link(event) %></td>
           <td><%= event.display_user_total_amount %></td>
           <td><%= event.display_remaining_amount %></td>
-          <td><%= event.update_reason.try!(:name) %></td>
+          <td><%= event.store_credit_reason.try!(:name) %></td>
         </tr>
       <% end %>
     </tbody>

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

@@ -8,6 +8,7 @@
 
     <%= f.field_container :code do %>
       <%= f.label :code, class: 'required' %>
+      <%= f.field_hint :code %>
       <%= f.text_field :code, required: true, class: 'fullwidth' %>
       <%= f.error_message_on :code %>
     <% end %>

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

@@ -9,39 +9,49 @@
 <%-
 colors = [
   {
-    name: '$color-1',
+    name: '$color-white',
     value: '#FFFFFF',
-    used_for: 'Backgrounds.'
+    used_for: 'Body background color.'
   },
   {
-    name: '$color-2',
-    value: '#9FC820',
-    used_for: 'Active states.'
+    name: '$color-light',
+    value: '#F9FAFB',
+    used_for: 'Sidebar and header background color.'
   },
   {
-    name: '$color-3',
-    value: '#5498DA',
-    used_for: 'Buttons, links, form text.'
+    name: '$color-light-dark',
+    value: '#E5E7EB',
+    used_for: 'Borders color.'
   },
   {
-    name: '$color-4',
-    value: '#6788A2',
-    used_for: 'Non-interactive text outside of form fields.'
+    name: '$color-dark',
+    value: '#24282F',
+    used_for: 'Text and headings color.'
   },
   {
-    name: '$color-5',
-    value: '#C60F13',
-    used_for: 'Errors, destructive action warnings.'
+    name: '$color-dark-light',
+    value: '#808C9E',
+    used_for: 'Main text color for navigation, tabs, breadcrumb.'
+  },
+  {
+    name: '$color-primary',
+    value: '#3D76F1',
+    used_for: 'Buttons primary actions, links, active states.'
   },
   {
-    name: '$color-6',
-    value: '#FF9300',
-    used_for: 'Warnings'
+    name: '$color-success',
+    value: '#52B73B',
+    used_for: 'Success actions.'
+  },
+  {
+    name: '$color-error',
+    value: '#CE452A',
+    used_for: 'Errors, destructive action warnings.'
   },
   {
-    name: '$color-7',
-    value: '#F4F4F4',
-    used_for: 'Disabled states'
+    name: '$color-notice',
+    value: '#FFDD59',
+    used_for: 'Warnings actions.'
   }
 ]
 

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

@@ -1,6 +1,6 @@
 <div class="half">
   <p>
-    The typography base is "Open Sans" and Helvetica which we leave to the browser to provide.
+    The typography base is "Inter" and Helvetica which we load by stylesheet with @font-face rule.
     Set at 13px with no specified line-height.
   </p>
 

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

@@ -14,7 +14,7 @@
     <%= render partial: 'form', locals: { f: f } %>
     <div class="filter-actions actions">
       <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
-      <%= link_to t('spree.actions.cancel'), admin_taxonomies_path, class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), admin_taxonomies_path, class: 'btn btn-default' %>
     </div>
   </fieldset>
 

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

@@ -23,7 +23,7 @@
     <%= f.field_container :icon do %>
       <%= f.label :icon %><br />
       <%= f.file_field :icon %>
-      <%= image_tag f.object.icon(:mini) if f.object.icon.present? %>
+      <%= image_tag f.object.icon(:mini) if f.object.icon_present? %>
     <% end %>
   </div>
 

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

@@ -3,7 +3,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-primary' %>
+    <%= link_to t('spree.back_to_taxonomies_list'), spree.admin_taxonomies_path, class: 'btn btn-default' %>
   </li>
 <% end %>
 
@@ -14,6 +14,6 @@
 
   <div class="form-buttons filter-actions" data-hook="buttons">
     <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
-    <%= link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), class: 'btn btn-primary' %>
+    <%= link_to t('spree.actions.cancel'), edit_admin_taxonomy_url(@taxonomy), class: 'btn btn-default' %>
   </div>
 <% end %>

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

@@ -41,8 +41,8 @@
 
       </div>
       <div class="filter-actions actions">
-        <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-primary' %>
-        <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-primary' %>
+        <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-default' %>
+        <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-default' %>
       </div>
 
     <% else %>

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

@@ -82,14 +82,14 @@
       <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><%= user.spree_roles.map(&:name).to_sentence %></td>
-        <td class="align-center"><%= link_to user.orders.count, spree.orders_admin_user_path(user) %></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>
         <td class="align-center"><%= l user.created_at.to_date %></td>
         <td data-hook="admin_users_index_row_actions" class="actions">
           <% if can?(:edit, user) %>
             <%= link_to_edit user, no_text: true %>
           <% end %>
-          <% if can?(:destroy, user) %>
+          <% if can?(:destroy, user) && user.orders.count.zero? %>
             <%= link_to_delete user, no_text: true %>
           <% end %>
         </td>

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

@@ -41,7 +41,9 @@
             <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
               <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
               <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.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>

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

@@ -74,7 +74,7 @@
     <div class="no-objects-found">
       <%= render 'spree/admin/shared/no_objects_found',
                    resource: Spree::Order,
-                   new_resource_url: spree.new_admin_order_path %>
+                   new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
     </div>
   <% end %>
 

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

@@ -65,7 +65,7 @@
       <div class="col-3">
         <div class="field" data-hook="price">
           <%= f.label :price %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.default_price.currency %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.find_or_build_default_price.currency %>
         </div>
       </div>
 

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

@@ -8,7 +8,7 @@
       <%= link_to(
         t('spree.new_variant'),
         new_admin_product_variant_url(@product),
-        class: 'button'
+        class: 'btn btn-primary'
       ) %>
     </li>
   <% end %>

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

@@ -4,7 +4,7 @@
 
     <%= zone_form.field_container :state_ids do %>
       <%= zone_form.label :state_ids, plural_resource_name(Spree::State) %><br>
-      <%= zone_form.collection_select :state_ids, @states, :id, :name, {}, { multiple: true, class: "select2 fullwidth" } %>
+      <%= zone_form.collection_select :state_ids, @states, :id, :state_with_country, {}, { multiple: true, class: "select2 fullwidth" } %>
     <% end %>
   </fieldset>
 </div>

data/config/routes.rb

@@ -16,7 +16,7 @@ Spree::Core::Engine.routes.draw do
     resources :promotions do
       resources :promotion_rules
       resources :promotion_actions
-      resources :promotion_codes, only: [:index]
+      resources :promotion_codes, only: [:index, :new, :create]
       resources :promotion_code_batches, only: [:index, :new, :create] do
         get '/download', to: "promotion_code_batches#download", defaults: { format: "csv" }
       end
@@ -141,17 +141,11 @@ Spree::Core::Engine.routes.draw do
       end
     end
 
-    resources :reports, only: [:index] do
-      collection do
-        get :sales_total
-        post :sales_total
-      end
-    end
-
     resources :reimbursement_types, only: [:index]
     resources :adjustment_reasons, except: [:show, :destroy]
     resources :refund_reasons, except: [:show, :destroy]
     resources :return_reasons, except: [:show, :destroy]
+    resources :store_credit_reasons, except: [:show]
 
     resources :shipping_methods
     resources :shipping_categories

data/lib/spree/backend.rb

@@ -3,7 +3,7 @@
 require 'rails/all'
 require 'jquery-rails'
 require 'coffee-rails'
-require 'sass-rails'
+require 'sassc-rails'
 require 'handlebars_assets'
 require 'font-awesome-rails'
 require 'autoprefixer-rails'