spree_backend 2.2.14 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb74c85f6cfb6c2599e2c97ba8e7ffa2a83aa8ab
-  data.tar.gz: 0040298cdc8bb24df26f6fc3181272daa29375ee
+  metadata.gz: 9a6c692cd83aec89a4023acd65033394747f4650
+  data.tar.gz: 755427877461d3f88c63f66474b3bdf085e3fc7b
 SHA512:
-  metadata.gz: dc896e568003a8ae266c6da7ca08562ecc652588b320d584821da85ca34eecffa5c1b643372b1ce887c455df988e2bbd0d3ec56de0fdb63f3c379826addab350
-  data.tar.gz: a258a5968bec8b5a854dd202c131b8ad6c8114e0f322858b38324af1039619a9ae8fdf62bf1c41f0a56744f986aa05bcb2c395d8c1920af2b2ef36a6c3538e39
+  metadata.gz: 3fd47ea8edf040ac138306306aca56696c7445e5e628733acfb3a8366765ba632f392df762ce6bbac4fa6f81c527920b11e7386d5c7dbb313d5f492671bf8849
+  data.tar.gz: ccc6f145bba25155cd8b2750be3fb28035133ab640947fa03cb32e4ed152e1dfb2f4f21412acbd7bb51e4dc0da8f94c9cf8bb0e9e1421565fb946fd4dcd54096

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

@@ -20,3 +20,25 @@
 //= require spree
 //= require spree/backend/spree-select2
 //= require_tree .
+
+
+Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
+Spree.routes.classifications_api = Spree.pathFor('api/classifications')
+Spree.routes.option_type_search = Spree.pathFor('api/option_types')
+Spree.routes.orders_api = Spree.pathFor('api/orders')
+Spree.routes.product_search = Spree.pathFor('api/products')
+Spree.routes.shipments_api = Spree.pathFor('api/shipments')
+Spree.routes.checkouts_api = Spree.pathFor('api/checkouts')
+Spree.routes.stock_locations_api = Spree.pathFor('api/stock_locations')
+Spree.routes.taxon_products_api = Spree.pathFor('api/taxons/products')
+Spree.routes.taxons_search = Spree.pathFor('api/taxons')
+Spree.routes.user_search = Spree.pathFor('admin/search/users')
+Spree.routes.variants_api = Spree.pathFor('api/variants')
+
+Spree.routes.payments_api = function(order_id) {
+  return Spree.pathFor('api/orders/' + order_id + '/payments')
+}
+
+Spree.routes.stock_items_api = function(stock_location_id) {
+  return Spree.pathFor('api/stock_locations/' + stock_location_id + '/stock_items')
+}

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

@@ -3,10 +3,9 @@ $(@).ready( ->
     return if $("#coupon_code").val().length == 0
     $.ajax
       type: 'PUT'
-      url: Spree.url(Spree.routes.orders_api + '/' + order_number + '/apply_coupon_code.json');
+      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

@@ -140,11 +140,11 @@ $(document).ready(function(){
              }
     });
   });
-
+  var uniqueId = 1;
   $('.spree_add_fields').click(function() {
     var target = $(this).data("target");
     var new_table_row = $(target + ' tr:visible:last').clone();
-    var new_id = new Date().getTime();
+    var new_id = new Date().getTime() + (uniqueId++);
     new_table_row.find("input, select").each(function () {
       var el = $(this);
       el.val("");

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 }

data/app/assets/javascripts/spree/backend/images/index.js.coffee

@@ -13,4 +13,3 @@ $ ->
       )
       success: (r) ->
         ($ '#images').html r
-        ($ '.select2').select2()

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

@@ -46,7 +46,6 @@ adjustLineItem = (line_item_id, quantity) ->
     data:
       line_item:
         quantity: quantity
-      token: Spree.api_key
   ).done (msg) ->
     advanceOrder()
 
@@ -55,10 +54,8 @@ deleteLineItem = (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()
+    advanceOrder()

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) {
@@ -40,4 +38,4 @@ $(document).ready(function () {
       }
     });
   }
-});
+});

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

@@ -1,8 +1,9 @@
 jQuery ($) ->
   # Payment model
+  order_id = $('#payments').data('order-id')
   class Payment
     constructor: (id) ->
-      @url  = Spree.url("#{Spree.routes.payments_api}/#{id}.json" + '?token=' + Spree.api_key)
+      @url  = Spree.url("#{Spree.routes.payments_api(order_id)}/#{id}.json")
       @json = $.getJSON @url.toString(), (data) =>
         @data = data
 

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

@@ -12,9 +12,7 @@ $(document).ready(function() {
     $('.payment_methods_radios').click(
       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();
         }
       }
@@ -23,11 +21,9 @@ $(document).ready(function() {
     $('.payment_methods_radios').each(
       function() {
         if (this.checked) {
-          $('#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);
         }
 
         if ($("#card_new" + this.value).is("*")) {

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) {
@@ -43,4 +41,4 @@ $.fn.productAutocomplete = function () {
 
 $(document).ready(function () {
   $('.product_picker').productAutocomplete();
-});
+});

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

@@ -4,4 +4,4 @@ $ ->
     $('input[name="payment[payment_method_id]"]').click ()->
       $('.payment-method-settings fieldset').addClass('hidden')
       id = $(this).parents('li').data('id')
-      $("fieldset[data-id='#{id}']").removeClass('hidden')
+      $("fieldset##{id}").removeClass('hidden')

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

@@ -65,10 +65,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) {
@@ -95,8 +92,7 @@ $(document).ready(function () {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        },
-        token: Spree.api_key
+        }
       }
     }).done(function () {
       window.location.reload();
@@ -105,12 +101,22 @@ $(document).ready(function () {
     });
   });
 
+  var toggleTrackingEdit = function(event) {
+    event.preventDefault();
+
+    var link = $(this);
+    link.parents('tbody').find('tr.edit-tracking').toggle();
+    link.parents('tbody').find('tr.show-tracking').toggle();
+  }
+
   // handle tracking edit click
-  $('a.edit-tracking').on('click', toggleTrackingEdit);
-  $('a.cancel-tracking').on('click', toggleTrackingEdit);
+  $('a.edit-tracking').click(toggleTrackingEdit);
+  $('a.cancel-tracking').click(toggleTrackingEdit);
 
   // handle tracking save
-  $('[data-hook=admin_shipment_form] a.save-tracking').on('click', function () {
+  $('[data-hook=admin_shipment_form] a.save-tracking').on('click', function (event) {
+    event.preventDefault();
+
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     var tracking = link.parents('tbody').find('input#tracking').val();
@@ -122,16 +128,16 @@ $(document).ready(function () {
       data: {
         shipment: {
           tracking: tracking
-        },
-        token: Spree.api_key
+        }
       }
-    }).done(function () {
-      window.location.reload();
-    }).error(function (msg) {
-      console.log(msg);
+    }).done(function (data) {
+      link.parents('tbody').find('tr.edit-tracking').toggle();
+
+      var show = link.parents('tbody').find('tr.show-tracking');
+      show.toggle();
+      show.find('.tracking-value').html($("<strong>").html("<%= Spree.t(:tracking) %>: ")).append(data.tracking);
     });
   });
-
 });
 
 adjustShipmentItems = function(shipment_number, variant_id, quantity){
@@ -154,23 +160,13 @@ 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();
       });
     }
 }
 
-toggleTrackingEdit = function(){
-  var link = $(this);
-  link.parents('tbody').find('tr.edit-tracking').toggle();
-  link.parents('tbody').find('tr.show-tracking').toggle();
-}
-
 toggleMethodEdit = function(){
   var link = $(this);
   link.parents('tbody').find('tr.edit-method').toggle();
@@ -206,8 +202,7 @@ startItemSplit = function(event){
     data: {
       q: {
         "id_eq": variant_id
-      },
-      token: Spree.api_key
+      }
     }
   }).success(function( data ) {
     variant = data['variants'][0];
@@ -260,7 +255,7 @@ completeItemSplit = function(event) {
         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 }
+        data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
       }).done(function(msg) {
         advanceOrder();
       });
@@ -269,7 +264,7 @@ completeItemSplit = function(event) {
         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 }
+        data: { variant_id: variant_id, quantity: quantity }
       }).done(function(msg) {
         advanceOrder();
       });
@@ -312,12 +307,7 @@ addVariantFromStockLocation = function() {
     $.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

@@ -1,18 +1,18 @@
 jQuery ->
-  $('#stock_movement_stock_item_id').select2
+  el = $('#stock_movement_stock_item_id')
+  el.select2
     placeholder: "Find a stock item" # translate
     ajax:
-      url: Spree.url(Spree.routes.stock_items_api)
+      url: Spree.url(Spree.routes.stock_items_api(el.data('stock-location-id')))
       data: (term, page) ->
         q:
           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

@@ -7,8 +7,7 @@ $(document).ready(function () {
       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']);
@@ -21,7 +20,6 @@ $(document).ready(function () {
           return {
             per_page: 50,
             page: page,
-            without_children: true,
             q: {
               name_cont: term
             },

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)