spree_backend 4.2.0.rc4 → 4.2.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8121bf0a1967bf78b87f0e260a572238140c19948c991f8684693472b69ec15
-  data.tar.gz: a740ec1df8fdfb18fa8558487dc413096332ef08339b4dd374c78d19f06bf458
+  metadata.gz: 661c4ea54cb3f641be07d818710678496c47b7c52740291b6ed53083e28fb830
+  data.tar.gz: e4eb12865f64f1dd5de03dd5a70548556f588a0646c81776757b6b8d50b0aec8
 SHA512:
-  metadata.gz: 1c68a55ff4b579d488d570cf99c49bc082806fb7ef5395cbe6967a38535e4dbd395afdce0929c2916f337086bf979f70e5a5b4fb1f0ac19908d79ebfdd55d2dc
-  data.tar.gz: 4d7db3cec1602bf2858f15f322294132522f1a55df6f2fffc4482911583720985592a60f068f3d04304b3533a79f7cfbd8da21509773864d71a2590b5861e079
+  metadata.gz: a0438029b7fc2caa555ede1118025e7e5a47187052702089f2dc908eb4661c06171a3f421462a2764d93c27f5fc149a5d65882261609d3b2634dd4d058c8b5cc
+  data.tar.gz: f5c360a0f0a24849ab80171eddb29b2631ac5cb86fa51299c27710ac14b77a9a0b6078d3f4b40cebab4c167403f58f5303e228f6f3151c88049c615969b6d2ea

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

@@ -5,9 +5,6 @@ Hopefully, this will evolve into a propper class.
 **/
 
 /* global AUTH_TOKEN, order_number, Sortable, flatpickr, DOMPurify */
-
-//= require spree/backend/flatpickr_locals
-
 jQuery(function ($) {
   // Add some tips
   $('.with-tip').each(function() {
@@ -227,8 +224,8 @@ $.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {
 
 document.addEventListener('DOMContentLoaded', function() {
   var dateFrom = flatpickr('.datePickerFrom', {
+    locale: Spree.translations.flatpickr_locale,
     time_24hr: true,
-    dateFormat: Spree.translations.date_picker,
     monthSelectorType: 'static',
     onChange: function(selectedDates) {
       dateTo.set('minDate', selectedDates[0])
@@ -236,18 +233,18 @@ document.addEventListener('DOMContentLoaded', function() {
   })
 
   var dateTo = flatpickr('.datePickerTo', {
+    locale: Spree.translations.flatpickr_locale,
     monthSelectorType: 'static',
     time_24hr: true,
-    dateFormat: Spree.translations.date_picker,
     onChange: function(selectedDates) {
       dateFrom.set('maxDate', selectedDates[0])
     }
   })
 
   flatpickr('.datepicker', {
+    locale: Spree.translations.flatpickr_locale,
     monthSelectorType: 'static',
-    time_24hr: true,
-    dateFormat: Spree.translations.date_picker
+    time_24hr: true
   })
 })
 

data/app/assets/stylesheets/spree/backend/shared/_base.scss

@@ -55,3 +55,7 @@
 .resize-animation-stopper * {
   transition: none !important;
 }
+
+.button_to {
+  display: inline-block;
+}

data/app/controllers/spree/admin/base_controller.rb

@@ -2,6 +2,7 @@ module Spree
   module Admin
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
+      helper 'spree/locale'
       layout 'spree/layouts/admin'
 
       before_action :authorize_admin

data/app/controllers/spree/admin/images_controller.rb

@@ -18,15 +18,15 @@ module Spree
       end
 
       def load_index_data
-        @product = Product.friendly.includes(*variant_index_includes).find(params[:product_id])
+        @product = Product.friendly.preload(*variant_index_includes).find(params[:product_id])
       end
 
       def load_edit_data
-        @product = Product.friendly.includes(*variant_edit_includes).find(params[:product_id])
+        @product = Product.friendly.preload(*variant_edit_includes).find(params[:product_id])
         @variants = @product.variants.map do |variant|
           [variant.sku_and_options_text, variant.id]
         end
-        @variants.insert(0, [Spree.t(:all), @product.master.id])
+        @variants.insert(0, [Spree.t(:all), @product.master_id])
       end
 
       def set_viewable

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -11,7 +11,7 @@ module Spree
         end
 
         def edit
-          country_id = Address.default.country.id
+          country_id = Address.default.country_id
           @order.build_bill_address(country_id: country_id) if @order.bill_address.nil?
           @order.build_ship_address(country_id: country_id) if @order.ship_address.nil?
 

data/app/controllers/spree/admin/prices_controller.rb

@@ -3,8 +3,6 @@ module Spree
     class PricesController < ResourceController
       belongs_to 'spree/product', find_by: :slug
 
-      helper_method :supported_currencies_for_all_stores
-
       def create
         params.require(:vp).permit!
         params[:vp].each do |variant_id, prices|
@@ -23,17 +21,6 @@ module Spree
         flash[:success] = Spree.t('notice_messages.prices_saved')
         redirect_to admin_product_path(parent)
       end
-
-      private
-
-      def supported_currencies_for_all_stores
-        @supported_currencies_for_all_stores = begin
-          (
-            Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)
-          ).
-            compact.uniq.map { |code| ::Money::Currency.find(code.strip) }
-        end
-      end
     end
   end
 end

data/app/controllers/spree/admin/stores_controller.rb

@@ -9,8 +9,6 @@ module Spree
       before_action :load_all_countries, only: [:new, :edit, :update, :create]
       before_action :load_all_zones, only: %i[new edit]
 
-      helper_method :all_locales_options
-
       def index
         if params[:ids]
           load_stores_by_ids
@@ -132,18 +130,6 @@ module Spree
       def set_default_country_id
         @store.default_country_id = Spree::Config[:default_country_id]
       end
-
-      def all_locales_options
-        if defined?(SpreeI18n)
-          SpreeI18n::Locale.all.map { |locale| locale_presentation(locale) }.push(['English (EN)', :en])
-        else
-          [['English (EN)', :en]]
-        end
-      end
-
-      def locale_presentation(locale)
-        [Spree.t('i18n.this_file_language', locale: locale), locale]
-      end
     end
   end
 end

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

@@ -1,6 +1,18 @@
 module Spree
   module Admin
     module BaseHelper
+      SELECT2_SUPPORTED_LOCALES = %w[
+        af ar az bg bn bs ca cs da de dsb el en eo es et eu fa fi fr gl he
+        hi hr hsb hu hy id is it ja ka km ko lt lv mk ms nb ne nl pa pl ps
+        pt pt-BR ro ru sk sl sq sr sr-Cyrl sv th tk tr uk vi zh-CN zh-TW
+      ].freeze
+
+      FLATPICKR_SUPPORTED_LOCALES = %w[
+        ar at az be bg bn bs cs cy da de eo es et fa fi fo fr ga gr he
+        hi hr hu id is it ja ka km ko kz lv mk mn ms my nl no pa pl pt ro ru
+        si sk sl sq sr sv th tr uk uz vn zh
+      ].freeze
+
       def flash_alert(flash)
         if flash.present?
           message = flash[:error] || flash[:notice] || flash[:success]
@@ -201,6 +213,40 @@ module Spree
           class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_taxon', target: :blank
         )
       end
+
+      def admin_logout_link
+        if defined?(admin_logout_path)
+          admin_logout_path
+        elsif defined?(spree_logout_path)
+          spree_logout_path
+        end
+      end
+
+      def select2_local_fallback
+        stripped_locale = I18n.locale.to_s.split('-').first
+
+        if ['zh-CN', 'zh-TW', 'sr-Cyrl', 'pt-BR'].include?(I18n.locale.to_s)
+          I18n.locale
+        elsif SELECT2_SUPPORTED_LOCALES.include? stripped_locale
+          stripped_locale
+        else
+          'en'
+        end
+      end
+
+      def flatpickr_local_fallback
+        stripped_locale = I18n.locale.to_s.split('-').first
+
+        if I18n.locale.to_s == 'zh-TW'
+          # Taiwanese is a popular language in Spree,
+          # it has been well translated.
+          'zh-tw'
+        elsif FLATPICKR_SUPPORTED_LOCALES.include? stripped_locale
+          stripped_locale
+        else
+          'default'
+        end
+      end
     end
   end
 end

data/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="first page-item">
     <%= link_to_unless current_page.first?, svg_icon(name: "double-chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb

@@ -3,8 +3,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page gap disabled page-item d-none d-lg-flex">
   <a href="#" onclick="return false;" class="page-link">
     <%= raw(t 'views.pagination.truncate') %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
     <%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="next_page page-item">
     <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb

@@ -5,8 +5,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page<%= ' active' if page.current? %> page-item">
   <%= link_to page,
     url,

data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb

@@ -4,8 +4,8 @@
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
+    paginator:     the paginator that renders the pagination tags inside -%>
+
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="prev page-item">
     <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>

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

@@ -29,8 +29,8 @@
   </div>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
   var order_number = '<%= @order.number %>';
-<% end %>
+</script>
 
 <%= render partial: 'spree/admin/shared/order_summary' %>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -1,54 +1,54 @@
 <div class="table-responsive">
-<table class="show return-items-table table table-condensed table-bordered index">
-  <thead>
-    <tr>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:sku) %></th>
-      <th><%= Spree.t(:pre_tax_amount) %></th>
-      <th><%= Spree.t(:preferred_reimbursement_type) %></th>
-      <th><%= Spree.t(:exchange_for) %></th>
-      <th><%= Spree.t(:acceptance_errors) %></th>
-      <% if show_decision %>
-        <th></th>
-      <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <% return_items.each do |return_item| %>
+  <table class="show return-items-table table table-condensed table-bordered index">
+    <thead>
       <tr>
-        <td>
-          <div class="variant-name">
-            <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
-          </div>
-          <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
-        </td>
-        <td>
-          <%= return_item.inventory_unit.variant.sku %>
-        </td>
-        <td>
-          <%= return_item.display_pre_tax_amount %>
-        </td>
-        <td>
-          <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
-        </td>
-        <td>
-          <%= return_item.exchange_variant.try(:exchange_name) %>
-        </td>
-        <td>
-          <%= return_item.acceptance_status_errors %>
-        </td>
+        <th><%= Spree.t(:product) %></th>
+        <th><%= Spree.t(:sku) %></th>
+        <th><%= Spree.t(:pre_tax_amount) %></th>
+        <th><%= Spree.t(:preferred_reimbursement_type) %></th>
+        <th><%= Spree.t(:exchange_for) %></th>
+        <th><%= Spree.t(:acceptance_errors) %></th>
         <% if show_decision %>
-          <td class='actions actions-2'>
-            <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
-              <%= Spree.t(:accept) %>
-            <% end if can?(:accept, return_item) %>
-            <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
-              <%= Spree.t(:reject) %>
-            <% end if can?(:reject, return_item) %>
-          </td>
+          <th></th>
         <% end %>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% return_items.each do |return_item| %>
+        <tr>
+          <td>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
+            <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+          </td>
+          <td>
+            <%= return_item.inventory_unit.variant.sku %>
+          </td>
+          <td>
+            <%= return_item.display_pre_tax_amount %>
+          </td>
+          <td>
+            <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
+          </td>
+          <td>
+            <%= return_item.exchange_variant.try(:exchange_name) %>
+          </td>
+          <td>
+            <%= return_item.acceptance_status_errors if return_item.acceptance_status_errors.present? %>
+          </td>
+          <% if show_decision %>
+            <td class='actions actions-2'>
+              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
+                <%= Spree.t(:accept) %>
+              <% end if can?(:accept, return_item) %>
+              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
+                <%= Spree.t(:reject) %>
+              <% end if can?(:reject, return_item) %>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>

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

@@ -44,7 +44,7 @@
 </fieldset>
 
 <% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? && can?(:create, Spree::Reimbursement) %>
-  <fieldset data-hook="reimbursements" class="marginb">
+  <fieldset data-hook="reimbursements" class="mb-3">
     <% if @customer_return.completely_decided? %>
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
         <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>

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

@@ -39,7 +39,7 @@
           <%#-------------------------------------------------%>
           <div class="card mb-3" id="general-settings-cache" data-hook="general_settings_cache">
             <div class="card-header">
-              <h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache)%></h1>
+              <h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache) %></h1>
             </div>
 
             <div class="card-body">
@@ -61,7 +61,7 @@
           <div class="card mb-3" id="general-settings-currency" data-hook="general_settings_currency">
             <div class="card-header">
               <h1 class="card-title mb-0 h5">
-                <%= Spree.t(:currency_settings)%>
+                <%= Spree.t(:currency_settings) %>
               </h1>
             </div>
 
@@ -79,7 +79,7 @@
           <div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores">
             <div class="card-header">
               <h1 class="card-title mb-0 h5">
-                <%= Spree.t(:multiple_stores)%>
+                <%= Spree.t(:multiple_stores) %>
               </h1>
             </div>
             <div class="card-body">