solidus_backend 2.5.2 → 2.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 677c8a507ac453e77774d4f96196b315b1ad706763c2611f0571f0eb53205e4c
-  data.tar.gz: 14eea3e8b0daac22dce08b0b17f1991ca9359861b5a40d8485a49b299a61538f
+  metadata.gz: f79830d32bfa95c9482aeca3614e8d72742a3e9b565087d09b4bd42e296a2c15
+  data.tar.gz: deb28571eea0833eaef03429c6f1fc508e0f2516ccb7f006cb6a22f8d4788cd4
 SHA512:
-  metadata.gz: 0031a89ed07fae86008cfa1a6b97d8b4d621508471516267360dcd1ca0411e5ee08cdc04aa78204e42a137e855ce49de59cd28959ee95c84d93eadeb151adbd6
-  data.tar.gz: d6468cd42e1dc058457e6c68d6b0797158b99b528b8eb3dd0ff198428a96ce3970051ade41a592cf95f1cabd40ad45c9250fb81be65ac44b0b3f6eb5aadd101b
+  metadata.gz: dfdfd52a7a26db75deeb3180e2d4f70c68e0381fb74200de5ac35e97da95f1d0ef870aa48570e1d4fc2eb0c363e3f7cc1788a20a22b5032a812517e6be9936df
+  data.tar.gz: 2d009959f1e8c74be278aa12f28b0704ab6842a9597b908fe402e710213bf1fc6900e5d3562661653f4356c61ddd85992fdc99d6fadf8485820a30dd2add41f7

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
@@ -10,7 +12,7 @@ RSpec::Core::RakeTask.new
 task default: [:spec, 'spec:js']
 
 DummyApp::RakeTasks.new(
-  gem_root: File.expand_path('../', __FILE__),
+  gem_root: File.expand_path(__dir__),
   lib_name: 'solidus_backend'
 )
 
@@ -26,7 +28,7 @@ task :teaspoon do
     driver_options: ENV["driver_options"],
   }
 
-  options.delete_if { |k, v| v.nil? }
+  options.delete_if { |_k, v| v.nil? }
 
   abort("rake teaspoon failed") if Teaspoon::Console.new(options).failures?
 end
@@ -35,7 +37,7 @@ desc "Run javascript specs"
 task 'spec:js' => :teaspoon
 
 namespace :teaspoon do
-  task :server  do
+  task :server do
     require 'teaspoon'
     Rake::Task['dummy_environment'].invoke
     require 'teaspoon/server'

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

@@ -37,6 +37,7 @@
 //= require spree/backend/handlebars_extensions
 //= require spree/backend/images/index
 //= require spree/backend/images/upload
+//= require spree/backend/locale_selection
 //= require spree/backend/navigation
 //= require spree/backend/option_type_autocomplete
 //= require spree/backend/option_value_picker

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

@@ -7,6 +7,7 @@
 //= require spree/backend/product_picker
 //= require spree/backend/option_value_picker
 //= require spree/backend/taxons
+//= require spree/backend/highlight_negative_numbers
 
 /**
 This is a collection of javascript functions and whatnot

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

@@ -0,0 +1,14 @@
+Spree.ready(function() {
+  // Highlight negative numbers in red.
+  document.querySelector('body').addEventListener('input', function(e){
+    var el = e.target;
+    var isInputNumber = el instanceof HTMLInputElement && el.type == 'number';
+    if (isInputNumber) {
+      if (el.value < 0) {
+        el.classList.add("negative");
+      } else {
+        el.classList.remove("negative");
+      }
+    }
+  });
+});

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

@@ -0,0 +1,18 @@
+Spree.ready(function() {
+  var localeSelect = document.querySelector('.js-locale-selection');
+  if (!localeSelect) return;
+
+  localeSelect.addEventListener('change', function() {
+    Spree.ajax({
+      type: "PUT",
+      dataType: "json",
+      url: Spree.pathFor("admin/locale/set"),
+      data: {
+        switch_to_locale: localeSelect.value
+      },
+      success: function(data) {
+        document.location.href = data.location;
+      }
+    });
+  });
+});

data/app/assets/javascripts/spree/backend/templates/products/sortable.hbs

@@ -1,5 +1,5 @@
 <a href="#" id="product_{{ id }}" data-product-id="{{ id }}" class="sort_item list-group-item">
   <i class="fa fa-sort"></i>
   <span class="product_name">{{ name }}</span>
-  <span class="right">{{ display_price }}</span>
+  <span class="float-right">{{ display_price }}</span>
 </a>

data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs

@@ -11,10 +11,19 @@
 <td>
   {{#if editing}}
     <form>
-      <input class="fullwidth" name="count_on_hand" type="number" value="{{count_on_hand}}">
+      <input
+      {{#if negative}}
+        class="fullwidth negative"
+      {{else}}
+        class="fullwidth"
+      {{/if}}
+      name="count_on_hand"
+      type="number"
+      value="{{count_on_hand}}"
+    >
     </form>
   {{else}}
-    <span>{{count_on_hand}}</span>
+    <span {{#if negative}}class="negative"{{/if}}>{{count_on_hand}}</span>
   {{/if}}
 </td>
 <td class="actions">

data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js

@@ -4,6 +4,7 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
   initialize: function(options) {
     this.stockLocationName = options.stockLocationName;
     this.editing = false;
+    this.negative = this.model.attributes.count_on_hand < 0;
     this.render();
   },
 
@@ -19,7 +20,8 @@ Spree.Views.Stock.EditStockItemRow = Backbone.View.extend({
   render: function() {
     var renderAttr = {
       stockLocationName: this.stockLocationName,
-      editing: this.editing
+      editing: this.editing,
+      negative: this.negative
     };
     _.extend(renderAttr, this.model.attributes);
     this.$el.attr("data-variant-id", this.model.get('variant_id'));

data/app/assets/stylesheets/spree/backend/components/_navigation.scss

@@ -160,6 +160,10 @@ nav.menu {
   }
 }
 
+.admin-locale-selection {
+  margin: 1em;
+}
+
 .admin-nav.fits .admin-nav-footer {
   position: fixed;
   bottom: 0;
@@ -170,8 +174,8 @@ nav.menu {
 
 .admin-login-nav {
   list-style: none;
-  margin: 0;
-  padding: 1rem 0;
+  padding: 0;
+  margin: 1rem 0;
 
   li {
     padding: 0.3rem 1.2rem;

data/app/assets/stylesheets/spree/backend/globals/_functions.scss

@@ -1,5 +1,5 @@
 // Make color very close to white
-@function very-light($color, $adjust: 3){
+@function very-light($color, $adjust: 3){  
   @if type-of($adjust) == 'number' and $adjust > 0 {
     @for $i from 0 through 100 {
       @if lighten($color, $i) == white and ($i - $adjust) > $adjust {
@@ -10,7 +10,6 @@
   @else {
     @debug "Please correct $adjust value. It should be number and larger then 0. Currently it is '#{type-of($adjust)}' with value '#{$adjust}'"
   }
-  @return $color;
 };
 
 // Quick fix for dynamic variables missing in SASS

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

@@ -98,6 +98,9 @@ dl {
 .red    { color: $color-5 }
 .yellow { color: $color-6 }
 
+.negative { color: $red }
+input[type="number"].negative { color: $red } // needed to override blue style that is more specific than '.negative'
+
 .no-objects-found {
   text-align: center;
   font-size: 120%;

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class AdjustmentReasonsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class AdjustmentsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class BaseController < Spree::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class CancellationsController < Spree::Admin::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class CustomerReturnsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class DashboardsController < BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class GeneralSettingsController < Spree::Admin::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ImagesController < ResourceController

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Spree
+  module Admin
+    class LocaleController < Spree::Admin::BaseController
+      def set
+        locale = params[:switch_to_locale].to_s.presence
+
+        if locale && I18n.available_locales.include?(locale.to_sym)
+          I18n.locale = locale
+          session[:locale] = locale
+
+          respond_to do |format|
+            format.json { render json: { locale: locale, location: spree.admin_url } }
+          end
+        else
+          respond_to do |format|
+            format.json { render json: { locale: I18n.locale }, status: 404 }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class LogEntriesController < Spree::Admin::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class OptionTypesController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class OptionValuesController < Spree::Admin::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     module Orders

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
@@ -30,7 +32,7 @@ module Spree
         if params[:q][:created_at_gt].present?
           params[:q][:created_at_gt] = begin
                                          Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day
-                                       rescue
+                                       rescue StandardError
                                          ""
                                        end
         end
@@ -38,7 +40,7 @@ module Spree
         if params[:q][:created_at_lt].present?
           params[:q][:created_at_lt] = begin
                                          Time.zone.parse(params[:q][:created_at_lt]).end_of_day
-                                       rescue
+                                       rescue StandardError
                                          ""
                                        end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PaymentMethodsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PaymentsController < Spree::Admin::BaseController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PricesController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ProductPropertiesController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class ProductsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Admin::PromotionActionsController < Spree::Admin::BaseController
   before_action :load_promotion, only: [:create, :destroy]
   before_action :validate_promotion_action_type, only: :create

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PromotionCategoriesController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PromotionCodeBatchesController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module Spree

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
   helper 'spree/promotion_rules'
 
@@ -33,6 +35,10 @@ class Spree::Admin::PromotionRulesController < Spree::Admin::BaseController
     @promotion = Spree::Promotion.find(params[:promotion_id])
   end
 
+  def model_class
+    Spree::PromotionRule
+  end
+
   def validate_promotion_rule_type
     requested_type = params[:promotion_rule].delete(:type)
     promotion_rule_types = Rails.application.config.spree.promotions.rules

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PromotionsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class PropertiesController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class RefundReasonsController < ResourceController

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spree
   module Admin
     class RefundsController < ResourceController