spree_core 1.0.7 → 1.1.0.rc1

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

@@ -1,4 +1,3 @@
-<%# encoding: utf-8 %>
 //= require_self
 
 /**
@@ -60,10 +59,8 @@ format_product_autocomplete = function(item){
     }
 
     html += "<div><h4>" + product['name'] + "</h4>";
-    if (product['master']) {
-      html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + product['master']['sku'] + "</span>";
-    }
-    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + product['count_on_hand'] + "</span></div>";
+    html += "<span><strong>Sku: </strong>" + product['master']['sku'] + "</span>";
+    html += "<span><strong>On Hand: </strong>" + product['count_on_hand'] + "</span></div>";
   }else{
     // variant
     var variant = item.data['variant'];
@@ -78,12 +75,12 @@ format_product_autocomplete = function(item){
     }
 
     name += " - " + $.map(variant['option_values'], function(option_value){
-      return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
+      return option_value["option_type"]["presentation"] + ": " + option_value['name'];
     }).join(", ")
 
     html += "<div><h4>" + name + "</h4>";
-    html += "<span><strong><%= ::I18n.t(:sku) %>: </strong>" + variant['sku'] + "</span>";
-    html += "<span><strong><%= ::I18n.t(:on_hand) %>: </strong>" + variant['count_on_hand'] + "</span></div>";
+    html += "<span><strong>Sku: </strong>" + variant['sku'] + "</span>";
+    html += "<span><strong>On Hand: </strong>" + variant['count_on_hand'] + "</span></div>";
   }
 
   return html
@@ -100,7 +97,7 @@ prep_product_autocomplete_data = function(data){
 
         var name = product['name'];
         name += " - " + $.map(variant['option_values'], function(option_value){
-          return option_value["option_type"]["presentation"] + ": " + option_value['presentation'];
+          return option_value["option_type"]["presentation"] + ": " + option_value['name'];
         }).join(", ");
 
         return {
@@ -123,7 +120,7 @@ $.fn.product_autocomplete = function(){
   return this.each(function() {
     $(this).autocomplete({
       source: function(request, response) {
-        $.get(ajax_urls.product_search_json + "?q=" + $('#add_product_name').val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.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);
         });
@@ -174,9 +171,8 @@ $.fn.objectPicker = function(url){
 $.fn.productPicker = function(){
   $(this).objectPicker(ajax_urls.product_search_basic_json);
 }
-
 $.fn.userPicker = function(){
-  $(this).objectPicker(ajax_urls.user_search_json);
+  $(this).objectPicker(ajax_urls.user_search_basic_json);
 }
 
 // Possible defunct
@@ -210,12 +206,7 @@ $(".observe_field").live('change', function() {
 
 handle_date_picker_fields = function(){
   $('.datepicker').datepicker({
-    dateFormat: "<%= ::I18n.t(:format, :scope => 'spree.date_picker', :default => 'yy/mm/dd') %>",
-    dayNames: <%= ::I18n.t(:day_names, :scope => :date).to_json %>,
-    dayNamesMin: <%= ::I18n.t(:abbr_day_names, :scope => :date).to_json %>,
-    monthNames: <%= (::I18n.t(:month_names, :scope => :date).delete_if(&:blank?)).to_json %>,
-    prevText: '<%= ::I18n.t(:previous) %>',
-    nextText: '<%= ::I18n.t(:next) %>',
+    dateFormat: 'yy/mm/dd',
     showOn: "button",
     buttonImage: "<%= asset_path 'datepicker/cal.gif' %>",
     buttonImageOnly: true

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

@@ -1,14 +1,15 @@
 $(function() {
-  var original_calc_type = $('#calc-type').attr('value');
-  $('div.calculator-settings-warning').hide();
-  $('#calc-type').change(function() {
-    if ($('#calc-type').attr('value') == original_calc_type) {
+  var calculator_select = $('select#calc_type')
+  var original_calc_type = calculator_select.attr('value');
+  $('div#calculator-settings-warning').hide();
+  calculator_select.change(function() {
+    if (calculator_select.attr('value') == original_calc_type) {
       $('div.calculator-settings').show();
-      $('div.calculator-settings-warning').hide();
+      $('div#calculator-settings-warning').hide();
       $('.calculator-settings input').prop("disabled", false);
     } else {
       $('div.calculator-settings').hide();
-      $('div.calculator-settings-warning').show();
+      $('div#calculator-settings-warning').show();
       $('.calculator-settings input').prop("disabled", true);
     }
   });

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

@@ -46,7 +46,7 @@ $(document).ready(function(){
       minChars: 5,
       delay: 1500,
       source: function(request, response) {
-        $.get(ajax_urls.user_search_json + "&q=" + $("#customer_search").val() + "&authenticity_token=" + encodeURIComponent($('meta[name=csrf-token]').attr("content")), function(data) {
+        $.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);
         });
@@ -78,7 +78,6 @@ $(document).ready(function(){
         $('#user_id').val(ui.item.data['id']);
         $('#guest_checkout_true').prop("checked", false);
         $('#guest_checkout_false').prop("checked", true);
-        $('#guest_checkout_false').prop("disabled", false);
         return true;
       }
     }).data("autocomplete")._renderItem = function(ul, item) {
@@ -108,6 +107,7 @@ $(document).ready(function(){
     $('#customer_search').val("");
     $('#user_id').val("");
     $('#checkout_email').val("");
+    $('#guest_checkout_false').prop("disabled", true);
 
     $('#order_bill_address_attributes_firstname').val("");
     $('#order_bill_address_attributes_lastname').val("");

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

@@ -0,0 +1,49 @@
+$(document).ready(function() {
+
+  if ($('input#preferences_use_s3[type="checkbox"]:checked').length > 0)
+    $('#s3_settings').show();
+
+  // Toggle display of S3 settings based on value of use_s3 checkbox
+  $('input#preferences_use_s3[type="checkbox"]').click(function() {
+    $('#s3_settings').toggle();
+  });
+
+  $('.destroy_style').live("click", function() {
+   $(this).parent().remove();
+  });
+
+  $('.destroy_header').live("click", function() {
+    $(this).parent().remove();
+  });
+
+  // Handle adding new styles
+  var styles_hash_index = 1;
+  $('.add_style').click(function() {
+    $('#styles_list').append(generate_html_for_hash("new_attachment_styles", styles_hash_index));
+  });
+
+  // Handle adding new headers
+  var headers_hash_index = 1;
+  $('.add_header').click(function() {
+    $('#headers_list').append(generate_html_for_hash("new_s3_headers", headers_hash_index));
+  });
+
+  // Generates html for new paperclip styles form fields
+  generate_html_for_hash = function(hash_name, index) {
+    var html = '<li>';
+    html += '<label for="' + hash_name + '_' + index + '_name">';
+    html += 'Name</label>';
+    html += '<input id="' + hash_name + '_' + index + '_name" name="' + hash_name + '[' + index + '][name]" type="text">';
+    html += '<label for="' + hash_name + '_' + index + '_value">';
+    html += 'Value</label>';
+    html += '<input id="' + hash_name + '_' + index + '_value" name="' + hash_name + '[' + index + '][value]" type="text">';
+    html += '<a href="#" alt="Destroy" class="destroy_style">&nbsp;x</a>';
+    html += '</li>';
+
+    index += 1;
+    return html;
+  };
+
+
+
+});

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

@@ -1,18 +1,18 @@
-$.each($('td.qty input'), function(i, inpt){
+$(document).ready(function() {
+  $.each($('td.qty input'), function(i, input) {
 
-  $(inpt).delayedObserver(function() {
+    $(input).live('change', function() {
 
-    var id = $(this).attr('id').replace("order_line_items_attributes_", "").replace("_quantity", "");
-    id = "#order_line_items_attributes_" + id + "_id";
+      var id = "#" + $(this).attr('id').replace("_quantity", "_id");
+      console.log($(this))
+      console.log($(id))
 
-    jQuery.ajax({
-      type: "POST",
-      url: "/admin/orders/" + $('input#order_number').val() + "/line_items/" + $(id).val(),
-      data: ({_method: "put", "line_item[quantity]": $(this).val()}),
-      complete: function(resp){ 
-        $('#order-form-wrapper').html(resp.responseText);
-      }
-    });
-
-  }, 0,5);
+      jQuery.post("/admin/orders/" + $('input#order_number').val() + "/line_items/" + $(id).val(),
+        { _method: "put", "line_item[quantity]": $(this).val()},
+        function(resp) {
+          $('#order-form-wrapper').html(resp.responseText);
+      })
+    })
+  })
 });
+

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

@@ -313,7 +313,7 @@ body {
       width: 24px; }
     button.small {
       font-size: 1em;
-      padding: 0 20px 0 0;
+      padding: 0 10px 0 10px;
     }
   input.title,
   textarea {
@@ -476,25 +476,15 @@ div#calculator-settings-warning, .warning {
   padding-right:10px;
 }
 
-ul#shipping-specs {
+ul#shipping_specs {
   margin: 0;
   padding-bottom:10px;
 }
-ul#shipping-specs li {
+ul#shipping_specs li {
   list-style-image:none;
   display:inline;
 }
 
-.product-scopes ul > li {
-  float: left;
-  width: 220px;
-  margin-right: 20px;
-}
-
-.product-scopes .invalid {
-  background-color: red;
-}
-
 div.product-preview-products {
   max-height: 200px;
   overflow: auto;
@@ -536,50 +526,29 @@ div.product-preview-products {
   padding-left:10px;
 }
 
-
-
-
-
-
-
-/* Product Groups */
-
-table#product_scopes tr {
-  background-color: #eee;
-
-}
-table#product_scopes tr td {
-  border-top: 4px solid #fff;
-  border-bottom: 1px solid #bbb;
-  padding: 5px 10px;
+.product-prototype-options,
+.product-prototype-options ul {
+  list-style-type: none;
+  margin-left: 0;
 }
-table#product_scopes tr td.actions {
-  vertical-align: middle;
-  text-align: right;
-}
-table#product_scopes tr td table {
-  margin: 0;
+.product-prototype-options > li {
+  display: block;
+  float: left;
   width: auto;
 }
-table#product_scopes tr td table tr td {
-  padding: 0;
-  border:  none;
-  padding-right: 5px;
+.product-prototype-options > li b {
+  display: block;
+  padding-right: 30px;
+  margin-right: 20px;
+  font-size: 14px;
+  border-bottom: 1px solid #ddd;
 }
-
-#product_group_forms_container {
-  position: relative;
+.product-prototype-options > li ul {
+  padding: 5px 0;
 }
-#new_product_group_form {
-  position: absolute;
-  right: 25px;
-  bottom: 0;
+.product-prototype-options > li label {
+  padding-left: 5px;
 }
-#new_product_group_form p {
-  text-align: right;
-  margin: 0;
-}
-
 
 span.handle{
   background-image: url(<%= asset_path 'admin/icons/switch.png' %>);
@@ -597,9 +566,7 @@ span.handle{
   border: 1px solid #000;
 }
 
-.ac_results li div { max-width: 90%; }
-
-.ac_results li h4 { width: 100%; }
+.ac_results li h4 { width: 100% }
 
 .ac_results li:last-child { border: none; }
 
@@ -686,3 +653,18 @@ span.handle{
   float: right;
   margin-right: 25px;
 }
+
+/* Image Settings Styles */
+#s3_settings {
+  display: none;
+}
+#styles_list {
+  list-style: none;
+}
+#headers_list {
+  list-style: none;
+}
+#s3_settings label, #attachment_styles label {
+  padding-left: 3px;
+  padding-right: 5px;
+}

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

@@ -462,6 +462,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     margin-top: 15px;
 
     input[type="number"] {
+      margin-right: 3px;
       width: 60px;
       vertical-align: middle;
       padding: 5px;
@@ -474,13 +475,13 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     color: $link_text_color;
 
     &.selling {
-      font-size: $product_detail_price_font_size;      
+      font-size: $product_detail_price_font_size;
     }
     &.diff {
       font-weight: bold;
     }  
   }
-  
+
   .taxon-title {
     font-size: $product_list_header_font_size;
   }
@@ -490,14 +491,14 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   }
 
   ul#products {
-		&:after {
-	  	content: " ";
-    	display: block;
-	  	clear: both;
-	  	visibility: hidden;
-	  	line-height: 0;
-	  	height: 0;
-		}
+    &:after {
+      content: " ";
+      display: block;
+      clear: both;
+      visibility: hidden;
+      line-height: 0;
+      height: 0;
+    }
 
     li {
       text-align: center;
@@ -513,6 +514,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
           font-size: $product_list_name_font_size;
           color: $product_link_text_color;
           border-bottom: 1px solid lighten($body_text_color, 60);
+          overflow: hidden;
         }
       }
 
@@ -567,7 +569,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
       line-height: 24px;
     }
   }
-  
+
   .taxon {
     overflow: hidden;
   }
@@ -629,6 +631,17 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     }
   }
 
+  #cart-form {
+    #inside-product-cart-form:after {
+      content: " ";
+      display: block;
+      clear: both;
+      visibility: hidden;
+      line-height: 0;
+      height: 0;
+    }
+  }
+
   /*--------------------------------------*/
   /* Checkout
   /*--------------------------------------*/
@@ -807,7 +820,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
   /* Cart
   /*--------------------------------------*/
   table#cart-detail {
-		width: 100%;
+    width: 100%;
     tbody#line_items {
       tr {
 

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

@@ -7,11 +7,11 @@ module Spree
       helper 'spree/admin/navigation'
       layout '/spree/layouts/admin'
 
-      before_filter :check_alerts unless Rails.env.development?
+      before_filter :check_alerts
 
       protected
         def check_alerts
-          return unless current_user and should_check_alerts?
+          return unless should_check_alerts?
 
           unless session.has_key? :alerts
             begin
@@ -25,7 +25,7 @@ module Spree
         end
 
         def should_check_alerts?
-          return false if not Spree::Config[:check_for_spree_alerts]
+          return false if !Rails.env.production? || !Spree::Config[:check_for_spree_alerts]
 
           last_check = Spree::Config[:last_check_for_spree_alerts]
           return true if last_check.blank?

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

@@ -0,0 +1,71 @@
+module Spree
+  module Admin
+    class ImageSettingsController < BaseController
+      def show
+        styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        @styles_list = styles.collect { |k, v| k }.join(", ")
+      end
+
+      def edit
+        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+      end
+
+      def update
+        update_styles(params)
+        update_headers(params) if Spree::Config[:use_s3]
+
+        Spree::Config.set(params[:preferences])
+        update_paperclip_settings
+
+        respond_to do |format|
+          format.html {
+            flash[:notice] = t(:image_settings_updated)
+            redirect_to admin_image_settings_path
+          }
+        end
+      end
+
+
+      private
+
+      def update_styles(params)
+        params[:new_attachment_styles].each do |index, style|
+          params[:attachment_styles][style[:name]] = style[:value] unless style[:value].empty?
+        end if params[:new_attachment_styles].present?
+
+        styles = params[:attachment_styles]
+
+        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
+      end
+
+      def update_headers(params)
+        params[:new_s3_headers].each do |index, header|
+          params[:s3_headers][header[:name]] = header[:value] unless header[:value].empty?
+        end if params[:new_s3_headers].present?
+
+        headers = params[:s3_headers]
+
+        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
+      end
+
+      def update_paperclip_settings
+        if Spree::Config[:use_s3]
+          s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
+          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
+          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
+          Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
+          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
+        else
+          Spree::Image.attachment_definitions[:attachment].delete :storage
+        end
+
+        Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
+        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
+        Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
+        Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
+      end
+    end
+  end
+end
+

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

@@ -17,36 +17,37 @@ module Spree
         end
       end
 
+
       private
   
-      def location_after_save
-        admin_product_images_url(@product)
-      end
+        def location_after_save
+          admin_product_images_url(@product)
+        end
 
-      def load_data
-        @product = Product.find_by_permalink(params[:product_id])
-        @variants = @product.variants.collect do |variant|
-          [variant.options_text, variant.id ]
+        def load_data
+          @product = Product.find_by_permalink(params[:product_id])
+          @variants = @product.variants.collect do |variant|
+            [variant.options_text, variant.id]
+          end
+          @variants.insert(0, [I18n.t(:all), 'All'])
         end
-        @variants.insert(0, [I18n.t(:all), 'All'])
-      end
 
-      def set_viewable
-        if params[:image].has_key? :viewable_id
-          if params[:image][:viewable_id] == "All"
-            @image.viewable = @product
+        def set_viewable
+          if params[:image].has_key? :viewable_id
+            if params[:image][:viewable_id] == 'All'
+              @image.viewable = @product.master
+            else
+              @image.viewable_type = 'Spree::Variant'
+              @image.viewable_id = params[:image][:viewable_id]
+            end
           else
-            @image.viewable_type = 'Spree::Variant'
-            @image.viewable_id = params[:image][:viewable_id]
+            @image.viewable = @product.master
           end
-        else
-          @image.viewable = @product
         end
-      end
 
-      def destroy_before
-        @viewable = @image.viewable
-      end
+        def destroy_before
+          @viewable = @image.viewable
+        end
 
     end
   end

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

@@ -5,7 +5,7 @@ module Spree
 
       def testmail
         @mail_method = Spree::MailMethod.find(params[:id])
-        if TestMailer.test_email(@mail_method, current_user).deliver
+        if TestMailer.test_email(@mail_method, respond_to?(:current_user) ? current_user : nil).deliver
           flash.notice = t('admin.mail_methods.testmail.delivery_success')
         else
           flash[:error] = t('admin.mail_methods.testmail.delivery_error')

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

@@ -10,8 +10,8 @@ module Spree
         end
 
         def edit
-          @order.bill_address = Address.default if @order.bill_address.nil?
-          @order.ship_address = Address.default if @order.ship_address.nil?
+          @order.build_bill_address(:country_id => Spree::Config[:default_country_id]) if @order.bill_address.nil?
+          @order.build_ship_address(:country_id => Spree::Config[:default_country_id]) if @order.ship_address.nil?
         end
 
         def update

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

@@ -9,27 +9,26 @@ module Spree
       respond_to :html
 
       def index
-        params[:search] ||= {}
-        params[:search][:completed_at_is_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
-        @show_only_completed = params[:search][:completed_at_is_not_null].present?
-        params[:search][:meta_sort] ||= @show_only_completed ? 'completed_at.desc' : 'created_at.desc'
+        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?
+        params[:q][:meta_sort] ||= @show_only_completed ? 'completed_at.desc' : 'created_at.desc'
 
-        @search = Order.metasearch(params[:search])
-
-        if !params[:search][:created_at_greater_than].blank?
-          params[:search][:created_at_greater_than] = Time.zone.parse(params[:search][:created_at_greater_than]).beginning_of_day rescue ""
+        if !params[:q][:created_at_gt].blank?
+          params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
         end
 
-        if !params[:search][:created_at_less_than].blank?
-          params[:search][:created_at_less_than] = Time.zone.parse(params[:search][:created_at_less_than]).end_of_day rescue ""
+        if !params[:q][:created_at_lt].blank?
+          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
         end
 
         if @show_only_completed
-          params[:search][:completed_at_greater_than] = params[:search].delete(:created_at_greater_than)
-          params[:search][:completed_at_less_than] = params[:search].delete(:created_at_less_than)
+          params[:q][:completed_at_gt] = params[:q].delete(:created_at_gt)
+          params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
         end
 
-        @orders = Order.metasearch(params[:search]).includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
+        @search = Order.search(params[:q])
+        @orders = @search.result.includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
         respond_with(@orders)
       end
 
@@ -49,6 +48,7 @@ module Spree
       def update
         return_path = nil
         if @order.update_attributes(params[:order]) && @order.line_items.present?
+          @order.update!
           unless @order.complete?
 
           else

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

@@ -5,7 +5,7 @@ module Spree
       before_filter :load_data
 
       def create
-        @payment_method = params[:payment_method][:type].constantize.new(params[:payment_method])
+        @payment_method = params[:payment_method].delete(:type).constantize.new(params[:payment_method])
         @object = @payment_method
         invoke_callbacks(:create, :before)
         if @payment_method.save