spree_backend 3.4.1 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e4381d1f23f046d523eb25fec4d634975b4e44
-  data.tar.gz: 4c2d7e6180f068273b2cff0912ef9f694a6ee5ae
+  metadata.gz: 0b1a51ff1bd5e5f0730f0cddb303706c14d1fdf8
+  data.tar.gz: 15e8cf70f3ad56a8b143e7a1c361f22307b19e8d
 SHA512:
-  metadata.gz: dbeeb481268869fa3ca8ac8eb17d1a8716615b8ee1db41f61afb34f0abc152b7c47116c1c170720cb9445e26f845580e684302d0518f70adc172a412931e6c2b
-  data.tar.gz: 5f34945fdb76b1f38c0257e14801360e5f249a9bb7600bec3311150574218cc22e04673a62544f539a2b61e271adb1cb01974a89ed01d412c4e15bce3470141d
+  metadata.gz: 345e63ee9cdcdf344c19a5041118ce258b0f9945d6d718adb58701752d4daf0b826bb2aaad21b77afce678c8f31f5a76978f7de55d712fb21f91e99c41cb1b37
+  data.tar.gz: e818d85b39617c87d600389a4e5beae33501448ce1c9326a86c9c8a1a7776fcdd6622ffe21771d1aea4774e17717cb6a6dbe8f2d46a719b72a3d2f1e8fa5f2b6

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

@@ -31,7 +31,14 @@ $(document).ready(function() {
         cache: true,
         data: function(term, page) {
           return {
-            q: term,
+            q: {
+              'm': 'or',
+              'email_start': term,
+              'ship_address_firstname_start': term,
+              'ship_address_lastname_start': term,
+              'bill_address_firstname_start': term,
+              'bill_address_lastname_start': term
+            },
             token: Spree.api_key
           }
         },

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

@@ -43,9 +43,23 @@ $(document).ready(function () {
       var del = $(this);
       var shipment_number = del.data('shipment-number');
       var variant_id = del.data('variant-id');
+      var shipment = _.findWhere(shipments, {number: shipment_number + ''});
+      var url = Spree.routes.shipments_api + "/" + shipment_number + '/remove';
 
       toggleItemEdit();
-      adjustShipmentItems(shipment_number, variant_id, 0);
+
+      $.ajax({
+        type: "PUT",
+        url: Spree.url(url),
+        data: {
+          variant_id: variant_id,
+          token: Spree.api_key
+        }
+      }).done(function( msg ) {
+        window.location.reload();
+      }).fail(function(msg) {
+        alert(msg.responseJSON.message)
+      });
     }
     return false;
   });
@@ -145,13 +159,16 @@ adjustShipmentItems = function(shipment_number, variant_id, quantity){
 
     var url = Spree.routes.shipments_api + "/" + shipment_number;
 
-    var new_quantity = 0;
-    if(inventory_units.length<quantity){
+    var previous_quantity = inventory_units.reduce(function(accumulator, current_unit, _index, _array) {
+      return accumulator + current_unit.quantity;
+    }, 0);
+
+    if(previous_quantity<quantity){
       url += "/add"
-      new_quantity = (quantity - inventory_units.length);
-    }else if(inventory_units.length>quantity){
+      new_quantity = (quantity - previous_quantity);
+    }else if(previous_quantity>quantity){
       url += "/remove"
-      new_quantity = (inventory_units.length - quantity);
+      new_quantity = (previous_quantity - quantity);
     }
     url += '.json';
 
@@ -264,7 +281,7 @@ completeItemSplit = function(event) {
       }).error(function(msg) {
           alert(msg.responseJSON['message']);
       }).done(function(msg) {
-        window.Spree.advanceOrder();
+          window.location.reload();
       });
     } else {
         // TRANSFER TO AN EXISTING SHIPMENT
@@ -282,7 +299,7 @@ completeItemSplit = function(event) {
         }).error(function(msg) {
             alert(msg.responseJSON['message']);
         }).done(function(msg) {
-            window.Spree.advanceOrder();
+            window.location.reload();
         });
     }
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-12-08 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.4.1
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement