shipments.js.erb in spree_backend-2.3.0

- old
+ new

@@ -63,14 +63,11 @@
     var link = $(this);
     var shipment_number = link.data('shipment-number');
     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) {
       console.log(msg);
     });
@@ -93,26 +90,35 @@
       url: url,
       data: {
         shipment: {
           selected_shipping_rate_id: selected_shipping_rate_id,
           unlock: unlock
-        },
-        token: Spree.api_key
+        }
       }
     }).done(function () {
       window.location.reload();
     }).error(function (msg) {
       console.log(msg);
     });
   });
 
+  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();
     var url = Spree.url(Spree.routes.shipments_api + '/' + shipment_number + '.json');
 
@@ -120,20 +126,20 @@
       type: 'PUT',
       url: url,
       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){
     var shipment = _.findWhere(shipments, {number: shipment_number + ''});
     var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
@@ -152,27 +158,17 @@
 
     if(new_quantity!=0){
       $.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();
   link.parents('tbody').find('tr.show-method').toggle();
 }
@@ -204,12 +200,11 @@
     async: false,
     url: Spree.url(Spree.routes.variants_api),
     data: {
       q: {
         "id_eq": variant_id
-      },
-      token: Spree.api_key
+      }
     }
   }).success(function( data ) {
     variant = data['variants'][0];
   }).error(function( msg ) {
     console.log(msg);
@@ -258,20 +253,20 @@
     if (new_shipment != undefined) {
       $.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 }
+        data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
       }).done(function(msg) {
         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 }
+        data: { variant_id: variant_id, quantity: quantity }
       }).done(function(msg) {
         advanceOrder();
       });
     }
   }
@@ -310,15 +305,10 @@
 
   if(shipment==undefined){
     $.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 ) {
       console.log(msg);
     });