spree_core 1.0.0.rc3 → 1.0.0.rc4

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

@@ -1,4 +1,3 @@
-//= require store/helpers
 //= require_self
 
 /**
@@ -17,6 +16,20 @@ $(document).ajaxStop(function(){
 
 $.fn.visible = function(cond) { this[cond ? 'show' : 'hide' ]() };
 
+show_flash_error = function(message) {
+  error_div = $('.flash.error');
+  if (error_div.length > 0) {
+    error_div.html(message);
+    error_div.show();
+  } else {
+    if ($("#content .toolbar").length > 0) {
+      $("#content .toolbar").before('<div class="flash error">' + message + '</div>');
+    } else {
+      $("#content h1").before('<div class="flash error">' + message + '</div>');
+    }
+  }
+}
+
 // Apply to individual radio button that makes another element visible when checked
 $.fn.radioControlsVisibilityOfElement = function(dependentElementSelector){
   if(!this.get(0)){ return  }
@@ -227,19 +240,17 @@ $(document).ready(function(){
         update: function(event, ui) {
           $("#progress").show();
           positions = {};
-          type = '';
           $.each($('table.sortable tbody tr'), function(position, obj){
             reg = /spree_(\w+_?)+_(\d+)/;
             parts = reg.exec($(obj).attr('id'));
             if (parts) {
               positions['positions['+parts[2]+']'] = position;
-              type = parts[1];
             }
           });
           $.ajax({
             type: 'POST',
             dataType: 'script',
-            url: Spree.base_path + 'admin/' + type + 's/update_positions',
+            url: $(ui.item).closest("table.sortable").data("sortable-link"),
             data: positions,
             success: function(data){ $("#progress").hide(); }
           });
@@ -250,7 +261,7 @@ $(document).ready(function(){
 });
 
 jQuery(document).ready(function() {
-  $('div.alert a.dismiss').click(function() {
+  $('a.dismiss').click(function() {
     $(this).parent().fadeOut();
   });
 });

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 store/helpers
 //= require_tree .

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

@@ -5,4 +5,3 @@
 //= require store/checkout
 //= require store/product
 //= require store/cart
-//= require store/helpers

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

@@ -616,17 +616,71 @@ span.handle{
   font-size: 0.8em;
 }
 .alert.release {
-  background: #ccddff url(../images/shadow_top.png) 0px -50px repeat-x;
+  background-color: #ccddff;
   color: #556699;
   border: 1px solid #99aacc;
 }
 .alert.security {
-  background: #f4b4b4 url(../images/shadow_top.png) 0px -50px repeat-x;
+  background-color: #f4b4b4;
   color: #000000;
   border: 1px solid #e75b5b;
 }
 .alert.news {
-  background: #ccffd4 url(../images/shadow_top.png) 0px -50px repeat-x;
+  background-color: #ccffd4;
   color: #000000;
   border: 1px solid #66ff7e;
 }
+
+/* Spree analytics preview buttons */
+.analytics_splash{
+  text-align: center;
+}
+.preview-buttons {
+  position: absolute;
+  left: 860px;
+  top: 820px;
+}
+.preview-buttons a.button {
+  display: inline-block;
+  float: none;
+  font-size: 14px;
+}
+
+/* Spree admin banners*/
+.banner {
+  overflow: auto;
+}
+.banner p {
+  text-transform: uppercase;
+  font-weight: bold;
+}
+.banner .button {
+  float: none !important;
+  display: inline-block;
+}
+
+.banner.payment_banner {
+  width: 739px;
+  height: 135px;
+  background: transparent url(<%= asset_path 'admin/payment_banner.png' %>) no-repeat left top;
+  position: absolute;
+  left: -17px;
+}
+.banner.payment_banner .message {
+  padding-left: 40px;
+  padding-top: 35px;
+  font-size: 16px;
+  width: 500px;
+  color: #5A81B3;
+  line-height: 25px;
+}
+.banner.payment_banner .message a {
+  color: #82a653 !important;
+}
+
+.banner.payment_banner .dismiss {
+  color: #B25B59 !important;
+  font-weight: bold;
+  float: right;
+  margin-right: 25px;
+}

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

@@ -2,13 +2,18 @@
 /* Colors
 /*--------------------------------------*/
 $c_base:        #404042;  /* Dark gray      */
-$c_gray1:       #bbbbbb;  /* Mid light gray */
+$c_gray:        #bbbbbb;  /* Mid light gray */
 $c_colored:     #00ADEE;  /* Light blue     */
 $c_colored_alt: #f0f8ff;  /* Lighter blue   */
 $c_border:      #dedede;  /* Light gray     */
 $c_green:       #8dba53;  /* Spree green    */
 $c_red:         #e45353;  /* Error red      */
 
+/*--------------------------------------*/
+/* Fonts
+/*--------------------------------------*/
+@import url(http://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
+
 /*--------------------------------------*/
 /* Basic styles 
 /*--------------------------------------*/
@@ -19,6 +24,11 @@ body {
   font-size: 12px;
 }
 
+/* Line style */
+hr {
+  border-color: $c_border;
+}
+
 /* Custom text-selection colors (remove any text shadows: twitter.com/miketaylr/status/12228805301) */
 ::-moz-selection{background: $c_colored; color: white; text-shadow: none;}
 ::selection {background: $c_colored; color: white; text-shadow: none;} 
@@ -55,27 +65,25 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
       }
     }
   }
-
   
-    dl {
-      dt, dd {
-        display: inline-block;
-        width: 50%;
-        padding: 5px;
+  dl {
+    dt, dd {
+      display: inline-block;
+      width: 50%;
+      padding: 5px;
 
-        &.odd {
-          background-color: $c_border;
-        }
-      }
-      dt {
-        font-weight: bold;
-        text-transform: uppercase;      
-      }
-      dd {
-        margin-left: -23px;
+      &.odd {
+        background-color: $c_border;
       }
     }
-  
+    dt {
+      font-weight: bold;
+      text-transform: uppercase;      
+    }
+    dd {
+      margin-left: -23px;
+    }
+  }
 
   /*--------------------------------------*/
   /* Headers
@@ -90,7 +98,6 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
   h5 { font-size: 16px; line-height: 26px; }
   h6 { font-size: 14px; line-height: 24px; }
 
-
   /*--------------------------------------*/
   /* Forms
   /*--------------------------------------*/
@@ -121,6 +128,13 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
   select {
     border: 1px solid $c_border;
     font-family: "Ubuntu", sans-serif;
+    background-image: url('select_arrow.gif');
+    background-repeat: no-repeat;
+    background-position: right center;
+
+    &:active, &:focus {
+      @extend input[type="text"]:focus  
+    }
   }
 
   label.error {
@@ -142,7 +156,6 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
     -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
      -khtml-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
        -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
-        -ms-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
          -o-box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
             box-shadow: inset 0 1px 0 rgba(255,255,255,0.4);
     -webkit-border-radius: 0px;
@@ -290,7 +303,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
             font-weight: bold;
             border-left: 1px solid $c_border;
             padding-left: 5px;
-            padding-bottom: 8px;
+            padding-bottom: 5px;
           }
         }
       }
@@ -386,7 +399,10 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
     margin-top: 15px;
 
     input[type="number"] {
-      width: 40px;
+      width: 60px;
+      vertical-align: middle;
+      padding: 5px;
+      height: 35px;
     }
   }
 
@@ -417,7 +433,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
         &.info {
           height: 35px;
           margin-top: 5px;
-          color: $c_gray1;
+          color: $c_gray;
           border-bottom: 1px solid $c_border;
         }
       }
@@ -534,7 +550,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
       font-weight: bold;
       text-transform: uppercase;
       padding: 5px 20px;
-      color: $c_gray1;
+      color: $c_gray;
 
       &.current-first, &.current {
         background-color: $c_colored;
@@ -638,7 +654,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
 
     table tfoot {
       text-align: right;
-      color: $c_gray1;
+      color: $c_gray;
 
       tr {
         border: none;
@@ -723,7 +739,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
     #subtotal {
       text-align: right;
       text-transform: uppercase;
-      margin-top: 10px;
+      margin-top: 15px;
 
       span.order-total {
         @extend span.price;
@@ -878,6 +894,33 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
       }
     }
 
+    table#cart-detail, table[data-hook="order_details"] {
+      tbody {
+        tr {
+          td[data-hook="cart_item_description"], td[data-hook="order_item_description"] {
+            font-size: 11px;
+            line-height: 15px;
+            width: 100px;
+
+            h4 {
+              font-size: 14px;
+              line-height: 17px;
+              margin-bottom: 10px;
+            }
+          }
+          td[data-hook="cart_item_price"], td[data-hook="cart_item_total"],
+          td[data-hook="order_item_price"], td[data-hook="order_item_total"]  {
+            font-size: 12px !important; 
+          }
+          td[data-hook="cart_item_image"], td[data-hook="order_item_image"] {
+            img {
+              width: 70px;
+            }
+          }
+        }
+      }  
+    }
+
   }
 
 
@@ -907,10 +950,10 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
       margin-top: 0;
     }
 
-    table#cart-detail {
+    table#cart-detail, table[data-hook="order_details"] {
       tbody {
         tr {
-          td[data-hook="cart_item_description"] {
+          td[data-hook="cart_item_description"], td[data-hook="order_item_description"] {
             padding: 0 !important;
             text-indent: -9999px;
 
@@ -918,7 +961,7 @@ mark {background-color: $c_colored; color: white; font-style: italic; font-weigh
               display: none;
             }
           }
-          td[data-hook="cart_item_image"] {
+          td[data-hook="cart_item_image"], td[data-hook="order_item_image"] {
             img {
               width: 70px;
             }

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

@@ -1,6 +1,7 @@
 /*
-* This is a manifest file that includes stylesheets for spree_core 
- *= require store/base
- *= require jquery.formalize.css
+* This is a manifest file that includes stylesheets for spree_core  
+ *= require html5reset
+ *= require skeleton
+ *= require jquery.formalize
  *= require store/screen 
-*/
+*/

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

@@ -1,6 +1,19 @@
 module Spree
   module Admin
     class TaxCategoriesController < ResourceController
+      def destroy
+        if @object.mark_deleted!
+          flash.notice = flash_message_for(@object, :successfully_removed)
+          respond_with(@object) do |format|
+            format.html { redirect_to collection_url }
+            format.js   { render :partial => "spree/admin/shared/destroy" }
+          end
+        else
+          respond_with(@object) do |format|
+            format.html { redirect_to collection_url }
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     class UsersController < ResourceController
+      rescue_from User::DestroyWithOrdersError, :with => :user_destroy_with_orders_error
+
       # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
       before_filter :check_json_authenticity, :only => :index
       before_filter :load_roles, :only => [:edit, :new, :update, :create]
@@ -16,6 +18,13 @@ module Spree
         end
       end
 
+      def dismiss_banner
+        if request.xhr? and params[:banner_id]
+          current_user.dismiss_banner(params[:banner_id])
+          render :nothing => true
+        end
+      end
+
       protected
       def collection
         return @collection if @collection.present?
@@ -48,6 +57,13 @@ module Spree
         end
 
       private
+
+        # handling raise from Admin::ResourceController#destroy
+        def user_destroy_with_orders_error
+          invoke_callbacks(:destroy, :fails)
+          render :status => :forbidden, :text => t(:error_user_destroy_with_orders)
+        end
+
         # Allow different formats of json data to suit different ajax calls
         def json_data
           json_format = params[:json_format] or 'default'

data/app/controllers/spree/products_controller.rb

@@ -7,7 +7,7 @@ module Spree
     respond_to :html
 
     def index
-      @searcher = Spree::Config.searcher_class.new(params)
+      @searcher = Config.searcher_class.new(params)
       @products = @searcher.retrieve_products
       respond_with(@products)
     end

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

@@ -64,6 +64,7 @@ module Spree
         options.reverse_merge! :title => t(:confirm_delete)
         options.reverse_merge! :dataType => 'script'
         options.reverse_merge! :success => "function(r){ $('##{dom_id resource}').fadeOut('hide'); }"
+        options.reverse_merge! :error => "function(jqXHR, textStatus, errorThrown){ show_flash_error(jqXHR.responseText); }"
         options.reverse_merge! :name => icon('delete') + ' ' + t(:delete)
 
         link_to_function_delete(options, html_options)
@@ -92,7 +93,8 @@ module Spree
             url: '#{options[:url]}',
             data: ({_method: 'delete', authenticity_token: AUTH_TOKEN}),
             dataType:'#{options[:dataType]}',
-            success: #{options[:success]}
+            success: #{options[:success]},
+            error: #{options[:error]}
           });
         }
       end

data/app/models/spree/payment_method.rb

@@ -3,6 +3,8 @@ module Spree
     DISPLAY =  [:both, :front_end, :back_end]
     default_scope where(:deleted_at => nil)
 
+    scope :production, where(:environment => 'production')
+
     def self.providers
       Rails.application.config.spree.payment_methods
     end

data/app/models/spree/preferences/preferable.rb

@@ -1,3 +1,8 @@
+# The preference_cache_key is used to determine if the preference
+# can be set. The default behavior is to return nil if there is no
+# id value. On ActiveRecords, new objects will have their preferences
+# saved to a pending hash until it is persisted.
+#
 # class_attributes are inheritied unless you reassign them in
 # the subclass, so when you inherit a Preferable class, the
 # inherited hook will assign a new hash for the subclass definitions
@@ -8,11 +13,19 @@ module Spree::Preferences::Preferable
   def self.included(base)
     base.class_eval do
       extend Spree::Preferences::PreferableClassMethods
+
+      if respond_to?(:after_create)
+        after_create do |obj|
+          obj.save_pending_preferences
+        end
+      end
+
       if respond_to?(:after_destroy)
         after_destroy do |obj|
           obj.clear_preferences
         end
       end
+
     end
   end
 
@@ -64,7 +77,15 @@ module Spree::Preferences::Preferable
   end
 
   def preference_cache_key(name)
-    [self.class.name, name, (try(:id) || :new)].join('::').underscore
+    return unless id
+    [self.class.name, name, id].join('::').underscore
+  end
+
+  def save_pending_preferences
+    return unless @pending_preferences
+    @pending_preferences.each do |name, value|
+      set_preference(name, value)
+    end
   end
 
   def clear_preferences
@@ -73,6 +94,16 @@ module Spree::Preferences::Preferable
 
   private
 
+  def add_pending_preference(name, value)
+    @pending_preferences ||= {}
+    @pending_preferences[name] = value
+  end
+
+  def get_pending_preference(name)
+    return unless @pending_preferences
+    @pending_preferences[name]
+  end
+
   def preference_store
     Spree::Preferences::Store.instance
   end

data/app/models/spree/preferences/preferable_class_methods.rb

@@ -7,11 +7,17 @@ module Spree::Preferences
       default = options[:default]
       description = options[:description] || name
 
+      # cache_key will be nil for new objects, then if we check if there
+      # is a pending preference before going to default
       define_method preference_getter_method(name) do
-        if preference_store.exist? preference_cache_key(name)
+        if preference_cache_key(name) && preference_store.exist?(preference_cache_key(name))
           preference_store.get preference_cache_key(name)
         else
-          send self.class.preference_default_getter_method(name)
+          if get_pending_preference(name)
+            get_pending_preference(name)
+          else
+            send self.class.preference_default_getter_method(name)
+          end
         end
       end
       alias_method prefers_getter_method(name), preference_getter_method(name)
@@ -20,9 +26,20 @@ module Spree::Preferences
         # Boolean attributes can come back from forms as '0' or '1'
         # Convert them to their correct values here
         if type == :boolean && !value.is_a?(TrueClass) && !value.is_a?(FalseClass)
-          value = value.to_i == 1
+          value = value.downcase if value.respond_to? :downcase
+          case value
+          when 0, '0', 'false', 'f', "", []
+            value = false
+          else
+            value = true
+          end
+        end
+
+        if preference_cache_key(name)
+          preference_store.set preference_cache_key(name), value
+        else
+          add_pending_preference(name, value)
         end
-        preference_store.set preference_cache_key(name), value
       end
       alias_method prefers_setter_method(name), preference_setter_method(name)
 

data/app/models/spree/product.rb

@@ -140,10 +140,11 @@ module Spree
       image_dup = lambda { |i| j = i.dup; j.attachment = i.attachment.clone; j }
       p.images = self.images.map { |i| image_dup.call i }
 
-      variant = self.master.dup
-      variant.sku = 'COPY OF ' + self.master.sku
+      master = Spree::Variant.find_by_product_id_and_is_master(self.id, true)
+      variant = master.dup
+      variant.sku = 'COPY OF ' + master.sku
       variant.deleted_at = nil
-      variant.images = self.master.images.map { |i| image_dup.call i }
+      variant.images = master.images.map { |i| image_dup.call i }
       p.master = variant
 
       if self.has_variants?

data/app/models/spree/tax_category.rb

@@ -1,11 +1,13 @@
 module Spree
   class TaxCategory < ActiveRecord::Base
-    validates :name, :presence => true, :uniqueness => true
+    validates :name, :presence => true, :uniqueness => { :scope => :deleted_at }
 
     has_many :tax_rates, :dependent => :destroy
 
     before_save :set_default_category
 
+    default_scope where(:deleted_at => nil)
+
     def set_default_category
       #set existing default tax category to false if this one has been marked as default
 
@@ -14,5 +16,9 @@ module Spree
       end
     end
 
+    def mark_deleted!
+      self.deleted_at = Time.now
+      self.save
+    end
   end
 end

data/app/models/spree/tax_rate.rb

@@ -35,7 +35,10 @@ module Spree
       category = TaxCategory.includes(:tax_rates).where(:is_default => true).first
       return 0 unless category
 
-      category.effective_amount || 0
+      address ||= Address.new(:country_id => Spree::Config[:default_country_id])
+      rate = category.tax_rates.detect { |rate| rate.zone.include? address }.try(:amount)
+
+      rate || 0
     end
 
     # Creates necessary tax adjustments for the order.

data/app/models/spree/user.rb

@@ -1,6 +1,8 @@
 # Default implementation of User.  This class is intended to be modified by extensions (ex. spree_auth)
 module Spree
   class User < ActiveRecord::Base
+    include Core::UserBanners
+
     has_many :orders
 
     belongs_to :ship_address, :foreign_key => 'ship_address_id', :class_name => 'Spree::Address'

data/app/views/spree/admin/banners/_gateway.html.erb

@@ -0,0 +1,14 @@
+<% if !current_user.dismissed_banner?(:gateway) &&
+      Spree::PaymentMethod.production.where("type != 'Spree::Gateway::Bogus'").empty?  %>
+
+  <div class="banner payment_banner">
+    <p class="message">
+      <%= t(:payment_processor_choose_banner_text)%>
+      <%= link_to t(:payment_processor_choose_link), "http://spreecommerce.com/products/gateway", :target => '_blank' %>
+    </p>
+
+    <%= link_to t(:dismiss_banner), dismiss_banner_admin_user_path(current_user, :banner_id => :gateway),
+                :remote => true, :method => :post, :class => 'dismiss' %>
+  </div>
+
+<% end %>