solidus_backend 2.2.2 → 2.3.0.beta1

data/app/assets/javascripts/spree/backend/views/payment/edit_credit_card.js

@@ -0,0 +1,23 @@
+//= require jquery.payment
+Spree.Views.Payment.EditCreditCard = Backbone.View.extend({
+  initialize: function() {
+    this.$(".cardNumber").payment('formatCardNumber');
+    this.$(".cardExpiry").payment('formatCardExpiry');
+    this.$(".cardCode").payment('formatCardCVC');
+
+    this.render()
+  },
+
+  events: {
+    'change [name=card]': 'render',
+    'change .cardNumber': 'render'
+  },
+
+  render: function() {
+    var isNew = (this.$('[name=card]:checked').val() === 'new') || (this.$('[name=card]').length == 0);
+    this.$('.js-new-credit-card-form').toggleClass('hidden', !isNew)
+    this.$('.js-new-credit-card-form :input').prop('disabled', !isNew)
+
+    this.$(".ccType").val($.payment.cardType(this.$('.cardNumber').val()))
+  }
+})

data/app/assets/javascripts/spree/backend/views/payment/new.js

@@ -0,0 +1,25 @@
+Spree.Views.Payment.New = Backbone.View.extend({
+  initialize: function() {
+    this.onSelectMethod()
+  },
+
+  events: {
+    'change [name="payment[payment_method_id]"]': 'onSelectMethod',
+    'change .cardNumber': 'onChangeCard'
+  },
+
+  onSelectMethod: function(e) {
+    this.selectedId = parseInt(this.$('input[name="payment[payment_method_id]"]:checked').val())
+    this.render();
+  },
+
+  render: function() {
+    var view = this;
+    this.$('.payment-method-settings .payment-methods').each(function() {
+      var $method = $(this);
+      var selected = $method.data("payment-method-id") === view.selectedId;
+      $method.toggleClass('hidden', !selected);
+      $method.find(':input').prop('disabled', !selected);
+    });
+  }
+});

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

@@ -24,7 +24,7 @@ Spree.Views.StateSelect = Backbone.View.extend({
   onChange: function() {
     this.model.set({
       state_name: this.$state_input.val(),
-      state_id: this.$state_select.select2("val")
+      state_id: this.$state_select.val()
     })
   },
 
@@ -39,11 +39,11 @@ Spree.Views.StateSelect = Backbone.View.extend({
   },
 
   render: function() {
-    this.$state_select.empty().select2("destroy").hide();
+    this.$state_select.empty().hide();
     this.$state_input.hide();
 
     if (!this.states.fetched) {
-      this.$state_select.show().select2().select2("disable");
+      this.$state_select.show().prop("disabled", true);
     } else if (this.states.length) {
       var $state_select = this.$state_select;
       this.states.each(function(state) {
@@ -52,7 +52,7 @@ Spree.Views.StateSelect = Backbone.View.extend({
         );
       })
       this.$state_select.val(this.model.get("state_id"))
-      this.$state_select.show().select2().select2("enable");
+      this.$state_select.show().prop("disabled", false);
     } else {
       this.$state_input.prop('disabled', false).show();
     }

data/app/assets/javascripts/spree/backend/views/tables/editable_table.js.coffee

@@ -0,0 +1,14 @@
+Spree.Views.Tables ||= {}
+
+class Spree.Views.Tables.EditableTable
+  @add: ($el) ->
+    new Spree.Views.Tables.EditableTableRow el: $el
+
+  @append: (html) ->
+    $row = $(html)
+
+    $('#images-table').removeClass('hidden').find('tbody').append($row)
+    $row.find('.select2').select2()
+    $('.no-objects-found').hide()
+
+    @add($row)

data/app/assets/javascripts/spree/backend/views/tables/editable_table_row.js.coffee

@@ -0,0 +1,45 @@
+Spree.Views.Tables.EditableTableRow = Backbone.View.extend
+  events:
+    "select2-open": "onEdit"
+    "focus input": "onEdit"
+    "click [data-action=save]": "onSave"
+    "click [data-action=cancel]": "onCancel"
+    'keyup input': 'onKeypress'
+
+  onEdit: (e) ->
+    return if @$el.hasClass('editing')
+    @$el.addClass('editing')
+
+    @$el.find('input, select').each ->
+      $input = $(this)
+      $input.data 'original-value', $input.val()
+
+  onCancel: (e) ->
+    e.preventDefault()
+    @$el.removeClass("editing")
+
+    @$el.find('input, select').each ->
+      $input = $(this)
+      originalValue = $input.data('original-value')
+      $input.val(originalValue).change()
+
+  onSave: (e) ->
+    e.preventDefault()
+
+    Spree.ajax @$el.find('.actions [data-action=save]').attr('href'),
+      data: @$el.find('select, input').serialize()
+      dataType: 'json'
+      method: 'put'
+      success: (response) =>
+        @$el.removeClass("editing")
+      error: (response) =>
+        show_flash 'error', response.responseJSON.error
+
+  ENTER_KEY: 13
+  ESC_KEY: 27
+
+  onKeypress: (e) ->
+    key = e.keyCode || e.which
+    switch key
+      when @ENTER_KEY then @onSave(e)
+      when @ESC_KEY then @onCancel(e)

data/app/assets/stylesheets/spree/backend/components/_date-picker.scss

@@ -46,7 +46,6 @@
       }
 
       .ui-icon {
-        @extend [class^="icon-"]:before;
         @extend .fa;
 
         background-image: none;

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

@@ -0,0 +1,37 @@
+.inline-editable-table tr:not(:hover):not(.editing)  {
+  input {
+    border: 1px solid transparent;
+    color: inherit;
+    background-color: transparent;
+  }
+
+  .select2-arrow {
+    display: none;
+  }
+
+  .select2-choice {
+    background-color: transparent;
+    border-color: transparent;
+    color: inherit;
+  }
+
+  .select2-chosen {
+    color: inherit;
+  }
+}
+
+.inline-editable-table tr {
+  .fa-check, .fa-cancel {
+    display: none !important;
+  }
+
+  &.editing {
+    .fa-check, .fa-cancel {
+      display: inline-block !important;
+    }
+
+    .fa {
+      display: none;
+    }
+  }
+}

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

@@ -38,10 +38,10 @@
   &.action-edit, &.action-save, &.action-capture, &.action-add {
     @include bootstrap-tooltip-color($brand-success);
   }
-  &.action-clone {
+  &.action-clone, &.action-cancel {
     @include bootstrap-tooltip-color($brand-warning);
   }
-  &.action-void, &.action-failure, &.action-cancel, &.action-remove {
+  &.action-void, &.action-failure, &.action-remove {
     @include bootstrap-tooltip-color($brand-danger);
   }
 }

data/app/assets/stylesheets/spree/backend/sections/_products.scss

@@ -52,14 +52,6 @@ div[data-hook="admin_products_index_search_buttons"] {
   }
 }
 
-progress {
-  width: 100%;
-}
-
-.margin-bottom-one {
-  margin-bottom: 1rem;
-}
-
 .progress-card {
   height: 100%;
   padding: 1rem;

data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss

@@ -26,7 +26,8 @@
     flex: 1;
   }
 
-  ul {
+  ul.example,
+  ul.example ul {
     list-style: none;
     padding-left: 0;
   }
@@ -64,10 +65,6 @@
     margin: 4rem 0;
   }
 
-  &-section {
-    @include clearfix;
-  }
-
   &-section-header {
     @include margin(7rem 0 3rem);
     border-bottom: 1px solid darken($color-7, 10%);
@@ -88,13 +85,13 @@
   }
 
   .half {
-    width: 50%;
-    float: left;
+    display: inline-block;
+    width: 49%;
     padding-right: 1rem;
+    vertical-align: top;
 
     + .half {
-      float: none;
-      margin-left: 50%;
+      display: inline-block;
       padding-right: 0;
       padding-left: 1rem;
     }
@@ -106,6 +103,15 @@
       border: 1px solid darken($color-7, 10%);
     }
   }
+
+  table.with-actions-borders {
+    th, td {
+      &.actions {
+        border-right: 1px solid #cee1f4 !important;
+        border-bottom: 1px solid #cee1f4 !important;
+      }
+    }
+  }
 }
 
 .color-variables {

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

@@ -14,24 +14,24 @@
   }
 }
 
-.fa-email:before     { @extend .fa-envelope:before }
-.fa-resume:before    { @extend .fa-refresh:before  }
-.fa-approve:before   { @extend .fa-check:before    }
+.fa-email     { @extend .fa-envelope }
+.fa-resume    { @extend .fa-refresh  }
+.fa-approve   { @extend .fa-check    }
 
-.fa-remove:before,
-.fa-cancel:before,
-.fa-void:before      { @extend .fa-times:before    }
+.fa-remove,
+.fa-cancel,
+.fa-void      { @extend .fa-times    }
 
-.fa-failure:before   { @extend .fa-thumbs-down:before }
+.fa-failure   { @extend .fa-thumbs-down }
 
-.fa-trash:before     { @extend .fa-trash-o:before  }
+.fa-trash     { @extend .fa-trash-o  }
 
-.fa-capture:before   { @extend .fa-check:before    }
-.fa-credit:before    { @extend .fa-check:before    }
-.fa-approve:before   { @extend .fa-check:before    }
-.fa-icon-cogs:before { @extend .fa-cogs:before     }
-.fa-ok:before,
-.fa-icon-ok:before   { @extend .fa-check:before    }
+.fa-capture   { @extend .fa-check    }
+.fa-credit    { @extend .fa-check    }
+.fa-approve   { @extend .fa-check    }
+.fa-icon-cogs { @extend .fa-cogs     }
+.fa-ok,
+.fa-icon-ok   { @extend .fa-check    }
 
 button, a {
   &.fa:before {

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

@@ -40,7 +40,7 @@ table {
         font-size: $font-size-base;
       }
 
-      [class*='fa-'].no-text {
+      .fa {
         font-size: 120%;
         background-color: very-light($color-3);
         border: 1px solid $color-border;
@@ -112,7 +112,6 @@ table {
     }
 
     .handle {
-      @extend [class^="icon-"]:before;
       @extend .fa;
       @extend .fa-bars;
       cursor: move;

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

@@ -20,6 +20,19 @@
   display: none;
 }
 
+/* hide and show elements based on editing */
+.editing .editing-hide {
+  display: none;
+}
+
+.editing .editing-show {
+  display: block;
+}
+
+.editing-show {
+  display: none;
+}
+
 // For block grids
 .frameless {
   margin-left: -10px;

data/app/assets/stylesheets/spree/backend/spree_admin.scss

@@ -35,6 +35,7 @@
 @import 'spree/backend/components/sidebar';
 @import 'spree/backend/components/number_field_update';
 @import 'spree/backend/components/stock_table';
+@import 'spree/backend/components/editable_table';
 @import 'spree/backend/components/tabs';
 
 @import 'font-awesome';
@@ -56,4 +57,3 @@
 @import 'spree/backend/sections/transfer_items';
 @import 'spree/backend/sections/stock_transfers';
 @import 'spree/backend/sections/style_guide';
-@import 'spree/backend/sections/payments';

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

@@ -32,7 +32,7 @@ module Spree
       end
 
       def load_order
-        @order = Spree::Order.find_by_number!(params[:order_id])
+        @order = Spree::Order.find_by!(number: params[:order_id])
         authorize! action, @order
       end
 

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

@@ -51,7 +51,7 @@ module Spree
         end
 
         def load_order
-          @order = Spree::Order.includes(:adjustments).find_by_number!(params[:order_id])
+          @order = Spree::Order.includes(:adjustments).find_by!(number: params[:order_id])
         end
 
         def model_class

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

@@ -69,23 +69,16 @@ module Spree
       end
 
       def new
-        user = Spree.user_class.find_by_id(params[:user_id]) if params[:user_id]
+        user = Spree.user_class.find_by(id: params[:user_id]) if params[:user_id]
         @order = Spree::Core::Importer::Order.import(user, order_params)
         redirect_to cart_admin_order_url(@order)
       end
 
       def edit
         require_ship_address
-
-        unless @order.completed?
-          @order.refresh_shipment_rates
-        end
       end
 
       def cart
-        unless @order.completed?
-          @order.refresh_shipment_rates
-        end
         if @order.shipped_shipments.count > 0
           redirect_to edit_admin_order_url(@order)
         end
@@ -145,7 +138,7 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver_later
+        OrderMailer.confirm_email(@order, true).deliver_later
         flash[:success] = Spree.t(:order_email_resent)
 
         redirect_to(spree.edit_admin_order_path(@order))
@@ -178,7 +171,7 @@ module Spree
       end
 
       def load_order
-        @order = Spree::Order.includes(:adjustments).find_by_number!(params[:id])
+        @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
         authorize! action, @order
       end
 

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

@@ -2,8 +2,8 @@ module Spree
   module Admin
     class PaymentMethodsController < ResourceController
       skip_before_action :load_resource, only: :create
-      before_action :load_providers
-      before_action :validate_payment_method_provider, only: [:create, :update]
+      before_action :load_payment_method_types, except: [:index]
+      before_action :validate_payment_method_type, only: [:create, :update]
 
       respond_to :html
 
@@ -49,16 +49,29 @@ module Spree
       end
 
       def load_providers
-        @providers = Spree::PaymentMethod.providers.sort_by(&:name)
+        load_payment_method_types
       end
+      deprecate load_providers: :load_payment_method_types, deprecator: Spree::Deprecation
 
-      def validate_payment_method_provider
+      def load_payment_method_types
+        @payment_method_types = Rails.application.config.spree.payment_methods.sort_by(&:name)
+        # TODO: Remove `@providers` instance var once `load_providers` gets removed.
+        @providers = @payment_method_types
+      end
+
+      def validate_payment_provider
+        validate_payment_method_type
+      end
+      deprecate validate_payment_provider: :validate_payment_method_type,
+        deprecator: Spree::Deprecation
+
+      def validate_payment_method_type
         requested_type = params[:payment_method].delete(:type)
-        @payment_method_type = @providers.detect do |klass|
+        @payment_method_type = @payment_method_types.detect do |klass|
           klass.name == requested_type
         end
         if !@payment_method_type
-          flash[:error] = Spree.t(:invalid_payment_provider)
+          flash[:error] = Spree.t(:invalid_payment_method_type)
           redirect_to new_admin_payment_method_path
         end
       end