spree_backend 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12021adfcb10f00a2b98a07f498f4edef06d5d24
-  data.tar.gz: 4d536e1bc06c6e6ad0920efa39c156a401b5a6a6
+  metadata.gz: ec214ff2a06feab677374b259cbe3ed5117788ba
+  data.tar.gz: 8e262166c0c7cc2184fed2a7bca15521e236efba
 SHA512:
-  metadata.gz: e1e3f510b20c7c7243503752495bea80ce72982bd284c9e569cbe43f5a4539dc3864a4e279c92c84ce82c5a718870ff00db70bfa927eb25ecba4139acf4d3589
-  data.tar.gz: 50227ecf97ee5deb2ff786c43ea1190738882a39e3992e9a8f7a4feb2a5b0aad34313f7c5f4530399abc49ff0bbc2da2daa63f2e68883007ce4f66285b818bc8
+  metadata.gz: 5138ae5ce5036521d3e75b276aef5a25876bdb16fdab647e241a7c503f98f3052b1f02679681b832499aded94cbc97f7c9da6730adef60b11865db284032c970
+  data.tar.gz: c4053f45aebe4441685eb8d02565ffdb66e7afaac1d9a1caaff565470a4752d8dd5ba587246b9ca6f2c95d4807cc2cb7a9463a702e84d245a4fede9c797759a2

data/app/assets/javascripts/admin/admin.js.erb

@@ -78,15 +78,16 @@ jQuery(function($) {
 
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
-show_flash_error = function(message) {
-  var error_div = $('.flash.error');
-  if (error_div.length == 0) {
-    error_div = $('<div class="flash error" />');
-    $('#wrapper').prepend(error_div);
+show_flash = function(type, message) {
+  var flash_div = $('.flash.' + type);
+  if (flash_div.length == 0) {
+    flash_div = $('<div class="flash ' + type + '" />');
+    $('#wrapper').prepend(flash_div);
   }
-  error_div.html(message).show().fadeOut(5000);
+  flash_div.html(message).show().delay(5000).fadeOut(500);
 }
 
+
 // Apply to individual radio button that makes another element visible when checked
 $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   if(!this.get(0)){ return  }
@@ -169,12 +170,12 @@ $(document).ready(function(){
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
         },
-        dataType: 'html',
+        dataType: 'script',
         success: function(response) {
           el.parents("tr").fadeOut('hide');
         },
         error: function(response, textStatus, errorThrown) {
-          show_flash_error(response.responseText);
+          show_flash('error', response.responseText);
         }
       });
     }
@@ -199,7 +200,7 @@ $(document).ready(function(){
           el.parents("tr").fadeOut('hide');
         },
         error: function(response, textStatus, errorThrown) {
-          show_flash_error(response.responseText);
+          show_flash('error', response.responseText);
         }
 
       })

data/app/assets/javascripts/admin/line_items.js.coffee

@@ -0,0 +1,61 @@
+$(document).ready ->
+  #handle edit click
+  $('a.edit-line-item').click toggleLineItemEdit
+
+  #handle cancel click
+  $('a.cancel-line-item').click toggleLineItemEdit
+
+  #handle save click
+  $('a.save-line-item').click ->
+    save = $ this
+    line_item_id = save.data('line-item-id')
+    quantity = parseInt(save.parents('tr').find('input.line_item_quantity').val())
+
+    toggleItemEdit()
+    adjustLineItem(line_item_id, quantity)
+    false
+
+  # handle delete click
+  $('a.delete-line-item').click ->
+    if confirm(Spree.translations.are_you_sure_delete)
+      del = $(this);
+      line_item_id = del.data('line-item-id');
+
+      toggleItemEdit()
+      deleteLineItem(line_item_id)
+
+toggleLineItemEdit = ->
+  link = $(this);
+  link.parent().find('a.edit-line-item').toggle();
+  link.parent().find('a.cancel-line-item').toggle();
+  link.parent().find('a.save-line-item').toggle();
+  link.parent().find('a.delete-line-item').toggle();
+  link.parents('tr').find('td.line-item-qty-show').toggle();
+  link.parents('tr').find('td.line-item-qty-edit').toggle();
+
+  false
+
+lineItemURL = (line_item_id) ->
+  url = Spree.routes.orders_api + "/" + order_number + "/line_items/" + line_item_id + ".json"
+
+adjustLineItem = (line_item_id, quantity) ->
+  url = lineItemURL(line_item_id)
+  $.ajax(
+    type: "PUT",
+    url: Spree.url(url),
+    data:
+      line_item:
+        quantity: quantity
+  ).done (msg) ->
+    advanceOrder()
+
+deleteLineItem = (line_item_id) ->
+  url = lineItemURL(line_item_id)
+  $.ajax(
+    type: "DELETE"
+    url: Spree.url(url)
+  ).done (msg) ->
+    $('#line-item-' + line_item_id).remove()
+    if $('.line-items tr.line-item').length == 0
+      $('.line-items').remove()
+    advanceOrder()

data/app/assets/javascripts/admin/payments/edit.js.coffee

@@ -19,7 +19,7 @@ jQuery ($) ->
         @data = data
       jqXHR.fail ->
         response = $.parseJSON(jqXHR.responseText)
-        show_flash_error(response.error)
+        show_flash('error', response.error)
 
     amount:         -> @data.amount
     display_amount: -> @data.display_amount

data/app/assets/javascripts/admin/product_picker.js

@@ -24,8 +24,9 @@ $.fn.productAutocomplete = function () {
         };
       },
       results: function (data, page) {
+        var products = data.products ? data.products : [];
         return {
-          results: data.products
+          results: products
         };
       }
     },

data/app/assets/javascripts/admin/progress.coffee

@@ -16,11 +16,11 @@ $(document).ready ->
     top: 'auto'
     left: 'auto'
 
-  target = document.getElementById("spinner")
+  target  = document.getElementById("spinner")
+  spinner = new Spinner(opts).spin(target)
 
   $(document).ajaxStart ->
     $("#progress").stop(true, true).fadeIn()
-    spinner = new Spinner(opts).spin(target)
 
   $(document).ajaxStop ->
     $("#progress").fadeOut()

data/app/assets/javascripts/admin/shipments.js.erb

@@ -2,6 +2,62 @@
 $(document).ready(function () {
   'use strict';
 
+  // handle variant selection, show stock level.
+  $('#add_variant_id').change(function(){
+    var variant_id = $(this).val();
+
+    var variant = _.find(window.variants, function(variant){
+      return variant.id == variant_id
+    })
+    $('#stock_details').html(variantStockTemplate({variant: variant}));
+    $('#stock_details').show();
+
+    $('button.add_variant').click(addVariantFromStockLocation);
+
+    // Add some tips
+    $('.with-tip').powerTip({
+      smartPlacement: true,
+      fadeInTime: 50,
+      fadeOutTime: 50,
+      intentPollInterval: 300
+    });
+
+  });
+
+  //handle edit click
+  $('a.edit-item').click(toggleItemEdit);
+
+  //handle cancel click
+  $('a.cancel-item').click(toggleItemEdit);
+
+  //handle split click
+  $('a.split-item').click(startItemSplit);
+
+  //handle save click
+  $('a.save-item').click(function(){
+    var save = $(this);
+    var shipment_number = save.data('shipment-number');
+    var variant_id = save.data('variant-id');
+
+    var quantity = parseInt(save.parents('tr').find('input.line_item_quantity').val());
+
+    toggleItemEdit();
+    adjustShipmentItems(shipment_number, variant_id, quantity);
+    return false;
+  });
+
+  //handle delete click
+  $('a.delete-item').click(function(){
+    if (confirm(Spree.translations.are_you_sure_delete)) {
+      var del = $(this);
+      var shipment_number = del.data('shipment-number');
+      var variant_id = del.data('variant-id');
+
+      toggleItemEdit();
+      adjustShipmentItems(shipment_number, variant_id, 0);
+    }
+  });
+
   // handle ship click
   $('[data-hook=admin_order_edit_form] a.ship').on('click', function () {
     var link = $(this);
@@ -72,3 +128,189 @@ $(document).ready(function () {
   });
 
 });
+
+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});
+
+    var url = Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number;
+
+    var new_quantity = 0;
+    if(inventory_units.length<quantity){
+      url += "/add"
+      new_quantity = (quantity - inventory_units.length);
+    }else if(inventory_units.length>quantity){
+      url += "/remove"
+      new_quantity = (inventory_units.length - quantity);
+    }
+    url += '.json';
+
+    if(new_quantity!=0){
+      $.ajax({
+        type: "PUT",
+        url: Spree.url(url),
+        data: { variant_id: variant_id, quantity: new_quantity }
+      }).done(function( msg ) {
+        advanceOrder();
+      });
+    }
+}
+
+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();
+}
+
+toggleItemEdit = function(){
+  var link = $(this);
+  link.parent().find('a.edit-item').toggle();
+  link.parent().find('a.cancel-item').toggle();
+  link.parent().find('a.split-item').toggle();
+  link.parent().find('a.save-item').toggle();
+  link.parent().find('a.delete-item').toggle();
+  link.parents('tr').find('td.item-qty-show').toggle();
+  link.parents('tr').find('td.item-qty-edit').toggle();
+
+  return false;
+}
+
+startItemSplit = function(event){
+  event.preventDefault();
+  var link = $(this);
+  link.parent().find('a.edit-item').toggle();
+  link.parent().find('a.split-item').toggle();
+  link.parent().find('a.delete-item').toggle();
+  var variant_id = link.data('variant-id');
+
+  var variant = {};
+  $.ajax({
+    type: "GET",
+    async: false,
+    url: Spree.url(Spree.routes.variants_api),
+    data: {
+      q: {
+        "id_eq": variant_id
+      }
+    }
+  }).success(function( data ) {
+    variant = data['variants'][0];
+  }).error(function( msg ) {
+    console.log(msg);
+  });
+
+  var max_quantity = link.closest('tr').data('item-quantity');
+  var split_item_template = Handlebars.compile($('#variant_split_template').text());
+  link.closest('tr').after(split_item_template({ variant: variant, shipments: shipments, max_quantity: max_quantity }));
+  $('a.cancel-split').click(cancelItemSplit);
+  $('a.save-split').click(completeItemSplit);
+
+  // Add some tips
+  $('.with-tip').powerTip({
+    smartPlacement: true,
+    fadeInTime: 50,
+    fadeOutTime: 50,
+    intentPollInterval: 300
+  });
+  $('#item_stock_location').select2({ width: 'resolve', placeholder: 'Choose Location' });
+}
+
+completeItemSplit = function(event) {
+  event.preventDefault();
+  var link = $(this);
+  var order_number = link.closest('tbody').data('order-number');
+  var stock_item_row = link.closest('tr');
+  var variant_id = stock_item_row.data('variant-id');
+  var quantity = stock_item_row.find('#item_quantity').val();
+
+  var stock_location_id = stock_item_row.find('#item_stock_location').val();
+  var original_shipment_number = link.closest('tbody').data('shipment-number');
+
+  var selected_shipment = stock_item_row.find($('#item_stock_location').select2('data').element);
+  var target_shipment_number = selected_shipment.data('shipment-number');
+  var new_shipment = selected_shipment.data('new-shipment');
+
+  if (stock_location_id != 'new_shipment') {
+    // first remove item(s) from original shipment
+    $.ajax({
+      type: "PUT",
+      async: false,
+      url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments/" + original_shipment_number + "/remove.json"),
+      data: { variant_id: variant_id, quantity: quantity }
+    });
+
+    if (new_shipment != undefined) {
+      $.ajax({
+        type: "POST",
+        async: false,
+        url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
+        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.orders_api + "/" + order_number + "/shipments/" + target_shipment_number + "/add.json"),
+        data: { variant_id: variant_id, quantity: quantity }
+      }).done(function(msg) {
+        advanceOrder();
+      });
+    }
+  }
+}
+
+advanceOrder = function() {
+  $.ajax({
+    type: "PUT",
+    async: false,
+    url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
+  }).done(function() {
+    window.location.reload();
+  });
+}
+
+cancelItemSplit = function(event) {
+  event.preventDefault();
+  var link = $(this);
+  var prev_row = link.closest('tr').prev();
+  link.closest('tr').remove();
+  prev_row.find('a.edit-item').toggle();
+  prev_row.find('a.split-item').toggle();
+  prev_row.find('a.delete-item').toggle();
+}
+
+addVariantFromStockLocation = function() {
+  $('#stock_details').hide();
+
+  var variant_id = $('input.variant_autocomplete').val();
+  var stock_location_id = $(this).data('stock-location-id');
+  var quantity = $("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
+
+  var shipment = _.find(shipments, function(shipment){
+    return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
+  });
+
+  if(shipment==undefined){
+    $.ajax({
+      type: "POST",
+      url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
+      data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
+    }).done(function( msg ) {
+      advanceOrder();
+    }).error(function( msg ) {
+      console.log(msg);
+    });
+  }else{
+    //add to existing shipment
+    adjustShipmentItems(shipment.number, variant_id, quantity);
+  }
+  return 1
+}

data/app/assets/javascripts/admin/variant_autocomplete.js.erb

@@ -6,253 +6,9 @@ $(document).ready(function() {
   if ($('#variant_autocomplete_template').length > 0) {
     window.variantTemplate = Handlebars.compile($('#variant_autocomplete_template').text());
     window.variantStockTemplate = Handlebars.compile($('#variant_autocomplete_stock_template').text());
-
-    // handle variant selection, show stock level.
-    $('#add_variant_id').change(function(){
-      var variant_id = $(this).val();
-
-      var variant = _.find(window.variants, function(variant){
-        return variant.id == variant_id
-      })
-      $('#stock_details').html(variantStockTemplate({variant: variant}));
-      $('#stock_details').show();
-
-      $('button.add_variant').click(addVariantFromStockLocation);
-
-      // Add some tips
-      $('.with-tip').powerTip({
-        smartPlacement: true,
-        fadeInTime: 50,
-        fadeOutTime: 50,
-        intentPollInterval: 300
-      });
-
-    });
-
-    //handle edit click
-    $('a.edit-item').click(toggleItemEdit);
-
-    //handle cancel click
-    $('a.cancel-item').click(toggleItemEdit);
-
-    //handle split click
-    $('a.split-item').click(startItemSplit);
-
-    //handle save click
-    $('a.save-item').click(function(){
-      var save = $(this);
-      var shipment_number = save.data('shipment-number');
-      var variant_id = save.data('variant-id');
-
-      var quantity = parseInt(save.parents('tr').find('input.line_item_quantity').val());
-
-      toggleItemEdit();
-
-      adjustItems(shipment_number, variant_id, quantity);
-      return false;
-    });
-
-    //handle delete click
-    $('a.delete-item').click(function(){
-      if (confirm(Spree.translations.are_you_sure_delete)) {
-        var del = $(this);
-        var shipment_number = del.data('shipment-number');
-        var variant_id = del.data('variant-id');
-
-        toggleItemEdit();
-
-        adjustItems(shipment_number, variant_id, 0);
-      }
-    });
   }
 });
 
-adjustItems = function(shipment_number, variant_id, quantity){
-    var shipment = _.findWhere(shipments, {number: shipment_number + ''});
-    var inventory_units = _.where(shipment.inventory_units, {variant_id: variant_id});
-
-    var url = Spree.routes.orders_api + "/" + order_number + "/shipments/" + shipment_number;
-
-    var new_quantity = 0;
-    if(inventory_units.length<quantity){
-      url += "/add"
-      new_quantity = (quantity - inventory_units.length);
-    }else if(inventory_units.length>quantity){
-      url += "/remove"
-      new_quantity = (inventory_units.length - quantity);
-    }
-    url += '.json';
-
-    if(new_quantity!=0){
-      $.ajax({
-        type: "PUT",
-        url: Spree.url(url),
-        data: { variant_id: variant_id, quantity: new_quantity }
-      }).done(function( msg ) {
-        advanceOrder();
-      });
-    }
-}
-
-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();
-}
-
-toggleItemEdit = function(){
-  var link = $(this);
-  link.parent().find('a.edit-item').toggle();
-  link.parent().find('a.cancel-item').toggle();
-  link.parent().find('a.split-item').toggle();
-  link.parent().find('a.save-item').toggle();
-  link.parent().find('a.delete-item').toggle();
-  link.parents('tr').find('td.item-qty-show').toggle();
-  link.parents('tr').find('td.item-qty-edit').toggle();
-
-  return false;
-}
-
-startItemSplit = function(event){
-  event.preventDefault();
-  var link = $(this);
-  link.parent().find('a.edit-item').toggle();
-  link.parent().find('a.split-item').toggle();
-  link.parent().find('a.delete-item').toggle();
-  var variant_id = link.data('variant-id');
-
-  var variant = {};
-  $.ajax({
-    type: "GET",
-    async: false,
-    url: Spree.url(Spree.routes.variants_api),
-    data: {
-      q: {
-        "id_eq": variant_id
-      }
-    }
-  }).success(function( data ) {
-    variant = data['variants'][0];
-  }).error(function( msg ) {
-    console.log(msg);
-  });
-
-  var max_quantity = link.closest('tr').data('item-quantity');
-  var split_item_template = Handlebars.compile($('#variant_split_template').text());
-  link.closest('tr').after(split_item_template({ variant: variant, shipments: shipments, max_quantity: max_quantity }));
-  $('a.cancel-split').click(cancelItemSplit);
-  $('a.save-split').click(completeItemSplit);
-
-  // Add some tips
-  $('.with-tip').powerTip({
-    smartPlacement: true,
-    fadeInTime: 50,
-    fadeOutTime: 50,
-    intentPollInterval: 300
-  });
-  $('#item_stock_location').select2({ width: 'resolve', placeholder: 'Choose Location' });
-}
-
-completeItemSplit = function(event) {
-  event.preventDefault();
-  var link = $(this);
-  var order_number = link.closest('tbody').data('order-number');
-  var stock_item_row = link.closest('tr');
-  var variant_id = stock_item_row.data('variant-id');
-  var quantity = stock_item_row.find('#item_quantity').val();
-
-  var stock_location_id = stock_item_row.find('#item_stock_location').val();
-  var original_shipment_number = link.closest('tbody').data('shipment-number');
-
-  var selected_shipment = stock_item_row.find($('#item_stock_location').select2('data').element);
-  var target_shipment_number = selected_shipment.data('shipment-number');
-  var new_shipment = selected_shipment.data('new-shipment');
-
-  if (stock_location_id != 'new_shipment') {
-    // first remove item(s) from original shipment
-    $.ajax({
-      type: "PUT",
-      async: false,
-      url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments/" + original_shipment_number + "/remove.json"),
-      data: { variant_id: variant_id, quantity: quantity }
-    });
-
-    if (new_shipment != undefined) {
-      $.ajax({
-        type: "POST",
-        async: false,
-        url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
-        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.orders_api + "/" + order_number + "/shipments/" + target_shipment_number + "/add.json"),
-        data: { variant_id: variant_id, quantity: quantity }
-      }).done(function(msg) {
-        advanceOrder();
-      });
-    }
-  }
-}
-
-advanceOrder = function() {
-  $.ajax({
-    type: "PUT",
-    async: false,
-    url: Spree.url(Spree.routes.checkouts_api + "/" + order_number + "/advance")
-  }).done(function() {
-    window.location.reload();
-  });
-}
-
-cancelItemSplit = function(event) {
-  event.preventDefault();
-  var link = $(this);
-  var prev_row = link.closest('tr').prev();
-  link.closest('tr').remove();
-  prev_row.find('a.edit-item').toggle();
-  prev_row.find('a.split-item').toggle();
-  prev_row.find('a.delete-item').toggle();
-}
-
-addVariantFromStockLocation = function() {
-  $('#stock_details').hide();
-
-  var variant_id = $('input.variant_autocomplete').val();
-  var stock_location_id = $(this).data('stock-location-id');
-  var quantity = $("input.quantity[data-stock-location-id='" + stock_location_id + "']").val();
-
-  var shipment = _.find(shipments, function(shipment){
-    return shipment.stock_location_id == stock_location_id && (shipment.state == 'ready' || shipment.state == 'pending');
-  });
-
-  if(shipment==undefined){
-    $.ajax({
-      type: "POST",
-      url: Spree.url(Spree.routes.orders_api + "/" + order_number + "/shipments.json"),
-      data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
-    }).done(function( msg ) {
-      advanceOrder();
-    }).error(function( msg ) {
-      console.log(msg);
-    });
-  }else{
-    //add to existing shipment
-    adjustItems(shipment.number, variant_id, quantity);
-  }
-  return 1
-}
-
 formatVariantResult = function(variant) {
   if (variant["images"][0] != undefined && variant["images"][0].urls != undefined) {
     variant.image = variant.images[0].urls.mini

data/app/assets/javascripts/admin/variant_management.js.coffee

@@ -0,0 +1,10 @@
+jQuery ->
+  $('.track_inventory_checkbox').on 'click', ->
+    $(@).siblings('.variant_track_inventory').val($(@).is(':checked'))
+    $(@).parent('form').submit()
+  $('.toggle_variant_track_inventory').on 'submit', ->
+    $.ajax
+      type: @method
+      url: @action
+      data: $(@).serialize()
+    false

data/app/assets/stylesheets/admin/sections/_log_entries.scss

@@ -0,0 +1,17 @@
+.log_entry {
+  &.success {
+    background: lighten($color-2, 15);
+
+    td h4 {
+      color: darken($color-body-text, 25);
+    }
+  }
+
+  &.fail {
+    background: lighten($color-5, 25);
+
+    td h4 {
+      color: lighten($color-body-text, 50);
+    }
+  }
+}