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
@@ -0,0 +1,423 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
shared_examples "check total store credit from payments" do
|
4
|
+
context 'with valid payments' do
|
5
|
+
let(:order) { payment.order }
|
6
|
+
let!(:payment) { create(:store_credit_payment) }
|
7
|
+
let!(:second_payment) { create(:store_credit_payment, order: order) }
|
8
|
+
|
9
|
+
subject { order }
|
10
|
+
|
11
|
+
it 'returns the sum of the payment amounts' do
|
12
|
+
expect(subject.total_applicable_store_credit).to eq (payment.amount + second_payment.amount)
|
13
|
+
end
|
14
|
+
end
|
15
|
+
|
16
|
+
context 'without valid payments' do
|
17
|
+
let(:order) { create(:order) }
|
18
|
+
|
19
|
+
subject { order }
|
20
|
+
|
21
|
+
it 'returns 0' do
|
22
|
+
expect(subject.total_applicable_store_credit).to be_zero
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
describe 'Order' do
|
28
|
+
describe '#add_store_credit_payments' do
|
29
|
+
let(:order_total) { 500.00 }
|
30
|
+
|
31
|
+
before { create(:store_credit_payment_method) }
|
32
|
+
|
33
|
+
subject { order.add_store_credit_payments }
|
34
|
+
|
35
|
+
context 'there is no store credit' do
|
36
|
+
let(:order) { create(:store_credits_order_without_user, total: order_total) }
|
37
|
+
|
38
|
+
before do
|
39
|
+
# callbacks recalculate total based on line items
|
40
|
+
# this ensures the total is what we expect
|
41
|
+
order.update_column(:total, order_total)
|
42
|
+
subject
|
43
|
+
order.reload
|
44
|
+
end
|
45
|
+
|
46
|
+
it 'does not create a store credit payment' do
|
47
|
+
expect(order.payments.count).to eq 0
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
context 'there is enough store credit to pay for the entire order' do
|
52
|
+
let(:store_credit) { create(:store_credit, amount: order_total) }
|
53
|
+
let(:order) { create(:order, user: store_credit.user, total: order_total) }
|
54
|
+
|
55
|
+
before do
|
56
|
+
subject
|
57
|
+
order.reload
|
58
|
+
end
|
59
|
+
|
60
|
+
it 'creates a store credit payment for the full amount' do
|
61
|
+
expect(order.payments.count).to eq 1
|
62
|
+
expect(order.payments.first).to be_store_credit
|
63
|
+
expect(order.payments.first.amount).to eq order_total
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
context 'the available store credit is not enough to pay for the entire order' do
|
68
|
+
let(:expected_cc_total) { 100.0 }
|
69
|
+
let(:store_credit_total) { order_total - expected_cc_total }
|
70
|
+
let(:store_credit) { create(:store_credit, amount: store_credit_total) }
|
71
|
+
let(:order) { create(:order, user: store_credit.user, total: order_total) }
|
72
|
+
|
73
|
+
before do
|
74
|
+
# callbacks recalculate total based on line items
|
75
|
+
# this ensures the total is what we expect
|
76
|
+
order.update_column(:total, order_total)
|
77
|
+
subject
|
78
|
+
order.reload
|
79
|
+
end
|
80
|
+
|
81
|
+
it 'creates a store credit payment for the available amount' do
|
82
|
+
expect(order.payments.count).to eq 1
|
83
|
+
expect(order.payments.first).to be_store_credit
|
84
|
+
expect(order.payments.first.amount).to eq store_credit_total
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
context 'there are multiple store credits' do
|
89
|
+
context 'they have different credit type priorities' do
|
90
|
+
let(:amount_difference) { 100 }
|
91
|
+
let!(:primary_store_credit) { create(:store_credit, amount: (order_total - amount_difference)) }
|
92
|
+
let!(:secondary_store_credit) do
|
93
|
+
create(:store_credit, amount: order_total, user: primary_store_credit.user,
|
94
|
+
credit_type: create(:secondary_credit_type))
|
95
|
+
end
|
96
|
+
let(:order) { create(:order, user: primary_store_credit.user, total: order_total) }
|
97
|
+
|
98
|
+
before do
|
99
|
+
subject
|
100
|
+
order.reload
|
101
|
+
end
|
102
|
+
|
103
|
+
it 'uses the primary store credit type over the secondary' do
|
104
|
+
primary_payment = order.payments.first
|
105
|
+
secondary_payment = order.payments.last
|
106
|
+
|
107
|
+
expect(order.payments.size).to eq 2
|
108
|
+
expect(primary_payment.source).to eq primary_store_credit
|
109
|
+
expect(secondary_payment.source).to eq secondary_store_credit
|
110
|
+
expect(primary_payment.amount).to eq(order_total - amount_difference)
|
111
|
+
expect(secondary_payment.amount).to eq(amount_difference)
|
112
|
+
end
|
113
|
+
end
|
114
|
+
end
|
115
|
+
end
|
116
|
+
|
117
|
+
describe '#covered_by_store_credit' do
|
118
|
+
context "order doesn't have an associated user" do
|
119
|
+
subject { create(:store_credits_order_without_user) }
|
120
|
+
|
121
|
+
it 'returns false' do
|
122
|
+
expect(subject.covered_by_store_credit).to be false
|
123
|
+
end
|
124
|
+
end
|
125
|
+
|
126
|
+
context 'order has an associated user' do
|
127
|
+
let(:user) { create(:user) }
|
128
|
+
|
129
|
+
subject { create(:order, user: user) }
|
130
|
+
|
131
|
+
context 'user has enough store credit to pay for the order' do
|
132
|
+
before do
|
133
|
+
allow(user).to receive(:total_available_store_credit).and_return(10.0)
|
134
|
+
allow(subject).to receive(:total).and_return(5.0)
|
135
|
+
end
|
136
|
+
|
137
|
+
it 'returns true' do
|
138
|
+
expect(subject.covered_by_store_credit).to be true
|
139
|
+
end
|
140
|
+
end
|
141
|
+
|
142
|
+
context 'user does not have enough store credit to pay for the order' do
|
143
|
+
before do
|
144
|
+
allow(user).to receive(:total_available_store_credit).and_return(0.0)
|
145
|
+
allow(subject).to receive(:total).and_return(5.0)
|
146
|
+
end
|
147
|
+
|
148
|
+
it 'returns false' do
|
149
|
+
expect(subject.covered_by_store_credit).to be false
|
150
|
+
end
|
151
|
+
end
|
152
|
+
end
|
153
|
+
end
|
154
|
+
|
155
|
+
describe '#total_available_store_credit' do
|
156
|
+
context 'order does not have an associated user' do
|
157
|
+
subject { create(:store_credits_order_without_user) }
|
158
|
+
|
159
|
+
it 'returns 0' do
|
160
|
+
expect(subject.total_available_store_credit).to be_zero
|
161
|
+
end
|
162
|
+
end
|
163
|
+
|
164
|
+
context 'order has an associated user' do
|
165
|
+
let(:user) { create(:user) }
|
166
|
+
let(:available_store_credit) { 25.0 }
|
167
|
+
|
168
|
+
subject { create(:order, user: user) }
|
169
|
+
|
170
|
+
before do
|
171
|
+
allow(user).to receive(:total_available_store_credit).and_return(available_store_credit)
|
172
|
+
end
|
173
|
+
|
174
|
+
it "returns the user's available store credit" do
|
175
|
+
expect(subject.total_available_store_credit).to eq available_store_credit
|
176
|
+
end
|
177
|
+
end
|
178
|
+
end
|
179
|
+
|
180
|
+
describe '#could_use_store_credit?' do
|
181
|
+
context 'order does not have an associated user' do
|
182
|
+
subject { create(:store_credits_order_without_user) }
|
183
|
+
|
184
|
+
it { expect(subject.could_use_store_credit?).to be false }
|
185
|
+
end
|
186
|
+
|
187
|
+
context 'order has an associated user' do
|
188
|
+
let(:user) { create(:user) }
|
189
|
+
|
190
|
+
subject { create(:order, user: user) }
|
191
|
+
|
192
|
+
context 'without store credit' do
|
193
|
+
it { expect(subject.could_use_store_credit?).to be false }
|
194
|
+
end
|
195
|
+
|
196
|
+
context 'with store credit' do
|
197
|
+
let(:available_store_credit) { 25.0 }
|
198
|
+
|
199
|
+
before do
|
200
|
+
allow(user).to receive(:total_available_store_credit).and_return(available_store_credit)
|
201
|
+
end
|
202
|
+
|
203
|
+
it { expect(subject.could_use_store_credit?).to be true }
|
204
|
+
end
|
205
|
+
end
|
206
|
+
end
|
207
|
+
|
208
|
+
describe '#order_total_after_store_credit' do
|
209
|
+
let(:order_total) { 100.0 }
|
210
|
+
|
211
|
+
subject { create(:order, total: order_total) }
|
212
|
+
|
213
|
+
before do
|
214
|
+
allow(subject).to receive(:total_applicable_store_credit).and_return(applicable_store_credit)
|
215
|
+
end
|
216
|
+
|
217
|
+
context "order's user has store credits" do
|
218
|
+
let(:applicable_store_credit) { 10.0 }
|
219
|
+
|
220
|
+
it 'deducts the applicable store credit' do
|
221
|
+
expect(subject.order_total_after_store_credit).to eq (order_total - applicable_store_credit)
|
222
|
+
end
|
223
|
+
end
|
224
|
+
|
225
|
+
context "order's user does not have any store credits" do
|
226
|
+
let(:applicable_store_credit) { 0.0 }
|
227
|
+
|
228
|
+
it 'returns the order total' do
|
229
|
+
expect(subject.order_total_after_store_credit).to eq order_total
|
230
|
+
end
|
231
|
+
end
|
232
|
+
end
|
233
|
+
|
234
|
+
describe '#total_applicable_store_credit' do
|
235
|
+
context 'order is in the confirm state' do
|
236
|
+
before { order.update_attributes(state: 'confirm') }
|
237
|
+
include_examples 'check total store credit from payments'
|
238
|
+
end
|
239
|
+
|
240
|
+
context 'order is completed' do
|
241
|
+
before { order.update_attributes(state: 'complete') }
|
242
|
+
include_examples 'check total store credit from payments'
|
243
|
+
end
|
244
|
+
|
245
|
+
context 'order is in any state other than confirm or complete' do
|
246
|
+
context 'the associated user has store credits' do
|
247
|
+
let(:store_credit) { create(:store_credit) }
|
248
|
+
let(:order) { create(:order, user: store_credit.user) }
|
249
|
+
|
250
|
+
subject { order }
|
251
|
+
|
252
|
+
context 'the store credit is more than the order total' do
|
253
|
+
let(:order_total) { store_credit.amount - 1 }
|
254
|
+
|
255
|
+
before { order.update_attributes(total: order_total) }
|
256
|
+
|
257
|
+
it 'returns the order total' do
|
258
|
+
expect(subject.total_applicable_store_credit).to eq order_total
|
259
|
+
end
|
260
|
+
end
|
261
|
+
|
262
|
+
context 'the store credit is less than the order total' do
|
263
|
+
let(:order_total) { store_credit.amount * 10 }
|
264
|
+
|
265
|
+
before { order.update_attributes(total: order_total) }
|
266
|
+
|
267
|
+
it 'returns the store credit amount' do
|
268
|
+
expect(subject.total_applicable_store_credit).to eq store_credit.amount
|
269
|
+
end
|
270
|
+
end
|
271
|
+
end
|
272
|
+
|
273
|
+
context 'the associated user does not have store credits' do
|
274
|
+
let(:order) { create(:order) }
|
275
|
+
|
276
|
+
subject { order }
|
277
|
+
|
278
|
+
it 'returns 0' do
|
279
|
+
expect(subject.total_applicable_store_credit).to be_zero
|
280
|
+
end
|
281
|
+
end
|
282
|
+
|
283
|
+
context 'the order does not have an associated user' do
|
284
|
+
subject { create(:store_credits_order_without_user) }
|
285
|
+
|
286
|
+
it 'returns 0' do
|
287
|
+
expect(subject.total_applicable_store_credit).to be_zero
|
288
|
+
end
|
289
|
+
end
|
290
|
+
end
|
291
|
+
end
|
292
|
+
|
293
|
+
describe '#total_applied_store_credit' do
|
294
|
+
context 'with valid payments' do
|
295
|
+
let(:order) { payment.order }
|
296
|
+
let!(:payment) { create(:store_credit_payment) }
|
297
|
+
let!(:second_payment) { create(:store_credit_payment, order: order) }
|
298
|
+
|
299
|
+
subject { order }
|
300
|
+
|
301
|
+
it 'returns the sum of the payment amounts' do
|
302
|
+
expect(subject.total_applied_store_credit).to eq (payment.amount + second_payment.amount)
|
303
|
+
end
|
304
|
+
end
|
305
|
+
|
306
|
+
context 'without valid payments' do
|
307
|
+
let(:order) { create(:order) }
|
308
|
+
|
309
|
+
subject { order }
|
310
|
+
|
311
|
+
it 'returns 0' do
|
312
|
+
expect(subject.total_applied_store_credit).to be_zero
|
313
|
+
end
|
314
|
+
end
|
315
|
+
end
|
316
|
+
|
317
|
+
describe '#using_store_credit?' do
|
318
|
+
subject { create(:order) }
|
319
|
+
|
320
|
+
context 'order has store credit payment' do
|
321
|
+
before { allow(subject).to receive(:total_applied_store_credit).and_return(10.0) }
|
322
|
+
it { expect(subject.using_store_credit?).to be true }
|
323
|
+
end
|
324
|
+
|
325
|
+
context 'order has no store credit payments' do
|
326
|
+
before { allow(subject).to receive(:total_applied_store_credit).and_return(0.0) }
|
327
|
+
it { expect(subject.using_store_credit?).to be false }
|
328
|
+
end
|
329
|
+
end
|
330
|
+
|
331
|
+
describe '#display_total_applicable_store_credit' do
|
332
|
+
let(:total_applicable_store_credit) { 10.00 }
|
333
|
+
|
334
|
+
subject { create(:order) }
|
335
|
+
|
336
|
+
before do
|
337
|
+
allow(subject).to receive(:total_applicable_store_credit).and_return(total_applicable_store_credit)
|
338
|
+
end
|
339
|
+
|
340
|
+
it 'returns a money instance' do
|
341
|
+
expect(subject.display_total_applicable_store_credit).to be_a(Spree::Money)
|
342
|
+
end
|
343
|
+
|
344
|
+
it 'returns a negative amount' do
|
345
|
+
expect(subject.display_total_applicable_store_credit.money.cents).to eq (total_applicable_store_credit * -100.0)
|
346
|
+
end
|
347
|
+
end
|
348
|
+
|
349
|
+
describe '#display_total_applied_store_credit' do
|
350
|
+
let(:total_applied_store_credit) { 10.00 }
|
351
|
+
|
352
|
+
subject { create(:order) }
|
353
|
+
|
354
|
+
before do
|
355
|
+
allow(subject).to receive(:total_applied_store_credit).and_return(total_applied_store_credit)
|
356
|
+
end
|
357
|
+
|
358
|
+
it 'returns a money instance' do
|
359
|
+
expect(subject.display_total_applied_store_credit).to be_a(Spree::Money)
|
360
|
+
end
|
361
|
+
|
362
|
+
it 'returns a negative amount' do
|
363
|
+
expect(subject.display_total_applied_store_credit.money.cents).to eq (total_applied_store_credit * -100.0)
|
364
|
+
end
|
365
|
+
end
|
366
|
+
|
367
|
+
describe '#display_order_total_after_store_credit' do
|
368
|
+
let(:order_total_after_store_credit) { 10.00 }
|
369
|
+
|
370
|
+
subject { create(:order) }
|
371
|
+
|
372
|
+
before do
|
373
|
+
allow(subject).to receive(:order_total_after_store_credit).and_return(order_total_after_store_credit)
|
374
|
+
end
|
375
|
+
|
376
|
+
it 'returns a money instance' do
|
377
|
+
expect(subject.display_order_total_after_store_credit).to be_a(Spree::Money)
|
378
|
+
end
|
379
|
+
|
380
|
+
it 'returns the order_total_after_store_credit amount' do
|
381
|
+
expect(subject.display_order_total_after_store_credit.money.cents).to eq (order_total_after_store_credit * 100.0)
|
382
|
+
end
|
383
|
+
end
|
384
|
+
|
385
|
+
describe '#display_total_available_store_credit' do
|
386
|
+
let(:total_available_store_credit) { 10.00 }
|
387
|
+
|
388
|
+
subject { create(:order) }
|
389
|
+
|
390
|
+
before do
|
391
|
+
allow(subject).to receive(:total_available_store_credit).and_return(total_available_store_credit)
|
392
|
+
end
|
393
|
+
|
394
|
+
it 'returns a money instance' do
|
395
|
+
expect(subject.display_total_available_store_credit).to be_a(Spree::Money)
|
396
|
+
end
|
397
|
+
|
398
|
+
it 'returns the total_available_store_credit amount' do
|
399
|
+
expect(subject.display_total_available_store_credit.money.cents).to eq (total_available_store_credit * 100.0)
|
400
|
+
end
|
401
|
+
end
|
402
|
+
|
403
|
+
describe '#display_store_credit_remaining_after_capture' do
|
404
|
+
let(:total_available_store_credit) { 10.00 }
|
405
|
+
let(:total_applicable_store_credit) { 5.00 }
|
406
|
+
|
407
|
+
subject { create(:order) }
|
408
|
+
|
409
|
+
before do
|
410
|
+
allow(subject).to receive(:total_available_store_credit).and_return(total_available_store_credit)
|
411
|
+
allow(subject).to receive(:total_applicable_store_credit).and_return(total_applicable_store_credit)
|
412
|
+
end
|
413
|
+
|
414
|
+
it 'returns a money instance' do
|
415
|
+
expect(subject.display_store_credit_remaining_after_capture).to be_a(Spree::Money)
|
416
|
+
end
|
417
|
+
|
418
|
+
it "returns all of the user's available store credit minus what's applied to the order amount" do
|
419
|
+
amount_remaining = total_available_store_credit - total_applicable_store_credit
|
420
|
+
expect(subject.display_store_credit_remaining_after_capture.money.cents).to eq (amount_remaining * 100.0)
|
421
|
+
end
|
422
|
+
end
|
423
|
+
end
|
@@ -3,7 +3,7 @@ require 'spec_helper'
|
|
3
3
|
describe Spree::Order, :type => :model do
|
4
4
|
let(:order) { create(:order) }
|
5
5
|
|
6
|
-
context "#
|
6
|
+
context "#update_with_updater!" do
|
7
7
|
let(:line_items) { [mock_model(Spree::LineItem, :amount => 5) ]}
|
8
8
|
|
9
9
|
context "when there are update hooks" do
|
@@ -11,7 +11,7 @@ describe Spree::Order, :type => :model do
|
|
11
11
|
after { Spree::Order.update_hooks.clear }
|
12
12
|
it "should call each of the update hooks" do
|
13
13
|
expect(order).to receive :foo
|
14
|
-
order.
|
14
|
+
order.update_with_updater!
|
15
15
|
end
|
16
16
|
end
|
17
17
|
end
|
@@ -182,6 +182,47 @@ describe Spree::OrderContents, :type => :model do
|
|
182
182
|
end
|
183
183
|
end
|
184
184
|
|
185
|
+
context "#remove_line_item" do
|
186
|
+
context 'given a shipment' do
|
187
|
+
it "ensure shipment calls update_amounts instead of order calling ensure_updated_shipments" do
|
188
|
+
line_item = subject.add(variant, 1)
|
189
|
+
shipment = create(:shipment)
|
190
|
+
expect(subject.order).to_not receive(:ensure_updated_shipments)
|
191
|
+
expect(shipment).to receive(:update_amounts)
|
192
|
+
subject.remove_line_item(line_item, shipment: shipment)
|
193
|
+
end
|
194
|
+
end
|
195
|
+
|
196
|
+
context 'not given a shipment' do
|
197
|
+
it "ensures updated shipments" do
|
198
|
+
line_item = subject.add(variant, 1)
|
199
|
+
expect(subject.order).to receive(:ensure_updated_shipments)
|
200
|
+
subject.remove_line_item(line_item)
|
201
|
+
end
|
202
|
+
end
|
203
|
+
|
204
|
+
it 'should remove line_item' do
|
205
|
+
line_item = subject.add(variant, 1)
|
206
|
+
subject.remove_line_item(line_item)
|
207
|
+
|
208
|
+
expect(order.reload.line_items).to_not include(line_item)
|
209
|
+
end
|
210
|
+
|
211
|
+
it "should update order totals" do
|
212
|
+
expect(order.item_total.to_f).to eq(0.00)
|
213
|
+
expect(order.total.to_f).to eq(0.00)
|
214
|
+
|
215
|
+
line_item = subject.add(variant,2)
|
216
|
+
|
217
|
+
expect(order.item_total.to_f).to eq(39.98)
|
218
|
+
expect(order.total.to_f).to eq(39.98)
|
219
|
+
|
220
|
+
subject.remove_line_item(line_item)
|
221
|
+
expect(order.item_total.to_f).to eq(0.00)
|
222
|
+
expect(order.total.to_f).to eq(0.00)
|
223
|
+
end
|
224
|
+
end
|
225
|
+
|
185
226
|
context "update cart" do
|
186
227
|
let!(:shirt) { subject.add variant, 1 }
|
187
228
|
|
@@ -239,7 +280,7 @@ describe Spree::OrderContents, :type => :model do
|
|
239
280
|
end
|
240
281
|
|
241
282
|
context "completed order" do
|
242
|
-
let(:order) { create(:order, state: 'complete', completed_at: Time.
|
283
|
+
let(:order) { create(:order, state: 'complete', completed_at: Time.current) }
|
243
284
|
|
244
285
|
before { order.shipments.create! stock_location_id: variant.stock_location_ids.first }
|
245
286
|
|