spree_backend 2.0.13 → 2.1.0

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

@@ -6,9 +6,252 @@ $(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(){
+      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/stylesheets/admin/components/_navigation.scss

@@ -63,18 +63,12 @@ nav.menu {
 #admin-menu {
   background-color: $color-3;
 
-  ul{
-    display: table;
-    table-layout: fixed;
-    width: 100%;
-  }
-
   li {
-    display: table-cell;
+    min-width: 90px;
 
     a {
       display: block;
-      padding: 25px 15px;
+      padding: 25px 20px;
       color: $color-1 !important;
       text-transform: uppercase;
       position: relative;

data/app/assets/stylesheets/admin/hacks/_ie.scss

@@ -18,6 +18,7 @@ html.ie {
   }
   .select2-search {
     &:before {
+      position: relative;
       z-index: 10000;
       content: '\f002' !important;
     }
@@ -69,4 +70,4 @@ html.ie8 {
     }
   }
 
-}
+}

data/app/assets/stylesheets/admin/hacks/_mozilla.scss

@@ -22,7 +22,6 @@ html.firefox {
 
   // Fix select2 search input left padding to not overlap search icon
   .select2-search input.select2-input {
-    padding-bottom: 12px !important;
     padding-left: 25px !important;
   }
 
@@ -30,4 +29,4 @@ html.firefox {
   input#image_attachment {
     width: 80%;
   }
-}
+}

data/app/assets/stylesheets/admin/plugins/_select2.scss

@@ -63,15 +63,17 @@
     @extend [class^="icon-"]:before;
 
     position: absolute;
-    top: 16px;
+    top: 13px;
     left: 13px;
   }
 
   input {
     @extend input[type="text"];
-
-    padding: 6px 0 6px 25px;
-    margin: 5px 0 0 5px;
+    margin-top: 5px;
+    margin-left: -6px;
+    padding-left: 25px;
+    padding-top: 6px;
+    padding-bottom: 6px;
     font-family: $base-font-family;
     font-size: 90%;
     box-shadow: none;
@@ -99,17 +101,12 @@
   }
 }
 
-.select2-results {
+.select2-results { 
   padding-left: 0 !important;
 
   li {
     font-size: 85% !important;
 
-
-    &:nth-child(odd) {
-      background: #efefef;
-    }
-
     &.select2-highlighted {
       .select2-result-label {
         &, h6 {
@@ -136,7 +133,7 @@
   }
 
   .select2-highlighted {
-    background-color: $color-sel-bg !important;
+    background-color: $color-sel-bg;
   }
 }
 

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

@@ -0,0 +1,15 @@
+#ul-nested-country {
+  > li {
+    margin-bottom: 10px;
+  }
+
+  .select2-container, select {
+    width: 90%;
+  }
+
+  a.remove {
+    display: inline-block;
+    margin-top: 6px;
+  }
+
+}

data/app/assets/stylesheets/admin/shared/_forms.scss

@@ -62,7 +62,6 @@ button, .button {
   color: $color-btn-text;
   text-transform: uppercase;
   font-weight: 600 !important;
-  white-space: nowrap;
 
   &:before {
     font-weight: normal !important;

data/app/assets/stylesheets/admin/shared/_icons.scss

@@ -8,6 +8,7 @@
     width: auto;
 
     &:before {
+      padding-right: 5px;
       padding-top: 3px;
     }
   }

data/app/assets/stylesheets/admin/shared/_layout.scss

@@ -75,7 +75,6 @@
   }
   .page-actions {
     text-align: right;
-    line-height: 38px;
     form {
       display: inline-block;
     }

data/app/assets/stylesheets/admin/shared/_tables.scss

@@ -84,7 +84,7 @@ table {
         background-color: $color-notice;
         color: $color-1;
       }
-      .icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover, .icon-save:hover {
+      .icon-edit:hover, .icon-capture:hover, .icon-ok:hover, .icon-plus:hover {
         background-color: $color-success;
         color: $color-1;
       }

data/app/assets/stylesheets/admin/spree_admin.scss

@@ -34,6 +34,7 @@
 @import 'sections/promotions';
 @import 'sections/edit_checkouts';
 @import 'sections/bulk_transfer';
+@import 'sections/tax_zones';
 
 @import 'hacks/mozilla';
 @import 'hacks/opera';

data/app/assets/stylesheets/admin/spree_backend.css

@@ -9,6 +9,7 @@
  *= require normalize
  *= require skeleton
  *= require jquery.ui.datepicker
+ *= require jquery.ui.autocomplete
  *= require jquery.powertip
  *= require select2
 

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

@@ -19,7 +19,7 @@ module Spree
           if respond_to?(:model_class, true) && model_class
             record = model_class
           else
-            record = controller_name.to_sym
+            record = Object
           end
           authorize! :admin, record
           authorize! action, record

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -16,7 +16,7 @@ module Spree
         end
 
         def update
-          if @order.update_attributes(params[:order])
+          if @order.update_attributes(order_params)
             if params[:guest_checkout] == "false"
               @order.associate_user!(Spree.user_class.find_by_email(@order.email))
             end
@@ -32,13 +32,17 @@ module Spree
         end
 
         private
-
-          def load_order
-            @order = Order.find_by_number!(params[:order_id], :include => :adjustments)
+          def order_params
+            params.require(:order).permit(
+              :email,
+              :use_billing,
+              :bill_address_attributes => permitted_address_attributes,
+              :ship_address_attributes => permitted_address_attributes
+            )
           end
 
-          def model_class
-            Spree::Order
+          def load_order
+            @order = Order.includes(:adjustments).find_by_number!(params[:order_id])
           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] == '1'
+        @show_only_completed = params[:q][:completed_at_not_null].present?
         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(distinct: true).includes([:user, :shipments, :payments]).
+        @orders = @search.result.includes([:user, :shipments, :payments]).
           page(params[:page]).
           per(params[:per_page] || Spree::Config[:orders_per_page])
 
@@ -83,7 +83,7 @@ module Spree
         # TODO - possible security check here but right now any admin can before any transition (and the state machine
         # itself will make sure transitions are not applied in the wrong state)
         event = params[:e]
-        if @order.state_events.include?(event.to_sym) && @order.send("#{event}")
+        if @order.send("#{event}")
           flash[:success] = Spree.t(:order_updated)
         else
           flash[:error] = Spree.t(:cannot_perform_operation)
@@ -118,8 +118,9 @@ module Spree
       end
 
       private
+
         def load_order
-          @order = Order.includes(:adjustments).find_by_number!(params[:id])
+          @order = Order.includes(:adjustments).find_by_number!(params[:id]) if params[:id]
           authorize! action, @order
         end
 

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

@@ -2,8 +2,6 @@
 module Spree
   module Admin
     class OverviewController < Spree::Admin::BaseController
-      #todo, add rss feed of information that is happening
-
       def index
         @users = User.all
       end

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

@@ -8,7 +8,7 @@ module Spree
       respond_to :html
 
       def create
-        @payment_method = params[:payment_method].delete(:type).constantize.new(params[:payment_method])
+        @payment_method = params[:payment_method].delete(:type).constantize.new(payment_method_params)
         @object = @payment_method
         invoke_callbacks(:create, :before)
         if @payment_method.save
@@ -29,8 +29,8 @@ module Spree
           @payment_method = PaymentMethod.find(params[:id])
         end
 
-        payment_method_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        attributes = params[:payment_method].merge(payment_method_params)
+        update_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
+        attributes = payment_method_params.merge(update_params)
         attributes.each do |k,v|
           if k.include?("password") && attributes[k].blank?
             attributes.delete(k)
@@ -60,6 +60,10 @@ module Spree
           redirect_to new_admin_payment_method_path
         end
       end
+
+      def payment_method_params
+        params.require(:payment_method).permit!
+      end
     end
   end
 end

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

@@ -32,15 +32,17 @@ module Spree
           if @order.completed?
             @payment.process!
             flash[:success] = flash_message_for(@payment, :successfully_created)
+
+             redirect_to admin_order_payments_path(@order)
           else
             #This is the first payment (admin created order)
             until @order.completed?
               @order.next!
             end
             flash[:success] = Spree.t(:new_order_completed)
+            redirect_to edit_admin_order_url(@order)
           end
 
-          redirect_to admin_order_payments_path(@order)
         rescue Spree::Core::GatewayError => e
           flash[:error] = "#{e.message}"
           redirect_to new_admin_order_payment_path(@order)
@@ -69,7 +71,7 @@ module Spree
         if params[:payment] and params[:payment_source] and source_params = params.delete(:payment_source)[params[:payment][:payment_method_id]]
           params[:payment][:source_attributes] = source_params
         end
-        params[:payment]
+        params.require(:payment).permit(:amount, :payment_method_id, :source_attributes)
       end
 
       def load_data
@@ -83,14 +85,8 @@ module Spree
         @previous_cards = @order.credit_cards.with_payment_profile
       end
 
-      # At this point admin should have passed through Customer Details step
-      # where order.next is called which leaves the order in payment step
-      #
-      # Orders in complete step also allows to access this controller
-      #
-      # Otherwise redirect user to that step
       def can_transition_to_payment
-        unless @order.billing_address.present?
+        unless @order.billing_address.present? 
           flash[:notice] = Spree.t(:fill_in_customer_info)
           redirect_to edit_admin_order_customer_url(@order)
         end
@@ -105,10 +101,6 @@ 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/products_controller.rb

@@ -6,6 +6,7 @@ module Spree
       before_filter :load_data, :except => :index
       create.before :create_before
       update.before :update_before
+      helper_method :clone_object_url
 
       def show
         session[:return_to] ||= request.referer
@@ -116,6 +117,13 @@ module Spree
          [{:variants => [:images, {:option_values => :option_type}]}, {:master => [:images, :default_price]}]
         end
 
+        def clone_object_url resource
+          clone_admin_product_url resource
+        end
+
+        def permit_attributes
+          params.require(:product).permit!
+        end
     end
   end
 end