spree_backend 4.2.0.rc2 → 4.2.1

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';
@@ -18,9 +19,10 @@
 @import 'components/progress';
 @import 'components/spinner';
 
-@import 'plugins/select2';
 @import 'plugins/jquery_ui';
 @import 'plugins/flatpickr';
+@import 'plugins/select2_bootstrap4';
+@import 'plugins/select2_custom';
 
 @import 'shared/base';
 @import 'shared/forms';

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/general_settings_controller.rb

@@ -27,7 +27,7 @@ module Spree
       end
 
       def render(*args)
-        @preferences_currency |= [:show_store_currency_selector]
+        @preferences_currency |= [:show_store_selector]
         super
       end
 

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/orders_controller.rb

@@ -2,7 +2,10 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       before_action :initialize_order_events
-      before_action :load_order, only: [:edit, :update, :cancel, :resume, :approve, :resend, :open_adjustments, :close_adjustments, :cart, :store, :set_store]
+      before_action :load_order, only: %i[
+        edit update cancel resume approve resend open_adjustments
+        close_adjustments cart store set_store channel set_channel
+      ]
 
       respond_to :html
 
@@ -144,11 +147,21 @@ module Spree
         redirect_to store_admin_order_url(@order)
       end
 
+      def set_channel
+        if @order.update(order_params)
+          flash[:success] = flash_message_for(@order, :successfully_updated)
+        else
+          flash[:error] = @order.errors.full_messages.join(', ')
+        end
+
+        redirect_to channel_admin_order_url(@order)
+      end
+
       private
 
       def order_params
         params[:created_by_id] = try_spree_current_user.try(:id)
-        params.permit(:created_by_id, :user_id, :store_id)
+        params.permit(:created_by_id, :user_id, :store_id, :channel)
       end
 
       def load_order

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/products_controller.rb

@@ -20,10 +20,10 @@ module Spree
 
       def update
         if params[:product][:taxon_ids].present?
-          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].reject(&:empty?)
         end
         if params[:product][:option_type_ids].present?
-          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].reject(&:empty?)
         end
         invoke_callbacks(:update, :before)
         if @object.update(permitted_resource_params)

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

@@ -22,7 +22,7 @@ module Spree
       end
 
       def load_data
-        @countries = Country.order(:name)
+        @countries = Spree::Country.where(states_required: true).order(:name)
       end
     end
   end

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

@@ -5,16 +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]
 
-      if defined?(SpreeI18n)
-        include SpreeI18n::LocaleHelper
-      end
-
-      helper_method :all_locales_options
-
       def index
         if params[:ids]
           load_stores_by_ids
@@ -133,16 +128,14 @@ module Spree
         end
       end
 
-      def set_default_country_id
-        @store.default_country_id = Spree::Config[:default_country_id]
+      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
 
-      # this method is overriten by spree_i18n to add support for more locales
-      # in https://github.com/spree-contrib/spree_i18n/blob/master/app/helpers/spree_i18n/locale_helper.rb#L17
-      unless defined?(SpreeI18n)
-        def all_locales_options
-          [['English (EN)', :en]]
-        end
+      def set_default_country_id
+        @store.default_country_id = Spree::Config[:default_country_id]
       end
     end
   end

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

@@ -1,8 +1,8 @@
 module Spree
   module Admin
     class TaxonsController < Spree::Admin::BaseController
-      before_action :load_taxonomy, only: [:create, :edit, :update]
-      before_action :load_taxon, only: [:edit, :update]
+      before_action :load_taxonomy, only: [:create, :edit, :update, :remove_icon]
+      before_action :load_taxon, only: [:edit, :update, :remove_icon]
       before_action :set_permalink_part, only: [:edit, :update]
       respond_to :html, :js
 
@@ -62,10 +62,22 @@ module Spree
         end
       end
 
+      def remove_icon
+        if @taxon.icon.destroy
+          flash[:success] = Spree.t('notice_messages.icon_removed')
+          redirect_to edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id)
+        else
+          flash[:error] = Spree.t('errors.messages.cannot_remove_icon')
+          render :edit
+        end
+      end
+
       private
 
       def set_permalink_part
         @permalink_part = @taxon.permalink.split('/').last
+        @parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
+        @parent_permalink += '/' unless @parent_permalink.blank?
       end
 
       def taxon_params
@@ -95,9 +107,7 @@ module Spree
 
       def set_permalink_params
         if params.key? 'permalink_part'
-          parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
-          parent_permalink += '/' unless parent_permalink.blank?
-          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
+          params[:taxon][:permalink] = @parent_permalink + params[:permalink_part]
         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
 
@@ -93,7 +105,9 @@ module Spree
                             class: 'input_integer form-control'
                           }
                         when :boolean
-                          {}
+                          {
+                            class: 'form-check-input'
+                          }
                         when :string
                           {
                             size: 10,
@@ -127,11 +141,25 @@ module Spree
 
         fields = object.preferences.keys.map do |key|
           if object.has_preference?(key)
-            form.label("preferred_#{key}", Spree.t(key) + ': ') +
-              preference_field_for(form, "preferred_#{key}", type: object.preference_type(key))
+            case key
+            when :currency
+              content_tag(:div, form.label("preferred_#{key}", Spree.t(key)) +
+                (form.select "preferred_#{key}", currency_options(object.preferences[key]), {}, { class: 'form-control select2' }),
+                          class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+            else
+              if object.preference_type(key) == :boolean
+                content_tag(:div, preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
+                  form.label("preferred_#{key}", Spree.t(key), class: 'form-check-label'),
+                            class: 'form-group form-check', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+              else
+                content_tag(:div, form.label("preferred_#{key}", Spree.t(key)) +
+                  preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)),
+                            class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
+              end
+            end
           end
         end
-        safe_join(fields, '<br />'.html_safe)
+        safe_join(fields)
       end
 
       # renders hidden field and link to remove record using nested_attributes
@@ -163,7 +191,7 @@ module Spree
       end
 
       def required_span_tag
-        content_tag(:span, ' *', class: 'required')
+        content_tag(:span, ' *', class: 'required font-weight-bold text-danger')
       end
 
       def product_preview_link(product)
@@ -185,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/helpers/spree/admin/navigation_helper.rb

@@ -130,7 +130,7 @@ module Spree
 
       def link_to_clone(resource, options = {})
         options[:data] = { action: 'clone', 'original-title': Spree.t(:clone) }
-        options[:class] = 'btn btn-primary btn-sm with-tip'
+        options[:class] = 'btn btn-warning btn-sm with-tip'
         options[:method] = :post
         options[:icon] = 'clone.svg'
         button_link_to '', clone_object_url(resource), options
@@ -251,6 +251,16 @@ module Spree
         end
       end
 
+      def active_badge(condition, options = {})
+        label = options[:label]
+        label ||= condition ? Spree.t(:say_yes) : Spree.t(:say_no)
+        css_class = condition ? 'badge-active' : 'badge-inactive'
+
+        content_tag(:strong, class: "badge #{css_class} text-uppercase") do
+          label
+        end
+      end
+
       def main_part_classes
         if cookies['sidebar-minimized'] == 'true'
           'col-12 sidebar-collapsed'

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

@@ -2,9 +2,9 @@ module Spree
   module Admin
     module PaymentsHelper
       def payment_method_name(payment)
-        # HACK: to allow us to retrieve the name of a "deleted" payment method
-        id = payment.payment_method_id
-        Spree::PaymentMethod.find_with_destroyed(id).name
+        payment_method = payment.payment_method
+
+        link_to payment_method.name, spree.edit_admin_payment_method_path(payment_method)
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Spree
         if stock_movement.originator.respond_to?(:number)
           if stock_movement.originator.respond_to?(:order)
             link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
+          elsif stock_movement.originator.is_a?(Spree::StockTransfer)
+            link_to stock_movement.originator.number, spree.admin_stock_transfer_url(stock_movement.originator)
           else
             stock_movement.originator.number
           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' %>