spree_backend 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1383ec02dbc60dee684d44c20561d0a74594be9
-  data.tar.gz: 434b4b92e525db7ef04a942913b40bb8421bddac
+  metadata.gz: 2447314964800e64a9f982e1b26653c897e06d0f
+  data.tar.gz: 983a63d82e29052149b7515d8670c6f7d0d60e95
 SHA512:
-  metadata.gz: 4ea92caa2390aaf80d14ae63c2a81fc7266f2297f09e9e27129d531e5913d78bb1567c6b3d74cf83efb9d040e22d59fb00533a0edd4a8c43d0e90ff92c7ddc28
-  data.tar.gz: c14bd0dc62c0d0a8fa38f0f0f4b216536bcaaab999b6ca6f2681578ad0e0b5aa209e3fa41e2550466df1d4462c18efe21883ce3f3d0cf61dede1542f75758dbd
+  metadata.gz: b8d4a40b8931039d01b1c069456f0d9222204c914cec92638b90694290e527c8d9fa9f5eeb737e2b38148b2eaacdcf73f6c99808b165acf141487894c0dc85a2
+  data.tar.gz: eec67f8663b064ba7b429391793cfe54417857bd30c27aa162927188221c5f6eb7e3e55adeb7ea296af67cbda28c7a1a352e167d68776c8d434d2134ec77be18

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

@@ -31,16 +31,18 @@ jQuery(function($) {
     smartPlacement: true,
     fadeInTime: 50,
     fadeOutTime: 50,
+    intentPollInterval: 300
   });
 
-  $('body')
-    .on('powerTipPreRender', '.with-tip', function() {
-      $('#powerTip').addClass($(this).data('action'));
-      $('#powerTip').addClass($(this).data('tip-color'));
-    })
-    .on('powerTipClose', '.with-tip', function() {
-      $('#powerTip').removeClass($(this).data('action'));
-    })
+  $('.with-tip').on({
+    powerTipPreRender: function(){
+      $('#powerTip').addClass($(this).attr("data-action"));
+      $('#powerTip').addClass($(this).attr("data-tip-color"));
+    },
+    powerTipClose: function(){
+      $('#powerTip').removeClass($(this).attr("data-action"))
+    }
+  });
 
   // Make flash messages dissapear
   setTimeout('$(".flash").fadeOut()', 5000);
@@ -78,16 +80,20 @@ jQuery(function($) {
 
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
-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);
+show_flash_error = function(message) {
+  error_div = $('.flash.error');
+  if (error_div.length > 0) {
+    error_div.html(message);
+    error_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
+    } else {
+      $("#content h1").before('<div class="flash error">' + message + '</div>');
+    }
   }
-  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  }
@@ -147,8 +153,8 @@ $(document).ready(function(){
     new_table_row.find("input, select").each(function () {
       var el = $(this);
       el.val("");
-      if (typeof el.attr("id") !== 'undefined') el.attr("id", el.attr("id").replace(/\d+/, new_id))
-      if (typeof el.attr("name") !== 'undefined') el.attr("name", el.attr("name").replace(/\d+/, new_id))
+      el.attr("id", el.attr("id").replace(/\d+/, new_id))
+      el.attr("name", el.attr("name").replace(/\d+/, new_id))
     })
     // When cloning a new row, set the href of all icons to be an empty "#"
     // This is so that clicking on them does not perform the actions for the
@@ -170,14 +176,12 @@ $(document).ready(function(){
           _method: 'delete',
           authenticity_token: AUTH_TOKEN
         },
-        dataType: 'script',
+        dataType: 'html',
         success: function(response) {
-          el.parents("tr").fadeOut('hide', function() {
-            $(this).remove();
-          });
+          el.parents("tr").fadeOut('hide');
         },
         error: function(response, textStatus, errorThrown) {
-          show_flash('error', response.responseText);
+          show_flash_error(response.responseText);
         }
       });
     }
@@ -202,7 +206,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/checkouts/edit.js

@@ -1,8 +1,20 @@
+//= require_self
+//= require jquery.payment
 $(document).ready(function() {
   if ($('#customer_autocomplete_template').length > 0) {
     window.customerTemplate = Handlebars.compile($('#customer_autocomplete_template').text());
   }
 
+  if ($("#card_number").is("*")) {
+    $("#card_number").payment('formatCardNumber')
+      $("#card_expiry").payment('formatCardExpiry')
+      $("#card_code").payment('formatCardCVC')
+
+      $("#card_number").change(function() {
+        $("#cc_type").val($.payment.cardType(this.value))
+      })
+  }
+
   formatCustomerResult = function(customer) {
     return customerTemplate({
       customer: customer,

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

@@ -25,9 +25,10 @@ $(document).ready(function() {
   });
 
   // Handle adding new styles
+  var styles_hash_index = 1;
   $(document).on('click', '.add_new_style', function(e) {
     e.preventDefault();
-    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", new Date().getTime()));
+    $('#new-styles').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
   });
 
   // Handle adding new headers

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

@@ -6,10 +6,7 @@ $(document).ready(function () {
       placeholder: Spree.translations.option_type_placeholder,
       multiple: true,
       initSelection: function (element, callback) {
-        var url = Spree.url(Spree.routes.option_type_search, {
-          ids: element.val()
-        });
-        return $.getJSON(url, null, function (data) {
+        return $.getJSON(Spree.routes.option_type_search + '?ids=' + (element.val()), null, function (data) {
           return callback(data);
         });
       },

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

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

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

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

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

@@ -2,62 +2,6 @@
 $(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);
@@ -128,190 +72,3 @@ $(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/spree_backend.js

@@ -1,5 +1,7 @@
 //= require jquery-migrate-1.0.0
-//= require jquery.ui.all
+//= require jquery.ui.datepicker
+//= require jquery.ui.sortable
+//= require jquery.ui.autocomplete
 //= require modernizr
 //= require jquery.cookie
 //= require jquery.delayedobserver

data/app/assets/javascripts/admin/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.routes.stock_locations_api, (data) =>
         @locations = (location for location in data.stock_locations)
         @force_receive_stock() if @locations.length < 2
 
@@ -69,7 +69,9 @@ $ ->
     populate_select: (select, except=0) ->
       select.children('option').remove()
       for location in @locations when location.id isnt except
-        select.append $('<option></option>').text(location.name).attr('value', location.id)
+        select.append $('<option></option>')
+                        .text(location.name)
+                        .attr('value', location.id)
       select.select2()
 
   # Populates variants drop down
@@ -90,13 +92,13 @@ $ ->
       if @cached_variants?
         @populate_select @cached_variants
       else
-        $.getJSON Spree.url(Spree.routes.variants_api), (data) =>
+        $.getJSON Spree.routes.variants_api, (data) =>
           @cached_variants = _.map(data.variants, (variant) -> new TransferVariant(variant))
           @populate_select @cached_variants
 
     _refresh_transfer_stock_items: ->
       stock_location_id = $('#transfer_source_location_id').val()
-      $.getJSON Spree.url(Spree.routes.stock_locations_api + "/#{stock_location_id}/stock_items"), (data) =>
+      $.getJSON Spree.routes.stock_locations_api + "/#{stock_location_id}/stock_items", (data) =>
         @populate_select _.map(data.stock_items, (stock_item) -> new TransferStockItem(stock_item))
 
     populate_select: (variants) ->
@@ -175,3 +177,5 @@ $ ->
     transfer_locations = new TransferLocations
     transfer_variants = new TransferVariants
     transfer_add_variants = new TransferAddVariants
+
+

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

@@ -14,7 +14,7 @@ handle_move = (e, data) ->
     type: "POST",
     dataType: "json",
     url: url.toString(),
-    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[child_index]": position }),
+    data: ({_method: "put", "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
     error: handle_ajax_error
 
   true
@@ -30,7 +30,7 @@ handle_create = (e, data) ->
     type: "POST",
     dataType: "json",
     url: base_url.toString(),
-    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id")}),
+    data: ({"taxon[name]": name, "taxon[parent_id]": new_parent.attr("id"), "taxon[position]": position }),
     error: handle_ajax_error,
     success: (data,result) ->
       node.attr('id', data.id)