spree_backend 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40b3e0c50a3466e2d27a556b75ddb02aa69ddb0c
-  data.tar.gz: cc2fab5e9597e131ce33008e97c28fd611d65830
+  metadata.gz: c3c7d240755279b9b1986b47039266db4ca6b87f
+  data.tar.gz: 1967d9b543c924495c3d8ec0155a56aa5b6e5822
 SHA512:
-  metadata.gz: 7e36ce2f094093b78ad6e89f3eb08ffa2595ff8ac01d714c0f73e7d85f87368803a409aaf6cb5e651f79be681a4066f722c02fc1e33278900570dcff392f88b6
-  data.tar.gz: 257141c17829aabbcc8c15b46d3218751a3f7e4047b51ab0ff262927a461a3cf7ce7122070a629ef95983bc4f9a61f11cb5c406e9842d50ce8e8190c817d37ee
+  metadata.gz: 9f775eddc2be3f07de1afc10dc055aca996de2a9e7414d49147d99016c9653a54a469f66b7943503cacaa89c34653556904fe088c43866bc5d16fa4f8772c3b2
+  data.tar.gz: 4d1a6db7a3b72b22d5438e1d9fbc5f63f2823387c4bad175827d57e963b328fd767b26f740436e6ec81f7aefde47a6d0745cfee135ed5562c1e44dc60171bb96

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/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,190 @@ $(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/controllers/spree/admin/orders/customer_details_controller.rb

@@ -37,6 +37,10 @@ module Spree
             @order = Order.find_by_number!(params[:order_id], :include => :adjustments)
           end
 
+          def model_class
+            Spree::Order
+          end
+
       end
     end
   end

data/app/controllers/spree/admin/orders_controller.rb

@@ -10,7 +10,7 @@ module Spree
       def index
         params[:q] ||= {}
         params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
-        @show_only_completed = params[:q][:completed_at_not_null].present?
+        @show_only_completed = params[:q][:completed_at_not_null] == '1'
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
 
         # As date params are deleted if @show_only_completed, store
@@ -35,7 +35,7 @@ module Spree
         end
 
         @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
-        @orders = @search.result.includes([:user, :shipments, :payments]).
+        @orders = @search.result(distinct: true).includes([:user, :shipments, :payments]).
           page(params[:page]).
           per(params[:per_page] || Spree::Config[:orders_per_page])
 
@@ -118,9 +118,8 @@ module Spree
       end
 
       private
-
         def load_order
-          @order = Order.find_by_number!(params[:id], :include => :adjustments) if params[:id]
+          @order = Order.includes(:adjustments).find_by_number!(params[:id])
           authorize! action, @order
         end
 

data/app/controllers/spree/admin/payments_controller.rb

@@ -107,6 +107,10 @@ module Spree
       def load_payment
         @payment = Payment.find(params[:id])
       end
+
+      def model_class
+        Spree::Payment
+      end
     end
   end
 end

data/app/controllers/spree/admin/reports_controller.rb

@@ -3,12 +3,26 @@ module Spree
     class ReportsController < Spree::Admin::BaseController
       respond_to :html
 
-      AVAILABLE_REPORTS = {
-        :sales_total => { :name => Spree.t(:sales_total), :description => Spree.t(:sales_total_description) }
-      }
+      class << self
+        def available_reports
+          @@available_reports
+        end
+
+        def add_available_report!(report_key, report_description_key = nil)
+          if report_description_key.nil?
+            report_description_key = "#{report_key}_description"
+          end
+          @@available_reports[report_key] = {name: Spree.t(report_key), description: Spree.t(report_description_key)}
+        end
+      end
+
+      def initialize
+        super 
+        ReportsController.add_available_report!(:sales_total)
+      end
 
       def index
-        @reports = AVAILABLE_REPORTS
+        @reports = ReportsController.available_reports
       end
 
       def sales_total
@@ -50,6 +64,8 @@ module Spree
         Spree::Admin::ReportsController
       end
 
+      @@available_reports = {}
+
     end
   end
 end

data/app/controllers/spree/admin/resource_controller.rb

@@ -6,20 +6,23 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
 
   respond_to :html
-  respond_to :js, :except => [:show, :index]
 
   def new
     invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      format.js   { render :layout => false }
+      if request.xhr?
+        format.js   { render :layout => false }
+      end
     end
   end
 
   def edit
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      format.js   { render :layout => false }
+      if request.xhr?
+        format.js   { render :layout => false }
+      end
     end
   end
 

data/app/controllers/spree/admin/variants_including_master_controller.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    class VariantsIncludingMasterController < VariantsController
+
+      def model_class
+        Spree::Variant
+      end
+
+      def object_name
+        "variant"
+      end
+
+    end
+  end
+end

data/app/helpers/spree/admin/base_helper.rb

@@ -71,7 +71,7 @@ module Spree
         when :integer
           text_field_tag(name, value, preference_field_options(options))
         when :boolean
-          hidden_field_tag(name, 0) +
+          hidden_field_tag(name, 0, id: "#{name}_hidden") +
           check_box_tag(name, 1, value, preference_field_options(options))
         when :string
           text_field_tag(name, value, preference_field_options(options))

data/app/helpers/spree/admin/navigation_helper.rb

@@ -29,7 +29,9 @@ module Spree
           link = link_to(titleized_label, destination_url)
         end
 
-        selected = if options[:match_path]
+        selected = if options[:match_path].is_a? Regexp
+          request.fullpath =~ options[:match_path]
+        elsif options[:match_path]
           request.fullpath.starts_with?("#{admin_path}#{options[:match_path]}")
         else
           args.include?(controller.controller_name.to_sym)
@@ -69,8 +71,9 @@ module Spree
       end
 
       def link_to_edit(resource, options={})
+        url = options[:url] || edit_object_url(resource)
         options[:data] = {:action => 'edit'}
-        link_to_with_icon('icon-edit', Spree.t(:edit), edit_object_url(resource), options)
+        link_to_with_icon('icon-edit', Spree.t(:edit), url, options)
       end
 
       def link_to_edit_url(url, options={})

data/app/helpers/spree/admin/stock_movements_helper.rb

@@ -3,7 +3,11 @@ module Spree
     module StockMovementsHelper
       def pretty_originator(stock_movement)
         if stock_movement.originator.respond_to?(:number)
-          stock_movement.originator.number
+          if stock_movement.originator.respond_to?(:order)
+            link_to stock_movement.originator.number, [:edit, :admin, stock_movement.originator.order]
+          else
+            stock_movement.originator.number
+          end
         else
           ""
         end

data/app/views/spree/admin/mail_methods/_form.html.erb

@@ -64,11 +64,11 @@
         </div>
         <div class="field">
           <%= label_tag :smtp_username, Spree.t(:smtp_username) %><br />
-          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth' %>
+          <%= text_field_tag :smtp_username, Spree::Config[:smtp_username], :class => 'fullwidth', :autocomplete => 'off' %>
         </div>
         <div class="field">
           <%= label_tag :preferred_smtp_password, Spree.t(:smtp_password) %><br />
-          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth' %>
+          <%= password_field_tag :smtp_password, Spree::Config[:smtp_password], :class => 'fullwidth', :autocomplete => 'off' %>
         </div>
       </fieldset>
     </div>

data/app/views/spree/admin/orders/_form.html.erb

@@ -3,7 +3,11 @@
     <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item } %>
   <% end %>
 
-  <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
+  <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+    <%= render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => order } %>
+  <% else %>
+    <%= render :partial => "spree/admin/orders/line_items", :locals => { :order => order } %>
+  <% end %>
   <% if order.adjustments.eligible.exists? %>
     <fieldset class="no-border-bottom">
       <legend><%= Spree.t('adjustments') %></legend>

data/app/views/spree/admin/orders/_line_items.html.erb

@@ -0,0 +1,46 @@
+<% if order.line_items.exists? %>
+  <table class="line-items index" data-hook="line-items">
+    <colgroup>
+      <col style="width: 10%;" />
+      <col style="width: 20%;" />
+      <col style="width: 20%;" />
+      <col style="width: 15%;" />
+    </colgroup>
+
+    <thead>
+      <th colspan="2"><%= Spree.t(:name) %></th>
+      <th><%= Spree.t(:price) %></th>
+      <th><%= Spree.t(:quantity) %></th>
+      <th><%= Spree.t(:total_price) %></th>
+      <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions">&nbsp;</th>
+    </thead>
+
+    <tbody>
+      <% order.line_items.each do |item| %>
+        
+        <tr class="line-item" id="line-item-<%= item.id %>">
+          <td class="line-item-image"><%= mini_image(item.variant) %></td>
+          <td class="line-item-name">
+            <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
+          </td>
+          <td class="line-item-price align-center"><%= item.single_money.to_html %></td>
+          <td class="line-item-qty-show align-center">
+            <%= item.quantity %>
+          </td>
+          <td class="line-item-qty-edit hidden">
+            <%= number_field_tag :quantity, item.quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
+          </td>
+          <td class="line-item-total align-center"><%= line_item_shipment_price(item, item.quantity) %></td>
+          <td class="cart-line-item-delete actions" data-hook="cart_line_item_delete">
+            <% if can? :update, item %>
+              <%= link_to '', '#', :class => 'save-line-item icon_link icon-ok no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'cancel-line-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
+              <%= link_to '', '#', :class => 'edit-line-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
+              <%= link_to '', '#', :class => 'delete-line-item icon-trash no-text with-tip', :data => { 'line-item-id' => item.id, :action => 'remove'}, :title => Spree.t('delete') %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -68,7 +68,7 @@
 
       <tr class="show-method total">
         <td colspan="4">
-          <% if shipment.adjustment.present? %>
+          <% if shipment.adjustment.present? && shipment.shipping_method.present? %>
             <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
           <% else %>
             <%= Spree.t(:cannot_set_shipping_method_without_address) %>
@@ -101,6 +101,14 @@
         </td>
       </tr>
 
+      <% if @order.special_instructions.present? %>
+        <tr class='special_instructions'>
+          <td colspan="5">
+            <strong><%= Spree.t(:special_instructions) %>:&nbsp;</strong><%= @order.special_instructions %>
+          </td>
+        </tr>
+      <% end %>
+
       <tr class="show-tracking total">
         <td colspan="5">
           <% if shipment.tracking.present? %>
@@ -117,4 +125,4 @@
       </tr>
     </tbody>
   </table>
-</div>
+</div>

data/app/views/spree/admin/orders/customer_details/edit.html.erb

@@ -10,7 +10,7 @@
   <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'icon-arrow-left' %></li>
 <% end %>
 
-<% if @order.cart? %>
+<% if @order.cart? || (@order.checkout_steps.include?("address") && @order.address?) %>
   <div id="select-customer" data-hook>
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:customer_search) %></legend>

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

@@ -60,7 +60,7 @@
       <div class="omega four columns">
         <div class="field checkbox">
           <label>
-            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '' %>
+            <%= f.check_box :completed_at_not_null, {:checked => @show_only_completed}, '1', '0' %>
             <%= Spree.t(:show_only_complete_orders) %>
           </label>
         </div>
@@ -87,7 +87,9 @@
        <col style="width: 10%;">
        <col style="width: 10%;">
        <col style="width: 12%;">
-       <col style="width: 12%;">
+       <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+         <col style="width: 12%;">
+       <% end %>
        <col style="width: 25%;">
        <col style="width: 10%;">
        <col style="width: 8%;">
@@ -102,7 +104,9 @@
         <th><%= sort_link @search, :number,         I18n.t(:number, :scope => 'activerecord.attributes.spree/order') %></th>
         <th><%= sort_link @search, :state,          I18n.t(:state, :scope => 'activerecord.attributes.spree/order') %></th>
         <th><%= sort_link @search, :payment_state,  I18n.t(:payment_state, :scope => 'activerecord.attributes.spree/order') %></th>
-        <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+          <th><%= sort_link @search, :shipment_state, I18n.t(:shipment_state, :scope => 'activerecord.attributes.spree/order') %></th>
+         <% end %>
         <th><%= sort_link @search, :email,          I18n.t(:email, :scope => 'activerecord.attributes.spree/order') %></th>
         <th><%= sort_link @search, :total,          I18n.t(:total, :scope => 'activerecord.attributes.spree/order') %></th>
         <th data-hook="admin_orders_index_header_actions" class="actions"></th>
@@ -115,7 +119,9 @@
         <td class="align-center"><%= link_to order.number, edit_admin_order_path(order) %></td>
         <td class="align-center"><span class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span></td>
         <td class="align-center"><span class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) if order.payment_state %></span></td>
-        <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+          <% if Spree::Order.checkout_step_names.include?(:delivery) %>
+            <td class="align-center"><span class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") if order.shipment_state %></span></td>
+          <% end %>
         <td><%= mail_to order.email %></td>
         <td class="align-center"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -1,5 +1,3 @@
-<% # Usage of old-style form helpers in this file is INTENTIONAL
-   # For reasons, see commit 3e981c7. %>
 <div data-hook="admin_payment_method_form_fields">
 
   <div data-hook="payment_method">

data/app/views/spree/admin/products/_form.html.erb

@@ -101,7 +101,6 @@
     <% end %>
   </div>
 
-  <!-- <h2><%= Spree.t(:metadata) %></h2> -->
   <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
     <%= f.field_container :meta_keywords do %>
       <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>

data/app/views/spree/admin/products/stock.html.erb

@@ -33,6 +33,15 @@
             <% if variant.images.present? %>
               <%= image_tag variant.images.first.attachment.url(:mini) %>
             <% end %>
+            <br/>
+            <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
+                <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
+                                  class: 'track_inventory_checkbox' %>
+                <%= Spree.t(:track_inventory) %>
+                <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
+                    class: 'variant_track_inventory',
+                    id: "variant_track_inventory_#{variant.id}" %>
+            <% end %>
           </td>
           <td colspan="4" class="stock_location_info">
             <table>

data/app/views/spree/admin/shared/_destroy.js.erb

@@ -1,16 +1,7 @@
-notice_div = $('.flash.notice');
-<% notice = flash.discard(:notice)
-if notice %>
-  if (notice_div.length > 0) {
-    notice_div.html("<%= notice %>");
-    notice_div.show();
-  } else {
-    if ($("#content .toolbar").length > 0) {
-      $("#content .toolbar").before('<div class="flash notice"><%= notice %></div>');
-    } else {
-      $("#content h1").before('<div class="flash notice"><%= notice %></div>');
-    }
-  } <%
-end %>
+<% success = flash.discard(:success)
+if success %>
+  console.log(show_flash)
+  show_flash('success', "<%= success %>")
+<% end %>
 
 <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>

data/app/views/spree/admin/shared/_order_tabs.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:order) %> #<%= @order.number %>
+  <%= link_to "#{Spree.t(:order)} ##{@order.number}", edit_admin_order_path(@order) %>
 <% end %>
 
 <% content_for :sidebar_title do %>
@@ -52,17 +52,17 @@
           <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, @order.adjustments %>
+      <% if can? :index, Spree::Adjustment %>
         <li<%== ' class="active"' if current == 'Adjustments' %>>
           <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, @order.payments && @payment_required %>
+      <% if can? :index, Spree::Payment && @payment_required %>
         <li<%== ' class="active"' if current == 'Payments' %>>
           <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
         </li>
       <% end %>
-      <% if can? :index, @order.return_authorizations %>
+      <% if can? :index, Spree::ReturnAuthorization %>
         <% if @order.completed? %>
           <li<%== ' class="active"' if current == 'Return Authorizations' %>>
             <%= link_to_with_icon 'icon-share-alt', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>

data/app/views/spree/admin/variants/update.js.erb

@@ -0,0 +1 @@
+<%= @object.as_json %>

data/config/routes.rb

@@ -42,6 +42,7 @@ Spree::Core::Engine.routes.draw do
           post :update_positions
         end
       end
+      resources :variants_including_master, :only => [:update]
     end
 
     get '/variants/search', :to => "variants#search", :as => :search_variants

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,82 +16,82 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.7
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 description: Required dependency for Spree
@@ -100,11 +100,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/fonts/FontAwesome.otf
 - app/assets/fonts/fontawesome-webfont.eot
 - app/assets/fonts/fontawesome-webfont.svg
 - app/assets/fonts/fontawesome-webfont.ttf
 - app/assets/fonts/fontawesome-webfont.woff
-- app/assets/fonts/FontAwesome.otf
 - app/assets/images/admin/payment_banner.png
 - app/assets/images/admin/progress.gif
 - app/assets/images/credit_cards/credit_card.gif
@@ -116,6 +116,7 @@ files:
 - app/assets/javascripts/admin/image_settings.js.erb
 - app/assets/javascripts/admin/images/index.js.coffee
 - app/assets/javascripts/admin/images/new.js.coffee
+- app/assets/javascripts/admin/line_items.js.coffee
 - app/assets/javascripts/admin/nested-attribute.js
 - app/assets/javascripts/admin/option_type_autocomplete.js.erb
 - app/assets/javascripts/admin/orders/edit.js
@@ -138,6 +139,7 @@ files:
 - app/assets/javascripts/admin/underscore-min.js
 - app/assets/javascripts/admin/user_picker.js
 - app/assets/javascripts/admin/variant_autocomplete.js.erb
+- app/assets/javascripts/admin/variant_management.js.coffee
 - app/assets/javascripts/admin/zone.js.coffee
 - app/assets/javascripts/store/backend.js
 - app/assets/stylesheets/admin/components/_actions.scss
@@ -220,6 +222,7 @@ files:
 - app/controllers/spree/admin/taxons_controller.rb
 - app/controllers/spree/admin/trackers_controller.rb
 - app/controllers/spree/admin/variants_controller.rb
+- app/controllers/spree/admin/variants_including_master_controller.rb
 - app/controllers/spree/admin/zones_controller.rb
 - app/helpers/spree/admin/base_helper.rb
 - app/helpers/spree/admin/general_settings_helper.rb
@@ -263,6 +266,7 @@ files:
 - app/views/spree/admin/orders/_add_product.html.erb
 - app/views/spree/admin/orders/_form.html.erb
 - app/views/spree/admin/orders/_line_item.html.erb
+- app/views/spree/admin/orders/_line_items.html.erb
 - app/views/spree/admin/orders/_shipment.html.erb
 - app/views/spree/admin/orders/_shipment_manifest.html.erb
 - app/views/spree/admin/orders/customer_details/_form.html.erb
@@ -417,6 +421,7 @@ files:
 - app/views/spree/admin/variants/index.html.erb
 - app/views/spree/admin/variants/new.html.erb
 - app/views/spree/admin/variants/new.js.erb
+- app/views/spree/admin/variants/update.js.erb
 - app/views/spree/admin/zones/_country_members.html.erb
 - app/views/spree/admin/zones/_form.html.erb
 - app/views/spree/admin/zones/_state_members.html.erb
@@ -427,9 +432,9 @@ files:
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/form_builder.rb
 - config/routes.rb
+- lib/spree/backend.rb
 - lib/spree/backend/action_callbacks.rb
 - lib/spree/backend/engine.rb
-- lib/spree/backend.rb
 - lib/spree_backend.rb
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png
 - vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png
@@ -481,18 +486,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 2.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: backend e-commerce functionality for the Spree project.