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,20 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::Gateway::BogusSimple, type: :model do
|
4
|
+
|
5
|
+
subject { Spree::Gateway::BogusSimple.new }
|
6
|
+
|
7
|
+
# regression test for #3824
|
8
|
+
describe "#capture" do
|
9
|
+
it "returns success with the right response code" do
|
10
|
+
response = subject.capture(123, '12345', {})
|
11
|
+
expect(response.message).to include("success")
|
12
|
+
end
|
13
|
+
|
14
|
+
it "returns failure with the wrong response code" do
|
15
|
+
response = subject.capture(123, 'wrong', {})
|
16
|
+
expect(response.message).to include("failure")
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
module Spree
|
4
|
+
describe Gateway::Bogus, type: :model do
|
5
|
+
let(:bogus) { create(:credit_card_payment_method) }
|
6
|
+
let!(:cc) { create(:credit_card, payment_method: bogus, gateway_customer_profile_id: "BGS-RERTERT") }
|
7
|
+
|
8
|
+
it "disable recurring contract by destroying payment source" do
|
9
|
+
bogus.disable_customer_profile(cc)
|
10
|
+
expect(cc.gateway_customer_profile_id).to be_nil
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,61 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::Gateway, type: :model do
|
4
|
+
class Provider
|
5
|
+
def initialize(options)
|
6
|
+
end
|
7
|
+
|
8
|
+
def imaginary_method
|
9
|
+
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
class TestGateway < Spree::Gateway
|
14
|
+
def provider_class
|
15
|
+
Provider
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
it "passes through all arguments on a method_missing call" do
|
20
|
+
gateway = TestGateway.new
|
21
|
+
expect(gateway.provider).to receive(:imaginary_method).with('foo')
|
22
|
+
gateway.imaginary_method('foo')
|
23
|
+
end
|
24
|
+
|
25
|
+
context "fetching payment sources" do
|
26
|
+
let(:order) { Spree::Order.create(user_id: 1) }
|
27
|
+
|
28
|
+
let(:has_card) { create(:credit_card_payment_method) }
|
29
|
+
let(:no_card) { create(:credit_card_payment_method) }
|
30
|
+
|
31
|
+
let(:cc) do
|
32
|
+
create(:credit_card, payment_method: has_card, gateway_customer_profile_id: "EFWE")
|
33
|
+
end
|
34
|
+
|
35
|
+
let(:payment) do
|
36
|
+
create(:payment, order: order, source: cc, payment_method: has_card)
|
37
|
+
end
|
38
|
+
|
39
|
+
it "finds credit cards associated on a order completed" do
|
40
|
+
allow(payment.order).to receive_messages completed?: true
|
41
|
+
|
42
|
+
expect(no_card.reusable_sources(payment.order)).to be_empty
|
43
|
+
expect(has_card.reusable_sources(payment.order)).not_to be_empty
|
44
|
+
end
|
45
|
+
|
46
|
+
it "finds credit cards associated with the order user" do
|
47
|
+
cc.update_column :user_id, 1
|
48
|
+
allow(payment.order).to receive_messages completed?: false
|
49
|
+
|
50
|
+
expect(no_card.reusable_sources(payment.order)).to be_empty
|
51
|
+
expect(has_card.reusable_sources(payment.order)).not_to be_empty
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
it "returns exchange multiplier for gateway" do
|
56
|
+
gateway = TestGateway.new
|
57
|
+
|
58
|
+
rate = Spree::Gateway::FROM_DOLLAR_TO_CENT_RATE
|
59
|
+
expect(gateway.exchange_multiplier).to eq rate
|
60
|
+
end
|
61
|
+
end
|
@@ -0,0 +1,256 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::InventoryUnit, type: :model do
|
4
|
+
let(:stock_location) { create(:stock_location_with_items) }
|
5
|
+
let(:stock_item) { stock_location.stock_items.order(:id).first }
|
6
|
+
|
7
|
+
describe 'scopes' do
|
8
|
+
let!(:inventory_unit_1) { create(:inventory_unit, state: 'on_hand') }
|
9
|
+
let!(:inventory_unit_2) { create(:inventory_unit, state: 'backordered') }
|
10
|
+
let!(:inventory_unit_3) { create(:inventory_unit, state: 'shipped') }
|
11
|
+
let!(:inventory_unit_4) { create(:inventory_unit, state: 'returned') }
|
12
|
+
|
13
|
+
describe '.backordered' do
|
14
|
+
it { expect(Spree::InventoryUnit.backordered).to eq([inventory_unit_2]) }
|
15
|
+
end
|
16
|
+
|
17
|
+
describe '.on_hand' do
|
18
|
+
it { expect(Spree::InventoryUnit.on_hand).to eq([inventory_unit_1]) }
|
19
|
+
end
|
20
|
+
|
21
|
+
describe '.on_hand_or_backordered' do
|
22
|
+
it { expect(Spree::InventoryUnit.on_hand_or_backordered).to match_array([inventory_unit_1, inventory_unit_2]) }
|
23
|
+
end
|
24
|
+
|
25
|
+
describe '.shipped' do
|
26
|
+
it { expect(Spree::InventoryUnit.shipped).to eq([inventory_unit_3]) }
|
27
|
+
end
|
28
|
+
|
29
|
+
describe '.returned' do
|
30
|
+
it { expect(Spree::InventoryUnit.returned).to eq([inventory_unit_4]) }
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
context "#backordered_for_stock_item" do
|
35
|
+
let(:order) do
|
36
|
+
order = create(:order, state: 'complete', ship_address: create(:ship_address))
|
37
|
+
order.completed_at = Time.current
|
38
|
+
create(:shipment, order: order, stock_location: stock_location)
|
39
|
+
order.shipments.reload
|
40
|
+
create(:line_item, order: order, variant: stock_item.variant)
|
41
|
+
order.line_items.reload
|
42
|
+
order.tap(&:save!)
|
43
|
+
end
|
44
|
+
|
45
|
+
let(:shipment) do
|
46
|
+
order.shipments.first
|
47
|
+
end
|
48
|
+
|
49
|
+
let(:shipping_method) do
|
50
|
+
shipment.shipping_methods.first
|
51
|
+
end
|
52
|
+
|
53
|
+
let!(:unit) do
|
54
|
+
unit = shipment.inventory_units.first
|
55
|
+
unit.state = 'backordered'
|
56
|
+
unit.tap(&:save!)
|
57
|
+
end
|
58
|
+
|
59
|
+
before do
|
60
|
+
stock_item.set_count_on_hand(-2)
|
61
|
+
end
|
62
|
+
|
63
|
+
# Regression for #3066
|
64
|
+
it "returns modifiable objects" do
|
65
|
+
units = Spree::InventoryUnit.backordered_for_stock_item(stock_item)
|
66
|
+
expect { units.first.save! }.to_not raise_error
|
67
|
+
end
|
68
|
+
|
69
|
+
it "finds inventory units from its stock location when the unit's variant matches the stock item's variant" do
|
70
|
+
expect(Spree::InventoryUnit.backordered_for_stock_item(stock_item)).to match_array([unit])
|
71
|
+
end
|
72
|
+
|
73
|
+
it "does not find inventory units that aren't backordered" do
|
74
|
+
on_hand_unit = shipment.inventory_units.build
|
75
|
+
on_hand_unit.state = 'on_hand'
|
76
|
+
on_hand_unit.variant_id = 1
|
77
|
+
on_hand_unit.save!
|
78
|
+
|
79
|
+
expect(Spree::InventoryUnit.backordered_for_stock_item(stock_item)).not_to include(on_hand_unit)
|
80
|
+
end
|
81
|
+
|
82
|
+
it "does not find inventory units that don't match the stock item's variant" do
|
83
|
+
other_variant_unit = shipment.inventory_units.build
|
84
|
+
other_variant_unit.state = 'backordered'
|
85
|
+
other_variant_unit.variant = create(:variant)
|
86
|
+
other_variant_unit.save!
|
87
|
+
|
88
|
+
expect(Spree::InventoryUnit.backordered_for_stock_item(stock_item)).not_to include(other_variant_unit)
|
89
|
+
end
|
90
|
+
|
91
|
+
it "does not change shipping cost when fulfilling the order" do
|
92
|
+
current_shipment_cost = shipment.cost
|
93
|
+
shipping_method.calculator.set_preference(:amount, current_shipment_cost + 5.0)
|
94
|
+
stock_item.set_count_on_hand(0)
|
95
|
+
expect(shipment.reload.cost).to eq(current_shipment_cost)
|
96
|
+
end
|
97
|
+
|
98
|
+
context "other shipments" do
|
99
|
+
let(:other_order) do
|
100
|
+
order = create(:order)
|
101
|
+
order.state = 'payment'
|
102
|
+
order.completed_at = nil
|
103
|
+
order.tap(&:save!)
|
104
|
+
end
|
105
|
+
|
106
|
+
let(:other_shipment) do
|
107
|
+
shipment = Spree::Shipment.new
|
108
|
+
shipment.stock_location = stock_location
|
109
|
+
shipment.shipping_methods << create(:shipping_method)
|
110
|
+
shipment.order = other_order
|
111
|
+
# We don't care about this in this test
|
112
|
+
allow(shipment).to receive(:ensure_correct_adjustment)
|
113
|
+
shipment.tap(&:save!)
|
114
|
+
end
|
115
|
+
|
116
|
+
let!(:other_unit) do
|
117
|
+
unit = other_shipment.inventory_units.build
|
118
|
+
unit.state = 'backordered'
|
119
|
+
unit.variant_id = stock_item.variant.id
|
120
|
+
unit.order_id = other_order.id
|
121
|
+
unit.tap(&:save!)
|
122
|
+
end
|
123
|
+
|
124
|
+
it "does not find inventory units belonging to incomplete orders" do
|
125
|
+
expect(Spree::InventoryUnit.backordered_for_stock_item(stock_item)).not_to include(other_unit)
|
126
|
+
end
|
127
|
+
|
128
|
+
end
|
129
|
+
|
130
|
+
end
|
131
|
+
|
132
|
+
context "#finalize_units!" do
|
133
|
+
let!(:stock_location) { create(:stock_location) }
|
134
|
+
let(:variant) { create(:variant) }
|
135
|
+
let (:shipment) { create(:shipment) }
|
136
|
+
let(:inventory_units) { [
|
137
|
+
create(:inventory_unit, variant: variant),
|
138
|
+
create(:inventory_unit, variant: variant)
|
139
|
+
] }
|
140
|
+
before do
|
141
|
+
shipment.inventory_units = inventory_units
|
142
|
+
end
|
143
|
+
|
144
|
+
it "should create a stock movement" do
|
145
|
+
expect { shipment.inventory_units.finalize_units! }.
|
146
|
+
to change { shipment.inventory_units.where(pending: false).count }.by 2
|
147
|
+
end
|
148
|
+
end
|
149
|
+
|
150
|
+
describe "#current_or_new_return_item" do
|
151
|
+
before { allow(inventory_unit).to receive_messages(pre_tax_amount: 100.0) }
|
152
|
+
|
153
|
+
subject { inventory_unit.current_or_new_return_item }
|
154
|
+
|
155
|
+
context "associated with a return item" do
|
156
|
+
let(:return_item) { create(:return_item) }
|
157
|
+
let(:inventory_unit) { return_item.inventory_unit }
|
158
|
+
|
159
|
+
it "returns a persisted return item" do
|
160
|
+
expect(subject).to be_persisted
|
161
|
+
end
|
162
|
+
|
163
|
+
it "returns it's associated return_item" do
|
164
|
+
expect(subject).to eq return_item
|
165
|
+
end
|
166
|
+
end
|
167
|
+
|
168
|
+
context "no associated return item" do
|
169
|
+
let(:inventory_unit) { create(:inventory_unit) }
|
170
|
+
|
171
|
+
it "returns a new return item" do
|
172
|
+
expect(subject).to_not be_persisted
|
173
|
+
end
|
174
|
+
|
175
|
+
it "associates itself to the new return_item" do
|
176
|
+
expect(subject.inventory_unit).to eq inventory_unit
|
177
|
+
end
|
178
|
+
end
|
179
|
+
end
|
180
|
+
|
181
|
+
describe '#additional_tax_total' do
|
182
|
+
let(:quantity) { 2 }
|
183
|
+
let(:line_item_additional_tax_total) { 10.00 }
|
184
|
+
let(:line_item) do
|
185
|
+
build(:line_item, {
|
186
|
+
quantity: quantity,
|
187
|
+
additional_tax_total: line_item_additional_tax_total,
|
188
|
+
})
|
189
|
+
end
|
190
|
+
|
191
|
+
subject do
|
192
|
+
build(:inventory_unit, line_item: line_item)
|
193
|
+
end
|
194
|
+
|
195
|
+
it 'is the correct amount' do
|
196
|
+
expect(subject.additional_tax_total).to eq line_item_additional_tax_total / quantity
|
197
|
+
end
|
198
|
+
end
|
199
|
+
|
200
|
+
describe '#included_tax_total' do
|
201
|
+
let(:quantity) { 2 }
|
202
|
+
let(:line_item_included_tax_total) { 10.00 }
|
203
|
+
let(:line_item) do
|
204
|
+
build(:line_item, {
|
205
|
+
quantity: quantity,
|
206
|
+
included_tax_total: line_item_included_tax_total,
|
207
|
+
})
|
208
|
+
end
|
209
|
+
|
210
|
+
subject do
|
211
|
+
build(:inventory_unit, line_item: line_item)
|
212
|
+
end
|
213
|
+
|
214
|
+
it 'is the correct amount' do
|
215
|
+
expect(subject.included_tax_total).to eq line_item_included_tax_total / quantity
|
216
|
+
end
|
217
|
+
end
|
218
|
+
|
219
|
+
describe '#additional_tax_total' do
|
220
|
+
let(:quantity) { 2 }
|
221
|
+
let(:line_item_additional_tax_total) { 10.00 }
|
222
|
+
let(:line_item) do
|
223
|
+
build(:line_item, {
|
224
|
+
quantity: quantity,
|
225
|
+
additional_tax_total: line_item_additional_tax_total,
|
226
|
+
})
|
227
|
+
end
|
228
|
+
|
229
|
+
subject do
|
230
|
+
build(:inventory_unit, line_item: line_item)
|
231
|
+
end
|
232
|
+
|
233
|
+
it 'is the correct amount' do
|
234
|
+
expect(subject.additional_tax_total).to eq line_item_additional_tax_total / quantity
|
235
|
+
end
|
236
|
+
end
|
237
|
+
|
238
|
+
describe '#included_tax_total' do
|
239
|
+
let(:quantity) { 2 }
|
240
|
+
let(:line_item_included_tax_total) { 10.00 }
|
241
|
+
let(:line_item) do
|
242
|
+
build(:line_item, {
|
243
|
+
quantity: quantity,
|
244
|
+
included_tax_total: line_item_included_tax_total,
|
245
|
+
})
|
246
|
+
end
|
247
|
+
|
248
|
+
subject do
|
249
|
+
build(:inventory_unit, line_item: line_item)
|
250
|
+
end
|
251
|
+
|
252
|
+
it 'is the correct amount' do
|
253
|
+
expect(subject.included_tax_total).to eq line_item_included_tax_total / quantity
|
254
|
+
end
|
255
|
+
end
|
256
|
+
end
|
@@ -0,0 +1,346 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
describe Spree::LineItem, type: :model do
|
4
|
+
let(:order) { create :order_with_line_items, line_items_count: 1 }
|
5
|
+
let(:line_item) { order.line_items.first }
|
6
|
+
|
7
|
+
before { create(:store) }
|
8
|
+
|
9
|
+
describe 'Validations' do
|
10
|
+
it { expect(line_item).to validate_numericality_of(:quantity).only_integer.with_message(Spree.t('validation.must_be_int')) }
|
11
|
+
it { expect(line_item).to validate_presence_of(:order) }
|
12
|
+
|
13
|
+
describe 'ensure_proper_currency' do
|
14
|
+
context 'order is present' do
|
15
|
+
context "when line_item's currency matches with order's" do
|
16
|
+
it { expect(line_item).to be_valid }
|
17
|
+
end
|
18
|
+
|
19
|
+
context "when line_item's currency does not matches with order's" do
|
20
|
+
before do
|
21
|
+
line_item.currency = "Invalid Currency"
|
22
|
+
end
|
23
|
+
|
24
|
+
it { expect(line_item).not_to be_valid }
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
describe '#ensure_valid_quantity' do
|
31
|
+
context 'quantity.nil?' do
|
32
|
+
before do
|
33
|
+
line_item.quantity = nil
|
34
|
+
line_item.valid?
|
35
|
+
end
|
36
|
+
|
37
|
+
it { expect(line_item.quantity).to be_zero }
|
38
|
+
end
|
39
|
+
|
40
|
+
context 'quantity < 0' do
|
41
|
+
before do
|
42
|
+
line_item.quantity = -1
|
43
|
+
line_item.valid?
|
44
|
+
end
|
45
|
+
|
46
|
+
it { expect(line_item.quantity).to be_zero }
|
47
|
+
end
|
48
|
+
|
49
|
+
context 'quantity = 0' do
|
50
|
+
before do
|
51
|
+
line_item.quantity = 0
|
52
|
+
line_item.valid?
|
53
|
+
end
|
54
|
+
|
55
|
+
it { expect(line_item.quantity).to be_zero }
|
56
|
+
end
|
57
|
+
|
58
|
+
context 'quantity > 0' do
|
59
|
+
let(:original_quantity) { 1 }
|
60
|
+
|
61
|
+
before do
|
62
|
+
line_item.quantity = original_quantity
|
63
|
+
line_item.valid?
|
64
|
+
end
|
65
|
+
|
66
|
+
it { expect(line_item.quantity).to eq(original_quantity) }
|
67
|
+
end
|
68
|
+
end
|
69
|
+
|
70
|
+
context '#save' do
|
71
|
+
it 'touches the order' do
|
72
|
+
expect(line_item.order).to receive(:touch)
|
73
|
+
line_item.touch
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
77
|
+
context "#discontinued" do
|
78
|
+
it "fetches discontinued products" do
|
79
|
+
line_item.product.discontinue!
|
80
|
+
expect(line_item.reload.product).to be_a Spree::Product
|
81
|
+
end
|
82
|
+
|
83
|
+
it "fetches discontinued variants" do
|
84
|
+
line_item.variant.discontinue!
|
85
|
+
expect(line_item.reload.variant).to be_a Spree::Variant
|
86
|
+
end
|
87
|
+
end
|
88
|
+
|
89
|
+
context "#destroy" do
|
90
|
+
let!(:line_item) { order.line_items.first }
|
91
|
+
it "returns inventory when a line item is destroyed" do
|
92
|
+
is_expected.to callback(:verify_order_inventory).before(:destroy)
|
93
|
+
end
|
94
|
+
|
95
|
+
it "deletes inventory units" do
|
96
|
+
expect { line_item.destroy }.to change { line_item.inventory_units.count }.from(1).to(0)
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
context "#save" do
|
101
|
+
context "line item changes" do
|
102
|
+
before do
|
103
|
+
line_item.quantity = line_item.quantity + 1
|
104
|
+
end
|
105
|
+
|
106
|
+
it "triggers adjustment total recalculation" do
|
107
|
+
expect(line_item).to receive(:update_tax_charge) # Regression test for https://github.com/spree/spree/issues/4671
|
108
|
+
expect(line_item).to receive(:recalculate_adjustments)
|
109
|
+
line_item.save
|
110
|
+
end
|
111
|
+
end
|
112
|
+
|
113
|
+
context "line item does not change" do
|
114
|
+
it "does not trigger adjustment total recalculation" do
|
115
|
+
expect(line_item).not_to receive(:recalculate_adjustments)
|
116
|
+
line_item.save
|
117
|
+
end
|
118
|
+
end
|
119
|
+
|
120
|
+
context "target_shipment is provided" do
|
121
|
+
it "verifies inventory" do
|
122
|
+
line_item.target_shipment = Spree::Shipment.new
|
123
|
+
expect_any_instance_of(Spree::OrderInventory).to receive(:verify)
|
124
|
+
line_item.save
|
125
|
+
end
|
126
|
+
end
|
127
|
+
end
|
128
|
+
|
129
|
+
context "#create" do
|
130
|
+
let(:variant) { create(:variant) }
|
131
|
+
|
132
|
+
before do
|
133
|
+
create(:tax_rate, zone: order.tax_zone, tax_category: variant.tax_category)
|
134
|
+
end
|
135
|
+
|
136
|
+
context "when order has a tax zone" do
|
137
|
+
before do
|
138
|
+
expect(order.tax_zone).to be_present
|
139
|
+
end
|
140
|
+
|
141
|
+
it "creates a tax adjustment" do
|
142
|
+
order.contents.add(variant)
|
143
|
+
line_item = order.find_line_item_by_variant(variant)
|
144
|
+
expect(line_item.adjustments.tax.count).to eq(1)
|
145
|
+
end
|
146
|
+
end
|
147
|
+
|
148
|
+
context "when order does not have a tax zone" do
|
149
|
+
before do
|
150
|
+
order.bill_address = nil
|
151
|
+
order.ship_address = nil
|
152
|
+
order.save
|
153
|
+
expect(order.reload.tax_zone).to be_nil
|
154
|
+
end
|
155
|
+
|
156
|
+
it "does not create a tax adjustment" do
|
157
|
+
order.contents.add(variant)
|
158
|
+
line_item = order.find_line_item_by_variant(variant)
|
159
|
+
expect(line_item.adjustments.tax.count).to eq(0)
|
160
|
+
end
|
161
|
+
end
|
162
|
+
end
|
163
|
+
|
164
|
+
# Test for #3391
|
165
|
+
context '#copy_price' do
|
166
|
+
it "copies over a variant's prices" do
|
167
|
+
line_item.price = nil
|
168
|
+
line_item.cost_price = nil
|
169
|
+
line_item.currency = nil
|
170
|
+
line_item.copy_price
|
171
|
+
variant = line_item.variant
|
172
|
+
expect(line_item.price).to eq(variant.price)
|
173
|
+
expect(line_item.cost_price).to eq(variant.cost_price)
|
174
|
+
expect(line_item.currency).to eq(variant.currency)
|
175
|
+
end
|
176
|
+
end
|
177
|
+
|
178
|
+
# test for copying prices when the vat changes
|
179
|
+
context "#update_price" do
|
180
|
+
it "copies over a variants differing price for another vat zone" do
|
181
|
+
expect(line_item.variant).to receive(:price_including_vat_for).and_return(12)
|
182
|
+
line_item.price = 10
|
183
|
+
line_item.update_price
|
184
|
+
expect(line_item.price).to eq(12)
|
185
|
+
end
|
186
|
+
end
|
187
|
+
|
188
|
+
# Test for #3481
|
189
|
+
context '#copy_tax_category' do
|
190
|
+
it "copies over a variant's tax category" do
|
191
|
+
line_item.tax_category = nil
|
192
|
+
line_item.copy_tax_category
|
193
|
+
expect(line_item.tax_category).to eq(line_item.variant.tax_category)
|
194
|
+
end
|
195
|
+
end
|
196
|
+
|
197
|
+
describe '#discounted_amount' do
|
198
|
+
it "returns the amount minus any discounts" do
|
199
|
+
line_item.price = 10
|
200
|
+
line_item.quantity = 2
|
201
|
+
line_item.taxable_adjustment_total = -5
|
202
|
+
expect(line_item.discounted_amount).to eq(15)
|
203
|
+
end
|
204
|
+
end
|
205
|
+
|
206
|
+
describe '.currency' do
|
207
|
+
it 'returns the globally configured currency' do
|
208
|
+
line_item.currency == 'USD'
|
209
|
+
end
|
210
|
+
end
|
211
|
+
|
212
|
+
describe "#discounted_money" do
|
213
|
+
it "should return a money object with the discounted amount" do
|
214
|
+
expect(line_item.discounted_money.to_s).to eq "$10.00"
|
215
|
+
end
|
216
|
+
end
|
217
|
+
|
218
|
+
describe "#money" do
|
219
|
+
before do
|
220
|
+
line_item.price = 3.50
|
221
|
+
line_item.quantity = 2
|
222
|
+
end
|
223
|
+
|
224
|
+
it "returns a Spree::Money representing the total for this line item" do
|
225
|
+
expect(line_item.money.to_s).to eq("$7.00")
|
226
|
+
end
|
227
|
+
end
|
228
|
+
|
229
|
+
describe '#single_money' do
|
230
|
+
before do
|
231
|
+
line_item.price = 3.50
|
232
|
+
line_item.quantity = 2
|
233
|
+
end
|
234
|
+
|
235
|
+
it "returns a Spree::Money representing the price for one variant" do
|
236
|
+
expect(line_item.single_money.to_s).to eq("$3.50")
|
237
|
+
end
|
238
|
+
end
|
239
|
+
|
240
|
+
context "has inventory (completed order so items were already unstocked)" do
|
241
|
+
let(:order) { Spree::Order.create(email: 'spree@example.com') }
|
242
|
+
let(:variant) { create(:variant) }
|
243
|
+
|
244
|
+
context "nothing left on stock" do
|
245
|
+
before do
|
246
|
+
variant.stock_items.update_all count_on_hand: 5, backorderable: false
|
247
|
+
order.contents.add(variant, 5)
|
248
|
+
order.create_proposed_shipments
|
249
|
+
order.finalize!
|
250
|
+
end
|
251
|
+
|
252
|
+
it "allows to decrease item quantity" do
|
253
|
+
line_item = order.line_items.first
|
254
|
+
line_item.quantity -= 1
|
255
|
+
line_item.target_shipment = order.shipments.first
|
256
|
+
|
257
|
+
line_item.save
|
258
|
+
expect(line_item.errors_on(:quantity).size).to eq(0)
|
259
|
+
end
|
260
|
+
|
261
|
+
it "doesnt allow to increase item quantity" do
|
262
|
+
line_item = order.line_items.first
|
263
|
+
line_item.quantity += 2
|
264
|
+
line_item.target_shipment = order.shipments.first
|
265
|
+
|
266
|
+
line_item.save
|
267
|
+
expect(line_item.errors_on(:quantity).size).to eq(1)
|
268
|
+
end
|
269
|
+
end
|
270
|
+
|
271
|
+
context "2 items left on stock" do
|
272
|
+
before do
|
273
|
+
variant.stock_items.update_all count_on_hand: 7, backorderable: false
|
274
|
+
order.contents.add(variant, 5)
|
275
|
+
order.create_proposed_shipments
|
276
|
+
order.finalize!
|
277
|
+
end
|
278
|
+
|
279
|
+
it "allows to increase quantity up to stock availability" do
|
280
|
+
line_item = order.line_items.first
|
281
|
+
line_item.quantity += 2
|
282
|
+
line_item.target_shipment = order.shipments.first
|
283
|
+
|
284
|
+
line_item.save
|
285
|
+
expect(line_item.errors_on(:quantity).size).to eq(0)
|
286
|
+
end
|
287
|
+
|
288
|
+
it "doesnt allow to increase quantity over stock availability" do
|
289
|
+
line_item = order.line_items.first
|
290
|
+
line_item.quantity += 3
|
291
|
+
line_item.target_shipment = order.shipments.first
|
292
|
+
|
293
|
+
line_item.save
|
294
|
+
expect(line_item.errors_on(:quantity).size).to eq(1)
|
295
|
+
end
|
296
|
+
end
|
297
|
+
end
|
298
|
+
|
299
|
+
context "currency same as order.currency" do
|
300
|
+
it "is a valid line item" do
|
301
|
+
line_item = order.line_items.first
|
302
|
+
line_item.currency = order.currency
|
303
|
+
line_item.valid?
|
304
|
+
|
305
|
+
expect(line_item.error_on(:currency).size).to eq(0)
|
306
|
+
end
|
307
|
+
end
|
308
|
+
|
309
|
+
context "currency different than order.currency" do
|
310
|
+
it "is not a valid line item" do
|
311
|
+
line_item = order.line_items.first
|
312
|
+
line_item.currency = "no currency"
|
313
|
+
line_item.valid?
|
314
|
+
|
315
|
+
expect(line_item.error_on(:currency).size).to eq(1)
|
316
|
+
end
|
317
|
+
end
|
318
|
+
|
319
|
+
describe "#options=" do
|
320
|
+
it "can handle updating a blank line item with no order" do
|
321
|
+
line_item.options = { price: 123 }
|
322
|
+
end
|
323
|
+
|
324
|
+
it "updates the data provided in the options" do
|
325
|
+
line_item.options = { price: 123 }
|
326
|
+
expect(line_item.price).to eq 123
|
327
|
+
end
|
328
|
+
|
329
|
+
it "updates the price based on the options provided" do
|
330
|
+
expect(line_item).to receive(:gift_wrap=).with(true)
|
331
|
+
expect(line_item.variant).to receive(:gift_wrap_price_modifier_amount_in).with("USD", true).and_return 1.99
|
332
|
+
line_item.options = { gift_wrap: true }
|
333
|
+
expect(line_item.price).to eq 21.98
|
334
|
+
end
|
335
|
+
end
|
336
|
+
|
337
|
+
describe "precision of pre_tax_amount" do
|
338
|
+
let(:line_item) { create :line_item, pre_tax_amount: 4.2051 }
|
339
|
+
|
340
|
+
it "keeps four digits of precision even when reloading" do
|
341
|
+
# prevent it from updating pre_tax_amount
|
342
|
+
allow_any_instance_of(Spree::LineItem).to receive(:update_tax_charge)
|
343
|
+
expect(line_item.reload.pre_tax_amount).to eq(4.2051)
|
344
|
+
end
|
345
|
+
end
|
346
|
+
end
|