spree_core 3.0.10 → 3.1.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree.js.coffee.erb +12 -3
- data/app/helpers/spree/base_helper.rb +4 -1
- data/app/helpers/spree/products_helper.rb +37 -6
- data/app/mailers/spree/base_mailer.rb +11 -2
- data/app/models/concerns/spree/adjustment_source.rb +3 -10
- data/app/models/concerns/spree/default_price.rb +7 -1
- data/app/models/concerns/spree/named_type.rb +1 -1
- data/app/models/concerns/spree/user_api_authentication.rb +7 -1
- data/app/models/concerns/spree/user_methods.rb +47 -0
- data/app/models/concerns/spree/user_reporting.rb +2 -2
- data/app/models/concerns/spree/vat_price_calculation.rb +47 -0
- data/app/models/spree/address.rb +8 -7
- data/app/models/spree/adjustable/adjuster/base.rb +25 -0
- data/app/models/spree/adjustable/adjuster/promotion.rb +41 -0
- data/app/models/spree/adjustable/adjuster/tax.rb +26 -0
- data/app/models/spree/adjustable/adjustments_updater.rb +22 -45
- data/app/models/spree/adjustment.rb +8 -10
- data/app/models/spree/app_configuration.rb +5 -2
- data/app/models/spree/base.rb +4 -0
- data/app/models/spree/calculator.rb +0 -5
- data/app/models/spree/calculator/default_tax.rb +2 -10
- data/app/models/spree/classification.rb +7 -3
- data/app/models/spree/country.rb +14 -3
- data/app/models/spree/credit_card.rb +21 -31
- data/app/models/spree/customer_return.rb +7 -15
- data/app/models/spree/gateway.rb +7 -6
- data/app/models/spree/image.rb +1 -1
- data/app/models/spree/inventory_unit.rb +9 -6
- data/app/models/spree/legacy_user.rb +1 -6
- data/app/models/spree/line_item.rb +69 -68
- data/app/models/spree/log_entry.rb +1 -4
- data/app/models/spree/option_type.rb +15 -6
- data/app/models/spree/option_type_prototype.rb +9 -0
- data/app/models/spree/option_value.rb +11 -3
- data/app/models/spree/option_value_variant.rb +6 -0
- data/app/models/spree/order.rb +113 -64
- data/app/models/spree/order/checkout.rb +8 -11
- data/app/models/spree/order/currency_updater.rb +1 -1
- data/app/models/spree/order/store_credit.rb +96 -0
- data/app/models/spree/order_contents.rb +6 -1
- data/app/models/spree/order_inventory.rb +4 -8
- data/app/models/spree/order_promotion.rb +6 -0
- data/app/models/spree/order_updater.rb +2 -7
- data/app/models/spree/payment.rb +46 -19
- data/app/models/spree/payment/gateway_options.rb +8 -4
- data/app/models/spree/payment_method.rb +12 -13
- data/app/models/spree/payment_method/store_credit.rb +130 -0
- data/app/models/spree/preference.rb +1 -1
- data/app/models/spree/price.rb +16 -6
- data/app/models/spree/product.rb +52 -49
- data/app/models/spree/product/scopes.rb +7 -2
- data/app/models/spree/product_option_type.rb +7 -2
- data/app/models/spree/product_promotion_rule.rb +9 -0
- data/app/models/spree/product_property.rb +8 -10
- data/app/models/spree/promotion.rb +19 -19
- data/app/models/spree/promotion/rules/product.rb +3 -1
- data/app/models/spree/promotion/rules/taxon.rb +2 -1
- data/app/models/spree/promotion/rules/user.rb +4 -4
- data/app/models/spree/promotion_action.rb +3 -3
- data/app/models/spree/promotion_category.rb +1 -1
- data/app/models/spree/promotion_rule_taxon.rb +9 -0
- data/app/models/spree/promotion_rule_user.rb +9 -0
- data/app/models/spree/property.rb +2 -1
- data/app/models/spree/property_prototype.rb +9 -0
- data/app/models/spree/prototype.rb +8 -3
- data/app/models/spree/prototype_taxon.rb +9 -0
- data/app/models/spree/refund.rb +10 -7
- data/app/models/spree/refund_reason.rb +1 -1
- data/app/models/spree/reimbursement.rb +12 -16
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +23 -6
- data/app/models/spree/reimbursement_type/store_credit.rb +28 -0
- data/app/models/spree/return_authorization.rb +8 -13
- data/app/models/spree/return_authorization_reason.rb +1 -1
- data/app/models/spree/return_item.rb +13 -12
- data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +1 -1
- data/app/models/spree/role.rb +3 -2
- data/app/models/spree/role_user.rb +6 -0
- data/app/models/spree/shipment.rb +18 -23
- data/app/models/spree/shipment_handler.rb +2 -2
- data/app/models/spree/shipping_category.rb +6 -3
- data/app/models/spree/shipping_method.rb +11 -10
- data/app/models/spree/shipping_method_zone.rb +6 -0
- data/app/models/spree/shipping_rate.rb +16 -29
- data/app/models/spree/state.rb +3 -2
- data/app/models/spree/state_change.rb +1 -1
- data/app/models/spree/stock/content_item.rb +10 -12
- data/app/models/spree/stock/coordinator.rb +13 -14
- data/app/models/spree/stock/estimator.rb +28 -30
- data/app/models/spree/stock/inventory_unit_builder.rb +1 -9
- data/app/models/spree/stock/packer.rb +1 -1
- data/app/models/spree/stock/quantifier.rb +5 -5
- data/app/models/spree/stock/splitter/backordered.rb +2 -2
- data/app/models/spree/stock_item.rb +12 -18
- data/app/models/spree/stock_location.rb +4 -7
- data/app/models/spree/stock_movement.rb +11 -9
- data/app/models/spree/stock_transfer.rb +11 -12
- data/app/models/spree/store.rb +14 -6
- data/app/models/spree/store_credit.rb +252 -0
- data/app/models/spree/store_credit_category.rb +22 -0
- data/app/models/spree/store_credit_event.rb +38 -0
- data/app/models/spree/store_credit_type.rb +6 -0
- data/app/models/spree/tax_category.rb +3 -8
- data/app/models/spree/tax_rate.rb +56 -122
- data/app/models/spree/taxon.rb +11 -5
- data/app/models/spree/tracker.rb +12 -1
- data/app/models/spree/validations/db_maximum_length_validator.rb +2 -1
- data/app/models/spree/variant.rb +82 -50
- data/app/models/spree/zone.rb +21 -17
- data/app/models/spree/zone_member.rb +6 -0
- data/app/validators/db_maximum_length_validator.rb +11 -0
- data/app/views/layouts/spree/base_mailer.html.erb +38 -781
- data/app/views/spree/order_mailer/_adjustment.html.erb +8 -0
- data/app/views/spree/order_mailer/_subtotal.html.erb +8 -0
- data/app/views/spree/order_mailer/_total.html.erb +8 -0
- data/app/views/spree/order_mailer/cancel_email.html.erb +13 -28
- data/app/views/spree/order_mailer/cancel_email.text.erb +1 -1
- data/app/views/spree/order_mailer/confirm_email.html.erb +49 -63
- data/app/views/spree/order_mailer/confirm_email.text.erb +1 -1
- data/app/views/spree/shared/_base_mailer_header.html.erb +5 -7
- data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +777 -0
- data/app/views/spree/shared/_error_messages.html.erb +1 -1
- data/app/views/spree/shared/_mailer_line_item.html.erb +12 -0
- data/app/views/spree/shipment_mailer/shipped_email.html.erb +21 -14
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +3 -3
- data/config/initializers/user_class_extensions.rb +7 -38
- data/config/locales/en.yml +113 -13
- data/config/routes.rb +7 -0
- data/db/default/spree/default_reimbursement_type.rb +1 -1
- data/db/default/spree/zones.rb +4 -5
- data/db/migrate/20150118210639_create_spree_store_credits.rb +24 -0
- data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +8 -0
- data/db/migrate/20150118212051_create_spree_store_credit_events.rb +17 -0
- data/db/migrate/20150118212101_create_spree_store_credit_types.rb +10 -0
- data/db/migrate/20150314013438_add_missing_indexes.rb +25 -0
- data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb +18 -0
- data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb +14 -0
- data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb +5 -0
- data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb +19 -0
- data/db/migrate/20150627090949_migrate_payment_methods_display.rb +12 -0
- data/db/migrate/20150714154102_spree_payment_method_store_credits.rb +12 -0
- data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb +18 -0
- data/db/migrate/20150727191614_spree_store_credit_types.rb +11 -0
- data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb +68 -0
- data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb +13 -0
- data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb +16 -0
- data/db/migrate/20160219165458_add_indexes.rb +14 -0
- data/lib/generators/spree/dummy/templates/rails/database.yml +31 -24
- data/lib/generators/spree/dummy/templates/rails/test.rb +2 -1
- data/lib/spree/core.rb +16 -0
- data/lib/spree/core/controller_helpers/auth.rb +1 -1
- data/lib/spree/core/controller_helpers/common.rb +3 -3
- data/lib/spree/core/controller_helpers/order.rb +6 -5
- data/lib/spree/core/controller_helpers/search.rb +1 -1
- data/lib/spree/core/controller_helpers/store.rb +29 -0
- data/lib/spree/core/delegate_belongs_to.rb +2 -2
- data/lib/spree/core/engine.rb +30 -25
- data/lib/spree/core/environment.rb +1 -1
- data/lib/spree/core/importer/order.rb +37 -40
- data/lib/spree/core/number_generator.rb +52 -0
- data/lib/spree/core/product_filters.rb +1 -1
- data/lib/spree/core/search/base.rb +4 -3
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/localized_number.rb +3 -1
- data/lib/spree/permitted_attributes.rb +5 -2
- data/lib/spree/testing_support/common_rake.rb +3 -3
- data/lib/spree/testing_support/factories.rb +3 -3
- data/lib/spree/testing_support/factories/address_factory.rb +1 -1
- data/lib/spree/testing_support/factories/country_factory.rb +2 -2
- data/lib/spree/testing_support/factories/order_factory.rb +2 -2
- data/lib/spree/testing_support/factories/payment_factory.rb +5 -0
- data/lib/spree/testing_support/factories/payment_method_factory.rb +8 -0
- data/lib/spree/testing_support/factories/promotion_rule_factory.rb +5 -0
- data/lib/spree/testing_support/factories/refund_factory.rb +9 -1
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +2 -0
- data/lib/spree/testing_support/factories/state_factory.rb +2 -2
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +9 -0
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +8 -0
- data/lib/spree/testing_support/factories/store_credit_factory.rb +17 -0
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +11 -0
- data/lib/spree/testing_support/factories/user_factory.rb +1 -1
- data/lib/spree/testing_support/factories/zone_member_factory.rb +6 -0
- data/lib/spree/testing_support/microdata.rb +189 -0
- data/lib/tasks/core.rake +68 -0
- data/lib/tasks/exchanges.rake +2 -2
- data/spec/fixtures/microdata.html +22 -0
- data/spec/fixtures/microdata_itemref.html +15 -0
- data/spec/fixtures/microdata_no_itemscope.html +20 -0
- data/spec/helpers/base_helper_spec.rb +64 -1
- data/spec/helpers/products_helper_spec.rb +75 -3
- data/spec/lib/i18n_spec.rb +2 -2
- data/spec/lib/search/base_spec.rb +2 -2
- data/spec/lib/spree/core/controller_helpers/auth_spec.rb +4 -2
- data/spec/lib/spree/core/controller_helpers/store_spec.rb +56 -0
- data/spec/lib/spree/core/importer/order_spec.rb +226 -123
- data/spec/lib/spree/core/number_generator_spec.rb +175 -0
- data/spec/lib/spree/core_spec.rb +23 -0
- data/spec/lib/spree/localized_number_spec.rb +10 -0
- data/spec/mailers/order_mailer_spec.rb +11 -13
- data/spec/mailers/shipment_mailer_spec.rb +26 -8
- data/spec/mailers/test_mailer_spec.rb +15 -1
- data/spec/models/option_type_prototype_spec.rb +9 -0
- data/spec/models/spree/ability_spec.rb +6 -13
- data/spec/models/spree/address_spec.rb +1 -1
- data/spec/models/spree/adjustable/adjuster/base_spec.rb +10 -0
- data/spec/models/spree/adjustable/adjuster/promotion_spec.rb +211 -0
- data/spec/models/spree/adjustable/adjuster/tax_spec.rb +86 -0
- data/spec/models/spree/adjustable/adjustments_updater_spec.rb +2 -262
- data/spec/models/spree/adjustment_spec.rb +27 -1
- data/spec/models/spree/app_configuration_spec.rb +5 -2
- data/spec/models/spree/calculator/default_tax_spec.rb +39 -14
- data/spec/models/spree/concerns/user_methods_spec.rb +55 -0
- data/spec/models/spree/concerns/vat_price_calculation_spec.rb +66 -0
- data/spec/models/spree/country_spec.rb +45 -8
- data/spec/models/spree/credit_card_spec.rb +8 -8
- data/spec/models/spree/customer_return_spec.rb +4 -26
- data/spec/models/spree/gateway_spec.rb +7 -0
- data/spec/models/spree/image_spec.rb +3 -0
- data/spec/models/spree/inventory_unit_spec.rb +1 -18
- data/spec/models/spree/line_item_spec.rb +78 -18
- data/spec/models/spree/option_type_spec.rb +2 -2
- data/spec/models/spree/option_value_spec.rb +8 -3
- data/spec/models/spree/order/checkout_spec.rb +49 -39
- data/spec/models/spree/order/currency_updater_spec.rb +3 -3
- data/spec/models/spree/order/finalizing_spec.rb +0 -3
- data/spec/models/spree/order/payment_spec.rb +1 -1
- data/spec/models/spree/order/state_machine_spec.rb +1 -6
- data/spec/models/spree/order/store_credit_spec.rb +423 -0
- data/spec/models/spree/order/updating_spec.rb +2 -2
- data/spec/models/spree/order_contents_spec.rb +42 -1
- data/spec/models/spree/order_inventory_spec.rb +27 -17
- data/spec/models/spree/order_spec.rb +65 -52
- data/spec/models/spree/payment/gateway_options_spec.rb +10 -2
- data/spec/models/spree/payment/store_credit_spec.rb +60 -0
- data/spec/models/spree/payment_method/store_credit_spec.rb +291 -0
- data/spec/models/spree/payment_method_spec.rb +22 -14
- data/spec/models/spree/payment_spec.rb +37 -44
- data/spec/models/spree/price_spec.rb +86 -0
- data/spec/models/spree/product/scopes_spec.rb +35 -0
- data/spec/models/spree/product_option_type_spec.rb +6 -2
- data/spec/models/spree/product_promotion_rule_spec.rb +9 -0
- data/spec/models/spree/product_property_spec.rb +11 -0
- data/spec/models/spree/product_spec.rb +82 -15
- data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/user_spec.rb +8 -0
- data/spec/models/spree/promotion_action_spec.rb +1 -1
- data/spec/models/spree/promotion_rule_spec.rb +1 -1
- data/spec/models/spree/promotion_rule_taxon_spec.rb +9 -0
- data/spec/models/spree/promotion_rule_user_spec.rb +9 -0
- data/spec/models/spree/promotion_spec.rb +57 -36
- data/spec/models/spree/property_prototype_spec.rb +9 -0
- data/spec/models/spree/prototype_taxon_spec.rb +9 -0
- data/spec/models/spree/refund_reason_spec.rb +7 -0
- data/spec/models/spree/reimbursement_spec.rb +3 -30
- data/spec/models/spree/reimbursement_tax_calculator_spec.rb +17 -5
- data/spec/models/spree/reimbursement_type/store_credit_spec.rb +101 -0
- data/spec/models/spree/return_authorization_reason_spec.rb +7 -0
- data/spec/models/spree/return_authorization_spec.rb +2 -22
- data/spec/models/spree/return_item_spec.rb +50 -1
- data/spec/models/spree/returns_calculator_spec.rb +1 -1
- data/spec/models/spree/role_spec.rb +7 -0
- data/spec/models/spree/shipment_spec.rb +17 -17
- data/spec/models/spree/shipping_calculator_spec.rb +2 -2
- data/spec/models/spree/shipping_category_spec.rb +14 -0
- data/spec/models/spree/shipping_method_spec.rb +9 -2
- data/spec/models/spree/shipping_rate_spec.rb +40 -41
- data/spec/models/spree/state_spec.rb +12 -1
- data/spec/models/spree/stock/content_item_spec.rb +9 -0
- data/spec/models/spree/stock/estimator_spec.rb +56 -8
- data/spec/models/spree/stock/quantifier_spec.rb +61 -32
- data/spec/models/spree/stock_item_spec.rb +19 -1
- data/spec/models/spree/store_credit_event_spec.rb +101 -0
- data/spec/models/spree/store_credit_spec.rb +786 -0
- data/spec/models/spree/store_spec.rb +39 -11
- data/spec/models/spree/tax_category_spec.rb +6 -1
- data/spec/models/spree/tax_rate_spec.rb +204 -44
- data/spec/models/spree/user_spec.rb +105 -38
- data/spec/models/spree/variant_spec.rb +281 -9
- data/spec/models/spree/zone_member_spec.rb +38 -0
- data/spec/models/spree/zone_spec.rb +32 -8
- data/spec/spec_helper.rb +3 -0
- data/spec/support/concerns/{adjustment_source_spec.rb → adjustment_source.rb} +0 -0
- data/spec/support/concerns/{default_price_spec.rb → default_price.rb} +9 -0
- data/spec/validators/db_maximum_length_validator_spec.rb +22 -0
- data/spree_core.gemspec +5 -6
- metadata +99 -36
- data/CHANGELOG.md +0 -4
- data/app/models/concerns/spree/number_generator.rb +0 -39
- data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +0 -24
@@ -3,40 +3,45 @@ require 'spec_helper'
|
|
3
3
|
module Spree
|
4
4
|
module Core
|
5
5
|
describe Importer::Order do
|
6
|
-
|
7
6
|
let!(:country) { create(:country) }
|
8
|
-
let!(:state) { country.states.first || create(:state, :
|
7
|
+
let!(:state) { country.states.first || create(:state, country: country) }
|
9
8
|
let!(:stock_location) { create(:stock_location, admin_name: 'Admin Name') }
|
10
9
|
|
11
|
-
let(:user) { stub_model(LegacyUser, :
|
10
|
+
let(:user) { stub_model(LegacyUser, email: 'fox@mudler.com') }
|
12
11
|
let(:shipping_method) { create(:shipping_method) }
|
13
12
|
let(:payment_method) { create(:check_payment_method) }
|
14
13
|
|
15
|
-
let(:product)
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
14
|
+
let(:product) do
|
15
|
+
product = Spree::Product.create(name: 'Test',
|
16
|
+
sku: 'TEST-1',
|
17
|
+
price: 33.22, available_on: Time.current - 1.day)
|
18
|
+
product.shipping_category = create(:shipping_category)
|
19
|
+
product.save
|
20
|
+
product
|
21
|
+
end
|
21
22
|
|
22
|
-
let(:variant)
|
23
|
-
|
24
|
-
|
23
|
+
let(:variant) do
|
24
|
+
variant = product.master
|
25
|
+
variant.stock_items.each { |si| si.update_attribute(:count_on_hand, 10) }
|
26
|
+
variant
|
27
|
+
end
|
25
28
|
|
26
29
|
let(:sku) { variant.sku }
|
27
30
|
let(:variant_id) { variant.id }
|
28
31
|
|
29
32
|
let(:line_items) { [{ variant_id: variant.id, quantity: 5 }] }
|
30
|
-
let(:ship_address)
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
33
|
+
let(:ship_address) do
|
34
|
+
{
|
35
|
+
address1: '123 Testable Way',
|
36
|
+
firstname: 'Fox',
|
37
|
+
lastname: 'Mulder',
|
38
|
+
city: 'Washington',
|
39
|
+
country_id: country.id,
|
40
|
+
state_id: state.id,
|
41
|
+
zipcode: '66666',
|
42
|
+
phone: '666-666-6666'
|
43
|
+
}
|
44
|
+
end
|
40
45
|
|
41
46
|
it 'can import an order number' do
|
42
47
|
params = { number: '123-456-789' }
|
@@ -45,9 +50,11 @@ module Spree
|
|
45
50
|
end
|
46
51
|
|
47
52
|
it 'optionally add completed at' do
|
48
|
-
params = {
|
49
|
-
|
50
|
-
|
53
|
+
params = {
|
54
|
+
email: 'test@test.com',
|
55
|
+
completed_at: Time.current,
|
56
|
+
line_items_attributes: line_items
|
57
|
+
}
|
51
58
|
|
52
59
|
order = Importer::Order.import(user, params)
|
53
60
|
expect(order).to be_completed
|
@@ -61,15 +68,15 @@ module Spree
|
|
61
68
|
end
|
62
69
|
|
63
70
|
context "assigning a user to an order" do
|
64
|
-
let(:other_user) { stub_model(LegacyUser, :
|
71
|
+
let(:other_user) { stub_model(LegacyUser, email: 'dana@scully.com') }
|
65
72
|
|
66
73
|
context "as an admin" do
|
67
|
-
before { allow(user).to receive_messages
|
74
|
+
before { allow(user).to receive_messages has_spree_role?: true }
|
68
75
|
|
69
76
|
context "a user's id is not provided" do
|
70
77
|
# this is a regression spec for an issue we ran into at Bonobos
|
71
78
|
it "doesn't unassociate the admin from the order" do
|
72
|
-
params = {
|
79
|
+
params = {}
|
73
80
|
order = Importer::Order.import(user, params)
|
74
81
|
expect(order.user_id).to eq(user.id)
|
75
82
|
end
|
@@ -77,7 +84,7 @@ module Spree
|
|
77
84
|
end
|
78
85
|
|
79
86
|
context "as a user" do
|
80
|
-
before { allow(user).to receive_messages
|
87
|
+
before { allow(user).to receive_messages has_spree_role?: false }
|
81
88
|
it "does not assign the order to the other user" do
|
82
89
|
params = { user_id: other_user.id }
|
83
90
|
order = Importer::Order.import(user, params)
|
@@ -87,9 +94,10 @@ module Spree
|
|
87
94
|
end
|
88
95
|
|
89
96
|
it 'can build an order from API with just line items' do
|
90
|
-
params = { :
|
97
|
+
params = { line_items_attributes: line_items }
|
91
98
|
|
92
|
-
expect(Importer::Order).to receive(:ensure_variant_id_from_params).and_return(
|
99
|
+
expect(Importer::Order).to receive(:ensure_variant_id_from_params).and_return(variant_id: variant.id,
|
100
|
+
quantity: 5)
|
93
101
|
order = Importer::Order.import(user, params)
|
94
102
|
expect(order.user).to eq(nil)
|
95
103
|
line_item = order.line_items.first
|
@@ -101,18 +109,14 @@ module Spree
|
|
101
109
|
line_items.first[:variant_id] = 'XXX'
|
102
110
|
params = { line_items_attributes: line_items }
|
103
111
|
|
104
|
-
expect {
|
105
|
-
Importer::Order.import(user, params)
|
106
|
-
}.to raise_error /XXX/
|
112
|
+
expect { Importer::Order.import(user, params) }.to raise_error /XXX/
|
107
113
|
end
|
108
114
|
|
109
115
|
it 'handles line_item updating exceptions' do
|
110
116
|
line_items.first[:currency] = 'GBP'
|
111
117
|
params = { line_items_attributes: line_items }
|
112
118
|
|
113
|
-
expect {
|
114
|
-
Importer::Order.import(user, params)
|
115
|
-
}.to raise_error /Validation failed/
|
119
|
+
expect { Importer::Order.import(user, params) }.to raise_error /Validation failed/
|
116
120
|
end
|
117
121
|
|
118
122
|
it 'can build an order from API with variant sku' do
|
@@ -127,14 +131,14 @@ module Spree
|
|
127
131
|
|
128
132
|
it 'handles exceptions when sku is not found' do
|
129
133
|
params = { line_items_attributes: [{ sku: 'XXX', quantity: 5 }] }
|
130
|
-
expect {
|
131
|
-
Importer::Order.import(user, params)
|
132
|
-
}.to raise_error /XXX/
|
134
|
+
expect { Importer::Order.import(user, params) }.to raise_error /XXX/
|
133
135
|
end
|
134
136
|
|
135
137
|
it 'can build an order from API shipping address' do
|
136
|
-
params = {
|
137
|
-
|
138
|
+
params = {
|
139
|
+
ship_address_attributes: ship_address,
|
140
|
+
line_items_attributes: line_items
|
141
|
+
}
|
138
142
|
|
139
143
|
order = Importer::Order.import(user, params)
|
140
144
|
expect(order.ship_address.address1).to eq '123 Testable Way'
|
@@ -143,8 +147,10 @@ module Spree
|
|
143
147
|
it 'can build an order from API with country attributes' do
|
144
148
|
ship_address.delete(:country_id)
|
145
149
|
ship_address[:country] = { 'iso' => 'US' }
|
146
|
-
params = {
|
147
|
-
|
150
|
+
params = {
|
151
|
+
ship_address_attributes: ship_address,
|
152
|
+
line_items_attributes: line_items
|
153
|
+
}
|
148
154
|
|
149
155
|
order = Importer::Order.import(user, params)
|
150
156
|
expect(order.ship_address.country.iso).to eq 'US'
|
@@ -153,12 +159,12 @@ module Spree
|
|
153
159
|
it 'handles country lookup exceptions' do
|
154
160
|
ship_address.delete(:country_id)
|
155
161
|
ship_address[:country] = { 'iso' => 'XXX' }
|
156
|
-
params = {
|
157
|
-
|
162
|
+
params = {
|
163
|
+
ship_address_attributes: ship_address,
|
164
|
+
line_items_attributes: line_items
|
165
|
+
}
|
158
166
|
|
159
|
-
expect {
|
160
|
-
Importer::Order.import(user, params)
|
161
|
-
}.to raise_error /XXX/
|
167
|
+
expect { Importer::Order.import(user, params) }.to raise_error /XXX/
|
162
168
|
end
|
163
169
|
|
164
170
|
it 'can build an order from API with state attributes' do
|
@@ -170,16 +176,14 @@ module Spree
|
|
170
176
|
}
|
171
177
|
|
172
178
|
order = Importer::Order.import(user, params)
|
173
|
-
expect(order.ship_address.state.name).to eq
|
179
|
+
expect(order.ship_address.state.name).to eq state.name
|
174
180
|
end
|
175
181
|
|
176
182
|
context "with a different currency" do
|
177
183
|
before { variant.price_in("GBP").update_attribute(:price, 18.99) }
|
178
184
|
|
179
185
|
it "sets the order currency" do
|
180
|
-
params = {
|
181
|
-
currency: "GBP"
|
182
|
-
}
|
186
|
+
params = { currency: "GBP" }
|
183
187
|
order = Importer::Order.import(user, params)
|
184
188
|
expect(order.currency).to eq "GBP"
|
185
189
|
end
|
@@ -221,8 +225,10 @@ module Spree
|
|
221
225
|
it 'sets state name if state record not found' do
|
222
226
|
ship_address.delete(:state_id)
|
223
227
|
ship_address[:state] = { 'name' => 'XXX' }
|
224
|
-
params = {
|
225
|
-
|
228
|
+
params = {
|
229
|
+
ship_address_attributes: ship_address,
|
230
|
+
line_items_attributes: line_items
|
231
|
+
}
|
226
232
|
|
227
233
|
order = Importer::Order.import(user, params)
|
228
234
|
expect(order.ship_address.state_name).to eq 'XXX'
|
@@ -240,9 +246,7 @@ module Spree
|
|
240
246
|
it 'raise error as variant shouldnt be found' do
|
241
247
|
variant.product.destroy
|
242
248
|
hash = { sku: variant.sku }
|
243
|
-
expect {
|
244
|
-
Importer::Order.ensure_variant_id_from_params(hash)
|
245
|
-
}.to raise_error
|
249
|
+
expect { Importer::Order.ensure_variant_id_from_params(hash) }.to raise_error("Ensure order import variant: Variant w/SKU #{ hash[:sku] } not found.")
|
246
250
|
end
|
247
251
|
end
|
248
252
|
|
@@ -256,9 +260,7 @@ module Spree
|
|
256
260
|
|
257
261
|
it "raises with proper message when cant find country" do
|
258
262
|
address = { country: { "name" => "NoNoCountry" } }
|
259
|
-
expect {
|
260
|
-
Importer::Order.ensure_country_id_from_params(address)
|
261
|
-
}.to raise_error /NoNoCountry/
|
263
|
+
expect { Importer::Order.ensure_country_id_from_params(address) }.to raise_error /NoNoCountry/
|
262
264
|
end
|
263
265
|
|
264
266
|
it 'ensures_state_id for state fields' do
|
@@ -294,7 +296,7 @@ module Spree
|
|
294
296
|
|
295
297
|
it 'ensures variant exists and is not deleted' do
|
296
298
|
expect(Importer::Order).to receive(:ensure_variant_id_from_params).exactly(6).times { line_items.first }
|
297
|
-
|
299
|
+
Importer::Order.import(user, params)
|
298
300
|
end
|
299
301
|
|
300
302
|
it 'builds them properly' do
|
@@ -328,9 +330,19 @@ module Spree
|
|
328
330
|
|
329
331
|
it "raises if cant find stock location" do
|
330
332
|
params[:shipments_attributes][0][:stock_location] = "doesnt exist"
|
331
|
-
expect {
|
332
|
-
|
333
|
-
|
333
|
+
expect { Importer::Order.import(user, params) }.to raise_error(StandardError)
|
334
|
+
end
|
335
|
+
|
336
|
+
context 'when a shipping adjustment is present' do
|
337
|
+
it 'creates the shipping adjustment' do
|
338
|
+
adjustment_attributes = [{ label: 'Shipping Discount', amount: -5.00 }]
|
339
|
+
params[:shipments_attributes][0][:adjustments_attributes] = adjustment_attributes
|
340
|
+
order = Importer::Order.import(user, params)
|
341
|
+
shipment = order.shipments.first
|
342
|
+
|
343
|
+
expect(shipment.adjustments.first.label).to eq('Shipping Discount')
|
344
|
+
expect(shipment.adjustments.first.amount).to eq(-5.00)
|
345
|
+
end
|
334
346
|
end
|
335
347
|
|
336
348
|
context 'when completed_at and shipped_at present' do
|
@@ -339,7 +351,8 @@ module Spree
|
|
339
351
|
completed_at: 2.days.ago,
|
340
352
|
line_items_attributes: line_items,
|
341
353
|
shipments_attributes: [
|
342
|
-
{
|
354
|
+
{
|
355
|
+
tracking: '123456789',
|
343
356
|
cost: '4.99',
|
344
357
|
shipped_at: 1.day.ago,
|
345
358
|
shipping_method: shipping_method.name,
|
@@ -370,18 +383,31 @@ module Spree
|
|
370
383
|
end
|
371
384
|
|
372
385
|
it 'handles shipment building exceptions' do
|
373
|
-
params = {
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
386
|
+
params = {
|
387
|
+
shipments_attributes: [
|
388
|
+
{
|
389
|
+
tracking: '123456789',
|
390
|
+
cost: '4.99',
|
391
|
+
shipping_method: 'XXX',
|
392
|
+
inventory_units: [{ sku: sku }]
|
393
|
+
}
|
394
|
+
]
|
395
|
+
}
|
378
396
|
expect { Importer::Order.import(user, params) }.to raise_error /XXX/
|
379
397
|
end
|
380
398
|
|
381
399
|
it 'adds adjustments' do
|
382
|
-
params = {
|
383
|
-
|
384
|
-
{
|
400
|
+
params = {
|
401
|
+
adjustments_attributes: [
|
402
|
+
{
|
403
|
+
label: 'Shipping Discount',
|
404
|
+
amount: -4.99
|
405
|
+
},
|
406
|
+
{
|
407
|
+
label: 'Promotion Discount',
|
408
|
+
amount: -3.00
|
409
|
+
}
|
410
|
+
]
|
385
411
|
}
|
386
412
|
|
387
413
|
order = Importer::Order.import(user, params)
|
@@ -390,6 +416,49 @@ module Spree
|
|
390
416
|
expect(order.adjustments.first.amount).to eq -4.99
|
391
417
|
end
|
392
418
|
|
419
|
+
it 'adds line item adjustments from promotion' do
|
420
|
+
line_items.first[:adjustments_attributes] = [
|
421
|
+
{
|
422
|
+
label: 'Line Item Discount',
|
423
|
+
amount: -4.99,
|
424
|
+
promotion: true
|
425
|
+
}
|
426
|
+
]
|
427
|
+
params = {
|
428
|
+
line_items_attributes: line_items,
|
429
|
+
adjustments_attributes: [
|
430
|
+
{ label: 'Order Discount', amount: -5.99 }
|
431
|
+
]
|
432
|
+
}
|
433
|
+
|
434
|
+
order = Importer::Order.import(user, params)
|
435
|
+
line_item_adjustment = order.line_item_adjustments.first
|
436
|
+
expect(line_item_adjustment.closed?).to be true
|
437
|
+
expect(line_item_adjustment.label).to eq 'Line Item Discount'
|
438
|
+
expect(line_item_adjustment.amount).to eq -4.99
|
439
|
+
expect(order.line_items.first.adjustment_total).to eq -4.99
|
440
|
+
end
|
441
|
+
|
442
|
+
it 'adds line item adjustments from taxation' do
|
443
|
+
line_items.first[:adjustments_attributes] = [
|
444
|
+
{ label: 'Line Item Tax', amount: -4.99, tax: true }
|
445
|
+
]
|
446
|
+
params = {
|
447
|
+
line_items_attributes: line_items,
|
448
|
+
adjustments_attributes: [
|
449
|
+
{ label: 'Order Discount', amount: -5.99 }
|
450
|
+
]
|
451
|
+
}
|
452
|
+
|
453
|
+
order = Importer::Order.import(user, params)
|
454
|
+
|
455
|
+
line_item_adjustment = order.line_item_adjustments.first
|
456
|
+
expect(line_item_adjustment.closed?).to be true
|
457
|
+
expect(line_item_adjustment.label).to eq 'Line Item Tax'
|
458
|
+
expect(line_item_adjustment.amount).to eq -4.99
|
459
|
+
expect(order.line_items.first.adjustment_total).to eq -4.99
|
460
|
+
end
|
461
|
+
|
393
462
|
it "calculates final order total correctly" do
|
394
463
|
params = {
|
395
464
|
adjustments_attributes: [
|
@@ -409,80 +478,115 @@ module Spree
|
|
409
478
|
end
|
410
479
|
|
411
480
|
it 'handles adjustment building exceptions' do
|
412
|
-
params = {
|
413
|
-
|
414
|
-
{
|
481
|
+
params = {
|
482
|
+
adjustments_attributes: [
|
483
|
+
{
|
484
|
+
amount: 'XXX'
|
485
|
+
},
|
486
|
+
{
|
487
|
+
label: 'Promotion Discount',
|
488
|
+
amount: '-3.00'
|
489
|
+
}
|
490
|
+
]
|
491
|
+
}
|
415
492
|
|
416
|
-
expect {
|
417
|
-
Importer::Order.import(user, params)
|
418
|
-
}.to raise_error /XXX/
|
493
|
+
expect { Importer::Order.import(user, params) }.to raise_error /XXX/
|
419
494
|
end
|
420
495
|
|
421
496
|
it 'builds a payment using state' do
|
422
|
-
params = {
|
423
|
-
|
424
|
-
|
497
|
+
params = {
|
498
|
+
payments_attributes: [
|
499
|
+
{
|
500
|
+
amount: '4.99',
|
501
|
+
payment_method: payment_method.name,
|
502
|
+
state: 'completed'
|
503
|
+
}
|
504
|
+
]
|
505
|
+
}
|
425
506
|
order = Importer::Order.import(user, params)
|
426
507
|
expect(order.payments.first.amount).to eq 4.99
|
427
508
|
end
|
428
509
|
|
429
510
|
it 'builds a payment using status as fallback' do
|
430
|
-
params = {
|
431
|
-
|
432
|
-
|
511
|
+
params = {
|
512
|
+
payments_attributes: [
|
513
|
+
{
|
514
|
+
amount: '4.99',
|
515
|
+
payment_method: payment_method.name,
|
516
|
+
status: 'completed'
|
517
|
+
}
|
518
|
+
]
|
519
|
+
}
|
433
520
|
order = Importer::Order.import(user, params)
|
434
521
|
expect(order.payments.first.amount).to eq 4.99
|
435
522
|
end
|
436
523
|
|
437
524
|
it 'handles payment building exceptions' do
|
438
|
-
params = {
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
525
|
+
params = {
|
526
|
+
payments_attributes: [
|
527
|
+
{
|
528
|
+
amount: '4.99',
|
529
|
+
payment_method: 'XXX'
|
530
|
+
}
|
531
|
+
]
|
532
|
+
}
|
533
|
+
expect { Importer::Order.import(user, params) }.to raise_error /XXX/
|
443
534
|
end
|
444
535
|
|
445
536
|
it 'build a source payment using years and month' do
|
446
|
-
params = {
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
537
|
+
params = {
|
538
|
+
payments_attributes: [
|
539
|
+
{
|
540
|
+
amount: '4.99',
|
541
|
+
payment_method: payment_method.name,
|
542
|
+
status: 'completed',
|
543
|
+
source: {
|
544
|
+
name: 'Fox',
|
545
|
+
last_digits: "7424",
|
546
|
+
cc_type: "visa",
|
547
|
+
year: '2022',
|
548
|
+
month: "5"
|
549
|
+
}
|
550
|
+
}
|
551
|
+
]
|
552
|
+
}
|
458
553
|
|
459
554
|
order = Importer::Order.import(user, params)
|
460
555
|
expect(order.payments.first.source.last_digits).to eq '7424'
|
461
556
|
end
|
462
557
|
|
463
558
|
it 'handles source building exceptions when do not have years and month' do
|
464
|
-
params = {
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
474
|
-
|
475
|
-
|
476
|
-
|
477
|
-
}
|
559
|
+
params = {
|
560
|
+
payments_attributes: [
|
561
|
+
{
|
562
|
+
amount: '4.99',
|
563
|
+
payment_method: payment_method.name,
|
564
|
+
status: 'completed',
|
565
|
+
source: {
|
566
|
+
name: 'Fox',
|
567
|
+
last_digits: "7424",
|
568
|
+
cc_type: "visa"
|
569
|
+
}
|
570
|
+
}
|
571
|
+
]
|
572
|
+
}
|
573
|
+
|
574
|
+
expect { Importer::Order.import(user, params) }.
|
575
|
+
to raise_error /Validation failed: Credit card Month is not a number, Credit card Year is not a number/
|
478
576
|
end
|
479
577
|
|
480
578
|
it 'builds a payment with an optional created_at' do
|
481
579
|
created_at = 2.days.ago
|
482
|
-
params = {
|
483
|
-
|
484
|
-
|
485
|
-
|
580
|
+
params = {
|
581
|
+
payments_attributes: [
|
582
|
+
{
|
583
|
+
amount: '4.99',
|
584
|
+
payment_method: payment_method.name,
|
585
|
+
state: 'completed',
|
586
|
+
created_at: created_at
|
587
|
+
}
|
588
|
+
]
|
589
|
+
}
|
486
590
|
order = Importer::Order.import(user, params)
|
487
591
|
expect(order.payments.first.created_at).to be_within(0.1).of created_at
|
488
592
|
end
|
@@ -492,11 +596,10 @@ module Spree
|
|
492
596
|
params = { payments_attributes: [{ payment_method: "XXX" }] }
|
493
597
|
count = Order.count
|
494
598
|
|
495
|
-
expect { Importer::Order.import(user, params) }.to raise_error
|
599
|
+
expect { Importer::Order.import(user, params) }.to raise_error(StandardError)
|
496
600
|
expect(Order.count).to eq count
|
497
601
|
end
|
498
602
|
end
|
499
|
-
|
500
603
|
end
|
501
604
|
end
|
502
605
|
end
|