solidus_core 1.2.3 → 1.3.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/Rakefile +1 -1
- data/app/assets/javascripts/spree.js.coffee.erb +1 -1
- data/app/helpers/spree/base_helper.rb +21 -43
- data/app/helpers/spree/orders_helper.rb +0 -1
- data/app/helpers/spree/products_helper.rb +10 -12
- data/app/helpers/spree/taxons_helper.rb +4 -4
- data/app/mailers/spree/base_mailer.rb +1 -3
- data/app/mailers/spree/carton_mailer.rb +2 -2
- data/app/mailers/spree/order_mailer.rb +2 -2
- data/app/models/concerns/spree/adjustment_source.rb +12 -16
- data/app/models/concerns/spree/calculated_adjustments.rb +17 -14
- data/app/models/concerns/spree/default_price.rb +10 -26
- data/app/models/concerns/spree/display_money.rb +1 -1
- data/app/models/concerns/spree/ordered_property_value_list.rb +10 -12
- data/app/models/concerns/spree/ransackable_attributes.rb +6 -5
- data/app/models/concerns/spree/user_address_book.rb +87 -81
- data/app/models/concerns/spree/user_methods.rb +2 -2
- data/app/models/concerns/spree/user_payment_source.rb +12 -8
- data/app/models/spree/ability.rb +2 -2
- data/app/models/spree/address.rb +37 -38
- data/app/models/spree/adjustment.rb +2 -6
- data/app/models/spree/app_configuration.rb +60 -5
- data/app/models/spree/base.rb +1 -1
- data/app/models/spree/calculator/default_tax.rb +28 -24
- data/app/models/spree/calculator/flat_percent_item_total.rb +1 -1
- data/app/models/spree/calculator/flat_rate.rb +2 -2
- data/app/models/spree/calculator/flexi_rate.rb +4 -4
- data/app/models/spree/calculator/percent_per_item.rb +8 -9
- data/app/models/spree/calculator/price_sack.rb +3 -3
- data/app/models/spree/calculator/returns/default_refund_amount.rb +11 -12
- data/app/models/spree/calculator/shipping/flat_percent_item_total.rb +1 -1
- data/app/models/spree/calculator/shipping/flat_rate.rb +2 -2
- data/app/models/spree/calculator/shipping/flexi_rate.rb +3 -3
- data/app/models/spree/calculator/shipping/per_item.rb +1 -1
- data/app/models/spree/calculator/shipping/price_sack.rb +3 -3
- data/app/models/spree/calculator/tiered_flat_rate.rb +2 -1
- data/app/models/spree/calculator/tiered_percent.rb +2 -1
- data/app/models/spree/calculator.rb +3 -3
- data/app/models/spree/carton.rb +2 -2
- data/app/models/spree/country.rb +7 -4
- data/app/models/spree/credit_card.rb +26 -22
- data/app/models/spree/customer_return.rb +8 -7
- data/app/models/spree/exchange.rb +1 -9
- data/app/models/spree/gateway/bogus.rb +31 -31
- data/app/models/spree/gateway/bogus_simple.rb +6 -8
- data/app/models/spree/gateway.rb +9 -15
- data/app/models/spree/image.rb +3 -3
- data/app/models/spree/inventory_unit.rb +23 -23
- data/app/models/spree/item_adjustments.rb +3 -2
- data/app/models/spree/legacy_user.rb +1 -5
- data/app/models/spree/line_item.rb +95 -84
- data/app/models/spree/option_type.rb +1 -1
- data/app/models/spree/option_value.rb +3 -1
- data/app/models/spree/order/checkout.rb +45 -44
- data/app/models/spree/order/payments.rb +42 -45
- data/app/models/spree/order.rb +70 -75
- data/app/models/spree/order_cancellations.rb +4 -4
- data/app/models/spree/order_capturing.rb +3 -2
- data/app/models/spree/order_contents.rb +61 -59
- data/app/models/spree/order_inventory.rb +59 -54
- data/app/models/spree/order_mutex.rb +0 -1
- data/app/models/spree/order_shipping.rb +8 -9
- data/app/models/spree/order_stock_location.rb +3 -3
- data/app/models/spree/order_update_attributes.rb +0 -2
- data/app/models/spree/order_updater.rb +11 -24
- data/app/models/spree/payment/processing.rb +26 -37
- data/app/models/spree/payment.rb +68 -71
- data/app/models/spree/payment_method/check.rb +2 -2
- data/app/models/spree/payment_method/store_credit.rb +6 -7
- data/app/models/spree/payment_method.rb +11 -8
- data/app/models/spree/preferences/configuration.rb +2 -2
- data/app/models/spree/preferences/preferable.rb +1 -1
- data/app/models/spree/preferences/preferable_class_methods.rb +1 -1
- data/app/models/spree/preferences/scoped_store.rb +6 -5
- data/app/models/spree/preferences/static_model_preferences.rb +1 -1
- data/app/models/spree/preferences/statically_configurable.rb +2 -2
- data/app/models/spree/preferences/store.rb +2 -6
- data/app/models/spree/price.rb +17 -19
- data/app/models/spree/product/scopes.rb +18 -17
- data/app/models/spree/product.rb +28 -11
- data/app/models/spree/product_property.rb +2 -0
- data/app/models/spree/product_scope/scopes.rb +22 -22
- data/app/models/spree/promotion/actions/create_adjustment.rb +3 -4
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +8 -8
- data/app/models/spree/promotion/actions/create_quantity_adjustments.rb +3 -3
- data/app/models/spree/promotion/actions/free_shipping.rb +4 -4
- data/app/models/spree/promotion/rules/first_order.rb +7 -6
- data/app/models/spree/promotion/rules/first_repeat_purchase_since.rb +2 -3
- data/app/models/spree/promotion/rules/item_total.rb +5 -2
- data/app/models/spree/promotion/rules/nth_order.rb +3 -4
- data/app/models/spree/promotion/rules/one_use_per_user.rb +1 -2
- data/app/models/spree/promotion/rules/option_value.rb +1 -2
- data/app/models/spree/promotion/rules/product.rb +4 -4
- data/app/models/spree/promotion/rules/taxon.rb +5 -5
- data/app/models/spree/promotion/rules/user.rb +1 -1
- data/app/models/spree/promotion/rules/user_logged_in.rb +1 -1
- data/app/models/spree/promotion.rb +8 -8
- data/app/models/spree/promotion_action.rb +1 -1
- data/app/models/spree/promotion_builder.rb +2 -2
- data/app/models/spree/promotion_chooser.rb +1 -0
- data/app/models/spree/promotion_code/code_builder.rb +3 -3
- data/app/models/spree/promotion_handler/cart.rb +17 -16
- data/app/models/spree/promotion_handler/coupon.rb +10 -14
- data/app/models/spree/promotion_handler/page.rb +4 -4
- data/app/models/spree/promotion_rule.rb +4 -3
- data/app/models/spree/prototype.rb +0 -1
- data/app/models/spree/refund.rb +3 -3
- data/app/models/spree/reimbursement/reimbursement_type_engine.rb +1 -3
- data/app/models/spree/reimbursement.rb +3 -5
- data/app/models/spree/reimbursement_performer.rb +0 -5
- data/app/models/spree/reimbursement_tax_calculator.rb +2 -7
- data/app/models/spree/reimbursement_type/credit.rb +1 -1
- data/app/models/spree/reimbursement_type/original_payment.rb +1 -1
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +3 -3
- data/app/models/spree/reimbursement_type/store_credit.rb +1 -1
- data/app/models/spree/reimbursement_type.rb +1 -1
- data/app/models/spree/return_authorization.rb +38 -37
- data/app/models/spree/return_item/eligibility_validator/default.rb +4 -4
- data/app/models/spree/return_item/eligibility_validator/no_reimbursements.rb +0 -1
- data/app/models/spree/return_item/eligibility_validator/rma_required.rb +0 -1
- data/app/models/spree/return_item.rb +24 -23
- data/app/models/spree/returns_calculator.rb +1 -2
- data/app/models/spree/shipment.rb +80 -74
- data/app/models/spree/shipping_calculator.rb +4 -5
- data/app/models/spree/shipping_manifest.rb +3 -4
- data/app/models/spree/shipping_method.rb +54 -23
- data/app/models/spree/shipping_method_stock_location.rb +4 -0
- data/app/models/spree/shipping_rate.rb +24 -29
- data/app/models/spree/shipping_rate_tax.rb +41 -0
- data/app/models/spree/state.rb +1 -1
- data/app/models/spree/state_change.rb +1 -1
- data/app/models/spree/stock/availability_validator.rb +2 -2
- data/app/models/spree/stock/coordinator.rb +12 -13
- data/app/models/spree/stock/differentiator.rb +1 -0
- data/app/models/spree/stock/estimator.rb +18 -25
- data/app/models/spree/stock/inventory_unit_builder.rb +1 -1
- data/app/models/spree/stock/package.rb +19 -9
- data/app/models/spree/stock/packer.rb +2 -3
- data/app/models/spree/stock/prioritizer.rb +3 -2
- data/app/models/spree/stock/quantifier.rb +2 -3
- data/app/models/spree/stock/shipping_rate_selector.rb +0 -1
- data/app/models/spree/stock/shipping_rate_sorter.rb +0 -1
- data/app/models/spree/stock/splitter/backordered.rb +0 -2
- data/app/models/spree/stock/splitter/base.rb +3 -2
- data/app/models/spree/stock/splitter/shipping_category.rb +2 -1
- data/app/models/spree/stock/splitter/weight.rb +2 -2
- data/app/models/spree/stock_item.rb +36 -37
- data/app/models/spree/stock_location.rb +17 -13
- data/app/models/spree/stock_movement.rb +1 -3
- data/app/models/spree/stock_transfer.rb +8 -8
- data/app/models/spree/store.rb +6 -0
- data/app/models/spree/store_credit.rb +24 -24
- data/app/models/spree/store_credit_category.rb +1 -2
- data/app/models/spree/tax/item_adjuster.rb +37 -0
- data/app/models/spree/tax/order_adjuster.rb +38 -0
- data/app/models/spree/tax/shipping_rate_taxer.rb +31 -0
- data/app/models/spree/tax/tax_helpers.rb +49 -0
- data/app/models/spree/tax/tax_location.rb +33 -0
- data/app/models/spree/tax_category.rb +1 -1
- data/app/models/spree/tax_rate.rb +46 -111
- data/app/models/spree/taxon.rb +36 -12
- data/app/models/spree/taxonomy.rb +10 -10
- data/app/models/spree/validations/db_maximum_length_validator.rb +0 -1
- data/app/models/spree/variant/pricer.rb +19 -0
- data/app/models/spree/variant/pricing_options.rb +31 -0
- data/app/models/spree/variant/scopes.rb +9 -9
- data/app/models/spree/variant.rb +95 -89
- data/app/models/spree/variant_property_rule.rb +1 -1
- data/app/models/spree/variant_property_rule_value.rb +2 -0
- data/app/models/spree/zone.rb +60 -24
- data/config/initializers/friendly_id.rb +1 -1
- data/config/locales/en.yml +337 -51
- data/config/routes.rb +1 -1
- data/db/default/spree/countries.rb +9 -15
- data/db/default/spree/roles.rb +1 -2
- data/db/default/spree/states.rb +7 -11
- data/db/default/spree/store_credit.rb +2 -2
- data/db/default/spree/stores.rb +2 -1
- data/db/migrate/20120831092320_spree_one_two.rb +100 -101
- data/db/migrate/20120831092359_spree_promo_one_two.rb +12 -12
- data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb +1 -1
- data/db/migrate/20121009142519_add_lock_version_to_variant.rb +1 -1
- data/db/migrate/20121010142909_add_states_required_to_countries.rb +1 -1
- data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +2 -2
- data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +4 -4
- data/db/migrate/20121031162139_split_prices_from_variants.rb +8 -8
- data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +2 -2
- data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +1 -1
- data/db/migrate/20121124203911_add_position_to_taxonomies.rb +1 -1
- data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb +1 -2
- data/db/migrate/20130211190146_create_spree_stock_items.rb +1 -1
- data/db/migrate/20130213191427_create_default_stock.rb +12 -21
- data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb +1 -1
- data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb +2 -2
- data/db/migrate/20130228210442_create_shipping_method_zone.rb +1 -1
- data/db/migrate/20130301162924_create_shipping_method_categories.rb +2 -2
- data/db/migrate/20130304162240_create_spree_shipping_rates.rb +4 -4
- data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb +2 -3
- data/db/migrate/20130306191917_add_active_field_to_stock_locations.rb +1 -1
- data/db/migrate/20130306195650_add_backorderable_to_stock_item.rb +1 -1
- data/db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb +1 -1
- data/db/migrate/20130319062004_change_orders_total_precision.rb +4 -4
- data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb +1 -3
- data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb +2 -4
- data/db/migrate/20130319082943_change_adjustments_amount_precision.rb +1 -3
- data/db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb +2 -2
- data/db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb +2 -2
- data/db/migrate/20130417120035_update_adjustment_states.rb +2 -2
- data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb +3 -3
- data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +1 -1
- data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +3 -3
- data/db/migrate/20130718042445_add_cost_price_to_line_item.rb +1 -1
- data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb +2 -2
- data/db/migrate/20130807024301_upgrade_adjustments.rb +3 -3
- data/db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb +1 -1
- data/db/migrate/20130813140619_expand_order_number_size.rb +2 -2
- data/db/migrate/20130815000406_add_adjustment_total_to_line_items.rb +1 -1
- data/db/migrate/20130815024413_add_adjustment_total_to_shipments.rb +1 -1
- data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb +1 -1
- data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +1 -1
- data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +1 -1
- data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +1 -0
- data/db/migrate/20131026154747_add_track_inventory_to_variant.rb +1 -1
- data/db/migrate/20131118043959_add_included_to_adjustments.rb +1 -1
- data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb +0 -1
- data/db/migrate/20131211112807_create_spree_orders_promotions.rb +1 -1
- data/db/migrate/20131218054603_add_item_count_to_spree_orders.rb +1 -1
- data/db/migrate/20140106065820_remove_value_type_from_spree_preferences.rb +1 -0
- data/db/migrate/20140219060952_add_considered_risky_to_orders.rb +1 -1
- data/db/migrate/20140309023735_migrate_old_preferences.rb +4 -3
- data/db/migrate/20140309033438_create_store_from_preferences.rb +2 -2
- data/db/migrate/20140410141842_add_many_missing_indexes.rb +13 -15
- data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb +38 -40
- data/db/migrate/20140508151342_change_spree_price_amount_precision.rb +4 -4
- data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb +1 -1
- data/db/migrate/20140710041921_recreate_spree_return_authorizations.rb +0 -1
- data/db/migrate/20140718195325_create_friendly_id_slugs.rb +4 -4
- data/db/migrate/20140723214541_copy_product_slugs_to_slug_history.rb +4 -6
- data/db/migrate/20140805171219_make_existing_credit_cards_default.rb +1 -0
- data/db/migrate/20141217215630_update_product_slug_index.rb +2 -4
- data/db/migrate/20150112194216_add_position_to_stock_location.rb +2 -2
- data/db/migrate/20150225205344_move_promotion_code_to_promotion_code_value.rb +0 -1
- data/db/migrate/20150313201503_copy_shipped_shipments_to_cartons.rb +0 -1
- data/db/migrate/20150506181611_create_spree_store_credit_payment_method.rb +3 -3
- data/db/migrate/20150515211137_fix_adjustment_order_id.rb +0 -1
- data/db/migrate/20150612205731_remove_spree_configurations.rb +2 -2
- data/db/migrate/20150619160613_create_adjustment_reason.rb +1 -1
- data/db/migrate/20150723224133_remove_unnecessary_indexes.rb +10 -2
- data/db/migrate/20150731201146_add_spree_user_addresses.rb +0 -1
- data/db/migrate/20150811211025_add_finalized_to_spree_adjustments.rb +1 -1
- data/db/migrate/20151001121454_create_spree_shipping_method_stock_locations.rb +13 -0
- data/db/migrate/20151002023248_add_foreign_key_to_shipping_method_stock_location.rb +6 -0
- data/db/migrate/20151026093607_change_return_item_pre_tax_amount_to_amount.rb +29 -0
- data/db/migrate/20160111091912_add_column_available_to_all_on_spree_shipping_method.rb +5 -0
- data/db/migrate/20160116133604_add_position_to_spree_payment_methods.rb +5 -0
- data/db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb +6 -0
- data/db/migrate/20160224201413_create_spree_shipping_rate_taxes.rb +11 -0
- data/db/migrate/20160229133259_add_cart_tax_country_iso_to_spree_store.rb +5 -0
- data/db/migrate/20160301103333_remove_pre_tax_amount_on_line_item_and_shipment.rb +6 -0
- data/db/migrate/20160308000300_disallow_adjustment_finalized_nulls.rb +19 -0
- data/db/migrate/20160318145302_add_timestamps_to_prices.rb +5 -0
- data/db/migrate/20160330204846_add_missing_timestamp_columns.rb +20 -0
- data/lib/generators/spree/custom_user/custom_user_generator.rb +3 -8
- data/lib/generators/spree/dummy/dummy_generator.rb +17 -19
- data/lib/generators/spree/install/install_generator.rb +15 -15
- data/lib/generators/spree/install/templates/config/initializers/spree.rb +1 -0
- data/lib/spree/core/controller_helpers/auth.rb +2 -4
- data/lib/spree/core/controller_helpers/common.rb +42 -43
- data/lib/spree/core/controller_helpers/order.rb +5 -9
- data/lib/spree/core/controller_helpers/payment_parameters.rb +4 -5
- data/lib/spree/core/controller_helpers/pricing.rb +27 -0
- data/lib/spree/core/controller_helpers/respond_with.rb +4 -4
- data/lib/spree/core/controller_helpers/search.rb +2 -2
- data/lib/spree/core/controller_helpers/store.rb +3 -3
- data/lib/spree/core/controller_helpers/strong_parameters.rb +4 -4
- data/lib/spree/core/current_store.rb +1 -1
- data/lib/spree/core/delegate_belongs_to.rb +19 -21
- data/lib/spree/core/engine.rb +12 -8
- data/lib/spree/core/environment/calculators.rb +0 -1
- data/lib/spree/core/environment_extension.rb +4 -4
- data/lib/spree/core/importer/order.rb +17 -22
- data/lib/spree/core/importer/product.rb +10 -9
- data/lib/spree/core/permalinks.rb +16 -16
- data/lib/spree/core/product_duplicator.rb +2 -3
- data/lib/spree/core/product_filters.rb +15 -16
- data/lib/spree/core/role_configuration.rb +2 -2
- data/lib/spree/core/search/base.rb +71 -57
- data/lib/spree/core/search/variant.rb +2 -4
- data/lib/spree/core/unreturned_item_charger.rb +1 -2
- data/lib/spree/core/validators/email.rb +2 -2
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/core.rb +2 -4
- data/lib/spree/i18n.rb +1 -1
- data/lib/spree/localized_number.rb +3 -1
- data/lib/spree/migrations.rb +27 -26
- data/lib/spree/money.rb +19 -4
- data/lib/spree/permission_sets/base.rb +1 -1
- data/lib/spree/permitted_attributes.rb +7 -7
- data/lib/spree/responder.rb +4 -5
- data/lib/spree/testing_support/authorization_helpers.rb +1 -1
- data/lib/spree/testing_support/caching.rb +8 -8
- data/lib/spree/testing_support/capybara_ext.rb +11 -13
- data/lib/spree/testing_support/common_rake.rb +4 -4
- data/lib/spree/testing_support/controller_requests.rb +1 -1
- data/lib/spree/testing_support/extension_rake.rb +1 -2
- data/lib/spree/testing_support/factories/address_factory.rb +14 -3
- data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +1 -1
- data/lib/spree/testing_support/factories/carton_factory.rb +2 -2
- data/lib/spree/testing_support/factories/credit_card_factory.rb +4 -0
- data/lib/spree/testing_support/factories/customer_return_factory.rb +4 -6
- data/lib/spree/testing_support/factories/line_item_factory.rb +1 -1
- data/lib/spree/testing_support/factories/order_factory.rb +10 -11
- data/lib/spree/testing_support/factories/payment_factory.rb +5 -0
- data/lib/spree/testing_support/factories/promotion_category_factory.rb +0 -1
- data/lib/spree/testing_support/factories/promotion_factory.rb +0 -1
- data/lib/spree/testing_support/factories/refund_factory.rb +1 -1
- data/lib/spree/testing_support/factories/reimbursement_factory.rb +1 -1
- data/lib/spree/testing_support/factories/return_item_factory.rb +1 -1
- data/lib/spree/testing_support/factories/shipping_method_factory.rb +5 -2
- data/lib/spree/testing_support/factories/state_factory.rb +17 -7
- data/lib/spree/testing_support/factories/stock_location_factory.rb +4 -4
- data/lib/spree/testing_support/factories/stock_transfer_factory.rb +1 -1
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +0 -1
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +0 -2
- data/lib/spree/testing_support/factories/tax_category_factory.rb +2 -2
- data/lib/spree/testing_support/factories/user_factory.rb +1 -1
- data/lib/spree/testing_support/factories/variant_factory.rb +1 -2
- data/lib/spree/testing_support/factories/zone_factory.rb +2 -1
- data/lib/spree/testing_support/i18n.rb +4 -5
- data/lib/spree/testing_support/order_walkthrough.rb +8 -9
- data/lib/spree/testing_support/preferences.rb +1 -1
- data/lib/spree/testing_support/sequences.rb +5 -4
- data/lib/tasks/core.rake +15 -19
- data/lib/tasks/email.rake +3 -3
- data/lib/tasks/exchanges.rake +12 -14
- data/lib/tasks/migrations/assure_store_on_orders.rake +38 -0
- data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake +2 -2
- data/lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake +1 -11
- data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake +17 -0
- data/lib/tasks/migrations/migrate_user_addresses.rake +1 -1
- data/lib/tasks/order_capturing.rake +1 -1
- data/lib/tasks/upgrade.rake +11 -0
- data/script/rails +0 -1
- data/solidus_core.gemspec +6 -8
- data/spec/helpers/base_helper_spec.rb +15 -18
- data/spec/helpers/order_helper_spec.rb +2 -2
- data/spec/helpers/products_helper_spec.rb +43 -51
- data/spec/helpers/taxons_helper_spec.rb +1 -1
- data/spec/lib/i18n_spec.rb +11 -11
- data/spec/lib/search/base_spec.rb +12 -14
- data/spec/lib/search/variant_spec.rb +1 -0
- data/spec/lib/spree/core/controller_helpers/order_spec.rb +1 -7
- data/spec/lib/spree/core/controller_helpers/payment_parameters_spec.rb +26 -28
- data/spec/lib/spree/core/controller_helpers/pricing_spec.rb +63 -0
- data/spec/lib/spree/core/controller_helpers/search_spec.rb +4 -2
- data/spec/lib/spree/core/delegate_belongs_to_spec.rb +1 -1
- data/spec/lib/spree/core/importer/order_spec.rb +95 -90
- data/spec/lib/spree/core/role_configuration_spec.rb +16 -16
- data/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb +35 -0
- data/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb +10 -1
- data/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb +0 -1
- data/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb +6 -1
- data/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb +37 -1
- data/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb +2 -2
- data/spec/lib/spree/core/testing_support/factories/stock_packer_factory_spec.rb +1 -1
- data/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb +1 -2
- data/spec/lib/spree/core/testing_support/preferences_spec.rb +26 -0
- data/spec/lib/spree/core/unreturned_item_charger_spec.rb +7 -9
- data/spec/lib/spree/core/validators/email_spec.rb +8 -6
- data/spec/lib/spree/localized_number_spec.rb +1 -3
- data/spec/lib/spree/migrations_spec.rb +2 -2
- data/spec/lib/spree/money_spec.rb +75 -6
- data/spec/lib/tasks/exchanges_spec.rb +2 -12
- data/spec/lib/tasks/migrations/copy_shipped_shipments_to_cartons_spec.rb +0 -1
- data/spec/lib/tasks/order_capturing_spec.rb +1 -1
- data/spec/mailers/carton_mailer_spec.rb +3 -3
- data/spec/mailers/order_mailer_spec.rb +9 -11
- data/spec/mailers/reimbursement_mailer_spec.rb +2 -2
- data/spec/mailers/test_mailer_spec.rb +1 -1
- data/spec/models/spree/ability_spec.rb +4 -7
- data/spec/models/spree/address_spec.rb +32 -35
- data/spec/models/spree/adjustment_reason_spec.rb +0 -2
- data/spec/models/spree/adjustment_spec.rb +2 -2
- data/spec/models/spree/app_configuration_spec.rb +33 -3
- data/spec/models/spree/asset_spec.rb +1 -2
- data/spec/models/spree/calculator/default_tax_spec.rb +141 -52
- data/spec/models/spree/calculator/flat_percent_item_total_spec.rb +1 -1
- data/spec/models/spree/calculator/flexi_rate_spec.rb +6 -6
- data/spec/models/spree/calculator/percent_on_line_item_spec.rb +1 -1
- data/spec/models/spree/calculator/price_sack_spec.rb +2 -2
- data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +9 -11
- data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +4 -4
- data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +2 -2
- data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +6 -7
- data/spec/models/spree/calculator/shipping/per_item_spec.rb +2 -2
- data/spec/models/spree/calculator/shipping/price_sack_spec.rb +2 -2
- data/spec/models/spree/calculator/tiered_flat_rate_spec.rb +1 -2
- data/spec/models/spree/calculator/tiered_percent_spec.rb +1 -1
- data/spec/models/spree/calculator_spec.rb +3 -8
- data/spec/models/spree/carton_spec.rb +1 -1
- data/spec/models/spree/classification_spec.rb +1 -1
- data/spec/models/spree/concerns/display_money_spec.rb +0 -1
- data/spec/models/spree/concerns/ordered_property_value_list_spec.rb +26 -1
- data/spec/models/spree/concerns/user_address_book_spec.rb +19 -12
- data/spec/models/spree/concerns/user_methods_spec.rb +1 -1
- data/spec/models/spree/country_spec.rb +52 -0
- data/spec/models/spree/credit_card_spec.rb +17 -12
- data/spec/models/spree/customer_return_spec.rb +27 -23
- data/spec/models/spree/exchange_spec.rb +2 -7
- data/spec/models/spree/gateway/bogus_simple.rb +2 -4
- data/spec/models/spree/gateway/bogus_spec.rb +4 -2
- data/spec/models/spree/gateway_spec.rb +8 -3
- data/spec/models/spree/inventory_unit_spec.rb +13 -14
- data/spec/models/spree/item_adjustments_spec.rb +36 -40
- data/spec/models/spree/line_item_spec.rb +92 -48
- data/spec/models/spree/option_type_spec.rb +1 -1
- data/spec/models/spree/option_value_spec.rb +1 -1
- data/spec/models/spree/order/address_spec.rb +1 -1
- data/spec/models/spree/order/callbacks_spec.rb +3 -3
- data/spec/models/spree/order/checkout_spec.rb +55 -48
- data/spec/models/spree/order/finalizing_spec.rb +8 -9
- data/spec/models/spree/order/payment_spec.rb +20 -20
- data/spec/models/spree/order/risk_assessment_spec.rb +1 -1
- data/spec/models/spree/order/state_machine_spec.rb +40 -131
- data/spec/models/spree/order/tax_spec.rb +11 -12
- data/spec/models/spree/order/totals_spec.rb +3 -3
- data/spec/models/spree/order/updating_spec.rb +2 -2
- data/spec/models/spree/order/validations_spec.rb +2 -2
- data/spec/models/spree/order_cancellations_spec.rb +1 -1
- data/spec/models/spree/order_capturing_spec.rb +1 -1
- data/spec/models/spree/order_contents_spec.rb +10 -11
- data/spec/models/spree/order_inventory_spec.rb +11 -11
- data/spec/models/spree/order_merger_spec.rb +1 -0
- data/spec/models/spree/order_shipping_spec.rb +8 -10
- data/spec/models/spree/order_spec.rb +137 -124
- data/spec/models/spree/order_stock_location_spec.rb +2 -2
- data/spec/models/spree/order_update_attributes_spec.rb +6 -10
- data/spec/models/spree/order_updater_spec.rb +4 -8
- data/spec/models/spree/payment_create_spec.rb +11 -12
- data/spec/models/spree/payment_method/store_credit_spec.rb +10 -6
- data/spec/models/spree/payment_method_spec.rb +4 -5
- data/spec/models/spree/payment_spec.rb +61 -69
- data/spec/models/spree/permission_sets/base_spec.rb +1 -1
- data/spec/models/spree/permission_sets/configuration_display.rb +0 -1
- data/spec/models/spree/permission_sets/configuration_management_spec.rb +0 -1
- data/spec/models/spree/permission_sets/dashboard_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/order_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/order_management_spec.rb +0 -1
- data/spec/models/spree/permission_sets/product_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/product_management_spec.rb +0 -1
- data/spec/models/spree/permission_sets/promotion_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/promotion_management_spec.rb +0 -1
- data/spec/models/spree/permission_sets/report_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/restricted_stock_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/restricted_stock_management_spec.rb +0 -1
- data/spec/models/spree/permission_sets/restricted_stock_transfer_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/restricted_stock_transfer_management_spec.rb +6 -6
- data/spec/models/spree/permission_sets/stock_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/stock_management_spec.rb +0 -1
- data/spec/models/spree/permission_sets/stock_transfer_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/stock_transfer_management_spec.rb +0 -2
- data/spec/models/spree/permission_sets/user_display_spec.rb +0 -1
- data/spec/models/spree/permission_sets/user_management_spec.rb +0 -1
- data/spec/models/spree/preference_spec.rb +1 -4
- data/spec/models/spree/preferences/configuration_spec.rb +2 -7
- data/spec/models/spree/preferences/preferable_spec.rb +13 -24
- data/spec/models/spree/preferences/scoped_store_spec.rb +1 -1
- data/spec/models/spree/preferences/static_model_preferences_spec.rb +5 -6
- data/spec/models/spree/preferences/statically_configurable_spec.rb +2 -6
- data/spec/models/spree/preferences/store_spec.rb +2 -3
- data/spec/models/spree/price_spec.rb +6 -6
- data/spec/models/spree/product/scopes_spec.rb +20 -20
- data/spec/models/spree/product_duplicator_spec.rb +16 -29
- data/spec/models/spree/product_filter_spec.rb +2 -2
- data/spec/models/spree/product_spec.rb +53 -20
- data/spec/models/spree/promotion/actions/create_adjustment_spec.rb +10 -12
- data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +4 -4
- data/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb +9 -9
- data/spec/models/spree/promotion/actions/free_shipping_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/first_order_spec.rb +10 -10
- data/spec/models/spree/promotion/rules/item_total_spec.rb +63 -19
- data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/product_spec.rb +8 -8
- data/spec/models/spree/promotion/rules/taxon_spec.rb +4 -4
- data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +3 -4
- data/spec/models/spree/promotion/rules/user_spec.rb +7 -7
- data/spec/models/spree/promotion_builder_spec.rb +10 -8
- data/spec/models/spree/promotion_category_spec.rb +1 -1
- data/spec/models/spree/promotion_code/code_builder_spec.rb +1 -3
- data/spec/models/spree/promotion_code_spec.rb +8 -7
- data/spec/models/spree/promotion_handler/cart_spec.rb +1 -1
- data/spec/models/spree/promotion_handler/coupon_spec.rb +28 -28
- data/spec/models/spree/promotion_handler/page_spec.rb +6 -7
- data/spec/models/spree/promotion_rule_spec.rb +1 -2
- data/spec/models/spree/promotion_spec.rb +25 -21
- data/spec/models/spree/refund_spec.rb +8 -11
- data/spec/models/spree/reimbursement/credit_spec.rb +2 -2
- data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb +6 -4
- data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb +1 -1
- data/spec/models/spree/reimbursement_performer_spec.rb +2 -2
- data/spec/models/spree/reimbursement_spec.rb +9 -11
- data/spec/models/spree/reimbursement_tax_calculator_spec.rb +4 -5
- data/spec/models/spree/reimbursement_type/credit_spec.rb +2 -2
- data/spec/models/spree/reimbursement_type/exchange_spec.rb +2 -3
- data/spec/models/spree/reimbursement_type/original_payment_spec.rb +4 -4
- data/spec/models/spree/reimbursement_type/store_credit_spec.rb +1 -1
- data/spec/models/spree/return_authorization_spec.rb +18 -21
- data/spec/models/spree/return_item/eligibility_validator/default_spec.rb +7 -7
- data/spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb +0 -1
- data/spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb +0 -1
- data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb +1 -1
- data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb +1 -1
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb +1 -2
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +3 -5
- data/spec/models/spree/return_item_spec.rb +29 -31
- data/spec/models/spree/returns_calculator_spec.rb +1 -1
- data/spec/models/spree/shipment_spec.rb +59 -43
- data/spec/models/spree/shipping_calculator_spec.rb +3 -3
- data/spec/models/spree/shipping_manifest_spec.rb +8 -7
- data/spec/models/spree/shipping_method_spec.rb +149 -24
- data/spec/models/spree/shipping_rate_spec.rb +116 -76
- data/spec/models/spree/shipping_rate_tax_spec.rb +83 -0
- data/spec/models/spree/state_spec.rb +2 -2
- data/spec/models/spree/stock/availability_validator_spec.rb +4 -4
- data/spec/models/spree/stock/coordinator_spec.rb +33 -49
- data/spec/models/spree/stock/differentiator_spec.rb +1 -1
- data/spec/models/spree/stock/estimator_spec.rb +83 -54
- data/spec/models/spree/stock/inventory_unit_builder_spec.rb +1 -3
- data/spec/models/spree/stock/package_spec.rb +27 -10
- data/spec/models/spree/stock/packer_spec.rb +4 -4
- data/spec/models/spree/stock/prioritizer_spec.rb +1 -1
- data/spec/models/spree/stock/quantifier_spec.rb +2 -6
- data/spec/models/spree/stock/splitter/backordered_spec.rb +1 -1
- data/spec/models/spree/stock/splitter/base_spec.rb +1 -2
- data/spec/models/spree/stock/splitter/shipping_category_spec.rb +1 -3
- data/spec/models/spree/stock/splitter/weight_spec.rb +3 -3
- data/spec/models/spree/stock_item_spec.rb +16 -16
- data/spec/models/spree/stock_location_spec.rb +6 -8
- data/spec/models/spree/stock_movement_spec.rb +1 -1
- data/spec/models/spree/stock_transfer_spec.rb +1 -3
- data/spec/models/spree/store_credit_category_spec.rb +1 -1
- data/spec/models/spree/store_credit_event_spec.rb +3 -5
- data/spec/models/spree/store_credit_spec.rb +24 -23
- data/spec/models/spree/store_spec.rb +21 -2
- data/spec/models/spree/tax/item_adjuster_spec.rb +74 -0
- data/spec/models/spree/tax/order_adjuster_spec.rb +49 -0
- data/spec/models/spree/tax/shipping_rate_taxer_spec.rb +50 -0
- data/spec/models/spree/tax/tax_location_spec.rb +68 -0
- data/spec/models/spree/tax/taxation_integration_spec.rb +787 -0
- data/spec/models/spree/tax_category_spec.rb +2 -2
- data/spec/models/spree/tax_rate_spec.rb +185 -536
- data/spec/models/spree/taxon_spec.rb +69 -5
- data/spec/models/spree/taxonomy_spec.rb +2 -3
- data/spec/models/spree/tracker_spec.rb +1 -1
- data/spec/models/spree/transfer_item_spec.rb +1 -1
- data/spec/models/spree/unit_cancel_spec.rb +9 -14
- data/spec/models/spree/user_spec.rb +19 -24
- data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +1 -1
- data/spec/models/spree/variant/pricer_spec.rb +48 -0
- data/spec/models/spree/variant/pricing_options_spec.rb +106 -0
- data/spec/models/spree/variant/scopes_spec.rb +31 -8
- data/spec/models/spree/variant_property_rule_spec.rb +1 -1
- data/spec/models/spree/variant_spec.rb +166 -52
- data/spec/models/spree/zone_spec.rb +135 -10
- data/spec/support/big_decimal.rb +1 -1
- data/spec/support/concerns/working_factories.rb +2 -2
- data/spec/support/dummy_ability.rb +0 -1
- metadata +55 -44
- data/lib/generators/spree/dummy/templates/initializers/devise.rb +0 -3
- data/lib/spree/migration_helpers.rb +0 -19
- data/vendor/assets/stylesheets/skeleton.css +0 -242
@@ -1,12 +1,10 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe Spree::StoreCredit do
|
4
|
-
|
5
4
|
let(:currency) { "TEST" }
|
6
5
|
let(:store_credit) { build(:store_credit, store_credit_attrs) }
|
7
6
|
let(:store_credit_attrs) { {} }
|
8
7
|
|
9
|
-
|
10
8
|
describe "callbacks" do
|
11
9
|
subject { store_credit.save }
|
12
10
|
|
@@ -23,7 +21,7 @@ describe Spree::StoreCredit do
|
|
23
21
|
|
24
22
|
context "category is a non-expiring type" do
|
25
23
|
let!(:secondary_credit_type) { create(:secondary_credit_type) }
|
26
|
-
let(:store_credit) { build(:store_credit, credit_type: nil)}
|
24
|
+
let(:store_credit) { build(:store_credit, credit_type: nil) }
|
27
25
|
|
28
26
|
before do
|
29
27
|
allow(store_credit.category).to receive(:non_expiring?).and_return(true)
|
@@ -47,8 +45,8 @@ describe Spree::StoreCredit do
|
|
47
45
|
end
|
48
46
|
|
49
47
|
context "the type is set" do
|
50
|
-
let!(:secondary_credit_type) { create(:secondary_credit_type)}
|
51
|
-
let(:store_credit) { build(:store_credit, credit_type: secondary_credit_type)}
|
48
|
+
let!(:secondary_credit_type) { create(:secondary_credit_type) }
|
49
|
+
let(:store_credit) { build(:store_credit, credit_type: secondary_credit_type) }
|
52
50
|
|
53
51
|
before do
|
54
52
|
allow(store_credit.category).to receive(:non_expiring?).and_return(false)
|
@@ -71,7 +69,7 @@ describe Spree::StoreCredit do
|
|
71
69
|
|
72
70
|
it "should set the correct error message" do
|
73
71
|
invalid_store_credit.valid?
|
74
|
-
expect(invalid_store_credit.errors.full_messages).to include("Amount
|
72
|
+
expect(invalid_store_credit.errors.full_messages).to include("Amount Used cannot be greater than the credited amount")
|
75
73
|
end
|
76
74
|
end
|
77
75
|
|
@@ -81,7 +79,6 @@ describe Spree::StoreCredit do
|
|
81
79
|
it "should be valid" do
|
82
80
|
expect(store_credit).to be_valid
|
83
81
|
end
|
84
|
-
|
85
82
|
end
|
86
83
|
end
|
87
84
|
|
@@ -168,7 +165,7 @@ describe Spree::StoreCredit do
|
|
168
165
|
before { store_credit.update_attributes(amount_authorized: authorized_amount) }
|
169
166
|
|
170
167
|
it "subtracts the authorized amount from the credited amount" do
|
171
|
-
expect(store_credit.amount_remaining).to eq
|
168
|
+
expect(store_credit.amount_remaining).to eq(store_credit.amount - authorized_amount)
|
172
169
|
end
|
173
170
|
end
|
174
171
|
end
|
@@ -180,7 +177,7 @@ describe Spree::StoreCredit do
|
|
180
177
|
|
181
178
|
context "the authorized amount is not defined" do
|
182
179
|
it "subtracts the amount used from the credited amount" do
|
183
|
-
expect(store_credit.amount_remaining).to eq
|
180
|
+
expect(store_credit.amount_remaining).to eq(store_credit.amount - amount_used)
|
184
181
|
end
|
185
182
|
end
|
186
183
|
|
@@ -190,7 +187,7 @@ describe Spree::StoreCredit do
|
|
190
187
|
before { store_credit.update_attributes(amount_authorized: authorized_amount) }
|
191
188
|
|
192
189
|
it "subtracts the amount used and the authorized amount from the credited amount" do
|
193
|
-
expect(store_credit.amount_remaining).to eq
|
190
|
+
expect(store_credit.amount_remaining).to eq(store_credit.amount - amount_used - authorized_amount)
|
194
191
|
end
|
195
192
|
end
|
196
193
|
end
|
@@ -203,7 +200,6 @@ describe Spree::StoreCredit do
|
|
203
200
|
let(:originator) { nil }
|
204
201
|
|
205
202
|
context "amount has not been authorized yet" do
|
206
|
-
|
207
203
|
before { store_credit.update_attributes(amount_authorized: authorization_amount) }
|
208
204
|
|
209
205
|
it "returns true" do
|
@@ -212,7 +208,7 @@ describe Spree::StoreCredit do
|
|
212
208
|
|
213
209
|
it "adds the new amount to authorized amount" do
|
214
210
|
store_credit.authorize(added_authorization_amount, store_credit.currency)
|
215
|
-
expect(store_credit.reload.amount_authorized).to eq
|
211
|
+
expect(store_credit.reload.amount_authorized).to eq(authorization_amount + added_authorization_amount)
|
216
212
|
end
|
217
213
|
|
218
214
|
context "originator is present" do
|
@@ -282,7 +278,7 @@ describe Spree::StoreCredit do
|
|
282
278
|
|
283
279
|
context 'troublesome floats' do
|
284
280
|
# 8.21.to_d < 8.21 => true
|
285
|
-
let(:store_credit_attrs) { {amount: 8.21} }
|
281
|
+
let(:store_credit_attrs) { { amount: 8.21 } }
|
286
282
|
|
287
283
|
subject { store_credit.validate_authorization(store_credit_attrs[:amount], store_credit.currency) }
|
288
284
|
|
@@ -374,7 +370,6 @@ describe Spree::StoreCredit do
|
|
374
370
|
end
|
375
371
|
|
376
372
|
context "no event found for auth_code" do
|
377
|
-
|
378
373
|
it "returns false" do
|
379
374
|
expect(subject).to be false
|
380
375
|
end
|
@@ -387,11 +382,13 @@ describe Spree::StoreCredit do
|
|
387
382
|
|
388
383
|
context "capture event found for auth_code" do
|
389
384
|
let(:captured_amount) { 10.0 }
|
390
|
-
let!(:capture_event) {
|
385
|
+
let!(:capture_event) {
|
386
|
+
create(:store_credit_auth_event,
|
391
387
|
action: Spree::StoreCredit::CAPTURE_ACTION,
|
392
388
|
authorization_code: auth_code,
|
393
389
|
amount: captured_amount,
|
394
|
-
store_credit: store_credit)
|
390
|
+
store_credit: store_credit)
|
391
|
+
}
|
395
392
|
|
396
393
|
it "returns false" do
|
397
394
|
expect(subject).to be false
|
@@ -406,10 +403,12 @@ describe Spree::StoreCredit do
|
|
406
403
|
let(:auth_event) { create(:store_credit_auth_event) }
|
407
404
|
|
408
405
|
let(:authorized_amount) { 10.0 }
|
409
|
-
let!(:auth_event) {
|
406
|
+
let!(:auth_event) {
|
407
|
+
create(:store_credit_auth_event,
|
410
408
|
authorization_code: auth_code,
|
411
409
|
amount: authorized_amount,
|
412
|
-
store_credit: store_credit)
|
410
|
+
store_credit: store_credit)
|
411
|
+
}
|
413
412
|
|
414
413
|
it "returns true" do
|
415
414
|
expect(subject).to be true
|
@@ -434,11 +433,13 @@ describe Spree::StoreCredit do
|
|
434
433
|
let(:event_auth_code) { "1-SC-20141111111111" }
|
435
434
|
let(:amount_used) { 10.0 }
|
436
435
|
let(:store_credit) { create(:store_credit, amount_used: amount_used) }
|
437
|
-
let!(:capture_event) {
|
436
|
+
let!(:capture_event) {
|
437
|
+
create(:store_credit_auth_event,
|
438
438
|
action: Spree::StoreCredit::CAPTURE_ACTION,
|
439
439
|
authorization_code: event_auth_code,
|
440
440
|
amount: captured_amount,
|
441
|
-
store_credit: store_credit)
|
441
|
+
store_credit: store_credit)
|
442
|
+
}
|
442
443
|
let(:originator) { nil }
|
443
444
|
|
444
445
|
subject { store_credit.credit(credit_amount, auth_code, currency, action_originator: originator) }
|
@@ -554,7 +555,7 @@ describe Spree::StoreCredit do
|
|
554
555
|
|
555
556
|
it "credits the passed amount to the store credit amount used" do
|
556
557
|
subject
|
557
|
-
expect(store_credit.reload.amount_used).to eq
|
558
|
+
expect(store_credit.reload.amount_used).to eq(amount_used - credit_amount)
|
558
559
|
end
|
559
560
|
|
560
561
|
it "creates a new store credit event" do
|
@@ -766,7 +767,7 @@ describe Spree::StoreCredit do
|
|
766
767
|
subject { create(:store_credit, user: user, amount: additional_store_credit_amount) }
|
767
768
|
|
768
769
|
it "saves the user's total store credit in the event" do
|
769
|
-
expect(subject.store_credit_events.first.user_total_amount).to eq
|
770
|
+
expect(subject.store_credit_events.first.user_total_amount).to eq(store_credit_amount + additional_store_credit_amount)
|
770
771
|
end
|
771
772
|
end
|
772
773
|
|
@@ -804,7 +805,7 @@ describe Spree::StoreCredit do
|
|
804
805
|
|
805
806
|
it "sets the adjustment amount on the store credit event correctly" do
|
806
807
|
subject
|
807
|
-
expect(store_credit.store_credit_events.find_by(action: Spree::StoreCredit::ADJUSTMENT_ACTION).amount).to eq
|
808
|
+
expect(store_credit.store_credit_events.find_by(action: Spree::StoreCredit::ADJUSTMENT_ACTION).amount).to eq(-20)
|
808
809
|
end
|
809
810
|
|
810
811
|
it "sets the originator on the store credit event correctly" do
|
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spree::Store, :
|
3
|
+
describe Spree::Store, type: :model do
|
4
|
+
it { is_expected.to respond_to(:cart_tax_country_iso) }
|
4
5
|
|
5
6
|
describe ".by_url" do
|
6
7
|
let!(:store) { create(:store, url: "website1.com\nwww.subdomain.com") }
|
@@ -19,7 +20,7 @@ describe Spree::Store, :type => :model do
|
|
19
20
|
let!(:store_1) { Spree::Store.first || create(:store) }
|
20
21
|
|
21
22
|
let!(:store_2) { create(:store, default: false, url: 'www.subdomain.com') }
|
22
|
-
let!(:store_3) { create(:store, default: false, url: 'www.another.com', code: 'CODE')}
|
23
|
+
let!(:store_3) { create(:store, default: false, url: 'www.another.com', code: 'CODE') }
|
23
24
|
|
24
25
|
it 'should return default when no domain' do
|
25
26
|
expect(subject.class.current).to eql(store_1)
|
@@ -52,4 +53,22 @@ describe Spree::Store, :type => :model do
|
|
52
53
|
end
|
53
54
|
end
|
54
55
|
|
56
|
+
describe '#default_cart_tax_location' do
|
57
|
+
subject { described_class.new(cart_tax_country_iso: cart_tax_country_iso) }
|
58
|
+
context "when there is no cart_tax_country_iso set" do
|
59
|
+
let(:cart_tax_country_iso) { '' }
|
60
|
+
it "responds with an empty default_cart_tax_location" do
|
61
|
+
expect(subject.default_cart_tax_location).to be_empty
|
62
|
+
end
|
63
|
+
end
|
64
|
+
|
65
|
+
context "when there is a cart_tax_country_iso set" do
|
66
|
+
let(:country) { create(:country, iso: "DE") }
|
67
|
+
let(:cart_tax_country_iso) { country.iso }
|
68
|
+
|
69
|
+
it "responds with a default_cart_tax_location with that country" do
|
70
|
+
expect(subject.default_cart_tax_location).to eq(Spree::Tax::TaxLocation.new(country: country))
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
55
74
|
end
|
@@ -0,0 +1,74 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe Spree::Tax::ItemAdjuster do
|
4
|
+
subject(:adjuster) { described_class.new(item) }
|
5
|
+
let(:order) { Spree::Order.new }
|
6
|
+
let(:item) { Spree::LineItem.new(order: order) }
|
7
|
+
|
8
|
+
before do
|
9
|
+
allow(order).to receive(:tax_zone) { build(:zone) }
|
10
|
+
end
|
11
|
+
|
12
|
+
describe 'initialization' do
|
13
|
+
it 'sets order to item order' do
|
14
|
+
expect(adjuster.order).to eq(item.order)
|
15
|
+
end
|
16
|
+
|
17
|
+
it 'sets adjustable' do
|
18
|
+
expect(adjuster.item).to eq(item)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
describe '#adjust!' do
|
23
|
+
before do
|
24
|
+
expect(order).to receive(:tax_zone).and_return(tax_zone)
|
25
|
+
end
|
26
|
+
|
27
|
+
context 'when the order has no tax zone' do
|
28
|
+
let(:tax_zone) { nil }
|
29
|
+
|
30
|
+
before do
|
31
|
+
allow(order).to receive(:tax_zone).and_return(nil)
|
32
|
+
adjuster.adjust!
|
33
|
+
end
|
34
|
+
|
35
|
+
it 'returns nil early' do
|
36
|
+
expect(adjuster.adjust!).to be_nil
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
context 'when the order has a tax zone' do
|
41
|
+
let(:item) { build_stubbed :line_item, order: order }
|
42
|
+
let(:tax_zone) { build_stubbed(:zone, :with_country) }
|
43
|
+
|
44
|
+
before do
|
45
|
+
expect(Spree::TaxRate).to receive(:for_zone).with(tax_zone).and_return(rates_for_order_zone)
|
46
|
+
expect(Spree::TaxRate).to receive(:for_zone).with(Spree::Zone.default_tax).and_return([])
|
47
|
+
end
|
48
|
+
|
49
|
+
context 'when there are no matching rates' do
|
50
|
+
let(:rates_for_order_zone) { [] }
|
51
|
+
|
52
|
+
it 'returns no adjustments' do
|
53
|
+
expect(adjuster.adjust!).to eq([])
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
57
|
+
context 'when there are matching rates for the zone' do
|
58
|
+
context 'and all rates have the same tax category as the item' do
|
59
|
+
let(:item_tax_category) { build_stubbed(:tax_category) }
|
60
|
+
let(:rate_1) { create :tax_rate, tax_category: item_tax_category }
|
61
|
+
let(:rate_2) { create :tax_rate }
|
62
|
+
let(:rates_for_order_zone) { [rate_1, rate_2] }
|
63
|
+
|
64
|
+
before { allow(item).to receive(:tax_category).and_return(item_tax_category) }
|
65
|
+
|
66
|
+
it 'creates an adjustment for every matching rate' do
|
67
|
+
expect(rate_1).to receive_message_chain(:adjustments, :create!)
|
68
|
+
expect(adjuster.adjust!.length).to eq(1)
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
@@ -0,0 +1,49 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe Spree::Tax::OrderAdjuster do
|
4
|
+
subject(:adjuster) { described_class.new(order) }
|
5
|
+
|
6
|
+
describe 'initialization' do
|
7
|
+
let(:order) { Spree::Order.new }
|
8
|
+
|
9
|
+
it 'sets order to adjustable' do
|
10
|
+
expect(adjuster.order).to eq(order)
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
describe '#adjust!' do
|
15
|
+
let(:zone) { build_stubbed(:zone) }
|
16
|
+
let(:line_items) { build_stubbed_list(:line_item, 2) }
|
17
|
+
let(:order) { build_stubbed(:order, line_items: line_items) }
|
18
|
+
let(:rates_for_order_zone) { [] }
|
19
|
+
let(:item_adjuster) { Spree::Tax::ItemAdjuster.new(line_items.first) }
|
20
|
+
|
21
|
+
before do
|
22
|
+
expect(order).to receive(:tax_zone).at_least(:once).and_return(zone)
|
23
|
+
expect(Spree::TaxRate).to receive(:for_zone).with(zone).and_return(rates_for_order_zone)
|
24
|
+
expect(Spree::TaxRate).to receive(:for_zone).with(Spree::Zone.default_tax).and_return([])
|
25
|
+
end
|
26
|
+
|
27
|
+
it 'calls the item adjuster with all line items' do
|
28
|
+
expect(Spree::Tax::ItemAdjuster).to receive(:new).
|
29
|
+
with(
|
30
|
+
line_items.first,
|
31
|
+
rates_for_order_zone: rates_for_order_zone,
|
32
|
+
rates_for_default_zone: [],
|
33
|
+
order_tax_zone: zone,
|
34
|
+
skip_destroy_adjustments: true
|
35
|
+
).and_return(item_adjuster)
|
36
|
+
expect(Spree::Tax::ItemAdjuster).to receive(:new).
|
37
|
+
with(
|
38
|
+
line_items.second,
|
39
|
+
rates_for_order_zone: rates_for_order_zone,
|
40
|
+
rates_for_default_zone: [],
|
41
|
+
order_tax_zone: zone,
|
42
|
+
skip_destroy_adjustments: true
|
43
|
+
).and_return(item_adjuster)
|
44
|
+
|
45
|
+
expect(item_adjuster).to receive(:adjust!).twice
|
46
|
+
adjuster.adjust!
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
@@ -0,0 +1,50 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::Tax::ShippingRateTaxer do
|
4
|
+
let(:shipping_rate) { build_stubbed(:shipping_rate) }
|
5
|
+
|
6
|
+
subject(:taxer) { described_class.new(shipping_rate) }
|
7
|
+
|
8
|
+
describe '#tax' do
|
9
|
+
subject(:taxer) { described_class.new.tax(shipping_rate) }
|
10
|
+
|
11
|
+
context 'with no matching tax rates' do
|
12
|
+
it 'returns the object' do
|
13
|
+
expect(subject).to eq(shipping_rate)
|
14
|
+
expect(subject.taxes).to eq([])
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
context 'with tax rates' do
|
19
|
+
let(:ship_address) { create :address }
|
20
|
+
let(:tax_category) { create :tax_category }
|
21
|
+
let(:order) { create :order, ship_address: ship_address }
|
22
|
+
let(:shipment) { create :shipment, order: order }
|
23
|
+
let!(:shipping_method) { create :shipping_method, tax_category: tax_category, zones: [zone] }
|
24
|
+
let(:zone) { create :zone, countries: [ship_address.country] }
|
25
|
+
let!(:tax_rate_one) { create :tax_rate, tax_category: tax_category, zone: zone, amount: 0.1 }
|
26
|
+
let!(:tax_rate_two) { create :tax_rate, tax_category: tax_category, zone: zone, amount: 0.2 }
|
27
|
+
let!(:non_applicable_rate) { create :tax_rate, zone: zone }
|
28
|
+
let(:shipping_rate) { create :shipping_rate, cost: 10, shipping_method: shipping_method }
|
29
|
+
|
30
|
+
it 'builds a shipping rate tax for every tax rate' do
|
31
|
+
expect(subject.taxes.length).to eq(2)
|
32
|
+
expect(subject.taxes.map(&:tax_rate)).to include(tax_rate_one)
|
33
|
+
expect(subject.taxes.map(&:tax_rate)).to include(tax_rate_two)
|
34
|
+
# This rate has a different tax category.
|
35
|
+
expect(subject.taxes.map(&:tax_rate)).not_to include(non_applicable_rate)
|
36
|
+
end
|
37
|
+
|
38
|
+
it 'will produce a shipping rate that, when saved, also saves the taxes' do
|
39
|
+
expect { subject.save }.to change(Spree::ShippingRateTax, :count).by(2)
|
40
|
+
end
|
41
|
+
|
42
|
+
it 'will produce a shipping rate with correct taxes' do
|
43
|
+
tax_one = subject.taxes.detect { |tax| tax.tax_rate == tax_rate_one }
|
44
|
+
tax_two = subject.taxes.detect { |tax| tax.tax_rate == tax_rate_two }
|
45
|
+
expect(tax_one.amount).to eq(shipping_rate.cost * tax_rate_one.amount)
|
46
|
+
expect(tax_two.amount).to eq(shipping_rate.cost * tax_rate_two.amount)
|
47
|
+
end
|
48
|
+
end
|
49
|
+
end
|
50
|
+
end
|
@@ -0,0 +1,68 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
RSpec.describe Spree::Tax::TaxLocation do
|
4
|
+
let(:country) { build_stubbed(:country) }
|
5
|
+
let(:state) { build_stubbed(:state) }
|
6
|
+
|
7
|
+
subject { described_class.new }
|
8
|
+
|
9
|
+
it { is_expected.to respond_to(:state_id) }
|
10
|
+
it { is_expected.to respond_to(:country_id) }
|
11
|
+
|
12
|
+
describe "default values" do
|
13
|
+
it "has a nil state and country id" do
|
14
|
+
expect(subject.state_id).to eq(nil)
|
15
|
+
expect(subject.country_id).to eq(nil)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
describe '#==' do
|
20
|
+
let(:other) { described_class.new(state: nil, country: nil) }
|
21
|
+
|
22
|
+
it 'compares the values of state id and country id and does not care about object identity' do
|
23
|
+
expect(subject).to eq(other)
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
describe "initialization" do
|
28
|
+
subject { described_class.new(args) }
|
29
|
+
|
30
|
+
context 'with a country object' do
|
31
|
+
let(:args) { { country: country } }
|
32
|
+
|
33
|
+
it "will yield a location with that country's id" do
|
34
|
+
expect(subject.country_id).to eq(country.id)
|
35
|
+
end
|
36
|
+
end
|
37
|
+
|
38
|
+
context 'with a state object' do
|
39
|
+
let(:args) { { state: state } }
|
40
|
+
|
41
|
+
it "will yield a location with that state's id" do
|
42
|
+
expect(subject.state_id).to eq(state.id)
|
43
|
+
end
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
describe "#empty?" do
|
48
|
+
subject { described_class.new(args).empty? }
|
49
|
+
|
50
|
+
context 'with a country present' do
|
51
|
+
let(:args) { { country: country } }
|
52
|
+
|
53
|
+
it { is_expected.to be false }
|
54
|
+
end
|
55
|
+
|
56
|
+
context 'with a state present' do
|
57
|
+
let(:args) { { state: state } }
|
58
|
+
|
59
|
+
it { is_expected.to be false }
|
60
|
+
end
|
61
|
+
|
62
|
+
context 'with no region data present' do
|
63
|
+
let(:args) { {} }
|
64
|
+
|
65
|
+
it { is_expected.to be true }
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|