spree_core 2.2.0 → 2.2.1

data/lib/spree/core/importer/order.rb

@@ -0,0 +1,168 @@
+module Spree
+  module Core
+    module Importer
+      class Order
+
+        def self.import(user, params)
+          begin
+            ensure_country_id_from_params params[:ship_address_attributes]
+            ensure_state_id_from_params params[:ship_address_attributes]
+            ensure_country_id_from_params params[:bill_address_attributes]
+            ensure_state_id_from_params params[:bill_address_attributes]
+
+            order = Spree::Order.create!
+            order.associate_user!(user)
+
+            create_shipments_from_params(params.delete(:shipments_attributes), order)
+            create_line_items_from_params(params.delete(:line_items_attributes),order)
+            create_adjustments_from_params(params.delete(:adjustments_attributes), order)
+            create_payments_from_params(params.delete(:payments_attributes), order)
+
+            if(completed_at = params.delete(:completed_at))
+              order.completed_at = completed_at
+              order.state = 'complete'
+            end
+
+            order.update_attributes!(params)
+            order.reload
+          rescue Exception => e
+            order.destroy if order && order.persisted?
+            raise e.message
+          end
+        end
+
+        def self.create_shipments_from_params(shipments_hash, order)
+          return [] unless shipments_hash
+          shipments_hash.each do |s|
+            begin
+              shipment = order.shipments.build
+              shipment.tracking = s[:tracking]
+              shipment.stock_location = Spree::StockLocation.find_by_name!(s[:stock_location])
+
+              inventory_units = s[:inventory_units] || []
+              inventory_units.each do |iu|
+                ensure_variant_id_from_params(iu)
+
+                unit = shipment.inventory_units.build
+                unit.order = order
+                unit.variant_id = iu[:variant_id]
+              end
+
+              shipment.save!
+
+              shipping_method = Spree::ShippingMethod.find_by_name!(s[:shipping_method])
+              shipment.shipping_rates.create!(:shipping_method => shipping_method,
+                                              :cost => s[:cost])
+            rescue Exception => e
+              raise "Order import shipments: #{e.message} #{s}"
+            end
+          end
+        end
+
+        def self.create_line_items_from_params(line_items_hash, order)
+          return {} unless line_items_hash
+          line_items_hash.each_key do |k|
+            begin
+              line_item = line_items_hash[k]
+              ensure_variant_id_from_params(line_item)
+
+              extra_params = line_item.except(:variant_id, :quantity)
+              line_item = order.contents.add(Spree::Variant.find(line_item[:variant_id]), line_item[:quantity])
+              line_item.update_attributes(extra_params) unless extra_params.empty?
+            rescue Exception => e
+              raise "Order import line items: #{e.message} #{line_item}"
+            end
+          end
+        end
+
+        def self.create_adjustments_from_params(adjustments, order)
+          return [] unless adjustments
+          adjustments.each do |a|
+            begin
+              adjustment = order.adjustments.build(:amount => a[:amount].to_f,
+                                                  :label => a[:label])
+              adjustment.save!
+              adjustment.close!
+            rescue Exception => e
+              raise "Order import adjustments: #{e.message} #{a}"
+            end
+          end
+        end
+
+        def self.create_payments_from_params(payments_hash, order)
+          return [] unless payments_hash
+          payments_hash.each do |p|
+            begin
+              payment = order.payments.build
+              payment.amount = p[:amount].to_f
+              payment.state = p.fetch(:state, 'completed')
+              payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
+              payment.save!
+            rescue Exception => e
+              raise "Order import payments: #{e.message} #{p}"
+            end
+          end
+        end
+
+        def self.ensure_variant_id_from_params(hash)
+          begin
+            unless hash[:variant_id].present?
+              hash[:variant_id] = Spree::Variant.active.find_by_sku!(hash[:sku]).id
+              hash.delete(:sku)
+            end
+          rescue Exception => e
+            raise "Ensure order import variant: #{e.message} #{hash}"
+          end
+        end
+
+        def self.ensure_country_id_from_params(address)
+          return if address.nil? or address[:country_id].present? or address[:country].nil?
+
+          begin
+            search = {}
+            if name = address[:country]['name']
+              search[:name] = name
+            elsif iso_name = address[:country]['iso_name']
+              search[:iso_name] = iso_name.upcase
+            elsif iso = address[:country]['iso']
+              search[:iso] = iso.upcase
+            elsif iso3 = address[:country]['iso3']
+              search[:iso3] = iso3.upcase
+            end
+
+            address.delete(:country)
+            address[:country_id] = Spree::Country.where(search).first!.id
+
+          rescue Exception => e
+            raise "Ensure order import address country: #{e.message} #{search}"
+          end
+        end
+
+        def self.ensure_state_id_from_params(address)
+          return if address.nil? or address[:state_id].present? or address[:state].nil?
+
+          begin
+            search = {}
+            if name = address[:state]['name']
+              search[:name] = name
+            elsif abbr = address[:state]['abbr']
+              search[:abbr] = abbr.upcase
+            end
+
+            address.delete(:state)
+            search[:country_id] = address[:country_id]
+
+            if state = Spree::State.where(search).first
+              address[:state_id] = state.id
+            else
+              address[:state_name] = search[:name] || search[:abbr]
+            end
+          rescue Exception => e
+            raise "Ensure order import address state: #{e.message} #{search}"
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/spree/core/importer.rb

@@ -0,0 +1,8 @@
+module Spree
+  module Core
+    module Importer
+    end
+  end
+end
+
+require 'spree/core/importer/order'

data/lib/spree/core/product_duplicator.rb

@@ -48,7 +48,7 @@ module Spree
       new_variant = variant.dup
       new_variant.sku = "COPY OF #{new_variant.sku}"
       new_variant.deleted_at = nil
-      new_variant.option_values = variant.option_values.map { |option_value| option_value.dup}
+      new_variant.option_values = variant.option_values.map { |option_value| option_value}
       new_variant
     end
 

data/lib/spree/core/user_address.rb

@@ -10,6 +10,8 @@ module Spree
         belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
         alias_attribute :shipping_address, :ship_address
 
+        accepts_nested_attributes_for :ship_address, :bill_address
+
         def persist_order_address(order)
           b_address = self.bill_address || self.build_bill_address
           b_address.attributes = order.bill_address.attributes.except('id', 'updated_at', 'created_at')

data/lib/spree/core/user_payment_source.rb

@@ -0,0 +1,20 @@
+module Spree
+  module Core
+    module UserPaymentSource
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :credit_cards, class_name: "Spree::CreditCard", foreign_key: :user_id
+
+        def payment_sources
+          credit_cards.with_payment_profile
+        end
+
+        def drop_payment_source(source)
+          gateway = source.payment_method
+          gateway.disable_customer_profile(source)
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.2.0"
+    "2.2.1"
   end
 end

data/lib/spree/core.rb

@@ -41,6 +41,7 @@ module Spree
     autoload :ProductFilters, "spree/core/product_filters"
 
     class GatewayError < RuntimeError; end
+    class DestroyWithOrdersError < StandardError; end
   end
 end
 
@@ -61,6 +62,7 @@ require 'spree/money'
 
 require 'spree/permitted_attributes'
 require 'spree/core/user_address'
+require 'spree/core/user_payment_source'
 require 'spree/core/delegate_belongs_to'
 require 'spree/core/permalinks'
 require 'spree/core/token_resource'
@@ -70,3 +72,5 @@ require 'spree/core/controller_helpers'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/search'
+
+require 'spree/core/importer'

data/lib/spree/migrations.rb

@@ -30,7 +30,7 @@ module Spree
 
         unless (engine_migrations.sort - engine_in_app.sort).empty?
           puts "[#{engine_name.capitalize} WARNING] Missing migrations." \
-               "Run `bundle exec rake railties:install:migrations` to get them.\n\n"
+               " Run `bundle exec rake railties:install:migrations` to get them.\n\n"
           true
         end
       end

data/lib/spree/permitted_attributes.rb

@@ -69,7 +69,7 @@ module Spree
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id, 
-      :gateway_payment_profile_id, :last_digits, :name]
+      :gateway_payment_profile_id, :last_digits, :name, :encrypted_data]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
 

data/lib/spree/testing_support/capybara_ext.rb

@@ -103,12 +103,34 @@ module CapybaraExt
 
   def wait_for_ajax
     counter = 0
-    while page.evaluate_script("$.active").to_i > 0
+    while page.evaluate_script("typeof($) === 'undefined' || $.active > 0")
       counter += 1
       sleep(0.1)
       raise "AJAX request took longer than 5 seconds." if counter >= 50
     end
   end
+
+  def accept_alert
+    if page.driver === Capybara::Selenium::Driver
+      yield
+      page.driver.browser.switch_to.alert.accept
+    else
+      page.evaluate_script('window.confirm = function() { return true; }')
+      yield
+    end
+  end
+  def dismiss_alert
+    if page.driver === Capybara::Selenium::Driver
+      yield
+      page.driver.browser.switch_to.alert.dismiss
+    else
+      page.evaluate_script('window.confirm = function() { return false; }')
+      yield
+
+      # Restore existing default
+      page.evaluate_script('window.confirm = function() { return true; }')
+    end
+  end
 end
 
 Capybara.configure do |config|

data/lib/spree/testing_support/factories/credit_card_factory.rb

@@ -1,10 +1,5 @@
-# allows credit card info to be saved to the database which is needed for factories to work properly
-class TestCard < Spree::CreditCard
-  def remove_readonly_attributes(attributes) attributes; end
-end
-
 FactoryGirl.define do
-  factory :credit_card, class: TestCard do
+  factory :credit_card, class: Spree::CreditCard do
     verification_value 123
     month 12
     year { Time.now.year }

data/lib/spree/testing_support/factories/order_factory.rb

@@ -55,17 +55,17 @@ FactoryGirl.define do
             end
             order.reload
           end
-        end
-
-        factory :shipped_order do
-          after(:create) do |order|
-            order.shipments.each do |shipment|
-              shipment.inventory_units.each { |u| u.update_column('state', 'shipped') }
-              shipment.update_column('state', 'shipped')
+          factory :shipped_order do
+            after(:create) do |order|
+              order.shipments.each do |shipment|
+                shipment.inventory_units.each { |u| u.update_column('state', 'shipped') }
+                shipment.update_column('state', 'shipped')
+              end
+              order.reload
             end
-            order.reload
           end
         end
+
       end
     end
   end

data/lib/spree/testing_support/factories/shipping_method_factory.rb

@@ -4,7 +4,9 @@ FactoryGirl.define do
     name 'UPS Ground'
 
     before(:create) do |shipping_method, evaluator|
-      shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
+      if shipping_method.shipping_categories.empty?
+        shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
+      end
     end
 
     factory :shipping_method, class: Spree::ShippingMethod do

data/lib/spree/testing_support/factories/user_factory.rb

@@ -13,5 +13,10 @@ FactoryGirl.define do
     factory :admin_user do
       spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
     end
+
+    factory :user_with_addreses do
+      ship_address
+      bill_address
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -282,6 +282,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - app/assets/images/logo/spree_50.png
 - app/assets/images/noimage/large.png
 - app/assets/images/noimage/mini.png
@@ -299,6 +300,8 @@ files:
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
 - app/mailers/spree/test_mailer.rb
+- app/models/concerns/spree/user_api_authentication.rb
+- app/models/concerns/spree/user_reporting.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
 - app/models/spree/adjustment.rb
@@ -337,6 +340,7 @@ files:
 - app/models/spree/option_value.rb
 - app/models/spree/order.rb
 - app/models/spree/order/checkout.rb
+- app/models/spree/order/currency_updater.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_populator.rb
@@ -556,6 +560,7 @@ files:
 - db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb
 - db/migrate/20140213184916_add_more_indexes.rb
 - db/migrate/20140219060952_add_considered_risky_to_orders.rb
+- db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -590,6 +595,8 @@ files:
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
 - lib/spree/core/environment_extension.rb
+- lib/spree/core/importer.rb
+- lib/spree/core/importer/order.rb
 - lib/spree/core/mail_interceptor.rb
 - lib/spree/core/mail_method.rb
 - lib/spree/core/mail_settings.rb
@@ -600,6 +607,7 @@ files:
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_resource.rb
 - lib/spree/core/user_address.rb
+- lib/spree/core/user_payment_source.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
 - lib/spree/i18n.rb
@@ -707,7 +715,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.