spree_backend 2.3.13 → 2.4.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e8b3afbab00ffe19dcef09a49f211f8fcee580c
-  data.tar.gz: f1d987f5916288b615fbeba2c34d424cde5e9863
+  metadata.gz: 0220e72e24f0fd5829e9a2be90630eeaf2b9e779
+  data.tar.gz: c2086648a7074b09bfac87626d946b5c4de5ec7d
 SHA512:
-  metadata.gz: ce2ee322aa3dcd44ce7ab37d41d974dee58083b237e232f1a5e58f017e6c076f31278f4e246dd413197ce28c69e7c4e71a6e580dd983c91e7df3226bddd30f2b
-  data.tar.gz: 8d344c7b53402e629187bf3ba9ee61c037665381210c1be885744d10cfc568fe0d9f34b1d9f02b64da035349661ded9cf58dd3c7f9fea481d4c830d2bafd2c8a
+  metadata.gz: 63f76b4dd18c00535e94297f58b76857443695cade165edc515a17051676be59bbdfa9427826e5b9e95acb5aa44a8b44d1bf5a024fc079f24b5bce8ebede717e
+  data.tar.gz: e4d6fd9b4c73c83f32bdeb219a348b2a9182273ebd3c3262fa321b44fe4475f5d008e0749fee17a606794c01df2cf381d5bcb1c7b340e9191ef70678d816f70e

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

@@ -1,4 +1,4 @@
-var update_state = function (region, done) {
+var update_state = function (region) {
   'use strict';
 
   var country = $('span#' + region + 'country .select2').select2('val');
@@ -27,7 +27,5 @@ var update_state = function (region, done) {
       state_input.prop('disabled', false).show();
       state_select.select2('destroy').hide();
     }
-
-    if(done) done();
   });
 };

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

@@ -6,7 +6,6 @@ $(@).ready( ->
       url: Spree.url(Spree.routes.apply_coupon_code(order_number))
       data:
         coupon_code: $("#coupon_code").val()
-        token: Spree.api_key
       success: ->
         window.location.reload();
       error: (msg) ->
@@ -14,4 +13,4 @@ $(@).ready( ->
           show_flash 'error', msg.responseJSON["error"]
         else
           show_flash 'error', "There was a problem adding this coupon code."
-)
+)

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

@@ -47,7 +47,7 @@ jQuery(function($) {
   setTimeout('$(".flash").fadeOut()', 5000);
 
   // Highlight hovered table column
-  $('table tbody tr td.actions a').hover(function(){
+  $('table tbody tr td.actions').find('a, button').hover(function(){
     var tr = $(this).closest('tr');
     var klass = 'highlight action-' + $(this).data('action')
     tr.addClass(klass)
@@ -271,4 +271,14 @@ $(document).ready(function(){
   $('a.dismiss').click(function() {
     $(this).parent().fadeOut();
   });
+
+  window.Spree.advanceOrder = function() {
+      $.ajax({
+          type: "PUT",
+          async: false,
+          url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
+      }).done(function() {
+          window.location.reload();
+      });
+  }
 });

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

@@ -19,10 +19,7 @@ $(document).ready(function() {
         url: Spree.routes.user_search,
         datatype: 'json',
         data: function(term, page) {
-          return {
-            q: term,
-            token: Spree.api_key
-          }
+          return { q: term }
         },
         results: function(data, page) {
           return { results: data }
@@ -37,22 +34,6 @@ $(document).ready(function() {
         $('#guest_checkout_false').prop("checked", true);
         $('#guest_checkout_false').prop("disabled", false);
 
-        var billAddress = customer.bill_address;
-        if(billAddress) {
-          $('#order_bill_address_attributes_firstname').val(billAddress.firstname);
-          $('#order_bill_address_attributes_lastname').val(billAddress.lastname);
-          $('#order_bill_address_attributes_address1').val(billAddress.address1);
-          $('#order_bill_address_attributes_address2').val(billAddress.address2);
-          $('#order_bill_address_attributes_city').val(billAddress.city);
-          $('#order_bill_address_attributes_zipcode').val(billAddress.zipcode);
-          $('#order_bill_address_attributes_phone').val(billAddress.phone);
-
-          $('#order_bill_address_attributes_country_id').select2("val", billAddress.country_id).promise().done(function () {
-            update_state('b', function () {
-              $('#order_bill_address_attributes_state_id').select2("val", billAddress.state_id);
-            });
-          });
-        }
         return customer.email;
       }
     })

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

@@ -46,19 +46,16 @@ adjustLineItem = (line_item_id, quantity) ->
     data:
       line_item:
         quantity: quantity
-      token: Spree.api_key
   ).done (msg) ->
-    advanceOrder()
+    window.Spree.advanceOrder()
 
 deleteLineItem = (line_item_id) ->
   url = lineItemURL(line_item_id)
   $.ajax(
     type: "DELETE"
     url: Spree.url(url)
-    data:
-      token: Spree.api_key
   ).done (msg) ->
     $('#line-item-' + line_item_id).remove()
     if $('.line-items tr.line-item').length == 0
       $('.line-items').remove()
-    advanceOrder()
+    window.Spree.advanceOrder()

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

@@ -0,0 +1,50 @@
+// This file contains the code for interacting with line items in the manual cart
+$(document).ready(function () {
+    'use strict';
+
+    // handle variant selection, show stock level.
+    $('#add_line_item_variant_id').change(function(){
+        var variant_id = $(this).val();
+
+        var variant = _.find(window.variants, function(variant){
+            return variant.id == variant_id
+        })
+        $('#stock_details').html(variantLineItemTemplate({variant: variant}));
+        $('#stock_details').show();
+
+        $('button.add_variant').click(addVariant);
+
+        // Add some tips
+        $('.with-tip').powerTip({
+            smartPlacement: true,
+            fadeInTime: 50,
+            fadeOutTime: 50,
+            intentPollInterval: 300
+        });
+
+    });
+});
+
+addVariant = function() {
+    $('#stock_details').hide();
+
+    var variant_id = $('input.variant_autocomplete').val();
+    var quantity = $("input.quantity[data-variant-id='" + variant_id + "']").val();
+
+    adjustLineItems(order_number, variant_id, quantity);
+    return 1
+}
+
+adjustLineItems = function(order_number, variant_id, quantity){
+    var url = Spree.routes.orders_api + "/" + order_number + '/line_items';
+
+    $.ajax({
+        type: "POST",
+        url: Spree.url(url),
+        data: { line_item: {variant_id: variant_id, quantity: quantity }}
+    }).done(function( msg ) {
+        window.Spree.advanceOrder();
+        window.location.reload();
+    });
+
+}

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

@@ -7,8 +7,7 @@ $(document).ready(function () {
       multiple: true,
       initSelection: function (element, callback) {
         var url = Spree.url(Spree.routes.option_type_search, {
-          ids: element.val(),
-          token: Spree.api_key
+          ids: element.val()
         });
         return $.getJSON(url, null, function (data) {
           return callback(data);
@@ -22,8 +21,7 @@ $(document).ready(function () {
           return {
             q: {
               name_cont: term
-            },
-            token: Spree.api_key
+            }
           };
         },
         results: function (data) {

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

@@ -9,8 +9,7 @@ $(document).ready(function () {
 
       $.post('/admin/orders/' + $('input#order_number').val() + '/line_items/' + $(id).val(), {
           _method: 'put',
-          'line_item[quantity]': $(this).val(),
-          token: Spree.api_key
+          'line_item[quantity]': $(this).val()
         },
 
         function (resp) {
@@ -18,4 +17,4 @@ $(document).ready(function () {
         });
     });
   });
-});
+});

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

@@ -3,13 +3,13 @@ jQuery ($) ->
   order_id = $('#payments').data('order-id')
   class Payment
     constructor: (id) ->
-      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json" + '?token=' + Spree.api_key)
+      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json")
       @json = $.getJSON @url.toString(), (data) =>
         @data = data
 
-    if_editable: (callback) ->
+    if_pending: (callback) ->
       @json.done (data) ->
-        callback() if data.state in ['checkout', 'pending']
+        callback() if data.state is 'pending'
 
     update: (attributes, success) ->
       jqXHR = $.ajax
@@ -142,8 +142,8 @@ jQuery ($) ->
       separator = Spree.translations.currency_separator
       amount.replace(///[^\d#{separator}]///g, '')
 
-  # Attach ShowPaymentView to each editable payment in the table
+  # Attach ShowPaymentView to each pending payment in the table
   $('.admin tr[data-hook=payments_row]').each ->
     $el = $(@)
     payment = new Payment($el.prop('id').match(/\d+$/))
-    payment.if_editable -> new ShowPaymentView($el, payment)
+    payment.if_pending -> new ShowPaymentView($el, payment)

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

@@ -6,8 +6,7 @@ $.fn.productAutocomplete = function () {
     multiple: true,
     initSelection: function (element, callback) {
       $.get(Spree.routes.product_search, {
-        ids: element.val().split(','),
-        token: Spree.api_key
+        ids: element.val().split(',')
       }, function (data) {
         callback(data.products);
       });
@@ -21,8 +20,7 @@ $.fn.productAutocomplete = function () {
             name_cont: term,
             sku_cont: term
           },
-          m: 'OR',
-          token: Spree.api_key
+          m: 'OR'
         };
       },
       results: function (data, page) {

data/app/assets/javascripts/spree/backend/returns/expedited_exchanges_warning.coffee

@@ -0,0 +1,4 @@
+$ ->
+  $(document).on("change", ".return-items-table .return-item-exchange-selection", ->
+    $(".expedited-exchanges-warning").fadeIn()
+  )

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

@@ -0,0 +1,35 @@
+$(document).ready(function() {
+  var formFields = $("[data-hook='admin_customer_return_form_fields'], \
+                     [data-hook='admin_return_authorization_form_fields']");
+
+  if(formFields.length > 0) {
+    function checkAddItemBox() {
+      $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
+      updateSuggestedAmount();
+    }
+
+    function updateSuggestedAmount() {
+      var totalPretaxRefund = 0;
+      var checkedItems = formFields.find('input.add-item:checked');
+      $.each(checkedItems, function(i, checkbox) {
+        totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
+      });
+
+      var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
+      formFields.find('span#total_pre_tax_refund').html(displayTotal);
+    }
+
+    updateSuggestedAmount();
+
+    formFields.find('input#select-all').on('change', function(ev) {
+      var checkBoxes = $(ev.currentTarget).parents('table:first').find('input.add-item');
+      checkBoxes.prop('checked', this.checked);
+      updateSuggestedAmount();
+    });
+
+    formFields.find('input.add-item').on('change', updateSuggestedAmount);
+    formFields.find('.refund-amount-input').on('keyup', updateSuggestedAmount);
+
+    formFields.find('input, select').not('.add-item').on('change', checkAddItemBox);
+  }
+});

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

@@ -66,10 +66,7 @@ $(document).ready(function () {
     var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '/ship.json');
     $.ajax({
       type: 'PUT',
-      url: url,
-      data: {
-        token: Spree.api_key
-      }
+      url: url
     }).done(function () {
       window.location.reload();
     }).error(function (msg) {
@@ -98,8 +95,7 @@ $(document).ready(function () {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        },
-        token: Spree.api_key
+        }
       }
     }).done(function () {
       window.location.reload();
@@ -135,8 +131,7 @@ $(document).ready(function () {
       data: {
         shipment: {
           tracking: tracking
-        },
-        token: Spree.api_key
+        }
       }
     }).done(function (data) {
       link.parents('tbody').find('tr.edit-tracking').toggle();
@@ -168,11 +163,7 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
       $.ajax({
         type: "PUT",
         url: Spree.url(url),
-        data: {
-          variant_id: variant_id,
-          quantity: new_quantity,
-          token: Spree.api_key
-        }
+        data: { variant_id: variant_id, quantity: new_quantity }
       }).done(function( msg ) {
         window.location.reload();
       });
@@ -216,8 +207,7 @@ startItemSplit = function(event){
     data: {
       q: {
         "id_eq": variant_id
-      },
-      token: Spree.api_key
+      }
     }
   }).success(function( data ) {
     variant = data['variants'][0];
@@ -243,8 +233,13 @@ startItemSplit = function(event){
 
 completeItemSplit = function(event) {
   event.preventDefault();
+
+  if($('#item_stock_location').val() === ""){
+      alert('Please select the split destination.');
+      return false;
+  }
+
   var link = $(this);
-  var order_number = link.closest('tbody').data('order-number');
   var stock_item_row = link.closest('tr');
   var variant_id = stock_item_row.data('variant-id');
   var quantity = stock_item_row.find('#item_quantity').val();
@@ -257,47 +252,44 @@ completeItemSplit = function(event) {
   var new_shipment = selected_shipment.data('new-shipment');
 
   if (stock_location_id != 'new_shipment') {
-    // first remove item(s) from original shipment
-    $.ajax({
-      type: "PUT",
-      async: false,
-      url: Spree.url(Spree.routes.shipments_api + "/" + original_shipment_number + "/remove.json"),
-      data: { variant_id: variant_id, quantity: quantity }
-    });
-
     if (new_shipment != undefined) {
+      // TRANSFER TO A NEW LOCATION
       $.ajax({
         type: "POST",
         async: false,
-        url: Spree.url(Spree.routes.shipments_api + "?shipment[order_id]=" + order_number),
-        data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id, token: Spree.api_key }
+        url: Spree.url(Spree.routes.shipments_api + "/transfer_to_location"),
+        data: {
+            original_shipment_number: original_shipment_number,
+            variant_id: variant_id,
+            quantity: quantity,
+            stock_location_id: stock_location_id
+        }
+      }).error(function(msg) {
+          alert(msg.responseJSON['message']);
       }).done(function(msg) {
-        advanceOrder();
+        window.Spree.advanceOrder();
       });
     } else {
-      $.ajax({
-        type: "PUT",
-        async: false,
-        url: Spree.url(Spree.routes.shipments_api + "/" + target_shipment_number + "/add.json"),
-        data: { variant_id: variant_id, quantity: quantity, token: Spree.api_key }
-      }).done(function(msg) {
-        advanceOrder();
-      });
+        // TRANSFER TO AN EXISTING SHIPMENT
+        $.ajax({
+            type: "POST",
+            async: false,
+            url: Spree.url(Spree.routes.shipments_api + "/transfer_to_shipment"),
+            data: {
+                original_shipment_number: original_shipment_number,
+                target_shipment_number: target_shipment_number,
+                variant_id: variant_id,
+                quantity: quantity
+            }
+        }).error(function(msg) {
+            alert(msg.responseJSON['message']);
+        }).done(function(msg) {
+            window.Spree.advanceOrder();
+        });
     }
   }
 }
 
-advanceOrder = function() {
-  $.ajax({
-    type: "PUT",
-    async: false,
-    url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance"),
-    data: { token: Spree.api_key }
-  }).done(function() {
-    window.location.reload();
-  });
-}
-
 cancelItemSplit = function(event) {
   event.preventDefault();
   var link = $(this);
@@ -325,12 +317,7 @@ addVariantFromStockLocation = function(event) {
     $.ajax({
       type: "POST",
       url: Spree.url(Spree.routes.shipments_api + "?shipment[order_id]=" + order_number),
-      data: {
-        variant_id: variant_id,
-        quantity: quantity,
-        stock_location_id: stock_location_id,
-        token: Spree.api_key
-      }
+      data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {

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

@@ -9,11 +9,10 @@ jQuery ->
           variant_product_name_cont: term
         per_page: 50
         page: page
-        token: Spree.api_key
       results: (data, page) ->
         more = (page * 50) < data.count
         return { results: data.stock_items, more: more }
     formatResult: (stock_item) ->
       variantTemplate({ variant: stock_item.variant })
     formatSelection: (stock_item) ->
-      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"
+      "#{stock_item.variant.name} (#{stock_item.variant.options_text})"

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

@@ -30,7 +30,7 @@ $ ->
 
       $('#transfer_receive_stock').change (event) => @receive_stock_change(event)
 
-      $.getJSON Spree.url(Spree.routes.stock_locations_api) + '?token=' + Spree.api_key, (data) =>
+      $.getJSON Spree.url(Spree.routes.stock_locations_api), (data) =>
         @locations = (location for location in data.stock_locations)
         @force_receive_stock() if @locations.length < 2
 
@@ -107,7 +107,6 @@ $ ->
             query_object = {}
             query_object[query] = term
             q: query_object
-            token: Spree.api_key
 
           results: (data, page) ->
             result = data["variants"] || data["stock_items"]

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

@@ -1,14 +1,13 @@
-$(document).ready(function () {
-  'use strict';
+'use strict';
 
+var set_taxon_select = function(){
   if ($('#product_taxon_ids').length > 0) {
     $('#product_taxon_ids').select2({
       placeholder: Spree.translations.taxon_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
         var url = Spree.url(Spree.routes.taxons_search, {
-          ids: element.val(),
-          token: Spree.api_key
+          ids: element.val()
         });
         return $.getJSON(url, null, function (data) {
           return callback(data['taxons']);
@@ -24,8 +23,7 @@ $(document).ready(function () {
             without_children: true,
             q: {
               name_cont: term
-            },
-            token: Spree.api_key
+            }
           };
         },
         results: function (data, page) {
@@ -44,4 +42,8 @@ $(document).ready(function () {
       }
     });
   }
+}
+
+$(document).ready(function () {
+  set_taxon_select()
 });

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

@@ -14,12 +14,7 @@ handle_move = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: {
-      _method: "put",
-      "taxon[parent_id]": new_parent.prop("id"),
-      "taxon[child_index]": position,
-      token: Spree.api_key
-    },
+    data: ({_method: "put", "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
     error: handle_ajax_error
 
   true
@@ -35,12 +30,7 @@ handle_create = (e, data) ->
     type: "POST",
     dataType: "json",
     url: base_url.toString(),
-    data: {
-      "taxon[name]": name,
-      "taxon[parent_id]": new_parent.prop("id"),
-      "taxon[child_index]": position,
-      token: Spree.api_key
-    },
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.prop("id"), "taxon[child_index]": position }),
     error: handle_ajax_error,
     success: (data,result) ->
       node.prop('id', data.id)
@@ -57,11 +47,7 @@ handle_rename = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: {
-      _method: "put",
-      "taxon[name]": name,
-      token: Spree.api_key
-    },
+    data: {_method: "put", "taxon[name]": name },
     error: handle_ajax_error
 
 handle_delete = (e, data) ->
@@ -75,10 +61,7 @@ handle_delete = (e, data) ->
         type: "POST",
         dataType: "json",
         url: delete_url.toString(),
-        data: {
-          _method: "delete",
-          token: Spree.api_key
-        },
+        data: {_method: "delete"},
         error: handle_ajax_error
     else
       $.jstree.rollback(last_rollback)
@@ -92,8 +75,6 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
 
     $.ajax
       url: Spree.url(base_url.path().replace("/taxons", "/jstree")).toString(),
-      data:
-        token: Spree.api_key
       success: (taxonomy) ->
         last_rollback = null
 
@@ -102,7 +83,7 @@ root.setup_taxonomy_tree = (taxonomy_id) ->
             data: taxonomy,
             ajax:
               url: (e) ->
-                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree' + '?token=' + Spree.api_key).toString()
+                Spree.url(base_url.path() + '/' + e.prop('id') + '/jstree').toString()
           themes:
             theme: "apple",
             url: Spree.url(Spree.routes.jstree_theme_path)

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

@@ -6,7 +6,6 @@ $(document).ready ->
       url: Spree.routes.classifications_api,
       method: 'PUT',
       data:
-        token: Spree.api_key,
         product_id: ui.item.data('product-id'),
         taxon_id: $('#taxon_id').val(),
         position: ui.item.index()
@@ -21,7 +20,6 @@ $(document).ready ->
         data: (term, page) ->
           per_page: 50,
           page: page,
-          token: Spree.api_key,
           q:
             name_cont: term
         results: (data, page) ->
@@ -38,8 +36,7 @@ $(document).ready ->
     $.ajax
       url: Spree.routes.taxon_products_api,
       data:
-        id: e.val,
-        token: Spree.api_key
+        id: e.val
       success: (data) ->
         el.empty();
         if data.products.length == 0
@@ -51,3 +48,4 @@ $(document).ready ->
               product.image = product.master.images[0].small_url
             el.append(productTemplate({ product: product }))
           $('#sorting_explanation').show()
+

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

@@ -16,8 +16,7 @@ $.fn.userAutocomplete = function () {
       datatype: 'json',
       data: function (term) {
         return {
-          q: term,
-          token: Spree.api_key
+          q: term
         };
       },
       results: function (data) {
@@ -37,4 +36,4 @@ $.fn.userAutocomplete = function () {
 
 $(document).ready(function () {
   $('.user_picker').userAutocomplete();
-});
+});

data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb

@@ -3,6 +3,7 @@ $(document).ready ->
   if $("#variant_autocomplete_template").length > 0
     window.variantTemplate = Handlebars.compile($("#variant_autocomplete_template").text())
     window.variantStockTemplate = Handlebars.compile($("#variant_autocomplete_stock_template").text())
+    window.variantLineItemTemplate = Handlebars.compile($("#variant_line_items_autocomplete_stock_template").text())
   return
 
 formatVariantResult = (variant) ->
@@ -22,7 +23,6 @@ $.fn.variantAutocomplete = ->
       data: (term, page) ->
         q:
           product_name_or_sku_cont: term
-        token: Spree.api_key
 
       results: (data, page) ->
         window.variants = data["variants"]
@@ -33,4 +33,4 @@ $.fn.variantAutocomplete = ->
       if !!variant.options_text
         variant.name + " (#{variant.options_text})"
       else
-        variant.name
+        variant.name