spree_core 1.3.5 → 2.0.0.rc1

data/app/models/spree/zone.rb

@@ -1,21 +1,23 @@
 module Spree
   class Zone < ActiveRecord::Base
-    has_many :zone_members, :dependent => :destroy, :class_name => "Spree::ZoneMember"
-    has_many :tax_rates, :dependent => :destroy
-    has_many :shipping_methods, :dependent => :nullify
+    has_many :zone_members, dependent: :destroy, class_name: "Spree::ZoneMember"
+    has_many :tax_rates, dependent: :destroy
+    has_and_belongs_to_many :shipping_methods
 
-    validates :name, :presence => true, :uniqueness => true
+    validates :name, presence: true, uniqueness: true
     after_save :remove_defunct_members
     after_save :remove_previous_default
 
     alias :members :zone_members
-    accepts_nested_attributes_for :zone_members, :allow_destroy => true, :reject_if => proc { |a| a['zoneable_id'].blank? }
+    accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
-    attr_accessible :name, :description, :default_tax, :kind, :zone_members, :zone_members_attributes
+    attr_accessible :name, :description, :default_tax, :kind, :zone_members,
+                    :zone_members_attributes
 
     def kind
-      return nil if members.empty? || members.any? { |member| member.try(:zoneable_type).nil? }
-      members.last.zoneable_type.demodulize.downcase
+      if members.any? && !members.any? { |member| member.try(:zoneable_type).nil? }
+        members.last.zoneable_type.demodulize.downcase
+      end
     end
 
     def kind=(value)
@@ -25,7 +27,6 @@ module Spree
     def include?(address)
       return false unless address
 
-      # NOTE: This is complicated by the fact that include? for HMP is broken in Rails 2.1 (so we use awkward index method)
       members.any? do |zone_member|
         case zone_member.zoneable_type
         when 'Spree::Country'
@@ -41,7 +42,9 @@ module Spree
     # Returns the matching zone with the highest priority zone type (State, Country, Zone.)
     # Returns nil in the case of no matches.
     def self.match(address)
-      return unless matches = self.includes(:zone_members).order('zone_members_count', 'created_at').select { |zone| zone.include? address }
+      return unless matches = self.includes(:zone_members).
+        order('zone_members_count', 'created_at').
+        select { |zone| zone.include? address }
 
       ['state', 'country'].each do |zone_kind|
         if match = matches.detect { |zone| zone_kind == zone.kind }
@@ -53,15 +56,11 @@ module Spree
 
     # convenience method for returning the countries contained within a zone
     def country_list
-      @countries ||=
-      case kind
-      when 'country'
-        zoneables
-      when 'state'
-        zoneables.collect(&:country)
-      else
-        nil
-      end.flatten.compact.uniq
+      @countries ||= case kind
+                     when 'country' then zoneables
+                     when 'state' then zoneables.collect(&:country)
+                     else nil
+                     end.flatten.compact.uniq
     end
 
     def <=>(other)
@@ -75,7 +74,7 @@ module Spree
     end
 
     def self.default_tax
-      where(:default_tax => true).first
+      where(default_tax: true).first
     end
 
     # Indicates whether the specified zone falls entirely within the zone performing
@@ -85,13 +84,9 @@ module Spree
       return false if zone_members.empty? || target.zone_members.empty?
 
       if kind == target.kind
-        target.zoneables.each do |target_zoneable|
-          return false unless zoneables.include?(target_zoneable)
-        end
+        return false if target.zoneables.any? { |target_zoneable| zoneables.exclude?(target_zoneable) }
       else
-        target.zoneables.each do |target_state|
-          return false unless zoneables.include?(target_state.country)
-        end
+        return false if target.zoneables.any? { |target_state| zoneables.exclude?(target_state.country) }
       end
       true
     end
@@ -99,17 +94,13 @@ module Spree
     private
 
       def remove_defunct_members
-        zone_members.each do |zone_member|
-          zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{kind.capitalize}"
+        if zone_members.any?
+          zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.capitalize}").destroy_all
         end
       end
 
       def remove_previous_default
-        return unless default_tax
-
-        self.class.all.each do |zone|
-          zone.update_column 'default_tax', false unless zone == self
-        end
+        Spree::Zone.where('id != ?', self.id).update_all(default_tax: false) if default_tax
       end
   end
 end

data/app/models/spree/zone_member.rb

@@ -1,7 +1,7 @@
 module Spree
   class ZoneMember < ActiveRecord::Base
-    belongs_to :zone, :counter_cache => true
-    belongs_to :zoneable, :polymorphic => true
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true
+    belongs_to :zoneable, polymorphic: true
 
     attr_accessible :zone, :zone_id, :zoneable, :zoneable_id, :zoneable_type
 

data/app/views/spree/order_mailer/cancel_email.text.erb

@@ -1,16 +1,16 @@
-<%= t('order_mailer.cancel_email.dear_customer') %>
+<%= Spree.t('order_mailer.cancel_email.dear_customer') %>
 
-<%= t('order_mailer.cancel_email.instructions') %>
+<%= Spree.t('order_mailer.cancel_email.instructions') %>
 
 ============================================================
-<%= t('order_mailer.cancel_email.order_summary_canceled') %>
+<%= Spree.t('order_mailer.cancel_email.order_summary_canceled') %>
 ============================================================
 <% @order.line_items.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= t('order_mailer.cancel_email.subtotal', :subtotal => @order.display_item_total) %>
+<%= Spree.t('order_mailer.cancel_email.subtotal', :subtotal => @order.display_item_total) %>
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
-<%= t('order_mailer.cancel_email.total', :total => @order.display_total) %>
+<%= Spree.t('order_mailer.cancel_email.total', :total => @order.display_total) %>

data/app/views/spree/order_mailer/confirm_email.text.erb

@@ -1,20 +1,20 @@
-<%= t('order_mailer.confirm_email.dear_customer') %>
+<%= Spree.t('order_mailer.confirm_email.dear_customer') %>
 
-<%= t('order_mailer.confirm_email.instructions') %>
+<%= Spree.t('order_mailer.confirm_email.instructions') %>
 
 ============================================================
-<%= t('order_mailer.confirm_email.order_summary') %>
+<%= Spree.t('order_mailer.confirm_email.order_summary') %>
 ============================================================
 <% @order.line_items.each do |item| %>
   <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.single_money %> = <%= item.display_amount %>
 <% end %>
 ============================================================
-<%= t('order_mailer.confirm_email.subtotal', :subtotal => @order.display_item_total) %>
+<%= Spree.t('order_mailer.confirm_email.subtotal', :subtotal => @order.display_item_total) %>
 
 <% @order.adjustments.eligible.each do |adjustment| %>
   <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
 <% end %>
 
-<%= t('order_mailer.confirm_email.total', :total => @order.display_total) %>
+<%= Spree.t('order_mailer.confirm_email.total', :total => @order.display_total) %>
 
-<%= t('order_mailer.confirm_email.thanks') %>
+<%= Spree.t('order_mailer.confirm_email.thanks') %>

data/app/views/spree/payments/_payment.html.erb

@@ -4,7 +4,7 @@
     <% unless (cc_type = source.cc_type).blank? %>
       <%= image_tag "credit_cards/icons/#{cc_type}.png" %>
     <% end %>
-    <%= t(:ending_in) %> <%= source.last_digits %>
+    <%= Spree.t(:ending_in) %> <%= source.last_digits %>
   </span>
   <br />
   <span class="full-name">

data/app/views/spree/shared/_address.html.erb

@@ -0,0 +1,38 @@
+<div class="address vcard">
+  <div class="fn"><%= address.full_name %></div>
+  <% unless address.company.blank? %>
+    <div class="org">
+      <%= address.company %>
+    </div>
+  <% end %>
+  <div class="adr">
+    <div class="street-address">
+      <div class="street-address-line">
+        <%= address.address1 %>
+      </div>
+      <% unless address.address2.blank? %>
+        <div class="street-address-line">
+          <%= address.address2 %>
+        </div>
+      <% end %>
+    </div>
+    <div class="local">
+      <span class="locality"><%= address.city %></span>
+      <span class="region"><%= address.state_text %></span>
+      <span class="postal-code"><%= address.zipcode %></span>
+      <div class="country-name"><%= address.country.try(:name) %></div>
+    </div>
+  </div>
+  <% unless address.phone.blank? %>
+    <div class="tel">
+      <span class="type"><%= Spree.t(:phone) %></span>
+      <%= address.phone %>
+    </div>
+  <% end %>
+  <% unless address.alternative_phone.blank? %>
+    <div class="alternative-phone tel">
+      <span class="type"><%= Spree.t(:alternative_phone) %></span>
+      <%= address.alternative_phone %>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/shared/_error_messages.html.erb

@@ -1,7 +1,7 @@
 <% if target && target.errors.any? %>
   <div id="errorExplanation" class="errorExplanation" data-hook>
-    <h2><%= t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
-    <p><%= t(:there_were_problems_with_the_following_fields) %>:</p>
+    <h2><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</h2>
+    <p><%= Spree.t(:there_were_problems_with_the_following_fields) %>:</p>
      <ul>
      <% target.errors.full_messages.each do |msg| %>
        <li><%= msg %></li>

data/app/views/spree/shared/_routes.html.erb

@@ -0,0 +1,10 @@
+<script>
+  if (Spree === undefined) {
+    var Spree = {}
+  }
+  if (Spree.routes == undefined) {
+    Spree.routes = {}
+  }
+  Spree.routes.states_search = "<%= spree.api_states_path(:format => 'json') %>"
+</script>
+

data/app/views/spree/shipment_mailer/shipped_email.text.erb

@@ -1,15 +1,16 @@
-<%= t('shipment_mailer.shipped_email.dear_customer') %>
+<%= Spree.t('shipment_mailer.shipped_email.dear_customer') %>
 
-<%= t('shipment_mailer.shipped_email.instructions') %>
+<%= Spree.t('shipment_mailer.shipped_email.instructions') %>
 
 ============================================================
-<%= t('shipment_mailer.shipped_email.shipment_summary') %>
+<%= Spree.t('shipment_mailer.shipped_email.shipment_summary') %>
 ============================================================
 <% @shipment.manifest.each do |item| %>
   <%= item.variant.sku %> <%= item.variant.product.name %> <%= item.variant.options_text %>
 <% end %>
 ============================================================
 
-<%= t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking) if @shipment.tracking %>
+<%= Spree.t('shipment_mailer.shipped_email.track_information', :tracking => @shipment.tracking)     if @shipment.tracking %>
+<%= Spree.t('shipment_mailer.shipped_email.track_link',        :url      => @shipment.tracking_url) if @shipment.tracking_url %>
 
-<%= t('shipment_mailer.shipped_email.thanks') %>
+<%= Spree.t('shipment_mailer.shipped_email.thanks') %>