spree_core 2.1.12 → 2.2.0

data/app/models/spree/zone.rb

@@ -11,6 +11,25 @@ module Spree
     alias :members :zone_members
     accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |a| a['zoneable_id'].blank? }
 
+    def self.default_tax
+      where(default_tax: true).first
+    end
+  
+    # 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 }
+
+      ['state', 'country'].each do |zone_kind|
+        if match = matches.detect { |zone| zone_kind == zone.kind }
+          return match
+        end
+      end
+      matches.first
+    end
+
     def kind
       if members.any? && !members.any? { |member| member.try(:zoneable_type).nil? }
         members.last.zoneable_type.demodulize.underscore
@@ -36,21 +55,6 @@ module Spree
       end
     end
 
-    # 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 }
-
-      ['state', 'country'].each do |zone_kind|
-        if match = matches.detect { |zone| zone_kind == zone.kind }
-          return match
-        end
-      end
-      matches.first
-    end
-
     # convenience method for returning the countries contained within a zone
     def country_list
       @countries ||= case kind
@@ -67,12 +71,12 @@ module Spree
     # All zoneables belonging to the zone members.  Will be a collection of either
     # countries or states depending on the zone type.
     def zoneables
-      members.includes(:zoneable).collect(&:zoneable)
+      members.collect(&:zoneable)
     end
 
     def country_ids
       if kind == 'country'
-        members.pluck(:zoneable_id)
+        members.collect(&:zoneable_id)
       else
         []
       end
@@ -80,7 +84,7 @@ module Spree
 
     def state_ids
       if kind == 'state'
-        members.pluck(:zoneable_id)
+        members.collect(&:zoneable_id)
       else
         []
       end
@@ -106,10 +110,6 @@ module Spree
       end
     end
 
-    def self.default_tax
-      where(default_tax: true).first
-    end
-
     # Indicates whether the specified zone falls entirely within the zone performing
     # the check.
     def contains?(target)
@@ -117,9 +117,9 @@ module Spree
       return false if zone_members.empty? || target.zone_members.empty?
 
       if kind == target.kind
-        return false if (target.zoneables.collect(&:id) - zoneables.collect(&:id)).present?
+        return false if target.zoneables.any? { |target_zoneable| zoneables.exclude?(target_zoneable) }
       else
-        return false if (target.zoneables.collect(&:country).collect(&:id) - zoneables.collect(&:id)).present?
+        return false if target.zoneables.any? { |target_state| zoneables.exclude?(target_state.country) }
       end
       true
     end

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

@@ -6,5 +6,8 @@
     Spree.routes = {}
   }
   Spree.routes.states_search = "<%= spree.api_states_path(:format => 'json') %>"
+  Spree.routes.apply_coupon_code = function(order_id) {
+    return "<%= spree.api_orders_path %>/" + order_id + "/apply_coupon_code"
+  }
   Spree.routes.root = "<%= spree.root_url if spree.respond_to? :root_url %>"
 </script>

data/config/locales/en.yml

@@ -24,6 +24,7 @@ en:
         number: Number
         verification_value: Verification Value
         year: Year
+        name: Name
       spree/inventory_unit:
         state: State
       spree/line_item:
@@ -143,6 +144,12 @@ en:
       spree/line_item:
         one: Line Item
         other: Line Items
+      spree/option_type:
+        one: Option Type
+        other: Option Types
+      spree/option_value:
+        one: Option Value
+        other: Option Values
       spree/order:
         one: Order
         other: Orders
@@ -182,9 +189,6 @@ en:
       spree/state:
         one: State
         other: States
-      spree/stock_movement:
-        one: Stock Movement
-        other: Stock Movements
       spree/stock_location:
         one: Stock Location
         other: Stock Locations
@@ -225,7 +229,6 @@ en:
           attributes:
             base:
               card_expired: "Card has expired"
-              expiry_invalid: "Card expiration is invalid"
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -293,6 +296,7 @@ en:
     add: Add
     add_action_of_type: Add action of type
     add_country: Add Country
+    add_coupon_code: Add Coupon Code
     add_new_header: Add New Header
     add_new_style: Add New Style
     add_one: Add One
@@ -308,6 +312,7 @@ en:
     additional_item: Additional Item Cost
     address1: Address
     address2: Address (contd.)
+    adjustable: Adjustable
     adjustment: Adjustment
     adjustment_amount: Amount
     adjustment_successfully_closed: Adjustment has been successfully closed!
@@ -356,14 +361,12 @@ en:
     analytics_desc_list_4: It's completely free!
     analytics_trackers: Analytics Trackers
     and: and
+    approve: approve
+    approver: Approver
+    approved_at: Approved at
     are_you_sure: Are you sure?
     are_you_sure_delete: Are you sure you want to delete this record?
     associated_adjustment_closed: The associated adjustment is closed, and will not be recalculated. Do you want to open it?
-    attachment_default_style: Attachments Style
-    attachment_default_url: Attachments Default URL
-    attachment_path: Attachments Path
-    attachment_styles: Paperclip Styles
-    attachment_url: Attachments URL
     authorization_failure: Authorization Failure
     auto_capture: Auto Capture
     available_on: Available On
@@ -384,7 +387,6 @@ en:
     back_to_prototypes_list: Back To Prototypes List
     back_to_reports_list: Back To Reports List
     back_to_shipping_categories: Back To Shipping Categories
-    back_to_shipping_categories_list: Back To Shipping Categories List
     back_to_shipping_methods_list: Back To Shipping Methods List
     back_to_states_list: Back To States List
     back_to_stock_locations_list: Back to Stock Locations List
@@ -411,16 +413,21 @@ en:
     cannot_perform_operation: Cannot perform requested operation
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
     capture: Capture
+    capture_events: Capture events
     card_code: Card Code
     card_number: Card Number
     card_type: Brand
     card_type_is: Card type is
     cart: Cart
+    cart_subtotal:
+      one: 'Subtotal (1 item)'
+      other: 'Subtotal (%{count} items)'
     categories: Categories
     category: Category
     check_for_spree_alerts: Check for Spree alerts
     checkout: Checkout
     choose_a_customer: Choose a customer
+    choose_a_taxon_to_sort_products_for: "Choose a taxon to sort products for"
     choose_currency: Choose Currency
     choose_dashboard_locale: Choose Dashboard Locale
     city: City
@@ -432,7 +439,6 @@ en:
     complete: complete
     configuration: Configuration
     configurations: Configurations
-    configure_s3: Configure S3
     confirm: Confirm
     confirm_delete: Confirm Deletion
     confirm_password: Password Confirmation
@@ -570,15 +576,17 @@ en:
     fill_in_customer_info: Please fill in customer info
     filter_results: Filter Results
     finalize: Finalize
+    find_a_taxon: Find a Taxon
+    finalized: Finalized
     first_item: First Item Cost
     first_name: First Name
     first_name_begins_with: First Name Begins With
     flat_percent: Flat Percent
-    flat_rate_per_item: Flat Rate (per item)
-    flat_rate_per_order: Flat Rate (per order)
+    flat_rate_per_order: Flat Rate
     flexible_rate: Flexible Rate
     forgot_password: Forgot Password?
     free_shipping: Free Shipping
+    free_shipping_amount: "-"
     front_end: Front End
     gateway: Gateway
     gateway_config_unavailable: Gateway unavailable for environment
@@ -607,9 +615,6 @@ en:
       translations: Translations
     icon: Icon
     image: Image
-    image_settings: Image Settings
-    image_settings_updated: Image Settings successfully updated.
-    image_settings_warning: You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this.
     images: Images
     inactive: Inactive
     included_in_price: Included in Price
@@ -641,6 +646,7 @@ en:
     last_name: Last Name
     last_name_begins_with: Last Name Begins With
     learn_more: Learn More
+    line_item_adjustments: "Line item adjustments"
     list: List
     listing_countries: Listing Countries
     listing_orders: Listing Orders
@@ -690,6 +696,7 @@ en:
     my_account: My Account
     my_orders: My Orders
     name: Name
+    name_on_card: Name on card
     name_or_sku: Name or SKU (enter at least first 4 characters of product name)
     new: New
     new_adjustment: New Adjustment
@@ -731,6 +738,7 @@ en:
     no_rules_added: No rules added
     no_resource_found: ! 'No %{resource} found'
     no_shipping_methods_found: No shipping methods found
+    no_shipping_method_selected: No shipping method selected.
     no_trackers_found: No Trackers Found
     no_stock_locations_found: No stock locations found
     no_tracking_present: No tracking details provided.
@@ -761,6 +769,8 @@ en:
     or_over_price: ! '%{price} or over'
     order: Order
     order_adjustments: Order adjustments
+    order_approved: Order approved
+    order_canceled: Order canceled
     order_details: Order Details
     order_email_resent: Order Email Resent
     order_information: Order Information
@@ -787,11 +797,13 @@ en:
       selected_quantity_not_available: ! 'Selected quantity of %{item} is not available.'
       please_enter_reasonable_quantity: Please enter a reasonable quantity.
     order_processed_successfully: Your order has been processed successfully
+    order_resumed: Order resumed
     order_state:
       address: address
       awaiting_return: awaiting return
       canceled: canceled
       cart: cart
+      considered_risky: considered risky
       complete: complete
       confirm: confirm
       delivery: delivery
@@ -815,6 +827,7 @@ en:
     path: Path
     pay: pay
     payment: Payment
+    payment_could_not_be_created: Payment could not be created.
     payment_information: Payment Information
     payment_method: Payment Method
     payment_methods: Payment Methods
@@ -868,13 +881,16 @@ en:
     promotion_action_types:
       create_adjustment:
         description: Creates a promotion credit adjustment on the order
-        name: Create adjustment
+        name: Create whole-order adjustment
+      create_item_adjustments:
+        description: Creates a promotion credit adjustment on a line item
+        name: Create per-line-item adjustment
       create_line_items:
         description: Populates the cart with the specified quantity of variant
         name: Create line items
-      give_store_credit:
-        description: Gives the user store credit of the amount specified
-        name: Give store credit
+      free_shipping:
+        description: Makes all shipments for the order free
+        name: Free shipping
     promotion_actions: Actions
     promotion_form:
       match_policies:
@@ -901,6 +917,7 @@ en:
         description: Available only to logged in users
         name: User Logged In
     promotions: Promotions
+    promotion_uses: Promotion uses
     properties: Properties
     property: Property
     prototype: Prototype
@@ -944,11 +961,6 @@ en:
     rma_value: RMA Value
     roles: Roles
     rules: Rules
-    s3_access_key: Access Key
-    s3_bucket: Bucket
-    s3_headers: S3 Headers
-    s3_protocol: S3 Protocol
-    s3_secret: Secret Key
     sales_total: Sales Total
     sales_total_description: Sales Total For All Orders
     sales_totals: Sales Totals
@@ -974,6 +986,8 @@ en:
     ship_address: Ship Address
     ship_total: Ship Total
     shipment: Shipment
+    shipment_adjustments: "Shipment adjustments"
+    shipment_details: "From %{stock_location} via %{shipping_method}"
     shipment_inc_vat: Shipment including VAT
     shipment_mailer:
       shipped_email:
@@ -1005,6 +1019,7 @@ en:
     shipping_method: Shipping Method
     shipping_methods: Shipping Methods
     shipping_price_sack: Price sack
+    shipping_total: Shipping total
     shop_by_taxonomy: Shop by %{taxonomy}
     shopping_cart: Shopping Cart
     show: Show
@@ -1015,6 +1030,7 @@ en:
     site_name: Site Name
     site_url: Site URL
     sku: SKU
+    slug: Slug
     smtp: SMTP
     smtp_authentication_type: SMTP Authentication Type
     smtp_domain: SMTP Domain
@@ -1058,12 +1074,12 @@ en:
     successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
     successfully_updated: ! '%{resource} has been successfully updated!'
     tax: Tax
+    tax_included: "Tax (incl.)"
     tax_categories: Tax Categories
     tax_category: Tax Category
     tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations, (i.e. if the tax rate is 5% then enter 0.05)
     tax_rates: Tax Rates
     tax_settings: Tax Settings
-    tax_total: Tax Total
     taxon: Taxon
     taxon_edit: Edit Taxon
     taxon_placeholder: Add a Taxon

data/db/migrate/20130213191427_create_default_stock.rb

@@ -5,11 +5,11 @@ class CreateDefaultStock < ActiveRecord::Migration
     location = Spree::StockLocation.new(name: 'default')
     location.save(validate: false)
 
-    Spree::Variant.find_each do |variant|
+    Spree::Variant.all.each do |variant|
       stock_item = Spree::StockItem.unscoped.build(stock_location: location, variant: variant)
       stock_item.send(:count_on_hand=, variant.count_on_hand)
       # Avoid running default_scope defined by acts_as_paranoid, related to #3805,
-      # validations would run a query with a delete_at column that might not be present yet
+      # validations would run a query with a delete_at column tha might not be present yet
       stock_item.save! validate: false
     end
 
@@ -19,7 +19,7 @@ class CreateDefaultStock < ActiveRecord::Migration
   def down
     add_column :spree_variants, :count_on_hand, :integer
 
-    Spree::StockItem.find_each do |stock_item|
+    Spree::StockItem.all.each do |stock_item|
       stock_item.variant.update_column :count_on_hand, stock_item.count_on_hand
     end
 

data/db/migrate/20130413230529_add_name_to_spree_credit_cards.rb

@@ -0,0 +1,5 @@
+class AddNameToSpreeCreditCards < ActiveRecord::Migration
+  def change
+    add_column :spree_credit_cards, :name, :string
+  end
+end

data/db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb

@@ -0,0 +1,13 @@
+class UpdateNameFieldsOnSpreeCreditCards < ActiveRecord::Migration
+  def up
+    if ActiveRecord::Base.connection.adapter_name.downcase.include? "mysql"
+      execute "UPDATE spree_credit_cards SET name = CONCAT(first_name, ' ', last_name)"
+    else
+      execute "UPDATE spree_credit_cards SET name = first_name || ' ' || last_name"
+    end
+  end
+
+  def down
+    execute "UPDATE spree_credit_cards SET name = NULL"
+  end
+end

data/db/migrate/20130417120035_update_adjustment_states.rb

@@ -1,10 +1,10 @@
 class UpdateAdjustmentStates < ActiveRecord::Migration
   def up
-    Spree::Order.complete.find_each do |order|
+    Spree::Order.complete.each do |order|
       order.adjustments.update_all(:state => 'closed')
     end
 
-    Spree::Shipment.shipped.includes(:adjustment).find_each do |shipment|
+    Spree::Shipment.shipped.each do |shipment|
       shipment.adjustment.update_column(:state, 'finalized') if shipment.adjustment
     end
 

data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb

@@ -1,6 +1,6 @@
 class AddShippingRatesToShipments < ActiveRecord::Migration
   def up
-    Spree::Shipment.find_each do |shipment|
+    Spree::Shipment.all.each do |shipment|
       shipment.shipping_rates.create(:shipping_method_id => shipment.shipping_method_id,
                                      :cost => shipment.cost,
                                      :selected => true)

data/db/migrate/20130509115210_add_number_to_stock_transfer.rb

@@ -6,7 +6,7 @@ class AddNumberToStockTransfer < ActiveRecord::Migration
     rename_column :spree_stock_transfers, :reference_number, :reference
     add_column :spree_stock_transfers, :number, :string
 
-    Spree::StockTransfer.find_each do |transfer|
+    Spree::StockTransfer.all.each do |transfer|
       transfer.send(:generate_stock_transfer_number)
       transfer.save!
     end

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -1,10 +1,5 @@
 class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
   def change
     rename_table :shipping_methods_zones, :spree_shipping_methods_zones
-    # If Spree::ShippingMethod zones association was patched in
-    # CreateShippingMethodZone migrations, it needs to be patched back
-    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
-                                                          :class_name => 'Spree::Zone',
-                                                          :foreign_key => 'shipping_method_id'
   end
 end