spree_core 0.70.7 → 1.0.0.rc1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2011, Rails Dog LLC and other contributors
+Copyright (c) 2007-2011, Spree Commerce, Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -23,4 +23,4 @@ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

@@ -35,14 +35,12 @@ image_html = function(item){
   return "<img src='" + item['images'][0]["mini_url"] + "'/>";
 }
 
-format_product_autocomplete = function(data){
+format_product_autocomplete = function(item){
   var html = "";
 
-  var product = data['product'];
-
-  if(data['variant']==undefined){
-    // product
+  var product = item.data['product'];
 
+  if(item.data['variant']==undefined){
     if(product['images'].length!=0){
       html = image_html(product);
     }
@@ -52,8 +50,8 @@ format_product_autocomplete = function(data){
     html += "<span><strong>On Hand: </strong>" + product['count_on_hand'] + "</span></div>";
   }else{
     // variant
-    var variant = data['variant'];
-    var name = product['name'];
+    var variant = item.data['variant'];
+    var name = item.data.product['name'];
 
     if(variant['images'].length!=0){
       html = image_html(variant);
@@ -106,22 +104,43 @@ prep_product_autocomplete_data = function(data){
 }
 
 $.fn.product_autocomplete = function(){
-  $(this).autocomplete("/admin/products.json?authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), {
-      parse: prep_product_autocomplete_data,
-      formatItem: function(item) {
-        return format_product_autocomplete(item);
-      }
-    }).result(function(event, data, formatted) {
-      if (data){
-        if(data['variant']==undefined){
-          // product
-          $('#add_variant_id').val(data['product']['master']['id']);
-        }else{
-          // variant
-          $('#add_variant_id').val(data['variant']['id']);
-        }
+  $(this).autocomplete({
+    source: function(request, response) {
+      $.get("/admin/products.json?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        result = prep_product_autocomplete_data(data)
+        response(result);
+      });
+    },
+    minLength: 4,
+    focus: function(event, ui) {
+      $('#add_product_name').val(ui.item.label);
+      return false;
+    },
+    select: function(event, ui) {
+      $('#add_product_name').val(ui.item.label);
+      product = ui.item.data;
+      if (product['variant'] == undefined) {
+        // product
+        $('#add_variant_id').val(product['product']['master']['id']);
+      } else {
+        // variant
+        $('#add_variant_id').val(product['variant']['id']);
       }
-    });
+      return false;
+    }
+  }).data("autocomplete")._renderItem = function(ul, item) {
+    $(ul).addClass('ac_results');
+    html = format_product_autocomplete(item);
+    return $("<li></li>")
+            .data("item.autocomplete", item)
+            .append("<a>" + html + "</a>")
+            .appendTo(ul);
+  }
+  
+  $(this).data("autocomplete")._resizeMenu = function() {
+    var ul = this.menu.element;
+    ul.outerWidth(this.element.outerWidth());
+  }
 }
 
 $.fn.objectPicker = function(url){

data/app/assets/javascripts/admin/checkouts/edit.js

@@ -17,7 +17,8 @@ $(document).ready(function(){
     return html;
   }
 
-  format_user_autocomplete = function(data){
+  format_user_autocomplete = function(item){
+    var data = item.data
     var html = "<h4>" + data['email'] +"</h4>";
     html += "<span><strong>Billing:</strong> ";
     html += add_address(data['bill_address']);
@@ -40,46 +41,62 @@ $(document).ready(function(){
     });
   }
 
-  $("#customer_search").autocomplete("/admin/users.json?authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), {
-    minChars: 5,
-    delay: 1500,
-    parse: prep_user_autocomplete_data,
-    formatItem: function(item) {
-      return format_user_autocomplete(item);
-    }
-  }).result(function(event, data, formatted) {
-    $('#user_id').val(data['id']);
-    $('#guest_checkout_true').prop("checked", false);
-    $('#guest_checkout_false').prop("checked", true);
-    $('#guest_checkout_false').prop("disabled", false);
-    $('#order_email').val(data['email']);
-
-    var addr = data['bill_address'];
-    if(addr!=undefined){
-      $('#order_bill_address_attributes_firstname').val(addr['firstname']);
-      $('#order_bill_address_attributes_lastname').val(addr['lastname']);
-      $('#order_bill_address_attributes_address1').val(addr['address1']);
-      $('#order_bill_address_attributes_address2').val(addr['address2']);
-      $('#order_bill_address_attributes_city').val(addr['city']);
-      $('#order_bill_address_attributes_zipcode').val(addr['zipcode']);
-      $('#order_bill_address_attributes_state_id').val(addr['state_id']);
-      $('#order_bill_address_attributes_country_id').val(addr['country_id']);
-      $('#order_bill_address_attributes_phone').val(addr['phone']);
+  if ($("#customer_search").length > 0) {
+    $("#customer_search").autocomplete({
+      minChars: 5,
+      delay: 1500,
+      source: function(request, response) {
+        $.get("/admin/users.json?q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+          result = prep_user_autocomplete_data(data)
+          response(result);
+        });
+      },
+      focus: function(event, ui) {
+        $('#customer_search').val(ui.item.label);
+        $(ui).addClass('ac_over');
+        return false;
+      },
+      select: function(event, ui) {
+        $('#customer_search').val(ui.item.label);
+        _.each(['bill', 'ship'], function(addr_name){
+          var addr = ui.item.data[addr_name + '_address'];
+          if(addr!=undefined){
+            $('#order_' + addr_name + '_address_attributes_firstname').val(addr['firstname']);
+            $('#order_' + addr_name + '_address_attributes_lastname').val(addr['lastname']);
+            $('#order_' + addr_name + '_address_attributes_company').val(addr['company']);
+            $('#order_' + addr_name + '_address_attributes_address1').val(addr['address1']);
+            $('#order_' + addr_name + '_address_attributes_address2').val(addr['address2']);
+            $('#order_' + addr_name + '_address_attributes_city').val(addr['city']);
+            $('#order_' + addr_name + '_address_attributes_zipcode').val(addr['zipcode']);
+            $('#order_' + addr_name + '_address_attributes_state_id').val(addr['state_id']);
+            $('#order_' + addr_name + '_address_attributes_country_id').val(addr['country_id']);
+            $('#order_' + addr_name + '_address_attributes_phone').val(addr['phone']);
+          }
+        });
+
+        $('#order_email').val(ui.item.data['email']);
+        $('#user_id').val(ui.item.data['id']);
+        $('#guest_checkout_true').prop("checked", false);
+        $('#guest_checkout_false').prop("checked", true);
+        return true;
+      }
+    }).data("autocomplete")._renderItem = function(ul, item) {
+      $(ul).addClass('ac_results');
+      html = format_user_autocomplete(item);
+      return $("<li></li>")
+              .data("item.autocomplete", item)
+              .append("<a class='ui-menu-item'>" + html + "</a>")
+              .appendTo(ul);
     }
 
-    var addr = data['ship_address'];
-    if(addr!=undefined){
-      $('#order_ship_address_attributes_firstname').val(addr['firstname']);
-      $('#order_ship_address_attributes_lastname').val(addr['lastname']);
-      $('#order_ship_address_attributes_address1').val(addr['address1']);
-      $('#order_ship_address_attributes_address2').val(addr['address2']);
-      $('#order_ship_address_attributes_city').val(addr['city']);
-      $('#order_ship_address_attributes_zipcode').val(addr['zipcode']);
-      $('#order_ship_address_attributes_state_id').val(addr['state_id']);
-      $('#order_ship_address_attributes_country_id').val(addr['country_id']);
-      $('#order_ship_address_attributes_phone').val(addr['phone']);
+    $("#customer_search").data("autocomplete")._resizeMenu = function() {
+      var ul = this.menu.element;
+      ul.outerWidth(this.element.outerWidth());
     }
-  });
+
+
+  }
+
 
 
   $('input#order_use_billing').click(function() {
@@ -94,6 +111,7 @@ $(document).ready(function(){
 
     $('#order_bill_address_attributes_firstname').val("");
     $('#order_bill_address_attributes_lastname').val("");
+    $('#order_bill_address_attributes_company').val("");
     $('#order_bill_address_attributes_address1').val("");
     $('#order_bill_address_attributes_address2').val("");
     $('#order_bill_address_attributes_city').val("");
@@ -104,6 +122,7 @@ $(document).ready(function(){
 
     $('#order_ship_address_attributes_firstname').val("");
     $('#order_ship_address_attributes_lastname').val("");
+    $('#order_bill_address_attributes_company').val("");
     $('#order_ship_address_attributes_address1').val("");
     $('#order_ship_address_attributes_address2').val("");
     $('#order_ship_address_attributes_city').val("");

data/app/assets/javascripts/admin/orders/edit.js

@@ -1,6 +1,7 @@
 $(document).ready(function(){
 
-  $("#add_product_name").product_autocomplete();
+  if ($("#add_product_name").length > 0)
+    $("#add_product_name").product_autocomplete();
 
   $("#add_line_item_to_order").live("click", function(){
     if($('#add_variant_id').val() == ''){ return false; }
@@ -12,4 +13,8 @@ $(document).ready(function(){
     return false;
   });
 
+  $("#add_product_name").live("click", function() {
+    $("#add_product_name").product_autocomplete();
+  });
+
 });

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

@@ -1,23 +1,2 @@
 $(function() {
-
-  // handle calculating VAT inclusive and exlcusive prices
-  // when the opposing value is changed.
-  //
-  if ($('input#price_including_vat').is('*')) {
-    $('input#price_including_vat').change(function(){
-      var inc_vat_price = parseFloat($(this).val());
-
-      price = inc_vat_price / (1 + effective_tax_rate);
-
-      $('input#product_price').val(price.toFixed(2));
-    });
-
-    $('input#product_price').change(function(){
-      var ex_vat_price = parseFloat($(this).val());
-
-      price = ex_vat_price + (ex_vat_price * effective_tax_rate);
-
-      $('input#price_including_vat').val(price.toFixed(2));
-    });
-  }
 });

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

@@ -6,5 +6,4 @@
 //= require jquery.delayedobserver
 //= require jquery.jstree/jquery.jstree
 //= require jquery.alerts/jquery.alerts
-//= require jquery.autocomplete.min
 //= require_tree .

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

@@ -79,15 +79,14 @@ var handle_delete = function(e, data){
 var taxonomy_id; 
 
 $(document).ready(function(){
-	if(taxonomy_id!=undefined){
-		
-		base_url = "/admin/taxonomies/" + taxonomy_id + "/taxons/";
-	  child_url = "/admin/taxonomies/" + taxonomy_id + "/get_children.json"
-		
-		is_cut = false;
-		last_rollback = null;
-	
-		
+  if(taxonomy_id!=undefined){
+
+    base_url = $("#taxonomy_tree").data("url").split("?")[0] + "/" ;
+    child_url = base_url.replace("/taxons", "/get_children.json");
+    
+    is_cut = false;
+    last_rollback = null;
+
     var conf = {
       json_data : {
         "data" : initial,
@@ -202,5 +201,5 @@ $(document).ready(function(){
           e.preventDefault();
       }
     });
-	}
+  }
 });

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

@@ -1,14 +1,11 @@
 $(function() {
   if ($('#country_based').is(':checked')) {
     show_country();
-  } else if ($('#state_based').is(':checked')) {
-    show_state();
   } else {
-    show_zone();
+    show_state();
   }
   $('#country_based').click(function() { show_country();} );
   $('#state_based').click(function() { show_state();} );
-  $('#zone_based').click(function() { show_zone();} );
 })
 
 var show_country = function() {
@@ -30,15 +27,3 @@ var show_state = function() {
   $('#state_members :input').each(function() { $(this).prop("disabled", false); })
   $('#state_members').show();
 };
-
-var show_zone = function() {
-  $('#state_members :input').each(function() { $(this).prop("disabled", true);
- })
-  $('#state_members').hide();
-  $('#country_members :input').each(function() { $(this).prop("disabled", true);
- })
-  $('#country_members').hide();
-  $('#zone_members :input').each(function() { $(this).prop("disabled", false); })
-  $('#zone_members').show();
-};
-

data/app/assets/javascripts/store/checkout.js

@@ -59,7 +59,6 @@
 
         }
       }).triggerHandler('click');
-
     }
 
     if($('#checkout_form_payment').is('*')){

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

@@ -589,6 +589,20 @@ span.handle{
   height:15px;
 }
 
+.ac_results, .ui-autocomplete {
+  max-height: 230px;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding-right: 20px;
+  border: 1px solid #000;
+}
+
+.ac_results li h4 { width: 100% }
+
+.ac_results li:last-child { border: none; }
+
+.ui-autocomplete a.ui-state-hover { color: #444; text-decoration: none; font-weight:normal; padding: 0 0 0 0; margin: 0 0 0 0; border:none; }
+
 .alert {
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;

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

@@ -8,8 +8,8 @@
  *= require admin/admin-tables
  *= require admin/admin-form
  *= require admin/admin-typography.css
- *= require admin/admin
  *= require admin/edit_checkouts.css
  *= require admin/token-input.css
  *= require jquery-ui.datepicker
+ *= require admin/admin
 */

data/app/assets/stylesheets/store/screen.css

@@ -90,6 +90,11 @@ div#product-images { width: 50%; }
 div#product-images, div#main-image, div#cart-form { float: left; }
 div#product-description { float: none; clear: both; }
 
+ul.filter_choices {
+  list-style-type:none;
+  padding-left:0px;
+}
+
 ul.thumbnails, #breadcrumbs ul {
   margin: 0;
   padding: 0;

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

@@ -0,0 +1,13 @@
+module Spree
+  module Admin
+    class AdjustmentsController < ResourceController
+      belongs_to 'spree/order', :find_by => :number
+      destroy.after :reload_order
+
+      private
+        def reload_order
+          @order.reload
+        end
+    end
+  end
+end

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

@@ -0,0 +1,59 @@
+module Spree
+  module Admin
+    class BaseController < Spree::BaseController
+      helper 'spree/search'
+      helper 'spree/admin/navigation'
+      layout '/spree/layouts/admin'
+
+      protected
+        def check_alerts
+          return unless current_user and should_check_alerts?
+
+          unless session.has_key? :alerts
+            begin
+              session[:alerts] = Spree::Alert.current(request.host)
+              filter_dismissed_alerts
+              Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
+            rescue
+              session[:alerts] = nil
+            end
+          end
+        end
+
+        def should_check_alerts?
+          return false if not Spree::Config[:check_for_spree_alerts]
+
+          last_check = Spree::Config[:last_check_for_spree_alerts]
+          return true if last_check.blank?
+
+          DateTime.parse(last_check) < 12.hours.ago
+        end
+
+        def flash_message_for(object, event_sym)
+          resource_desc  = object.class.model_name.human
+          resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
+          I18n.t(event_sym, :resource => resource_desc)
+        end
+
+        def render_js_for_destroy
+          render :partial => '/spree/admin/shared/destroy'
+        end
+
+        # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
+        def check_json_authenticity
+          return unless request.format.js? or request.format.json?
+          return unless protect_against_forgery?
+          auth_token = params[request_forgery_protection_token]
+          unless (auth_token and form_authenticity_token == URI.unescape(auth_token))
+            raise(ActionController::InvalidAuthenticityToken)
+          end
+        end
+
+        def filter_dismissed_alerts
+          return unless session[:alerts]
+          dismissed = (Spree::Config[:dismissed_spree_alerts] || '').split(',')
+          session[:alerts].reject! { |a| dismissed.include? a.id.to_s }
+        end
+    end
+  end
+end