spree_backend 4.2.0.rc4 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8121bf0a1967bf78b87f0e260a572238140c19948c991f8684693472b69ec15
-  data.tar.gz: a740ec1df8fdfb18fa8558487dc413096332ef08339b4dd374c78d19f06bf458
+  metadata.gz: e804e7fc688fe446f8605a8921fdc7d05bb80d3882effca39ac47aa05a972715
+  data.tar.gz: eb0eb8ef36b0232eb0c77e744e01caa2048167bb3c69b7e9e3b40908082e1110
 SHA512:
-  metadata.gz: 1c68a55ff4b579d488d570cf99c49bc082806fb7ef5395cbe6967a38535e4dbd395afdce0929c2916f337086bf979f70e5a5b4fb1f0ac19908d79ebfdd55d2dc
-  data.tar.gz: 4d7db3cec1602bf2858f15f322294132522f1a55df6f2fffc4482911583720985592a60f068f3d04304b3533a79f7cfbd8da21509773864d71a2590b5861e079
+  metadata.gz: fdf6eb91713f904b5ba898729266e57c3af20e2d5fc1b7fb9a9cce3604af5de457048dfeefc51fee7db6757e78d5eea1ad125cb4225ebffb0470cd9ad8dee4df
+  data.tar.gz: 4e8867aa78411d5e9fbe0a5a3a609f94611cca323b37a1f23a1531eaffddee6906e92d33194b23bd0dedcd351c71169a99142028559428574de4a1a914f82c72

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

@@ -11,7 +11,7 @@
 //= require jquery.jstree/jquery.jstree
 //= require jquery_ujs
 //= require jquery-ui/widgets/autocomplete
-//= require select2
+//= require select2-full
 //= require underscore-min.js
 
 //= require spree

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() {
@@ -123,7 +120,7 @@ jQuery(function ($) {
   $('.js-filterable').each(function () {
     var $this = $(this)
 
-    if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0) {
+    if ($this.val() !== null && $this.val() !== '' && $this.val().length !== 0 && !$this.hasClass('flatpickr-alt-input')) {
       var ransackValue, filter
       var ransackFieldId = $this.attr('id')
       var label = $('label[for="' + ransackFieldId + '"]')
@@ -226,29 +223,26 @@ $.fn.radioControlsVisibilityOfElement = function (dependentElementSelector) {
 }
 
 document.addEventListener('DOMContentLoaded', function() {
-  var dateFrom = flatpickr('.datePickerFrom', {
+  flatpickr.setDefaults({
+    altInput: true,
     time_24hr: true,
-    dateFormat: Spree.translations.date_picker,
-    monthSelectorType: 'static',
+    altInputClass: 'flatpickr-alt-input',
+    locale: Spree.translations.flatpickr_locale
+  })
+
+  var dateFrom = flatpickr('.datePickerFrom', {
     onChange: function(selectedDates) {
       dateTo.set('minDate', selectedDates[0])
     }
   })
 
   var dateTo = flatpickr('.datePickerTo', {
-    monthSelectorType: 'static',
-    time_24hr: true,
-    dateFormat: Spree.translations.date_picker,
     onChange: function(selectedDates) {
       dateFrom.set('maxDate', selectedDates[0])
     }
   })
 
-  flatpickr('.datepicker', {
-    monthSelectorType: 'static',
-    time_24hr: true,
-    dateFormat: Spree.translations.date_picker
-  })
+  flatpickr('.datepicker', { })
 })
 
 $(document).ready(function() {

data/app/assets/stylesheets/spree/backend/global/_mixins.scss

@@ -0,0 +1,19 @@
+// Mixin to prefix several properties at once
+
+// EXAMPLE
+// @include prefix((
+//   appearance: none,
+//   touch-callout: none,
+//   user-select: none
+// ), webkit moz ms khtml);
+
+@mixin prefix($declarations, $prefixes: ()) {
+  @each $property, $value in $declarations {
+    @each $prefix in $prefixes {
+      #{'-' + $prefix + '-' + $property}: $value;
+    }
+
+    // Output standard non-prefixed declaration
+    #{$property}: $value;
+  }
+}

data/app/assets/stylesheets/spree/backend/plugins/_flatpickr.scss

@@ -1,95 +1,113 @@
-// Adaptive icon from calendar to close.
-@mixin swith-appended-icon {
-  &:placeholder-shown:not(:focus) + * {
-      @content;
+.flatpickr-calendar {
+  // Custom Flatpickr styling for Spree + BS4.
+  .flatpickr-current-month {
+    span.cur-month:hover {
+      background: transparent;
+    }
+      .numInputWrapper {
+      margin-left: 3px;
+      border-radius: $border-radius;
+      overflow: hidden;
+    }
+
+    .flatpickr-monthDropdown-months {
+      @include prefix((
+        appearance: none
+      ), webkit moz ms khtml);
+
+      padding: 0.2em;
+      border-radius: $border-radius;
+    }
   }
-}
 
-input.flatpickr-input {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  background-color: white !important;
-}
+  .numInputWrapper span.arrowUp {
+    border-color: transparent;
+    border-radius: 0;
+  }
 
-.flatpickr-current-month .numInputWrapper {
-  margin-left: 3px;
-  border-radius: $border-radius;
-  overflow: hidden;
-}
-.flatpickr-current-month span.cur-month:hover {
-  background: transparent;
-}
-.numInputWrapper span.arrowUp {
-  border-color: transparent;
-  border-radius: 0;
-}
-.numInputWrapper span.arrowDown {
-  border-color: transparent;
-  border-radius: 0;
-}
+  .numInputWrapper span.arrowDown {
+    border-color: transparent;
+    border-radius: 0;
+  }
 
-.input-group {
-  input.flatpickr-input{
-    @include swith-appended-icon  {
-      opacity: 0;
-    }
+  .flatpickr-day {
+    margin: 2px 0;
+    border-radius: $border-radius ;
   }
-}
 
-.append_under {
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: 0;
-  height: 100%;
-}
+  .flatpickr-months .flatpickr-prev-month:hover svg,
+  .flatpickr-months .flatpickr-next-month:hover svg {
+    fill: $primary;
+  }
 
-.flatpickr-day {
-  margin: 2px 0;
-  border-radius: $border-radius ;
-}
+  .flatpickr-time {
+    border-radius: 0 0 5px 5px;
+    &:after {
+      display: none;
+    }
+    .numInputWrapper {
+      span {
+        border-color: transparent;
+        border-radius: 0;
+      }
+    }
+  }
 
-// Fix Flatpickr bug where things jusy highlight for no reason.
-input.flatpickr-input[readonly] {
-  -webkit-touch-callout: none; /* iOS Safari */
-    -webkit-user-select: none; /* Safari */
-     -khtml-user-select: none; /* Konqueror HTML */
-       -moz-user-select: none; /* Old versions of Firefox */
-        -ms-user-select: none; /* Internet Explorer/Edge */
-            user-select: none; /* Non-prefixed version, currently
-                                  supported by Chrome, Edge, Opera and Firefox */
+  // Required to stop an opened cal showing above the nav bar.
+  &.open {
+    z-index: $zindex-dropdown;
+  }
 }
 
-.flatpickr-months .flatpickr-prev-month:hover svg,
-.flatpickr-months .flatpickr-next-month:hover svg {
-  fill: $primary;
+// Mixin for calendar toggle icon show/hide.
+@mixin swith-appended-icon {
+  &:placeholder-shown:not(:focus) + * {
+      @content;
+  }
 }
 
-// Force rounded corner for the toggle cal and close icons.
-.input-group >
-.input-group-append:not(:last-child) >
-.force-round {
-  z-index: 5;
-  border-top-right-radius: $border-radius !important;
-  border-bottom-right-radius: $border-radius !important;
-}
+.input-group.datePickerFrom,
+.input-group.datePickerTo,
+.input-group.datepicker {
+  input.flatpickr-alt-input[readonly] {
+    // Flatpickr alternate input is read-only,
+    // style it as an active input field.
+    background-color: white !important;
 
-div.flatpickr-calendar.open {
-  z-index: $zindex-dropdown;
-}
+    // Fix a bug where occasionally the whole screen will highlight
+    // if you clicked the Flatpcikr input box while moving the cursor.
+    @include prefix((
+      appearance: none,
+      touch-callout: none,
+      user-select: none
+    ), webkit moz ms khtml);
 
-.flatpickr-time {
-  border-radius: 0 0 5px 5px;
-  &:after {
-    display: none;
+    @include swith-appended-icon  {
+      opacity: 0;
+    }
   }
-  .numInputWrapper {
-      span {
-        border-color: transparent;
-        border-radius: 0;
 
-      }
+  // Required for calendar toggle icon show/hide.
+  .append_under {
+    position: absolute;
+    right: 0;
+    top: 0;
+    z-index: 0;
+    height: 100%;
+  }
+
+  // Styling for calendar toggle icon toggle
+  .input-group-append:not(:last-child) >
+  .force-round {
+    z-index: 5;
+    border-top-right-radius: $border-radius !important;
+    border-bottom-right-radius: $border-radius !important;
+  }
 
+  // Styling for calendar toggle icon toggle
+  .form-control:not(:first-child),
+  .input-group >.flatpickr-alt-input:not(:first-child) {
+    border-top-left-radius: $border-radius !important;
+    border-bottom-left-radius: $border-radius !important;
   }
 }

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/assets/stylesheets/spree/backend/spree_admin.css.scss

@@ -1,4 +1,5 @@
 @import 'global/variables';
+@import 'global/mixins';
 
 @import 'bootstrap';
 @import 'glyphicons';

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

@@ -2,6 +2,8 @@ module Spree
   module Admin
     class BaseController < Spree::BaseController
       helper 'spree/admin/navigation'
+      helper 'spree/locale'
+      helper 'spree/currency'
       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

@@ -5,12 +5,11 @@ module Spree
       before_action :set_default_currency, only: :new
       before_action :set_default_locale, only: :new
       before_action :normalize_supported_currencies, only: [:create, :update]
+      before_action :normalize_supported_locales, only: [:create, :update]
       before_action :set_default_country_id, only: :new
       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
@@ -129,20 +128,14 @@ module Spree
         end
       end
 
-      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]]
+      def normalize_supported_locales
+        if params[:store][:supported_locales]&.is_a?(Array)
+          params[:store][:supported_locales] = params[:store][:supported_locales].compact.uniq.reject(&:blank?).join(',')
         end
       end
 
-      def locale_presentation(locale)
-        [Spree.t('i18n.this_file_language', locale: locale), locale]
+      def set_default_country_id
+        @store.default_country_id = Spree::Config[:default_country_id]
       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]
@@ -46,7 +58,7 @@ module Spree
 
       def datepicker_field_value(date)
         unless date.blank?
-          l(date, format: Spree.t('date_picker.format', default: '%Y/%m/%d'))
+          l(date, format: '%Y/%m/%d')
         end
       end
 
@@ -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