spree_backend 3.6.6 → 3.7.0.rc1

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

@@ -1,11 +1,10 @@
 $.fn.optionValueAutocomplete = function (options) {
-  /* globals Spree */
-  'use strict';
+  'use strict'
 
   // Default options
-  options = options || {};
-  var multiple = typeof(options.multiple) !== 'undefined' ? options.multiple : true;
-  var productSelect = options.productSelect;
+  options = options || {}
+  var multiple = typeof (options.multiple) !== 'undefined' ? options.multiple : true
+  var productSelect = options.productSelect
 
   this.select2({
     minimumInputLength: 3,
@@ -15,31 +14,31 @@ $.fn.optionValueAutocomplete = function (options) {
         ids: element.val().split(','),
         token: Spree.api_key
       }, function (data) {
-        callback(multiple ? data : data[0]);
-      });
+        callback(multiple ? data : data[0])
+      })
     },
     ajax: {
       url: Spree.routes.option_values_api,
       datatype: 'json',
       data: function (term) {
-        var productId = typeof(productSelect) !== 'undefined' ? $(productSelect).select2('val') : null;
+        var productId = typeof (productSelect) !== 'undefined' ? $(productSelect).select2('val') : null
         return {
           q: {
             name_cont: term,
             variants_product_id_eq: productId
           },
           token: Spree.api_key
-        };
+        }
       },
       results: function (data) {
-        return { results: data };
+        return { results: data }
       }
     },
     formatResult: function (optionValue) {
-      return optionValue.name;
+      return optionValue.name
     },
     formatSelection: function (optionValue) {
-      return optionValue.name;
+      return optionValue.name
     }
-  });
-};
+  })
+}

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

@@ -1,5 +1,4 @@
 $(document).ready(function () {
-  'use strict';
-
-  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete();
-});
+  'use strict'
+  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete()
+})

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

@@ -0,0 +1,230 @@
+/* global show_flash */
+jQuery(function ($) {
+  var extend = function (child, parent) {
+    for (var key in parent) {
+      if (hasProp.call(parent, key)) child[key] = parent[key]
+    }
+    function Ctor () {
+      this.constructor = child
+    }
+    Ctor.prototype = parent.prototype
+    child.prototype = new Ctor()
+    child.__super__ = parent.prototype
+    return child
+  }
+  var hasProp = {}.hasOwnProperty
+  var EditPaymentView, Payment, PaymentView, ShowPaymentView, orderId
+  orderId = $('#payments').data('order-id')
+  Payment = (function () {
+    function Payment (number) {
+      this.url = Spree.url(((Spree.routes.payments_api(orderId)) + '/' + number + '.json') + '?token=' + Spree.api_key)
+      this.json = $.getJSON(this.url.toString(), function (data) {
+        this.data = data
+      }.bind(this))
+      this.updating = false
+    }
+
+    Payment.prototype.if_editable = function (callback) {
+      return this.json.done(function (data) {
+        var ref
+        if ((ref = data.state) === 'checkout' || ref === 'pending') {
+          return callback()
+        }
+      })
+    }
+
+    Payment.prototype.update = function (attributes) {
+      this.updating = true
+      var jqXHR = $.ajax({
+        type: 'PUT',
+        url: this.url.toString(),
+        data: {
+          payment: attributes
+        }
+      })
+      jqXHR.always(function () {
+        this.updating = false
+      }.bind(this))
+      jqXHR.done(function (data) {
+        this.data = data
+      }.bind(this))
+      jqXHR.fail(function () {
+        var response = (jqXHR.responseJSON && jqXHR.responseJSON.error) || jqXHR.statusText
+        show_flash('error', response)
+      })
+      return jqXHR
+    }
+
+    Payment.prototype.amount = function () {
+      return this.data.amount
+    }
+
+    Payment.prototype.display_amount = function () {
+      return this.data.display_amount
+    }
+    return Payment
+  })()
+
+  PaymentView = (function () {
+    function PaymentView ($el1, payment1) {
+      this.$el = $el1
+      this.payment = payment1
+      this.render()
+    }
+
+    PaymentView.prototype.render = function () {
+      return this.add_action_button()
+    }
+
+    PaymentView.prototype.show = function () {
+      this.remove_buttons()
+      return new ShowPaymentView(this.$el, this.payment)
+    }
+
+    PaymentView.prototype.edit = function () {
+      this.remove_buttons()
+      return new EditPaymentView(this.$el, this.payment)
+    }
+
+    PaymentView.prototype.add_action_button = function () {
+      return this.$actions().prepend(this.$new_button(this.action))
+    }
+
+    PaymentView.prototype.remove_buttons = function () {
+      return this.$buttons().remove()
+    }
+
+    PaymentView.prototype.$new_button = function (action) {
+      return $('<a><span class="icon icon-' + action + '"></span></a>').attr({
+        'class': 'payment-action-' + action + ' btn btn-default btn-sm icon-link no-text with-tip',
+        title: Spree.translations[action]
+      }).data({
+        action: action
+      }).one({
+        click: function (event) {
+          event.preventDefault()
+        },
+        mouseup: function () {
+          this[action]()
+        }.bind(this)
+      })
+    }
+
+    PaymentView.prototype.$buttons = function () {
+      return this.$actions().find('.payment-action-' + this.action + ', .payment-action-cancel')
+    }
+
+    PaymentView.prototype.$actions = function () {
+      return this.$el.find('.actions')
+    }
+
+    PaymentView.prototype.$amount = function () {
+      return this.$el.find('td.amount')
+    }
+
+    return PaymentView
+  })()
+  ShowPaymentView = (function (superClass) {
+    extend(ShowPaymentView, superClass)
+
+    function ShowPaymentView () {
+      return ShowPaymentView.__super__.constructor.apply(this, arguments)
+    }
+
+    ShowPaymentView.prototype.action = 'edit'
+
+    ShowPaymentView.prototype.render = function () {
+      ShowPaymentView.__super__.render.apply(this, arguments)
+      this.set_actions_display()
+      this.show_actions()
+      return this.show_amount()
+    }
+
+    ShowPaymentView.prototype.set_actions_display = function () {
+      var width = this.$actions().width()
+      return this.$actions().width(width).css('text-align', 'left')
+    }
+
+    ShowPaymentView.prototype.show_actions = function () {
+      return this.$actions().find('a').show()
+    }
+
+    ShowPaymentView.prototype.show_amount = function () {
+      var amount = $('<span />').html(this.payment.display_amount()).one('click', function () {
+        this.edit().$input().focus()
+      }.bind(this))
+      return this.$amount().html(amount)
+    }
+
+    return ShowPaymentView
+  })(PaymentView)
+  EditPaymentView = (function (superClass) {
+    extend(EditPaymentView, superClass)
+
+    function EditPaymentView () {
+      return EditPaymentView.__super__.constructor.apply(this, arguments)
+    }
+
+    EditPaymentView.prototype.action = 'save'
+
+    EditPaymentView.prototype.render = function () {
+      EditPaymentView.__super__.render.apply(this, arguments)
+      this.hide_actions()
+      this.edit_amount()
+      return this.add_cancel_button()
+    }
+
+    EditPaymentView.prototype.add_cancel_button = function () {
+      return this.$actions().append(this.$new_button('cancel'))
+    }
+
+    EditPaymentView.prototype.hide_actions = function () {
+      return this.$actions().find('a').not(this.$buttons()).hide()
+    }
+
+    EditPaymentView.prototype.edit_amount = function () {
+      var amount = this.$amount()
+      return amount.html(this.$new_input(amount.find('span').width()))
+    }
+
+    EditPaymentView.prototype.save = function () {
+      if (!this.payment.updating) {
+        return this.payment.update({
+          amount: this.$input().val()
+        }).done(function () {
+          return this.show()
+        }.bind(this))
+      }
+    }
+
+    EditPaymentView.prototype.cancel = EditPaymentView.prototype.show
+
+    EditPaymentView.prototype.$new_input = function (width) {
+      var amount = this.constructor.normalize_amount(this.payment.display_amount())
+      return $('<input />').prop({
+        id: 'amount',
+        value: amount
+      }).width(width).css({
+        'text-align': 'right'
+      })
+    }
+
+    EditPaymentView.prototype.$input = function () {
+      return this.$amount().find('input')
+    }
+
+    EditPaymentView.normalize_amount = function (amount) {
+      var separator = Spree.translations.currency_separator
+      return amount.replace(RegExp('[^\\d' + separator + ']', 'g'), '')
+    }
+
+    return EditPaymentView
+  })(PaymentView)
+  return $('.admin tr[data-hook=payments_row]').each(function () {
+    var $el = $(this)
+    var payment = new Payment($el.attr('data-number'))
+    return payment.if_editable(function () {
+      return new ShowPaymentView($el, payment)
+    })
+  })
+})

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

@@ -1,50 +1,50 @@
 //= require jquery.payment
-$(document).ready(function() {
-  if ($("#new_payment").length) {
-    $(".cardNumber").payment('formatCardNumber');
-    $(".cardExpiry").payment('formatCardExpiry');
-    $(".cardCode").payment('formatCardCVC');
+$(document).ready(function () {
+  if ($('#new_payment').length) {
+    $('.cardNumber').payment('formatCardNumber')
+    $('.cardExpiry').payment('formatCardExpiry')
+    $('.cardCode').payment('formatCardCVC')
 
-    $(".cardNumber").change(function() {
-      $(".ccType").val($.payment.cardType(this.value))
+    $('.cardNumber').change(function () {
+      $('.ccType').val($.payment.cardType(this.value))
     })
 
     $('.payment_methods_radios').click(
-      function() {
-        $('.payment-methods').hide();
-        $('.payment-methods :input').prop('disabled', true);
+      function () {
+        $('.payment-methods').hide()
+        $('.payment-methods :input').prop('disabled', true)
         if (this.checked) {
-          $('#payment_method_' + this.value + ' :input').prop('disabled', false);
-          $('#payment_method_' + this.value).show();
+          $('#payment_method_' + this.value + ' :input').prop('disabled', false)
+          $('#payment_method_' + this.value).show()
         }
       }
-    );
+    )
 
     $('.payment_methods_radios').each(
-      function() {
+      function () {
         if (this.checked) {
-          $('#payment_method_' + this.value + ' :input').prop('disabled', false);
-          $('#payment_method_' + this.value).show();
+          $('#payment_method_' + this.value + ' :input').prop('disabled', false)
+          $('#payment_method_' + this.value).show()
         } else {
-          $('#payment_method_' + this.value).hide();
-          $('#payment_method_' + this.value + ' :input').prop('disabled', true);
+          $('#payment_method_' + this.value).hide()
+          $('#payment_method_' + this.value + ' :input').prop('disabled', true)
         }
 
-        if ($("#card_new" + this.value).is("*")) {
-          $("#card_new" + this.value).radioControlsVisibilityOfElement('#card_form' + this.value);
+        if ($('#card_new' + this.value).is('*')) {
+          $('#card_new' + this.value).radioControlsVisibilityOfElement('#card_form' + this.value)
         }
       }
-    );
+    )
 
-    $('.cvvLink').click(function(event){
-      window_name = 'cvv_info';
-      window_options = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1';
-      window.open($(this).prop('href'), window_name, window_options);
-      event.preventDefault();
-    });
+    $('.cvvLink').click(function (event) {
+      var windowName = 'cvv_info'
+      var windowOptions = 'left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1'
+      window.open($(this).prop('href'), windowName, windowOptions)
+      event.preventDefault()
+    })
 
-    $('select.jump_menu').change(function(){
-      window.location = this.options[this.selectedIndex].value;
-    });
+    $('select.jump_menu').change(function () {
+      window.location = this.options[this.selectedIndex].value
+    })
   }
-});
+})

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

@@ -1,12 +1,12 @@
 $.fn.productAutocomplete = function (options) {
-  'use strict';
+  'use strict'
 
   // Default options
-  options = options || {};
-  var multiple = typeof(options.multiple) !== 'undefined' ? options.multiple : true;
+  options = options || {}
+  var multiple = typeof (options.multiple) !== 'undefined' ? options.multiple : true
 
-  function formatProduct(product) {
-    return Select2.util.escapeMarkup(product.name);
+  function formatProduct (product) {
+    return Select2.util.escapeMarkup(product.name)
   }
 
   this.select2({
@@ -17,8 +17,8 @@ $.fn.productAutocomplete = function (options) {
         ids: element.val().split(','),
         token: Spree.api_key
       }, function (data) {
-        callback(multiple ? data.products : data.products[0]);
-      });
+        callback(multiple ? data.products : data.products[0])
+      })
     },
     ajax: {
       url: Spree.routes.products_api,
@@ -27,24 +27,24 @@ $.fn.productAutocomplete = function (options) {
       data: function (term, page) {
         return {
           q: {
-            name_or_master_sku_cont: term,
+            name_or_master_sku_cont: term
           },
           m: 'OR',
           token: Spree.api_key
-        };
+        }
       },
       results: function (data, page) {
-        var products = data.products ? data.products : [];
+        var products = data.products ? data.products : []
         return {
           results: products
-        };
+        }
       }
     },
     formatResult: formatProduct,
     formatSelection: formatProduct
-  });
-};
+  })
+}
 
 $(document).ready(function () {
-  $('.product_picker').productAutocomplete();
-});
+  $('.product_picker').productAutocomplete()
+})

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

@@ -0,0 +1,8 @@
+$(function () {
+  $(document).ajaxStart(function () {
+    $('#progress').stop(true, true).fadeIn()
+  })
+  $(document).ajaxStop(function () {
+    $('#progress').fadeOut()
+  })
+})