spree_core 3.1.14 → 3.2.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 → spree.js.coffee} +2 -2
- data/app/helpers/spree/base_helper.rb +1 -1
- data/app/helpers/spree/products_helper.rb +0 -6
- data/app/mailers/spree/reimbursement_mailer.rb +6 -6
- data/app/models/concerns/spree/acts_as_taggable.rb +11 -0
- data/app/models/concerns/spree/adjustment_source.rb +1 -1
- data/app/models/concerns/spree/ransackable_attributes.rb +0 -5
- data/app/models/spree/address.rb +67 -38
- data/app/models/spree/app_configuration.rb +9 -6
- data/app/models/spree/base.rb +1 -1
- data/app/models/spree/calculator.rb +1 -1
- data/app/models/spree/country.rb +5 -4
- data/app/models/spree/credit_card.rb +3 -3
- data/app/models/spree/gateway/bogus.rb +11 -11
- data/app/models/spree/gateway/bogus_simple.rb +4 -4
- data/app/models/spree/gateway.rb +1 -1
- data/app/models/spree/image.rb +2 -2
- data/app/models/spree/inventory_unit.rb +6 -10
- data/app/models/spree/line_item.rb +17 -6
- data/app/models/spree/order/checkout.rb +2 -2
- data/app/models/spree/order.rb +12 -25
- data/app/models/spree/order_contents.rb +7 -6
- data/app/models/spree/order_inventory.rb +12 -1
- data/app/models/spree/order_updater.rb +1 -2
- data/app/models/spree/payment/processing.rb +3 -3
- data/app/models/spree/payment_method.rb +7 -1
- data/app/models/spree/preferences/store.rb +3 -3
- data/app/models/spree/product/scopes.rb +16 -20
- data/app/models/spree/product.rb +11 -3
- data/app/models/spree/promotion/actions/create_line_items.rb +21 -3
- data/app/models/spree/promotion/rules/country.rb +23 -0
- data/app/models/spree/promotion/rules/option_value.rb +13 -10
- data/app/models/spree/promotion/rules/taxon.rb +1 -1
- data/app/models/spree/promotion.rb +35 -1
- data/app/models/spree/promotion_handler/cart.rb +3 -17
- data/app/models/spree/promotion_handler/coupon.rb +22 -22
- data/app/models/spree/promotion_handler/page.rb +2 -2
- data/app/models/spree/refund.rb +1 -1
- data/app/models/spree/refund_reason.rb +1 -1
- data/app/models/spree/reimbursement_type.rb +5 -1
- data/app/models/spree/return_item.rb +1 -1
- data/app/models/spree/shipment.rb +4 -6
- data/app/models/spree/shipment_handler.rb +1 -1
- data/app/models/spree/stock/adjuster.rb +9 -2
- data/app/models/spree/stock/coordinator.rb +11 -4
- data/app/models/spree/stock/inventory_unit_builder.rb +1 -1
- data/app/models/spree/stock/package.rb +11 -3
- data/app/models/spree/stock/packer.rb +15 -5
- data/app/models/spree/stock/prioritizer.rb +25 -15
- data/app/models/spree/stock/splitter/shipping_category.rb +6 -1
- data/app/models/spree/stock_item.rb +2 -1
- data/app/models/spree/stock_movement.rb +11 -6
- data/app/models/spree/store.rb +1 -0
- data/app/models/spree/store_credit.rb +1 -1
- data/app/models/spree/tag.rb +4 -0
- data/app/models/spree/tax_rate.rb +6 -0
- data/app/models/spree/taxon.rb +3 -3
- data/app/models/spree/variant.rb +6 -3
- data/app/models/spree/zone.rb +2 -2
- data/app/views/spree/shared/_paths.html.erb +8 -0
- data/config/initializers/acts_as_taggable_on.rb +9 -0
- data/config/initializers/friendly_id.rb +0 -81
- data/config/locales/en.yml +11 -0
- data/db/default/spree/countries.rb +5 -1
- data/db/default/spree/roles.rb +2 -2
- data/db/default/spree/states.rb +1 -1
- data/db/migrate/20120831092320_spree_one_two.rb +101 -101
- data/db/migrate/20120831092359_spree_promo_one_two.rb +14 -14
- data/db/migrate/20120905145253_add_tax_rate_label.rb +1 -1
- data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb +2 -2
- data/db/migrate/20120929093553_remove_unused_preference_columns.rb +4 -4
- data/db/migrate/20121009142519_add_lock_version_to_variant.rb +2 -2
- data/db/migrate/20121010142909_add_states_required_to_countries.rb +2 -2
- data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +3 -3
- data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +5 -5
- data/db/migrate/20121031162139_split_prices_from_variants.rb +10 -10
- data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +3 -3
- data/db/migrate/20121107184631_add_currency_to_line_items.rb +1 -1
- data/db/migrate/20121107194006_add_currency_to_orders.rb +1 -1
- data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +2 -2
- data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +1 -1
- data/db/migrate/20121124203911_add_position_to_taxonomies.rb +2 -2
- data/db/migrate/20121126040517_add_last_ip_to_spree_orders.rb +1 -1
- data/db/migrate/20121213162028_add_state_to_spree_adjustments.rb +1 -1
- data/db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb +1 -1
- data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb +2 -2
- data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +1 -1
- data/db/migrate/20130207155350_add_order_id_index_to_payments.rb +1 -1
- data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb +1 -1
- data/db/migrate/20130211190146_create_spree_stock_items.rb +2 -2
- data/db/migrate/20130211191120_create_spree_stock_locations.rb +1 -1
- data/db/migrate/20130213191427_create_default_stock.rb +1 -2
- data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +1 -1
- data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb +2 -2
- data/db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb +1 -1
- data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb +3 -3
- data/db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb +1 -1
- data/db/migrate/20130228210442_create_shipping_method_zone.rb +3 -3
- data/db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb +1 -1
- data/db/migrate/20130301162924_create_shipping_method_categories.rb +3 -3
- data/db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb +1 -1
- data/db/migrate/20130304162240_create_spree_shipping_rates.rb +5 -5
- data/db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb +1 -1
- data/db/migrate/20130305143310_create_stock_movements.rb +1 -1
- data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb +3 -3
- data/db/migrate/20130306191917_add_active_field_to_stock_locations.rb +2 -2
- data/db/migrate/20130306195650_add_backorderable_to_stock_item.rb +2 -2
- data/db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb +2 -2
- data/db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb +1 -1
- data/db/migrate/20130319062004_change_orders_total_precision.rb +5 -5
- data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb +2 -2
- data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb +2 -2
- data/db/migrate/20130319082943_change_adjustments_amount_precision.rb +2 -2
- data/db/migrate/20130319183250_add_originator_to_stock_movement.rb +1 -1
- data/db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb +3 -3
- data/db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb +3 -3
- data/db/migrate/20130326175857_add_stock_location_to_rma.rb +1 -1
- data/db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb +1 -1
- data/db/migrate/20130328195253_add_seo_metas_to_taxons.rb +1 -1
- data/db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb +1 -1
- data/db/migrate/20130413230529_add_name_to_spree_credit_cards.rb +1 -1
- data/db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb +2 -2
- data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb +1 -1
- data/db/migrate/20130417120035_update_adjustment_states.rb +3 -3
- data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb +4 -4
- data/db/migrate/20130418125341_create_spree_stock_transfers.rb +1 -1
- data/db/migrate/20130423110707_drop_products_count_on_hand.rb +1 -1
- data/db/migrate/20130423223847_set_default_shipping_rate_cost.rb +1 -1
- data/db/migrate/20130509115210_add_number_to_stock_transfer.rb +1 -1
- data/db/migrate/20130514151929_add_sku_index_to_spree_variants.rb +1 -1
- data/db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb +1 -1
- data/db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb +1 -1
- data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb +1 -1
- data/db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb +1 -1
- data/db/migrate/20130618041418_add_updated_at_to_spree_countries.rb +1 -1
- data/db/migrate/20130619012236_add_updated_at_to_spree_states.rb +1 -1
- data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb +1 -1
- data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +2 -2
- data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +4 -4
- data/db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb +1 -1
- data/db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb +1 -1
- data/db/migrate/20130718042445_add_cost_price_to_line_item.rb +2 -2
- data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb +3 -3
- data/db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb +1 -1
- data/db/migrate/20130729214043_index_completed_at_on_spree_orders.rb +1 -1
- data/db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb +1 -1
- data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +1 -1
- data/db/migrate/20130806022521_drop_spree_mail_methods.rb +1 -1
- data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb +1 -1
- data/db/migrate/20130807024301_upgrade_adjustments.rb +4 -4
- data/db/migrate/20130807024302_rename_adjustment_fields.rb +1 -1
- data/db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb +1 -1
- data/db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb +1 -1
- data/db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb +2 -2
- data/db/migrate/20130813140619_expand_order_number_size.rb +3 -3
- data/db/migrate/20130813232134_rename_activators_to_promotions.rb +1 -1
- data/db/migrate/20130815000406_add_adjustment_total_to_line_items.rb +2 -2
- data/db/migrate/20130815024413_add_adjustment_total_to_shipments.rb +2 -2
- data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb +1 -1
- data/db/migrate/20130828234942_add_tax_total_to_line_items_shipments_and_orders.rb +2 -2
- data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +2 -2
- data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +1 -1
- data/db/migrate/20130903183026_add_code_to_spree_promotion_rules.rb +1 -1
- data/db/migrate/20130909115621_change_states_required_for_countries.rb +1 -1
- data/db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb +1 -1
- data/db/migrate/20130917024658_remove_promotions_event_name_field.rb +1 -1
- data/db/migrate/20130924040529_add_promo_total_to_line_items_and_shipments_and_orders.rb +1 -1
- data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +2 -2
- data/db/migrate/20131026154747_add_track_inventory_to_variant.rb +2 -2
- data/db/migrate/20131107132123_add_tax_category_to_variants.rb +1 -1
- data/db/migrate/20131113035136_add_channel_to_spree_orders.rb +1 -1
- data/db/migrate/20131118043959_add_included_to_adjustments.rb +2 -2
- data/db/migrate/20131118050234_rename_tax_total_fields.rb +1 -1
- data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb +1 -1
- data/db/migrate/20131120234456_add_updated_at_to_variants.rb +1 -1
- data/db/migrate/20131127001002_add_position_to_classifications.rb +1 -1
- data/db/migrate/20131211112807_create_spree_orders_promotions.rb +2 -2
- data/db/migrate/20131211192741_unique_shipping_method_categories.rb +1 -1
- data/db/migrate/20131218054603_add_item_count_to_spree_orders.rb +2 -2
- data/db/migrate/20140106065820_remove_value_type_from_spree_preferences.rb +1 -1
- data/db/migrate/20140106224208_rename_permalink_to_slug_for_products.rb +1 -1
- data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb +1 -1
- data/db/migrate/20140124023232_rename_activator_id_in_rules_and_actions_to_promotion_id.rb +1 -1
- data/db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb +1 -1
- data/db/migrate/20140203161722_add_approver_id_and_approved_at_to_orders.rb +1 -1
- data/db/migrate/20140204115338_add_confirmation_delivered_to_spree_orders.rb +1 -1
- data/db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb +1 -1
- data/db/migrate/20140205120320_create_spree_payment_capture_events.rb +1 -1
- data/db/migrate/20140205144710_add_uncaptured_amount_to_payments.rb +1 -1
- data/db/migrate/20140205181631_default_variant_weight_to_zero.rb +1 -1
- data/db/migrate/20140207085910_add_tax_category_id_to_shipping_methods.rb +1 -1
- data/db/migrate/20140207093021_add_tax_rate_id_to_shipping_rates.rb +1 -1
- data/db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb +1 -1
- data/db/migrate/20140213184916_add_more_indexes.rb +1 -1
- data/db/migrate/20140219060952_add_considered_risky_to_orders.rb +2 -2
- data/db/migrate/20140227112348_add_preference_store_to_everything.rb +1 -1
- data/db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb +1 -1
- data/db/migrate/20140309023735_migrate_old_preferences.rb +1 -1
- data/db/migrate/20140309024355_create_spree_stores.rb +2 -2
- data/db/migrate/20140309033438_create_store_from_preferences.rb +2 -2
- data/db/migrate/20140315053743_add_timestamps_to_spree_assets.rb +1 -1
- data/db/migrate/20140318191500_create_spree_taxons_promotion_rules.rb +1 -1
- data/db/migrate/20140331100557_add_additional_store_fields.rb +1 -1
- data/db/migrate/20140410141842_add_many_missing_indexes.rb +1 -1
- data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb +1 -1
- data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb +1 -1
- data/db/migrate/20140508151342_change_spree_price_amount_precision.rb +5 -5
- data/db/migrate/20140518174634_add_token_to_spree_orders.rb +1 -1
- data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb +2 -2
- data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb +1 -1
- data/db/migrate/20140604135309_drop_credit_card_first_name_and_last_name.rb +1 -1
- data/db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb +1 -1
- data/db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb +1 -1
- data/db/migrate/20140625214618_create_spree_refunds.rb +1 -1
- data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb +1 -1
- data/db/migrate/20140707125621_rename_return_authorization_inventory_unit_to_return_items.rb +1 -1
- data/db/migrate/20140709160534_backfill_line_item_pre_tax_amount.rb +1 -1
- data/db/migrate/20140710041921_recreate_spree_return_authorizations.rb +2 -2
- data/db/migrate/20140710181204_add_amount_fields_to_return_items.rb +1 -1
- data/db/migrate/20140710190048_drop_return_authorization_amount.rb +1 -1
- data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb +1 -1
- data/db/migrate/20140713140527_create_spree_refund_reasons.rb +1 -1
- data/db/migrate/20140713142214_rename_return_authorization_reason.rb +1 -1
- data/db/migrate/20140715182625_create_spree_promotion_categories.rb +1 -1
- data/db/migrate/20140716204111_drop_received_at_on_return_items.rb +1 -1
- data/db/migrate/20140716212330_add_reception_and_acceptance_status_to_return_items.rb +1 -1
- data/db/migrate/20140717155155_create_default_refund_reason.rb +1 -1
- data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb +1 -1
- data/db/migrate/20140718133010_create_spree_customer_returns.rb +1 -1
- data/db/migrate/20140718133349_add_customer_return_id_to_return_item.rb +1 -1
- data/db/migrate/20140718195325_create_friendly_id_slugs.rb +5 -5
- data/db/migrate/20140723004419_rename_spree_refund_return_authorization_id.rb +1 -1
- data/db/migrate/20140723152808_increase_return_item_pre_tax_amount_precision.rb +1 -1
- data/db/migrate/20140723214541_copy_product_slugs_to_slug_history.rb +2 -2
- data/db/migrate/20140725131539_create_spree_reimbursements.rb +1 -1
- data/db/migrate/20140728225422_add_promotionable_to_spree_products.rb +1 -1
- data/db/migrate/20140729133613_add_exchange_inventory_unit_foreign_keys.rb +1 -1
- data/db/migrate/20140730155938_add_acceptance_status_errors_to_return_item.rb +1 -1
- data/db/migrate/20140731150017_create_spree_reimbursement_types.rb +1 -1
- data/db/migrate/20140804185157_add_default_to_shipment_cost.rb +1 -1
- data/db/migrate/20140805171035_add_default_to_spree_credit_cards.rb +1 -1
- data/db/migrate/20140805171219_make_existing_credit_cards_default.rb +1 -1
- data/db/migrate/20140806144901_add_type_to_reimbursement_type.rb +1 -1
- data/db/migrate/20140808184039_create_spree_reimbursement_credits.rb +1 -1
- data/db/migrate/20140827170513_add_meta_title_to_spree_products.rb +1 -1
- data/db/migrate/20140911173301_add_kind_to_zone.rb +1 -1
- data/db/migrate/20140924164824_add_code_to_spree_tax_categories.rb +1 -1
- data/db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb +1 -1
- data/db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb +1 -1
- data/db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb +1 -1
- data/db/migrate/20141009204607_add_store_id_to_orders.rb +1 -1
- data/db/migrate/20141012083513_create_spree_taxons_prototypes.rb +1 -1
- data/db/migrate/20141021194502_add_state_lock_version_to_order.rb +1 -1
- data/db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb +2 -7
- data/db/migrate/20141101231208_fix_adjustment_order_presence.rb +1 -1
- data/db/migrate/20141105213646_update_classifications_positions.rb +1 -1
- data/db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb +1 -1
- data/db/migrate/20141215232040_remove_token_permissions_table.rb +1 -1
- data/db/migrate/20141215235502_remove_extra_products_slug_index.rb +1 -1
- data/db/migrate/20141217215630_update_product_slug_index.rb +1 -1
- data/db/migrate/20141218025915_rename_identifier_to_number_for_payment.rb +1 -1
- data/db/migrate/20150118210639_create_spree_store_credits.rb +1 -1
- data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +1 -1
- data/db/migrate/20150118212051_create_spree_store_credit_events.rb +1 -1
- data/db/migrate/20150118212101_create_spree_store_credit_types.rb +1 -1
- data/db/migrate/20150121022521_remove_environment_from_payment_method.rb +1 -1
- data/db/migrate/20150122145607_add_resellable_to_return_items.rb +1 -1
- data/db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb +1 -1
- data/db/migrate/20150128032538_remove_environment_from_tracker.rb +1 -1
- data/db/migrate/20150128060325_remove_spree_configurations.rb +1 -1
- data/db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb +1 -1
- data/db/migrate/20150309161154_ensure_payments_have_numbers.rb +1 -1
- data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb +1 -1
- data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb +1 -1
- data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb +1 -1
- data/db/migrate/20150515211137_fix_adjustment_order_id.rb +1 -1
- data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb +1 -1
- data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb +1 -1
- data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb +1 -1
- data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb +1 -1
- data/db/migrate/20150627090949_migrate_payment_methods_display.rb +1 -1
- data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb +1 -1
- data/db/migrate/20150714154102_spree_payment_method_store_credits.rb +1 -1
- data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb +1 -1
- data/db/migrate/20150727191614_spree_store_credit_types.rb +1 -1
- data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb +1 -1
- data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb +1 -1
- data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb +1 -1
- data/db/migrate/20160219165458_add_indexes.rb +1 -1
- data/db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb +10 -0
- data/db/migrate/20160511071954_acts_as_taggable_on_spree_migration.rb +40 -0
- data/db/migrate/20160511072249_change_collation_for_spree_tag_names.rb +9 -0
- data/db/migrate/20160511072335_add_missing_indexes_to_spree_taggings.rb +14 -0
- data/db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb +7 -0
- data/db/migrate/20161014145148_add_created_at_to_variant.rb +8 -0
- data/db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb +6 -0
- data/lib/generators/spree/custom_user/custom_user_generator.rb +1 -1
- data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt +3 -3
- data/lib/generators/spree/custom_user/templates/migration.rb.tt +2 -2
- data/lib/generators/spree/dummy/dummy_generator.rb +11 -11
- data/lib/generators/spree/dummy/templates/rails/application.rb +1 -1
- data/lib/generators/spree/dummy/templates/rails/database.yml +9 -6
- data/lib/generators/spree/dummy/templates/rails/test.rb +2 -2
- data/lib/generators/spree/install/install_generator.rb +37 -13
- data/lib/spree/core/controller_helpers/common.rb +3 -3
- data/lib/spree/core/controller_helpers/order.rb +2 -5
- data/lib/spree/core/controller_helpers/respond_with.rb +1 -1
- data/lib/spree/core/delegate_belongs_to.rb +2 -2
- data/lib/spree/core/engine.rb +5 -4
- data/lib/spree/core/importer/product.rb +2 -2
- data/lib/spree/core/product_duplicator.rb +1 -1
- data/lib/spree/core/product_filters.rb +1 -1
- data/lib/spree/core/search/base.rb +1 -1
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/i18n/initializer.rb +1 -1
- data/lib/spree/money.rb +1 -15
- data/lib/spree/permitted_attributes.rb +1 -1
- data/lib/spree/testing_support/caching.rb +3 -3
- data/lib/spree/testing_support/common_rake.rb +0 -2
- data/lib/spree/testing_support/controller_requests.rb +4 -4
- data/lib/spree/testing_support/factories/line_item_factory.rb +0 -1
- data/lib/spree/testing_support/factories/order_factory.rb +1 -0
- data/lib/spree/testing_support/factories/tag_factory.rb +5 -0
- data/lib/spree/testing_support/kernel.rb +18 -0
- data/lib/spree/testing_support/order_walkthrough.rb +4 -4
- data/lib/tasks/core.rake +2 -2
- data/spec/helpers/base_helper_spec.rb +200 -0
- data/spec/helpers/products_helper_spec.rb +289 -0
- data/spec/lib/calculated_adjustments_spec.rb +7 -0
- data/spec/lib/i18n_spec.rb +123 -0
- data/spec/lib/search/base_spec.rb +86 -0
- data/spec/lib/spree/core/controller_helpers/auth_spec.rb +103 -0
- data/spec/lib/spree/core/controller_helpers/order_spec.rb +110 -0
- data/spec/lib/spree/core/controller_helpers/search_spec.rb +17 -0
- data/spec/lib/spree/core/controller_helpers/store_spec.rb +72 -0
- data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb +39 -0
- data/spec/lib/spree/core/delegate_belongs_to_spec.rb +22 -0
- data/spec/lib/spree/core/importer/order_spec.rb +605 -0
- data/spec/lib/spree/core/number_generator_spec.rb +175 -0
- data/spec/lib/spree/core/token_generator_spec.rb +24 -0
- data/spec/lib/spree/core/validators/email_spec.rb +53 -0
- data/spec/lib/spree/core_spec.rb +23 -0
- data/spec/lib/spree/localized_number_spec.rb +48 -0
- data/spec/lib/spree/migrations_spec.rb +36 -0
- data/spec/lib/spree/money_spec.rb +122 -0
- data/spec/lib/tasks/exchanges_spec.rb +136 -0
- data/spec/mailers/order_mailer_spec.rb +122 -0
- data/spec/mailers/reimbursement_mailer_spec.rb +47 -0
- data/spec/mailers/shipment_mailer_spec.rb +81 -0
- data/spec/mailers/test_mailer_spec.rb +38 -0
- data/spec/models/option_type_prototype_spec.rb +9 -0
- data/spec/models/spree/ability_spec.rb +251 -0
- data/spec/models/spree/address_spec.rb +402 -0
- 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 +26 -0
- data/spec/models/spree/adjustment_spec.rb +189 -0
- data/spec/models/spree/app_configuration_spec.rb +26 -0
- data/spec/models/spree/asset_spec.rb +28 -0
- data/spec/models/spree/calculator/default_tax_spec.rb +152 -0
- data/spec/models/spree/calculator/flat_percent_item_total_spec.rb +25 -0
- data/spec/models/spree/calculator/flat_rate_spec.rb +47 -0
- data/spec/models/spree/calculator/flexi_rate_spec.rb +41 -0
- data/spec/models/spree/calculator/percent_on_line_item_spec.rb +15 -0
- data/spec/models/spree/calculator/price_sack_spec.rb +30 -0
- data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +47 -0
- data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +23 -0
- data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +13 -0
- data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +52 -0
- data/spec/models/spree/calculator/shipping/per_item_spec.rb +20 -0
- data/spec/models/spree/calculator/shipping/price_sack_spec.rb +29 -0
- data/spec/models/spree/calculator/shipping.rb +8 -0
- data/spec/models/spree/calculator/tiered_flat_rate_spec.rb +40 -0
- data/spec/models/spree/calculator/tiered_percent_spec.rb +51 -0
- data/spec/models/spree/calculator_spec.rb +69 -0
- data/spec/models/spree/classification_spec.rb +93 -0
- data/spec/models/spree/concerns/display_money_spec.rb +43 -0
- data/spec/models/spree/concerns/user_methods_spec.rb +82 -0
- data/spec/models/spree/concerns/vat_price_calculation_spec.rb +66 -0
- data/spec/models/spree/country_spec.rb +55 -0
- data/spec/models/spree/credit_card_spec.rb +328 -0
- data/spec/models/spree/customer_return_spec.rb +240 -0
- data/spec/models/spree/exchange_spec.rb +75 -0
- data/spec/models/spree/gateway/bogus_simple.rb +20 -0
- data/spec/models/spree/gateway/bogus_spec.rb +13 -0
- data/spec/models/spree/gateway_spec.rb +61 -0
- data/spec/models/spree/image_spec.rb +8 -0
- data/spec/models/spree/inventory_unit_spec.rb +256 -0
- data/spec/models/spree/line_item_spec.rb +346 -0
- data/spec/models/spree/option_type_spec.rb +14 -0
- data/spec/models/spree/option_value_spec.rb +18 -0
- data/spec/models/spree/order/address_spec.rb +50 -0
- data/spec/models/spree/order/adjustments_spec.rb +29 -0
- data/spec/models/spree/order/callbacks_spec.rb +42 -0
- data/spec/models/spree/order/checkout_spec.rb +770 -0
- data/spec/models/spree/order/currency_updater_spec.rb +32 -0
- data/spec/models/spree/order/finalizing_spec.rb +114 -0
- data/spec/models/spree/order/helpers_spec.rb +5 -0
- data/spec/models/spree/order/payment_spec.rb +214 -0
- data/spec/models/spree/order/risk_assessment_spec.rb +84 -0
- data/spec/models/spree/order/shipments_spec.rb +43 -0
- data/spec/models/spree/order/state_machine_spec.rb +212 -0
- data/spec/models/spree/order/store_credit_spec.rb +426 -0
- data/spec/models/spree/order/tax_spec.rb +84 -0
- data/spec/models/spree/order/totals_spec.rb +24 -0
- data/spec/models/spree/order/updating_spec.rb +18 -0
- data/spec/models/spree/order/validations_spec.rb +15 -0
- data/spec/models/spree/order_contents_spec.rb +297 -0
- data/spec/models/spree/order_inventory_spec.rb +239 -0
- data/spec/models/spree/order_merger_spec.rb +135 -0
- data/spec/models/spree/order_spec.rb +1046 -0
- data/spec/models/spree/order_updater_spec.rb +294 -0
- data/spec/models/spree/payment/gateway_options_spec.rb +127 -0
- 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 +103 -0
- data/spec/models/spree/payment_spec.rb +919 -0
- data/spec/models/spree/preference_spec.rb +80 -0
- data/spec/models/spree/preferences/configuration_spec.rb +30 -0
- data/spec/models/spree/preferences/preferable_spec.rb +344 -0
- data/spec/models/spree/preferences/scoped_store_spec.rb +58 -0
- data/spec/models/spree/preferences/store_spec.rb +46 -0
- data/spec/models/spree/price_spec.rb +128 -0
- data/spec/models/spree/product/scopes_spec.rb +183 -0
- data/spec/models/spree/product_duplicator_spec.rb +103 -0
- data/spec/models/spree/product_filter_spec.rb +26 -0
- data/spec/models/spree/product_option_type_spec.rb +9 -0
- data/spec/models/spree/product_promotion_rule_spec.rb +9 -0
- data/spec/models/spree/product_property_spec.rb +22 -0
- data/spec/models/spree/product_spec.rb +619 -0
- data/spec/models/spree/promotion/actions/create_adjustment_spec.rb +50 -0
- data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +148 -0
- data/spec/models/spree/promotion/actions/create_line_items_spec.rb +86 -0
- data/spec/models/spree/promotion/actions/free_shipping_spec.rb +36 -0
- data/spec/models/spree/promotion/rules/country_spec.rb +36 -0
- data/spec/models/spree/promotion/rules/first_order_spec.rb +75 -0
- data/spec/models/spree/promotion/rules/item_total_spec.rb +282 -0
- data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +42 -0
- data/spec/models/spree/promotion/rules/option_value_spec.rb +90 -0
- data/spec/models/spree/promotion/rules/product_spec.rb +143 -0
- data/spec/models/spree/promotion/rules/taxon_spec.rb +102 -0
- data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +27 -0
- data/spec/models/spree/promotion/rules/user_spec.rb +45 -0
- data/spec/models/spree/promotion_action_spec.rb +10 -0
- data/spec/models/spree/promotion_category_spec.rb +17 -0
- data/spec/models/spree/promotion_handler/cart_spec.rb +102 -0
- data/spec/models/spree/promotion_handler/coupon_spec.rb +323 -0
- data/spec/models/spree/promotion_handler/free_shipping_spec.rb +48 -0
- data/spec/models/spree/promotion_handler/page_spec.rb +44 -0
- data/spec/models/spree/promotion_rule_spec.rb +29 -0
- 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 +679 -0
- data/spec/models/spree/property_prototype_spec.rb +9 -0
- data/spec/models/spree/property_spec.rb +5 -0
- data/spec/models/spree/prototype_spec.rb +5 -0
- data/spec/models/spree/prototype_taxon_spec.rb +9 -0
- data/spec/models/spree/refund_reason_spec.rb +20 -0
- data/spec/models/spree/refund_spec.rb +195 -0
- data/spec/models/spree/reimbursement/credit_spec.rb +36 -0
- data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb +140 -0
- data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb +83 -0
- data/spec/models/spree/reimbursement_performer_spec.rb +30 -0
- data/spec/models/spree/reimbursement_spec.rb +188 -0
- data/spec/models/spree/reimbursement_tax_calculator_spec.rb +63 -0
- data/spec/models/spree/reimbursement_type/credit_spec.rb +53 -0
- data/spec/models/spree/reimbursement_type/exchange_spec.rb +46 -0
- data/spec/models/spree/reimbursement_type/original_payment_spec.rb +55 -0
- 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 +230 -0
- data/spec/models/spree/return_item/eligibility_validator/default_spec.rb +77 -0
- data/spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb +58 -0
- data/spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb +61 -0
- data/spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb +32 -0
- data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb +29 -0
- data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb +35 -0
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb +65 -0
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +43 -0
- data/spec/models/spree/return_item_spec.rb +731 -0
- data/spec/models/spree/returns_calculator_spec.rb +14 -0
- data/spec/models/spree/role_spec.rb +7 -0
- data/spec/models/spree/shipment_spec.rb +742 -0
- data/spec/models/spree/shipping_calculator_spec.rb +45 -0
- data/spec/models/spree/shipping_category_spec.rb +19 -0
- data/spec/models/spree/shipping_method_spec.rb +95 -0
- data/spec/models/spree/shipping_rate_spec.rb +140 -0
- data/spec/models/spree/state_spec.rb +29 -0
- data/spec/models/spree/stock/availability_validator_spec.rb +36 -0
- data/spec/models/spree/stock/content_item_spec.rb +31 -0
- data/spec/models/spree/stock/coordinator_spec.rb +61 -0
- data/spec/models/spree/stock/differentiator_spec.rb +39 -0
- data/spec/models/spree/stock/estimator_spec.rb +202 -0
- data/spec/models/spree/stock/inventory_unit_builder_spec.rb +38 -0
- data/spec/models/spree/stock/package_spec.rb +182 -0
- data/spec/models/spree/stock/packer_spec.rb +70 -0
- data/spec/models/spree/stock/prioritizer_spec.rb +125 -0
- data/spec/models/spree/stock/quantifier_spec.rb +126 -0
- data/spec/models/spree/stock/splitter/backordered_spec.rb +29 -0
- data/spec/models/spree/stock/splitter/base_spec.rb +21 -0
- data/spec/models/spree/stock/splitter/shipping_category_spec.rb +47 -0
- data/spec/models/spree/stock/splitter/weight_spec.rb +32 -0
- data/spec/models/spree/stock_item_spec.rb +432 -0
- data/spec/models/spree/stock_location_spec.rb +243 -0
- data/spec/models/spree/stock_movement_spec.rb +120 -0
- data/spec/models/spree/stock_transfer_spec.rb +50 -0
- 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 +78 -0
- data/spec/models/spree/tax_category_spec.rb +32 -0
- data/spec/models/spree/tax_rate_spec.rb +561 -0
- data/spec/models/spree/taxon_spec.rb +85 -0
- data/spec/models/spree/taxonomy_spec.rb +18 -0
- data/spec/models/spree/tracker_spec.rb +21 -0
- data/spec/models/spree/user_spec.rb +203 -0
- data/spec/models/spree/variant_spec.rb +809 -0
- data/spec/models/spree/zone_member_spec.rb +38 -0
- data/spec/models/spree/zone_spec.rb +472 -0
- data/spec/spec_helper.rb +79 -0
- data/spec/support/big_decimal.rb +5 -0
- data/spec/support/concerns/adjustment_source.rb +23 -0
- data/spec/support/concerns/default_price.rb +37 -0
- data/spec/support/rake.rb +13 -0
- data/spec/support/test_gateway.rb +2 -0
- data/spree_core.gemspec +12 -12
- metadata +249 -43
- data/config/initializers/premailer_rails.rb +0 -3
@@ -0,0 +1,78 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::Store, type: :model do
|
4
|
+
|
5
|
+
describe ".by_url" do
|
6
|
+
let!(:store) { create(:store, url: "website1.com\nwww.subdomain.com") }
|
7
|
+
let!(:store_2) { create(:store, url: 'freethewhales.com') }
|
8
|
+
|
9
|
+
it "should find stores by url" do
|
10
|
+
by_domain = Spree::Store.by_url('www.subdomain.com')
|
11
|
+
|
12
|
+
expect(by_domain).to include(store)
|
13
|
+
expect(by_domain).not_to include(store_2)
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
describe '.current' do
|
18
|
+
# there is a default store created with the test_app rake task.
|
19
|
+
let!(:store_1) { Spree::Store.first || create(:store) }
|
20
|
+
|
21
|
+
let!(:store_2) { create(:store, default: false, url: 'www.subdomain.com') }
|
22
|
+
|
23
|
+
it 'should return default when no domain' do
|
24
|
+
expect(subject.class.current).to eql(store_1)
|
25
|
+
end
|
26
|
+
|
27
|
+
it 'should return store for domain' do
|
28
|
+
expect(subject.class.current('spreecommerce.com')).to eql(store_1)
|
29
|
+
expect(subject.class.current('www.subdomain.com')).to eql(store_2)
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
33
|
+
describe '.default' do
|
34
|
+
context 'when a default store is already present' do
|
35
|
+
let!(:store) { create(:store) }
|
36
|
+
let!(:store_2) { create(:store, default: true) }
|
37
|
+
|
38
|
+
it 'should return the already existing default store' do
|
39
|
+
expect(Spree::Store.default).to eq(store_2)
|
40
|
+
end
|
41
|
+
|
42
|
+
it "should ensure there is a default if one doesn't exist yet" do
|
43
|
+
expect(store_2.default).to be true
|
44
|
+
end
|
45
|
+
|
46
|
+
it 'should ensure there is only one default' do
|
47
|
+
[store, store_2].each(&:reload)
|
48
|
+
|
49
|
+
expect(Spree::Store.where(default: true).count).to eq(1)
|
50
|
+
expect(store_2.default).to be true
|
51
|
+
expect(store.default).not_to be true
|
52
|
+
end
|
53
|
+
|
54
|
+
context 'when store is not saved' do
|
55
|
+
before do
|
56
|
+
store.default = true
|
57
|
+
store.code = nil
|
58
|
+
store.save
|
59
|
+
end
|
60
|
+
|
61
|
+
it 'ensure old default location still default' do
|
62
|
+
[store, store_2].each(&:reload)
|
63
|
+
expect(store.default).to be false
|
64
|
+
expect(store_2.default).to be true
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
context 'when a default store is not present' do
|
70
|
+
it 'should build a new default store' do
|
71
|
+
expect(Spree::Store.default.class).to eq(Spree::Store)
|
72
|
+
expect(Spree::Store.default.persisted?).to eq(false)
|
73
|
+
expect(Spree::Store.default.default).to be(true)
|
74
|
+
end
|
75
|
+
end
|
76
|
+
end
|
77
|
+
|
78
|
+
end
|
@@ -0,0 +1,32 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::TaxCategory, type: :model do
|
4
|
+
describe 'Validations' do
|
5
|
+
it { is_expected.to validate_presence_of(:name) }
|
6
|
+
it { is_expected.to validate_uniqueness_of(:name).scoped_to(:deleted_at).case_insensitive.allow_blank }
|
7
|
+
end
|
8
|
+
|
9
|
+
context 'default tax category' do
|
10
|
+
let(:tax_category) { create(:tax_category) }
|
11
|
+
let(:new_tax_category) { create(:tax_category) }
|
12
|
+
|
13
|
+
before do
|
14
|
+
tax_category.update_column(:is_default, true)
|
15
|
+
end
|
16
|
+
|
17
|
+
it "should undefault the previous default tax category" do
|
18
|
+
new_tax_category.update_attributes({is_default: true})
|
19
|
+
expect(new_tax_category.is_default).to be true
|
20
|
+
|
21
|
+
tax_category.reload
|
22
|
+
expect(tax_category.is_default).to be false
|
23
|
+
end
|
24
|
+
|
25
|
+
it "should undefault the previous default tax category except when updating the existing default tax category" do
|
26
|
+
tax_category.update_column(:description, "Updated description")
|
27
|
+
|
28
|
+
tax_category.reload
|
29
|
+
expect(tax_category.is_default).to be true
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
@@ -0,0 +1,561 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::TaxRate, type: :model do
|
4
|
+
context "match" do
|
5
|
+
let(:order) { create(:order) }
|
6
|
+
let(:country) { create(:country) }
|
7
|
+
let(:tax_category) { create(:tax_category) }
|
8
|
+
let(:calculator) { Spree::Calculator::FlatRate.new }
|
9
|
+
|
10
|
+
it "should return an empty array when tax_zone is nil" do
|
11
|
+
allow(order).to receive_messages tax_zone: nil
|
12
|
+
expect(Spree::TaxRate.match(order.tax_zone)).to eq([])
|
13
|
+
end
|
14
|
+
|
15
|
+
context "when no rate zones match the tax zone" do
|
16
|
+
before do
|
17
|
+
Spree::TaxRate.create(amount: 1, zone: create(:zone))
|
18
|
+
end
|
19
|
+
|
20
|
+
context "when there is no default tax zone" do
|
21
|
+
before do
|
22
|
+
@zone = create(:zone, name: "Country Zone", default_tax: false, zone_members: [])
|
23
|
+
@zone.zone_members.create(zoneable: country)
|
24
|
+
end
|
25
|
+
|
26
|
+
it "should return an empty array" do
|
27
|
+
allow(order).to receive_messages tax_zone: @zone
|
28
|
+
expect(Spree::TaxRate.match(order.tax_zone)).to eq([])
|
29
|
+
end
|
30
|
+
|
31
|
+
it "should return the rate that matches the rate zone" do
|
32
|
+
rate = Spree::TaxRate.create(
|
33
|
+
amount: 1,
|
34
|
+
zone: @zone,
|
35
|
+
tax_category: tax_category,
|
36
|
+
calculator: calculator
|
37
|
+
)
|
38
|
+
|
39
|
+
allow(order).to receive_messages tax_zone: @zone
|
40
|
+
expect(Spree::TaxRate.match(order.tax_zone)).to eq([rate])
|
41
|
+
end
|
42
|
+
|
43
|
+
it "should return all rates that match the rate zone" do
|
44
|
+
rate1 = Spree::TaxRate.create(
|
45
|
+
amount: 1,
|
46
|
+
zone: @zone,
|
47
|
+
tax_category: tax_category,
|
48
|
+
calculator: calculator
|
49
|
+
)
|
50
|
+
|
51
|
+
rate2 = Spree::TaxRate.create(
|
52
|
+
amount: 2,
|
53
|
+
zone: @zone,
|
54
|
+
tax_category: tax_category,
|
55
|
+
calculator: Spree::Calculator::FlatRate.new
|
56
|
+
)
|
57
|
+
|
58
|
+
allow(order).to receive_messages tax_zone: @zone
|
59
|
+
expect(Spree::TaxRate.match(order.tax_zone)).to match_array([rate1, rate2])
|
60
|
+
end
|
61
|
+
|
62
|
+
context "when the tax_zone is contained within a rate zone" do
|
63
|
+
before do
|
64
|
+
sub_zone = create(:zone, name: "State Zone", zone_members: [])
|
65
|
+
sub_zone.zone_members.create(zoneable: create(:state, country: country))
|
66
|
+
allow(order).to receive_messages tax_zone: sub_zone
|
67
|
+
@rate = Spree::TaxRate.create(
|
68
|
+
amount: 1,
|
69
|
+
zone: @zone,
|
70
|
+
tax_category: tax_category,
|
71
|
+
calculator: calculator
|
72
|
+
)
|
73
|
+
end
|
74
|
+
|
75
|
+
it "should return the rate zone" do
|
76
|
+
expect(Spree::TaxRate.match(order.tax_zone)).to eq([@rate])
|
77
|
+
end
|
78
|
+
end
|
79
|
+
end
|
80
|
+
|
81
|
+
context "when there is a default tax zone" do
|
82
|
+
before do
|
83
|
+
@zone = create(:zone, name: "Country Zone", default_tax: true, zone_members: [])
|
84
|
+
@zone.zone_members.create(zoneable: country)
|
85
|
+
end
|
86
|
+
|
87
|
+
let(:included_in_price) { false }
|
88
|
+
let!(:rate) do
|
89
|
+
Spree::TaxRate.create(amount: 1,
|
90
|
+
zone: @zone,
|
91
|
+
tax_category: tax_category,
|
92
|
+
calculator: calculator,
|
93
|
+
included_in_price: included_in_price)
|
94
|
+
end
|
95
|
+
|
96
|
+
subject { Spree::TaxRate.match(order.tax_zone) }
|
97
|
+
|
98
|
+
context "when the order has the same tax zone" do
|
99
|
+
before do
|
100
|
+
allow(order).to receive_messages tax_zone: @zone
|
101
|
+
end
|
102
|
+
|
103
|
+
context "when the tax is not a VAT" do
|
104
|
+
it { is_expected.to eq([rate]) }
|
105
|
+
end
|
106
|
+
|
107
|
+
context "when the tax is a VAT" do
|
108
|
+
let(:included_in_price) { true }
|
109
|
+
it { is_expected.to eq([rate]) }
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
context "when the order has a different tax zone" do
|
114
|
+
before do
|
115
|
+
allow(order).to receive_messages tax_zone: create(:zone, name: "Other Zone")
|
116
|
+
end
|
117
|
+
|
118
|
+
context "when the tax is a VAT" do
|
119
|
+
let(:included_in_price) { true }
|
120
|
+
# The rate should NOT match in this instance because:
|
121
|
+
# The order has a different tax zone, and the price is
|
122
|
+
# henceforth a net price and will not change.
|
123
|
+
it 'return no tax rate' do
|
124
|
+
expect(subject).to be_empty
|
125
|
+
end
|
126
|
+
end
|
127
|
+
|
128
|
+
context "when the tax is not VAT" do
|
129
|
+
it "returns no tax rate" do
|
130
|
+
expect(subject).to be_empty
|
131
|
+
end
|
132
|
+
end
|
133
|
+
end
|
134
|
+
end
|
135
|
+
end
|
136
|
+
end
|
137
|
+
|
138
|
+
describe ".adjust" do
|
139
|
+
let(:order) { stub_model(Spree::Order) }
|
140
|
+
let(:tax_category_1) { stub_model(Spree::TaxCategory) }
|
141
|
+
let(:tax_category_2) { stub_model(Spree::TaxCategory) }
|
142
|
+
let(:rate_1) { stub_model(Spree::TaxRate, tax_category: tax_category_1) }
|
143
|
+
let(:rate_2) { stub_model(Spree::TaxRate, tax_category: tax_category_2) }
|
144
|
+
|
145
|
+
context "with line items" do
|
146
|
+
let(:line_item) do
|
147
|
+
stub_model(Spree::LineItem,
|
148
|
+
price: 10.0,
|
149
|
+
quantity: 1,
|
150
|
+
tax_category: tax_category_1,
|
151
|
+
variant: stub_model(Spree::Variant)
|
152
|
+
)
|
153
|
+
end
|
154
|
+
|
155
|
+
let(:line_items) { [line_item] }
|
156
|
+
|
157
|
+
before do
|
158
|
+
allow(Spree::TaxRate).to receive_messages match: [rate_1, rate_2]
|
159
|
+
end
|
160
|
+
|
161
|
+
it "should apply adjustments for two tax rates to the order" do
|
162
|
+
expect(rate_1).to receive(:adjust)
|
163
|
+
expect(rate_2).not_to receive(:adjust)
|
164
|
+
Spree::TaxRate.adjust(order, line_items)
|
165
|
+
end
|
166
|
+
end
|
167
|
+
|
168
|
+
context "without tax rates" do
|
169
|
+
let(:line_item) do
|
170
|
+
stub_model(Spree::LineItem,
|
171
|
+
:price => 10.0,
|
172
|
+
:quantity => 2,
|
173
|
+
:tax_category => nil,
|
174
|
+
:variant => stub_model(Spree::Variant)
|
175
|
+
)
|
176
|
+
end
|
177
|
+
|
178
|
+
let(:line_items) { [line_item] }
|
179
|
+
|
180
|
+
it "should update pre_tax_total to match line item cost if no taxes" do
|
181
|
+
line_item.tax_category = nil
|
182
|
+
Spree::TaxRate.adjust(order, line_items)
|
183
|
+
expect(line_item.pre_tax_amount).to eq line_item.price * line_item.quantity
|
184
|
+
end
|
185
|
+
end
|
186
|
+
|
187
|
+
context "with shipments" do
|
188
|
+
let(:shipments) { [stub_model(Spree::Shipment, cost: 10.0, tax_category: tax_category_1)] }
|
189
|
+
|
190
|
+
before do
|
191
|
+
allow(Spree::TaxRate).to receive_messages match: [rate_1, rate_2]
|
192
|
+
end
|
193
|
+
|
194
|
+
it "should apply adjustments for two tax rates to the order" do
|
195
|
+
expect(rate_1).to receive(:adjust)
|
196
|
+
expect(rate_2).not_to receive(:adjust)
|
197
|
+
Spree::TaxRate.adjust(order, shipments)
|
198
|
+
end
|
199
|
+
end
|
200
|
+
|
201
|
+
context "for MOSS taxation in Europe" do
|
202
|
+
let(:germany) { create :country, name: "Germany" }
|
203
|
+
let(:india) { create :country, name: "India" }
|
204
|
+
let(:france) { create :country, name: "France" }
|
205
|
+
let(:france_zone) { create :zone_with_country, name: "France Zone" }
|
206
|
+
let(:germany_zone) { create :zone_with_country, name: "Germany Zone", default_tax: true }
|
207
|
+
let(:india_zone) { create :zone_with_country, name: "India" }
|
208
|
+
let(:moss_category) { Spree::TaxCategory.create(name: "Digital Goods") }
|
209
|
+
let(:normal_category) { Spree::TaxCategory.create(name: "Analogue Goods") }
|
210
|
+
let(:eu_zone) { create(:zone, name: "EU") }
|
211
|
+
|
212
|
+
let!(:german_vat) do
|
213
|
+
Spree::TaxRate.create(
|
214
|
+
name: "German VAT",
|
215
|
+
amount: 0.19,
|
216
|
+
calculator: Spree::Calculator::DefaultTax.create,
|
217
|
+
tax_category: moss_category,
|
218
|
+
zone: germany_zone,
|
219
|
+
included_in_price: true
|
220
|
+
)
|
221
|
+
end
|
222
|
+
let!(:french_vat) do
|
223
|
+
Spree::TaxRate.create(
|
224
|
+
name: "French VAT",
|
225
|
+
amount: 0.25,
|
226
|
+
calculator: Spree::Calculator::DefaultTax.create,
|
227
|
+
tax_category: moss_category,
|
228
|
+
zone: france_zone,
|
229
|
+
included_in_price: true
|
230
|
+
)
|
231
|
+
end
|
232
|
+
let!(:eu_vat) do
|
233
|
+
Spree::TaxRate.create(
|
234
|
+
name: "EU_VAT",
|
235
|
+
amount: 0.19,
|
236
|
+
calculator: Spree::Calculator::DefaultTax.create,
|
237
|
+
tax_category: normal_category,
|
238
|
+
zone: eu_zone,
|
239
|
+
included_in_price: true
|
240
|
+
)
|
241
|
+
end
|
242
|
+
|
243
|
+
let(:download) { create(:product, tax_category: moss_category, price: 100) }
|
244
|
+
let(:tshirt) { create(:product, tax_category: normal_category, price: 100) }
|
245
|
+
let(:order) { Spree::Order.create }
|
246
|
+
|
247
|
+
before do
|
248
|
+
germany_zone.zone_members.create(zoneable: germany)
|
249
|
+
france_zone.zone_members.create(zoneable: france)
|
250
|
+
india_zone.zone_members.create(zoneable: india)
|
251
|
+
eu_zone.zone_members.create(zoneable: germany)
|
252
|
+
eu_zone.zone_members.create(zoneable: france)
|
253
|
+
end
|
254
|
+
|
255
|
+
context "a download" do
|
256
|
+
before do
|
257
|
+
order.contents.add(download.master, 1)
|
258
|
+
end
|
259
|
+
|
260
|
+
it "without an adress costs 100 euros including tax" do
|
261
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
262
|
+
order.update_with_updater!
|
263
|
+
expect(order.display_total).to eq(Spree::Money.new(100))
|
264
|
+
expect(order.included_tax_total).to eq(15.97)
|
265
|
+
end
|
266
|
+
|
267
|
+
it "to germany costs 100 euros including tax" do
|
268
|
+
allow(order).to receive(:tax_zone).and_return(germany_zone)
|
269
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
270
|
+
order.update_with_updater!
|
271
|
+
expect(order.display_total).to eq(Spree::Money.new(100))
|
272
|
+
expect(order.included_tax_total).to eq(15.97)
|
273
|
+
end
|
274
|
+
|
275
|
+
it "to france costs more including tax" do
|
276
|
+
allow(order).to receive(:tax_zone).and_return(france_zone)
|
277
|
+
order.update_line_item_prices!
|
278
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
279
|
+
order.update_with_updater!
|
280
|
+
expect(order.display_total).to eq(Spree::Money.new(105.04))
|
281
|
+
expect(order.included_tax_total).to eq(21.01)
|
282
|
+
expect(order.additional_tax_total).to eq(0)
|
283
|
+
end
|
284
|
+
|
285
|
+
it "to somewhere else costs the net amount" do
|
286
|
+
allow(order).to receive(:tax_zone).and_return(india_zone)
|
287
|
+
order.update_line_item_prices!
|
288
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
289
|
+
order.update_with_updater!
|
290
|
+
expect(order.included_tax_total).to eq(0)
|
291
|
+
expect(order.included_tax_total).to eq(0)
|
292
|
+
expect(order.display_total).to eq(Spree::Money.new(84.03))
|
293
|
+
end
|
294
|
+
end
|
295
|
+
|
296
|
+
context "a t-shirt" do
|
297
|
+
before do
|
298
|
+
order.contents.add(tshirt.master, 1)
|
299
|
+
end
|
300
|
+
|
301
|
+
it "to germany costs 100 euros including tax" do
|
302
|
+
allow(order).to receive(:tax_zone).and_return(germany_zone)
|
303
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
304
|
+
order.update_with_updater!
|
305
|
+
expect(order.display_total).to eq(Spree::Money.new(100))
|
306
|
+
expect(order.included_tax_total).to eq(15.97)
|
307
|
+
end
|
308
|
+
|
309
|
+
it "to france costs 100 euros including tax" do
|
310
|
+
allow(order).to receive(:tax_zone).and_return(france_zone)
|
311
|
+
order.update_line_item_prices!
|
312
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
313
|
+
order.update_with_updater!
|
314
|
+
expect(order.display_total).to eq(Spree::Money.new(100.00))
|
315
|
+
expect(order.included_tax_total).to eq(15.97)
|
316
|
+
expect(order.additional_tax_total).to eq(0)
|
317
|
+
end
|
318
|
+
|
319
|
+
it "to somewhere else costs the net amount" do
|
320
|
+
allow(order).to receive(:tax_zone).and_return(india_zone)
|
321
|
+
order.update_line_item_prices!
|
322
|
+
Spree::TaxRate.adjust(order, order.line_items)
|
323
|
+
order.update_with_updater!
|
324
|
+
expect(order.included_tax_total).to eq(0)
|
325
|
+
expect(order.display_total).to eq(Spree::Money.new(84.03))
|
326
|
+
end
|
327
|
+
end
|
328
|
+
end
|
329
|
+
end
|
330
|
+
|
331
|
+
describe ".included_tax_amount_for" do
|
332
|
+
let!(:order) { create :order_with_line_items }
|
333
|
+
let!(:included_tax_rate) do
|
334
|
+
create :tax_rate,
|
335
|
+
included_in_price: true,
|
336
|
+
tax_category: order.line_items.first.tax_category,
|
337
|
+
zone: order.tax_zone,
|
338
|
+
amount: 0.4
|
339
|
+
end
|
340
|
+
|
341
|
+
let!(:other_included_tax_rate) do
|
342
|
+
create :tax_rate,
|
343
|
+
included_in_price: true,
|
344
|
+
tax_category: order.line_items.first.tax_category,
|
345
|
+
zone: order.tax_zone,
|
346
|
+
amount: 0.05
|
347
|
+
end
|
348
|
+
|
349
|
+
let!(:additional_tax_rate) do
|
350
|
+
create :tax_rate,
|
351
|
+
included_in_price: false,
|
352
|
+
tax_category: order.line_items.first.tax_category,
|
353
|
+
zone: order.tax_zone,
|
354
|
+
amount: 0.2
|
355
|
+
end
|
356
|
+
|
357
|
+
let!(:included_tax_rate_from_somewhere_else) do
|
358
|
+
create :tax_rate,
|
359
|
+
included_in_price: true,
|
360
|
+
tax_category: order.line_items.first.tax_category,
|
361
|
+
zone: create(:zone_with_country),
|
362
|
+
amount: 0.1
|
363
|
+
end
|
364
|
+
let(:price_options) do
|
365
|
+
{
|
366
|
+
tax_zone: order.tax_zone,
|
367
|
+
tax_category: line_item.tax_category
|
368
|
+
}
|
369
|
+
end
|
370
|
+
|
371
|
+
|
372
|
+
let(:line_item) { order.line_items.first }
|
373
|
+
subject(:included_tax_amount) { Spree::TaxRate.included_tax_amount_for(price_options) }
|
374
|
+
|
375
|
+
it 'will only get me tax amounts from tax_rates that match' do
|
376
|
+
expect(subject).to eq(included_tax_rate.amount + other_included_tax_rate.amount)
|
377
|
+
end
|
378
|
+
end
|
379
|
+
|
380
|
+
describe "#adjust" do
|
381
|
+
before do
|
382
|
+
@country = create(:country)
|
383
|
+
@zone = create(:zone, name: "Country Zone", default_tax: true, zone_members: [])
|
384
|
+
@zone.zone_members.create(zoneable: @country)
|
385
|
+
@category = Spree::TaxCategory.create name: "Taxable Foo"
|
386
|
+
@category2 = Spree::TaxCategory.create(name: "Non Taxable")
|
387
|
+
@rate1 = Spree::TaxRate.create(
|
388
|
+
amount: 0.10,
|
389
|
+
calculator: Spree::Calculator::DefaultTax.create,
|
390
|
+
tax_category: @category,
|
391
|
+
zone: @zone
|
392
|
+
)
|
393
|
+
@rate2 = Spree::TaxRate.create(
|
394
|
+
amount: 0.05,
|
395
|
+
calculator: Spree::Calculator::DefaultTax.create,
|
396
|
+
tax_category: @category,
|
397
|
+
zone: @zone
|
398
|
+
)
|
399
|
+
@order = Spree::Order.create!
|
400
|
+
@taxable = create(:product, tax_category: @category)
|
401
|
+
@nontaxable = create(:product, tax_category: @category2)
|
402
|
+
end
|
403
|
+
|
404
|
+
context "not taxable line item " do
|
405
|
+
let!(:line_item) { @order.contents.add(@nontaxable.master, 1) }
|
406
|
+
|
407
|
+
it "should not create a tax adjustment" do
|
408
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
409
|
+
expect(line_item.adjustments.tax.charge.count).to eq(0)
|
410
|
+
end
|
411
|
+
|
412
|
+
it "should not create a refund" do
|
413
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
414
|
+
expect(line_item.adjustments.credit.count).to eq(0)
|
415
|
+
end
|
416
|
+
end
|
417
|
+
|
418
|
+
context "taxable line item" do
|
419
|
+
let!(:line_item) { @order.contents.add(@taxable.master, 1) }
|
420
|
+
|
421
|
+
context "when price includes tax" do
|
422
|
+
before do
|
423
|
+
@rate1.update_column(:included_in_price, true)
|
424
|
+
@rate2.update_column(:included_in_price, true)
|
425
|
+
Spree::TaxRate.store_pre_tax_amount(line_item, [@rate1, @rate2])
|
426
|
+
end
|
427
|
+
|
428
|
+
context "when zone is contained by default tax zone" do
|
429
|
+
it "should create two adjustments, one for each tax rate" do
|
430
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
431
|
+
expect(line_item.adjustments.count).to eq(2)
|
432
|
+
end
|
433
|
+
|
434
|
+
it "should not create a tax refund" do
|
435
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
436
|
+
expect(line_item.adjustments.credit.count).to eq(0)
|
437
|
+
end
|
438
|
+
end
|
439
|
+
|
440
|
+
context "when order's zone is neither the default zone, or included in the default zone, but matches the rate's zone" do
|
441
|
+
before do
|
442
|
+
new_rate = Spree::TaxRate.create(
|
443
|
+
amount: 0.2,
|
444
|
+
included_in_price: true,
|
445
|
+
calculator: Spree::Calculator::DefaultTax.create,
|
446
|
+
tax_category: @category,
|
447
|
+
zone: create(:zone_with_country)
|
448
|
+
)
|
449
|
+
allow(@order).to receive(:tax_zone).and_return(new_rate.zone)
|
450
|
+
end
|
451
|
+
|
452
|
+
it "should create an adjustment" do
|
453
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
454
|
+
expect(line_item.adjustments.charge.count).to eq(1)
|
455
|
+
end
|
456
|
+
|
457
|
+
it "should not create a tax refund for each tax rate" do
|
458
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
459
|
+
expect(line_item.adjustments.credit.count).to eq(0)
|
460
|
+
end
|
461
|
+
end
|
462
|
+
|
463
|
+
context "when order's zone does not match default zone, is not included in the default zone, AND does not match the rate's zone" do
|
464
|
+
before do
|
465
|
+
@new_zone = create(:zone, name: "New Zone", default_tax: false)
|
466
|
+
@new_country = create(:country, name: "New Country")
|
467
|
+
@new_zone.zone_members.create(zoneable: @new_country)
|
468
|
+
@order.ship_address = create(:address, country: @new_country)
|
469
|
+
@order.save
|
470
|
+
@order.reload
|
471
|
+
end
|
472
|
+
|
473
|
+
it "should not create positive adjustments" do
|
474
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
475
|
+
expect(line_item.adjustments.charge.count).to eq(0)
|
476
|
+
end
|
477
|
+
|
478
|
+
it "should not create a tax refund for each tax rate" do
|
479
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
480
|
+
expect(line_item.adjustments.credit.count).to eq(0)
|
481
|
+
end
|
482
|
+
end
|
483
|
+
|
484
|
+
context "when price does not include tax" do
|
485
|
+
before do
|
486
|
+
allow(@order).to receive_messages tax_zone: @zone
|
487
|
+
[@rate1, @rate2].each do |rate|
|
488
|
+
rate.included_in_price = false
|
489
|
+
rate.zone = @zone
|
490
|
+
rate.save
|
491
|
+
end
|
492
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
493
|
+
end
|
494
|
+
|
495
|
+
it "should delete adjustments for open order when taxrate is deleted" do
|
496
|
+
@rate1.destroy!
|
497
|
+
@rate2.destroy!
|
498
|
+
expect(line_item.adjustments.count).to eq(0)
|
499
|
+
end
|
500
|
+
|
501
|
+
it "should not delete adjustments for complete order when taxrate is deleted" do
|
502
|
+
@order.update_column :completed_at, Time.current
|
503
|
+
@rate1.destroy!
|
504
|
+
@rate2.destroy!
|
505
|
+
expect(line_item.adjustments.count).to eq(2)
|
506
|
+
end
|
507
|
+
|
508
|
+
it "should create an adjustment" do
|
509
|
+
expect(line_item.adjustments.count).to eq(2)
|
510
|
+
end
|
511
|
+
|
512
|
+
it "should not create a tax refund" do
|
513
|
+
expect(line_item.adjustments.credit.count).to eq(0)
|
514
|
+
end
|
515
|
+
|
516
|
+
describe 'tax adjustments' do
|
517
|
+
before { Spree::TaxRate.adjust(@order, @order.line_items) }
|
518
|
+
|
519
|
+
it "should apply adjustments when a tax zone is present" do
|
520
|
+
expect(line_item.adjustments.count).to eq(2)
|
521
|
+
line_item.adjustments.each do |adjustment|
|
522
|
+
expect(adjustment.label).to eq("#{adjustment.source.tax_category.name} #{adjustment.source.amount * 100}%")
|
523
|
+
end
|
524
|
+
end
|
525
|
+
|
526
|
+
describe 'when the tax zone is removed' do
|
527
|
+
before { allow(@order).to receive_messages tax_zone: nil }
|
528
|
+
|
529
|
+
it 'does not apply any adjustments' do
|
530
|
+
Spree::TaxRate.adjust(@order, @order.line_items)
|
531
|
+
expect(line_item.adjustments.count).to eq(0)
|
532
|
+
end
|
533
|
+
end
|
534
|
+
end
|
535
|
+
end
|
536
|
+
|
537
|
+
context "when two rates apply" do
|
538
|
+
before do
|
539
|
+
@price_before_taxes = line_item.price / (1 + @rate1.amount + @rate2.amount)
|
540
|
+
# Use the same rounding method as in DefaultTax calculator
|
541
|
+
@price_before_taxes = BigDecimal.new(@price_before_taxes).round(2, BigDecimal::ROUND_HALF_UP)
|
542
|
+
line_item.update_column(:pre_tax_amount, @price_before_taxes)
|
543
|
+
# Clear out any previously automatically-applied adjustments
|
544
|
+
@order.all_adjustments.delete_all
|
545
|
+
@rate1.adjust(@order, line_item)
|
546
|
+
@rate2.adjust(@order, line_item)
|
547
|
+
end
|
548
|
+
|
549
|
+
it "should create two price adjustments" do
|
550
|
+
expect(@order.line_item_adjustments.count).to eq(2)
|
551
|
+
end
|
552
|
+
|
553
|
+
it "price adjustments should be accurate" do
|
554
|
+
included_tax = @order.line_item_adjustments.sum(:amount)
|
555
|
+
expect(@price_before_taxes + included_tax).to eq(line_item.total)
|
556
|
+
end
|
557
|
+
end
|
558
|
+
end
|
559
|
+
end
|
560
|
+
end
|
561
|
+
end
|