spree_backend 4.2.0.rc2 → 4.2.1

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

@@ -1,37 +0,0 @@
-/* global flatpickr */
-document.addEventListener('DOMContentLoaded', function() {
-  flatpickr.l10ns.default.firstDayOfWeek = Spree.translations.firstDay
-  flatpickr.l10ns.default.rangeSeparator = Spree.translations.rangeSep
-  flatpickr.l10ns.default.weekAbbreviation = Spree.translations.weekAbbr
-  flatpickr.l10ns.default.scrollTitle = Spree.translations.scrollTitle
-  flatpickr.l10ns.default.toggleTitle = Spree.translations.toggleTitle
-  flatpickr.l10ns.default.amPM = [Spree.translations.am, Spree.translations.pm]
-  flatpickr.l10ns.default.yearAriaLabel = Spree.translations.yearAriaLabel
-  flatpickr.l10ns.default.hourAriaLabel = Spree.translations.hourAriaLabel
-  flatpickr.l10ns.default.minuteAriaLabel = Spree.translations.minuteAriaLabel
-  flatpickr.l10ns.default.weekdays = {
-    shorthand: [
-      Spree.translations.sun,
-      Spree.translations.mon,
-      Spree.translations.tue,
-      Spree.translations.wed,
-      Spree.translations.thu,
-      Spree.translations.fri,
-      Spree.translations.sat]
-  }
-  flatpickr.l10ns.default.months = {
-    longhand: [
-      Spree.translations.lh_jan,
-      Spree.translations.lh_feb,
-      Spree.translations.lh_mar,
-      Spree.translations.lh_apr,
-      Spree.translations.lh_may,
-      Spree.translations.lh_jun,
-      Spree.translations.lh_jul,
-      Spree.translations.lh_aug,
-      Spree.translations.lh_sep,
-      Spree.translations.lh_oct,
-      Spree.translations.lh_nov,
-      Spree.translations.lh_dec]
-  }
-})

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

@@ -1,52 +0,0 @@
-$.fn.tagAutocomplete = function () {
-  'use strict'
-
-  function formatTag (tag) {
-    return Select2.util.escapeMarkup(tag.name)
-  }
-
-  this.select2({
-    placeholder: Spree.translations.tags_placeholder,
-    minimumInputLength: 1,
-    tokenSeparators: [','],
-    multiple: true,
-    tags: true,
-    initSelection: function (element, callback) {
-      var data = $(element.val().split(',')).map(function () {
-        return { name: this, id: this }
-      })
-      callback(data)
-    },
-    ajax: {
-      url: Spree.routes.tags_api,
-      datatype: 'json',
-      cache: true,
-      data: function (term) {
-        return {
-          q: term,
-          token: Spree.api_key
-        }
-      },
-      results: function (data) {
-        return {
-          results: data.tags.map(function (tag) {
-            return { name: tag.name, id: tag.name }
-          })
-        }
-      }
-    },
-    createSearchChoice: function (term, data) {
-      if ($(data).filter(function () {
-        return this.name.localeCompare(term) === 0
-      }).length === 0) {
-        return { id: term, name: term }
-      }
-    },
-    formatResult: formatTag,
-    formatSelection: formatTag
-  })
-}
-
-$(document).ready(function () {
-  $('.tag_picker').tagAutocomplete()
-})

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

@@ -1,190 +0,0 @@
-div.select2-drop-mask {
-  z-index: 999;
-}
-.select2-container {
-  display: block;
-
-  .select2-choice {
-    height: $input-height;
-    line-height: 2.2;
-    border-color: $input-border-color;
-    background-image: none;
-    background-color: $input-bg;
-    color: $gray-700;
-
-    &,
-    .select2-arrow {
-      border-radius: $border-radius;
-    }
-
-    .select2-arrow {
-      background-image: none;
-      background-color: $input-bg;
-      border:none;
-      width: 30px;
-
-      b {
-        background-image: url(asset-path("backend-chevron-down.svg")) !important;
-        overflow: hidden !important;
-        vertical-align: middle !important;
-        background-repeat: no-repeat !important;
-        background-size: 1rem !important;
-        background-position: 48% !important;
-      }
-    }
-
-    .select2-chosen {
-      vertical-align: middle;
-      display: inline;
-    }
-
-    abbr {
-      top: 12px;
-    }
-  }
-}
-
-.select2-container-multi .select2-choices .select2-search-field input {
-  color: $gray-700;
-}
-
-.select2-search input {
-  border-color: $input-border-color;
-  border-radius: $border-radius;
-  background-image: url(asset-path("backend-search.svg")) !important;
-  overflow: hidden !important;
-  vertical-align: middle !important;
-  background-repeat: no-repeat !important;
-  background-size: 1rem !important;
-  background-position: 97% !important;
-}
-
-.select2-drop {
-  z-index: $zindex-dropdown;
-  &, &.select2-drop-above {
-    border-radius: $border-radius;
-    box-shadow: none;
-  }
-}
-
-.select2-container-active {
-  .select2-choice,
-  .select2-choices {
-    border-color: $input-focus-border-color;
-    border-bottom: 1px solid $input-focus-border-color;
-  }
-  &, & a {
-    box-shadow: none !important;
-  }
-}
-
-.select2-dropdown-open.select2-drop-above .select2-choice,
-.select2-dropdown-open.select2-drop-above .select2-choices {
-  background-image: none;
-}
-
-
-.select2-drop.select2-drop-active {
-  border-color: $input-focus-border-color;
-  border-top: 0;
-  border-radius: 0 0  $border-radius $border-radius;
-  margin-top: -6px;
-}
-
-.select2-drop.select2-drop-above.select2-drop-active {
-  border-color: $input-focus-border-color;
-  border-top: 1px solid $input-focus-border-color;
-  border-radius: $border-radius $border-radius 0 0;
-  margin-top: 6px;
-}
-
-.select2-container.select2-drop-above .select2-choice {
-  border-color: $input-focus-border-color !important;
-  border-radius: $border-radius;
-}
-.select2-result-label {
-  color: $gray-900;
-}
-
-.select2-results .select2-highlighted {
-  background-color: $primary;
-  border-radius: $border-radius;
-
-  .select2-result-label {
-    color: white;
-  }
-}
-
-.select2-container-multi {
-  .select2-choices {
-    min-height: $input-height;
-    border-radius: $border-radius;
-    line-height: 1;
-    border-color: $input-border-color;
-    background-image: none;
-    background-color: $input-bg;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-
-    .select2-search-choice {
-      @extend .badge;
-      @extend .badge-info;
-      box-shadow: none;
-      border: none;
-      background-image: none;
-      margin: 5px;
-      padding: 7px;
-
-      .select2-search-choice-close {
-        background-image: url(asset-path("backend-cancel.svg")) !important ;
-        position: absolute;
-        left: 7px;
-        top: 7px;
-        background-position: 50% !important;
-
-      }
-
-      div {
-        padding-left: 17px;
-      }
-    }
-  }
-
-  &.select2-container-active {
-    .select2-choices {
-      box-shadow: none;
-      border-color: $input-focus-border-color;
-    }
-  }
-}
-
-.select2-search input,
-.select2-search-choice-close,
-.select2-container .select2-choice abbr,
-.select2-container .select2-choice .select2-arrow b {
-    background-size: $select2-icon-size !important;
-}
-
-.select2-container.select2-allowclear .select2-choice abbr{
-  background-image: url(asset-path("backend-cancel.svg")) !important ;
-  overflow: hidden !important;
-  vertical-align: middle !important;
-  background-repeat: no-repeat !important;
-  background-position: 50% !important;
-  right:30px;
-  background-size: $select2-icon-size !important;
-}
-
-.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
-  background-position: 50% !important;
-}
-
-// Bugfix for required elements
-select.select2[required="required"] {
-  display: inline-block !important;
-  width: 0;
-  overflow: hidden;
-  opacity:0;
-  filter:alpha(opacity=0);
-}

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

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    module CurrencyHelper
-      def currency_options(selected_value = nil)
-        selected_value ||= Spree::Config[:currency]
-        currencies = ::Money::Currency.table.map do |_code, details|
-          iso = details[:iso_code]
-          [iso, "#{details[:name]} (#{iso})"]
-        end
-        options_from_collection_for_select(currencies, :first, :last, selected_value)
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-<div class="panel panel-default currencies">
-  <div class="panel-heading">
-    <%= Spree.t(:currencies) %>
-  </div>
-
-  <div class="panel-body">
-    <div class="form-group">
-      <div class="checkbox">
-        <label>
-          <%= check_box('', :show_store_currency_selector, { checked: Spree::Config.show_store_currency_selector }) %>
-          <%= Spree.t('show_store_currency_selector.short') %>
-        </label>
-        <p class="help-block"><%= Spree.t('show_store_currency_selector.long') %></p>
-      </div>
-    </div>
-  </div>
-</div>