solidus_backend 2.8.6 → 2.9.0.rc.1

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

@@ -26,7 +26,7 @@
       <div data-hook="admin_product_price_form_amount" class="col-4">
         <%= f.field_container :price do %>
           <%= f.label :price %>
-          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency_attr: :currency %>
+          <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency_attr: :currency, currency: @price.currency %>
         <% end %>
       </div>
   </div>

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

@@ -32,11 +32,22 @@
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price do %>
           <%= f.label :price, class: Spree::Config.require_master_price ? 'required' : '' %>
-          <%= render "spree/admin/shared/number_with_currency", f: f,
-                     amount_attr: :price,
-                     required: Spree::Config.require_master_price,
-                     currency: Spree::Config.default_pricing_options.currency %>
-          <%= f.error_message_on :price %>
+
+          <% if f.object.new_record? || f.object.has_default_price? %>
+            <%= render "spree/admin/shared/number_with_currency",
+                       f: f,
+                       amount_attr: :price,
+                       required: Spree::Config.require_master_price,
+                       currency: Spree::Config.default_pricing_options.currency %>
+            <%= f.error_message_on :price %>
+          <% else %>
+            <span class="info">
+              <%= t('spree.product_without_default_price_info',
+                    default_currency: Spree::Config.default_pricing_options.currency) %>
+              <%= link_to t('spree.product_without_default_price_cta'),
+                          spree.admin_product_prices_url(@product) %>
+            </span>
+          <% end %>
         <% end %>
       </div>
 

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

@@ -6,7 +6,7 @@
   <% 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' %>
+      <%= link_to t('spree.view_product'), spree.product_path(@product), id: 'admin_view_product', class: 'btn btn-default ml-2' %>
     </li>
   <% end %>
 <% end %>

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

@@ -44,13 +44,13 @@
       <div id="starts_at_field" class="field">
         <%= f.label :starts_at %>
         <%= f.field_hint :starts_at %>
-        <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at), placeholder: t(".starts_at_placeholder"), class: 'datepicker datepicker-from fullwidth' %>
+        <%= f.text_field :starts_at, value: datepicker_field_value(@promotion.starts_at, with_time: true), placeholder: t(".starts_at_placeholder"), class: 'datepicker datepicker-from fullwidth', data: { :'enable-time' => true, :'default-hour' => 0 } %>
       </div>
 
       <div id="expires_at_field" class="field">
         <%= f.label :expires_at %>
         <%= f.field_hint :expires_at %>
-        <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at), placeholder: t(".expires_at_placeholder"), class: 'datepicker datepicker-to fullwidth' %>
+        <%= f.text_field :expires_at, value: datepicker_field_value(@promotion.expires_at, with_time: true), placeholder: t(".expires_at_placeholder"), class: 'datepicker datepicker-to fullwidth', data: { :'enable-time' => true, :'default-hour' => 0 } %>
       </div>
     </div>
   </div>

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

@@ -78,11 +78,11 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.first.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.take.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">
-              <%= t(promotion.active?? :active : :inactive, scope: 'spree') %>
+              <%= t(admin_promotion_status(promotion), scope: 'spree.admin.promotion_status') %>
             </span>
           </td>
           <td>
@@ -92,10 +92,10 @@
             <%= promotion.usage_count %>
           </td>
           <td>
-            <%= promotion.starts_at.to_date.to_s(:short_date) if promotion.starts_at %>
+            <%= promotion.starts_at.to_s(:long) if promotion.starts_at %>
           </td>
           <td>
-            <%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %>
+            <%= promotion.expires_at.to_s(:long) if promotion.expires_at %>
           </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>

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

@@ -97,10 +97,10 @@
   <% end %>
   <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
     <% if !@reimbursement.reimbursed? %>
-      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button', method: 'post' } do %>
+      <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'button btn btn-primary', method: 'post' } do %>
         <%= t('spree.reimburse') %>
       <% end %>
-      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %>
+      <%= link_to t('spree.actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), class: 'btn btn-default' %>
     <% end %>
   </div>
 </fieldset>

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

@@ -5,9 +5,6 @@
 
 <title><%= admin_page_title %></title>
 
-<!-- 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/_modal.html.erb

@@ -11,7 +11,7 @@
         <%= content %>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div>
   </div>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields" class="row">
   <div data-hook="admin_shipping_method_form_name_field" class="col-5">
     <%= f.field_container :name do %>
-      <%= f.label :name %><br />
+      <%= f.label :name, class: 'required' %>
       <%= f.text_field :name, class: 'fullwidth' %>
       <%= error_message_on :shipping_method, :name %>
     <% end %>
@@ -9,32 +9,32 @@
 
   <div data-hook="admin_shipping_method_form_internal_name_field" class="col-5">
     <%= f.field_container :admin_name do %>
-      <%= f.label :admin_name %><br />
-      <%= f.text_field :admin_name, class: 'fullwidth', label: false  %>
+      <%= f.label :admin_name %>
+      <%= f.text_field :admin_name, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :admin_name %>
     <% end %>
   </div>
 
   <div data-hook="admin_shipping_method_form_code" class="col-5">
     <%= f.field_container :code do %>
-      <%= f.label :code %><br />
-      <%= f.text_field :code, class: 'fullwidth', label: false  %>
+      <%= f.label :code %>
+      <%= f.text_field :code, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :code %>
     <% end %>
   </div>
 
   <div class="col-5">
     <%= f.field_container :carrier do %>
-      <%= f.label :carrier %><br />
-      <%= f.text_field :carrier, class: 'fullwidth', label: false  %>
+      <%= f.label :carrier %>
+      <%= f.text_field :carrier, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :carrier %>
     <% end %>
   </div>
 
   <div class="col-5">
     <%= f.field_container :service_level do %>
-      <%= f.label :service_level %><br />
-      <%= f.text_field :service_level, class: 'fullwidth', label: false  %>
+      <%= f.label :service_level %>
+      <%= f.text_field :service_level, class: 'fullwidth', label: false %>
       <%= error_message_on :shipping_method, :service_level %>
     <% end %>
   </div>
@@ -49,7 +49,7 @@
 
   <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-10">
     <%= f.field_container :tracking_url do %>
-      <%= f.label :tracking_url %><br />
+      <%= f.label :tracking_url %>
       <%= f.text_field :tracking_url, class: 'fullwidth', placeholder: t('spree.tracking_url_placeholder') %>
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>

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

@@ -72,7 +72,7 @@
             </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? %>">
+                <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? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>">
                   <%# This is rendered in JS %>
                 </tr>
               <% end %>

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

@@ -20,7 +20,7 @@
     </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>

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/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/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/spec/controllers/spree/admin/locale_controller_spec.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::LocaleController, type: :controller do
+  stub_authorization!
+
+  before { I18n.backend.store_translations(:fr, {}) }
+
+  after do
+    I18n.locale = :en
+    I18n.reload!
+  end
+
+  context 'switch_to_locale specified' do
+    let(:json_response) { JSON.parse(response.body, symbolize_names: true) }
+
+    before do
+      get :set, params: { switch_to_locale: switch_to_locale, format: :json }
+    end
+
+    context 'available locale' do
+      let(:switch_to_locale) { 'fr' }
+
+      it 'sets locale and returns the location for the redirect' do
+        expect(I18n.locale).to eq :fr
+        expect(session[:admin_locale]).to eq(switch_to_locale)
+        expect(json_response).
+          to eq({ locale: switch_to_locale,
+                  location: spree.admin_url(host: 'test.host') })
+        expect(response).to have_http_status(:ok)
+      end
+    end
+
+    context 'unavailable locale' do
+      let(:switch_to_locale) { 'klingon' }
+
+      it 'does not change locale and returns 404' do
+        expect(I18n.locale).to eq :en
+        expect(json_response).to eq({ locale: 'en', })
+        expect(response).to have_http_status(:not_found)
+      end
+    end
+  end
+end