spree_backend 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0423c9ed97ff3f9cdaf5320fbad1e2c1edcacf27
+  data.tar.gz: 271f3c36169eeefa5ab4463913a0df48c56333fb
+SHA512:
+  metadata.gz: 938a189fc6a083123d838d649a4587f633dda9c62e97340d8ebff7b24a10a937deb09434fd1da1a4c4f7fd1e43c9db185732da88473cb7b3f114c2fc46512a42
+  data.tar.gz: bb905d0d2053784fbf0ce2ba66ec8d6ede87813121f3540cf2d6eb69c1a0d62d09e70f2f1a4ab14f567fd80cb3a19de3421e7d51fb819819a4732dad0f286a88

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

@@ -35,6 +35,9 @@ $(document).ready(function() {
     //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);
@@ -46,7 +49,7 @@ $(document).ready(function() {
       toggleItemEdit();
 
       adjustItems(shipment_number, variant_id, quantity);
-
+      return false;
     });
 
     //handle delete click
@@ -79,7 +82,6 @@ adjustItems = function(shipment_number, variant_id, quantity){
     }
     url += '.json';
 
-
     if(new_quantity!=0){
       $.ajax({
         type: "PUT",
@@ -87,8 +89,6 @@ adjustItems = function(shipment_number, variant_id, quantity){
         data: { variant_id: variant_id, quantity: new_quantity }
       }).done(function( msg ) {
         window.location.reload();
-      }).error(function( msg ) {
-        console.log(msg);
       });
     }
 }
@@ -109,10 +109,107 @@ 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("/api/variants.json"),
+    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("/api/orders/" + order_number + "/shipments/" + original_shipment_number + "/remove.json"),
+      data: { variant_id: variant_id, quantity: quantity }
+    }).done(function(msg) {
+      window.location.reload();
+    });
+
+    if (new_shipment != undefined) {
+      $.ajax({
+        type: "POST",
+        async: false,
+        url: Spree.url("/api/orders/" + order_number + "/shipments.json"),
+        data: { variant_id: variant_id, quantity: quantity, stock_location_id: stock_location_id }
+      });
+    } else {
+      $.ajax({
+        type: "PUT",
+        async: false,
+        url: Spree.url("/api/orders/" + order_number + "/shipments/" + target_shipment_number + "/add.json"),
+        data: { variant_id: variant_id, quantity: quantity }
+      });
+    }
+  }
+}
+
+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() {

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

@@ -18,8 +18,7 @@ module Spree
         options[:route] ||=  "admin_#{args.first}"
 
         destination_url = options[:url] || spree.send("#{options[:route]}_path")
-
-        titleized_label = Spree.t(options[:label], :default => options[:label]).titleize
+        titleized_label = Spree.t(options[:label], :default => options[:label], :scope => [:admin, :tab]).titleize
 
         css_classes = []
 

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

@@ -37,7 +37,7 @@
     var shipments = [];
 
     <% @order.shipments.each do |shipment| %>
-      shipments.push(<%== shipment.to_json(:root => false, :include => :inventory_units) %>);
+      shipments.push(<%== shipment.to_json(:root => false, :include => [:inventory_units, :stock_location]) %>);
     <% end %>
 
     <%= render :partial => 'spree/admin/shared/update_order_state', :handlers => [:js] %>

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

@@ -1,3 +1,4 @@
+<%= render :partial => "spree/admin/variants/split", :formats => :js %>
 <fieldset class="no-border-bottom">
   <legend align="center" class="stock-location" data-hook="stock-location">
     <span class="shipment-number"><%= shipment.number %></span>
@@ -30,11 +31,11 @@
     <th class="orders-actions actions" data-hook="admin_order_form_line_items_header_actions"></th>
   </thead>
 
-  <tbody>
+  <tbody data-shipment-number="<%= shipment.number %>" data-order-number="<%= order.number %>">
     <% shipment.manifest.each do |item| %>
       <% line_item = order.find_line_item_by_variant(item.variant) %>
 
-      <tr class="stock-item">
+      <tr class="stock-item" data-item-quantity="<%= item.quantity %>">
         <td class="item-image"><%= mini_image(item.variant) %></td>
         <td class="item-name">
           <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
@@ -57,7 +58,8 @@
               <%= link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
               <%= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
               <%= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
-              <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t(:delete) %>
+              <%= link_to '', '#', :class => 'split-item icon_link icon-resize-horizontal no-text with-tip', :data => {:action => 'split', 'variant-id' => item.variant.id}, :title => Spree.t('split') %>
+              <%= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => Spree.t('delete') %>
             <% end %>
           </td>
         <% end %>
@@ -98,7 +100,7 @@
     <tr class="show-method total">
       <td colspan="4">
         <% if shipment.adjustment.present? %>
-          <strong><%= shipment.adjustment.label %>:</strong>
+          <strong><%= shipment.adjustment.label %>: <%= shipment.shipping_method.name %></strong>
         <% else %>
           <%= Spree.t(:cannot_set_shipping_method_without_address) %>
         <% end %>

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

@@ -0,0 +1,29 @@
+<script type='text/template' id='variant_split_template'>
+  <tr class='stock-item-split' data-variant-id='{{variant.id}}'>
+    <td colspan='2'>
+      Move {{variant.name}} to:
+    </td>
+    <td colspan='2'>
+    <select name="item_stock_location" id='item_stock_location' style='width:100%;'>
+      <option></option>
+      <optgroup label="Existing Shipments">
+        {{#each shipments}}
+        <option data-shipment-number='{{this.number}}' value='{{this.stock_location_id}}'>{{this.stock_location.name}}({{this.number}})</option>
+        {{/each}}
+      </optgroup>
+      <optgroup label="New Shipment At Location">
+        {{#each variant.stock_items}}
+          <option data-new-shipment='true' value='{{this.stock_location_id}}'>{{this.stock_location_name}}</option>
+        {{/each}}
+      </optgroup>
+      </select>
+    </td>
+    <td>
+      <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
+    </td>
+    <td class='actions'>
+      <a href='#' class='save-split icon_link icon-ok no-text with-tip' title='Save'></a>
+      <a href='#' class='cancel-split icon_link icon-cancel no-text with-tip' title='Cancel'></a>
+    </td>
+  </tr>
+</script>

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: spree_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: spree_api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,23 +83,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: email_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -430,6 +415,7 @@ files:
 - app/views/spree/admin/trackers/new.html.erb
 - app/views/spree/admin/variants/_autocomplete.js.erb
 - app/views/spree/admin/variants/_form.html.erb
+- app/views/spree/admin/variants/_split.js.erb
 - app/views/spree/admin/variants/edit.html.erb
 - app/views/spree/admin/variants/index.html.erb
 - app/views/spree/admin/variants/new.html.erb
@@ -499,30 +485,26 @@ files:
 - vendor/assets/stylesheets/responsive-tables.css
 homepage: http://spreecommerce.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 89217670578797386
 requirements:
 - none
 rubyforge_project: spree_backend
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: backend e-commerce functionality for the Spree project.
 test_files: []