spree_backend 3.0.0.rc3 → 3.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f5db59f9bb47a1c51a531a664dfef2aa549dee7
-  data.tar.gz: 426c2b2ff66046c8fe9bcb9f9f72f174a7c26a1e
+  metadata.gz: c830b0a478d89e82b4dcf34c843707d5d974fd26
+  data.tar.gz: cbee1596932e60b0916c42810631bb22bf768f78
 SHA512:
-  metadata.gz: 9d3060c017cb9bcc9d65bbcb76622450005b8eb7c6de162c86ad543519f2705e0d4dcc598102f3da2d0829ee4666f0e932ce6aaad1398b4c060f22c77766272e
-  data.tar.gz: f0736eafd142aa3acabd97408f501f97c6a6dd13c96e382cc6c77e2c781b46b8cc51ac3bd65a17a757ae4bcfa63a773f63c83dffd652177c8f4f7e62dda57b3c
+  metadata.gz: bcc6c7c2b33851b52ec086e45389f8c9f1a374b605270704311b072cb79640f1d79740f13779eafa3df6a008fa53f4c5e2966b8c0a5a9926b99297ca57cebee6
+  data.tar.gz: a21a2a1aee9751be825199134d671e43f21c870e1e33c7a7dc4eeab2bd6d7934878342a3641dfcbff389614db86ffedef57c8092c1f4eb956e1659a7943d5aad

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

@@ -362,6 +362,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

@@ -32,7 +32,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

@@ -24,7 +24,8 @@ $.fn.productAutocomplete = function (options) {
             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

@@ -57,7 +57,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) {
@@ -86,7 +89,8 @@ $(document).ready(function () {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        }
+        },
+        token: Spree.api_key
       }
     }).done(function () {
       window.location.reload();
@@ -122,7 +126,8 @@ $(document).ready(function () {
       data: {
         shipment: {
           tracking: tracking
-        }
+        },
+        token: Spree.api_key
       }
     }).done(function (data) {
       link.parents('tbody').find('tr.edit-tracking').toggle();
@@ -154,7 +159,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();
       }).fail(function(msg) {
@@ -200,7 +209,8 @@ startItemSplit = function(event){
     data: {
       q: {
         "id_eq": variant_id
-      }
+      },
+      token: Spree.api_key
     }
   }).success(function( data ) {
     variant = data['variants'][0];
@@ -248,7 +258,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']);
@@ -265,7 +276,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']);
@@ -303,7 +315,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
 
@@ -109,6 +109,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

@@ -23,6 +23,7 @@ $(document).ready ->
         data: (term, page) ->
           per_page: 50,
           page: page,
+          token: Spree.api_key,
           q:
             name_cont: term
         results: (data, page) ->
@@ -39,7 +40,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
@@ -58,7 +60,7 @@ $(document).ready ->
     product_index = product_taxons.indexOf(parseFloat(current_taxon_id));
     product_taxons.splice(product_index, 1);
     $.ajax
-      url: Spree.routes.products_api + "/" + product_id + "?product[taxon_ids]=" + product_taxons,
+      url: Spree.routes.products_api + "/" + product_id + "?product[taxon_ids]=" + product_taxons + '&token=' + Spree.api_key,
       type: "PUT",
       success: (data) ->
         product.fadeOut 400, (e) ->

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

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

data/app/views/spree/admin/stock_transfers/index.html.erb

@@ -75,7 +75,7 @@
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StockTransfer)) %>,
-    <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::StockTransfer %>!
+    <%= link_to(Spree.t(:add_one), new_admin_stock_transfer_path) if can? :create, Spree::StockTransfer %>!
   </div>
 <% end %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc3
+  version: 3.0.0.rc4
 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: 3.0.0.rc3
+        version: 3.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc3
+        version: 3.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc3
+        version: 3.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc3
+        version: 3.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement