spree_backend 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e44f6e80b7177e474088784b8d7fae85806cd7
-  data.tar.gz: 056ee80f20f0a312113c0af59c35c678e8946a86
+  metadata.gz: d105c88339af651b3d6dab5380d768a8904ca8fd
+  data.tar.gz: c382e1e7ef8e6ad235562ad3d5904d22a06a0b21
 SHA512:
-  metadata.gz: e5f11436a3f19ed71060aca4167b9f22963c6e6c078ca43b9a2da679e707b9d52ae315185c258372d665fe0c1ae20f5a2a2aae18afde2ee2acd26c86f69ecb97
-  data.tar.gz: 90b635e024a15ef0e9bbb610b7849b984928f8904a07a3029841f598f607a0fdb886fe8890063fb6f7a0fcf74fda0c859e794e192ed024a36b2c5e7eb689c327
+  metadata.gz: dc8380f690b551b42d9117ea79cfb06e21fce015c059f398554a2438b3e6cfc4a88c82ae776dbf263cb7a5db1de3a0d497fad104c33dba245b2e5a00df1846e3
+  data.tar.gz: ccd896e04c903ac8b252d74b9e9488b306fcb3944e187c1e9eb0254bf1241a51b53f15d8e7216b523d2f26d01db746e694f02aa4dbc108668bfa85cc28717b9b

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

@@ -6,6 +6,7 @@ $(@).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) ->
@@ -13,4 +14,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

@@ -276,6 +276,9 @@ $(document).ready(function(){
       $.ajax({
           type: "PUT",
           async: false,
+          data: {
+            token: Spree.api_key
+          },
           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,7 +19,10 @@ $(document).ready(function() {
         url: Spree.routes.user_search,
         datatype: 'json',
         data: function(term, page) {
-          return { q: term }
+          return {
+            q: term,
+            token: Spree.api_key
+          }
         },
         results: function(data, page) {
           return { results: data }

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

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

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

@@ -41,7 +41,13 @@ adjustLineItems = function(order_number, variant_id, quantity){
     $.ajax({
         type: "POST",
         url: Spree.url(url),
-        data: { line_item: {variant_id: variant_id, quantity: quantity }}
+        data: {
+          line_item: {
+            variant_id: variant_id,
+            quantity: quantity
+          },
+          token: Spree.api_key
+        }
     }).done(function( msg ) {
         window.Spree.advanceOrder();
         window.location.reload();

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

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

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

@@ -20,7 +20,8 @@ $.fn.productAutocomplete = function () {
             name_cont: term,
             sku_cont: term
           },
-          m: 'OR'
+          m: 'OR',
+          token: Spree.api_key
         };
       },
       results: function (data, page) {

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

@@ -66,7 +66,10 @@ $(document).ready(function () {
     var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '/ship.json');
     $.ajax({
       type: 'PUT',
-      url: url
+      url: url,
+      data: {
+        token: Spree.api_key
+      }
     }).done(function () {
       window.location.reload();
     }).error(function (msg) {
@@ -95,7 +98,8 @@ $(document).ready(function () {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        }
+        },
+        token: Spree.api_key
       }
     }).done(function () {
       window.location.reload();
@@ -131,7 +135,8 @@ $(document).ready(function () {
       data: {
         shipment: {
           tracking: tracking
-        }
+        },
+        token: Spree.api_key
       }
     }).done(function (data) {
       link.parents('tbody').find('tr.edit-tracking').toggle();
@@ -163,7 +168,11 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
       $.ajax({
         type: "PUT",
         url: Spree.url(url),
-        data: { variant_id: variant_id, quantity: new_quantity }
+        data: {
+          variant_id: variant_id,
+          quantity: new_quantity,
+          token: Spree.api_key
+        }
       }).done(function( msg ) {
         window.location.reload();
       });
@@ -207,7 +216,8 @@ startItemSplit = function(event){
     data: {
       q: {
         "id_eq": variant_id
-      }
+      },
+      token: Spree.api_key
     }
   }).success(function( data ) {
     variant = data['variants'][0];
@@ -262,7 +272,8 @@ completeItemSplit = function(event) {
             original_shipment_number: original_shipment_number,
             variant_id: variant_id,
             quantity: quantity,
-            stock_location_id: stock_location_id
+            stock_location_id: stock_location_id,
+            token: Spree.api_key
         }
       }).error(function(msg) {
           alert(msg.responseJSON['message']);
@@ -279,7 +290,8 @@ completeItemSplit = function(event) {
                 original_shipment_number: original_shipment_number,
                 target_shipment_number: target_shipment_number,
                 variant_id: variant_id,
-                quantity: quantity
+                quantity: quantity,
+                token: Spree.api_key
             }
         }).error(function(msg) {
             alert(msg.responseJSON['message']);
@@ -317,7 +329,12 @@ 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 }
+      data: {
+        variant_id: variant_id,
+        quantity: quantity,
+        stock_location_id: stock_location_id,
+        token: Spree.api_key
+      }
     }).done(function( msg ) {
       window.location.reload();
     }).error(function( msg ) {

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

@@ -9,10 +9,11 @@ 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), (data) =>
+      $.getJSON Spree.url(Spree.routes.stock_locations_api) + '?token=' + Spree.api_key, (data) =>
         @locations = (location for location in data.stock_locations)
         @force_receive_stock() if @locations.length < 2
 
@@ -107,6 +107,7 @@ $ ->
             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

@@ -23,7 +23,8 @@ var set_taxon_select = function(){
             without_children: true,
             q: {
               name_cont: term
-            }
+            },
+            token: Spree.api_key
           };
         },
         results: function (data, page) {

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

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

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

@@ -20,6 +20,7 @@ $(document).ready ->
         data: (term, page) ->
           per_page: 50,
           page: page,
+          token: Spree.api_key,
           q:
             name_cont: term
         results: (data, page) ->
@@ -36,7 +37,8 @@ $(document).ready ->
     $.ajax
       url: Spree.routes.taxon_products_api,
       data:
-        id: e.val
+        id: e.val,
+        token: Spree.api_key
       success: (data) ->
         el.empty();
         if data.products.length == 0
@@ -48,4 +50,3 @@ $(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,7 +16,8 @@ $.fn.userAutocomplete = function () {
       datatype: 'json',
       data: function (term) {
         return {
-          q: term
+          q: term,
+          token: Spree.api_key
         };
       },
       results: function (data) {
@@ -36,4 +37,4 @@ $.fn.userAutocomplete = function () {
 
 $(document).ready(function () {
   $('.user_picker').userAutocomplete();
-});
+});

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

@@ -23,6 +23,7 @@ $.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 +34,4 @@ $.fn.variantAutocomplete = ->
       if !!variant.options_text
         variant.name + " (#{variant.options_text})"
       else
-        variant.name
+        variant.name

data/app/views/spree/admin/shared/_head.html.erb

@@ -23,6 +23,7 @@
 <%= javascript_tag do -%>
   jQuery.alerts.dialogClass = 'spree';
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
-<% end -%>
+  <%== "Spree.api_key = '#{try_spree_current_user.spree_api_key}';" if try_spree_current_user %>
+<% end %>
 
 <%= yield :head %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.5
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.5
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement