spree_core 3.0.9 → 3.2.0
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} +13 -4
- data/app/helpers/spree/base_helper.rb +5 -2
- data/app/helpers/spree/products_helper.rb +37 -12
- data/app/mailers/spree/base_mailer.rb +11 -2
- 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 +3 -10
- data/app/models/concerns/spree/default_price.rb +7 -1
- data/app/models/concerns/spree/named_type.rb +1 -1
- data/app/models/concerns/spree/ransackable_attributes.rb +6 -1
- data/app/models/concerns/spree/user_api_authentication.rb +7 -1
- data/app/models/concerns/spree/user_methods.rb +57 -0
- data/app/models/concerns/spree/user_reporting.rb +2 -2
- data/app/models/concerns/spree/vat_price_calculation.rb +47 -0
- data/app/models/spree/ability.rb +9 -1
- data/app/models/spree/address.rb +75 -45
- data/app/models/spree/adjustable/adjuster/base.rb +25 -0
- data/app/models/spree/adjustable/adjuster/promotion.rb +41 -0
- data/app/models/spree/adjustable/adjuster/tax.rb +26 -0
- data/app/models/spree/adjustable/adjustments_updater.rb +22 -45
- data/app/models/spree/adjustment.rb +8 -10
- data/app/models/spree/app_configuration.rb +14 -8
- data/app/models/spree/base.rb +5 -1
- data/app/models/spree/calculator/default_tax.rb +2 -10
- data/app/models/spree/calculator/free_shipping.rb +6 -5
- data/app/models/spree/calculator.rb +1 -6
- data/app/models/spree/classification.rb +7 -3
- data/app/models/spree/country.rb +15 -3
- data/app/models/spree/credit_card.rb +37 -38
- data/app/models/spree/customer_return.rb +7 -15
- data/app/models/spree/gateway/bogus.rb +12 -12
- data/app/models/spree/gateway/bogus_simple.rb +4 -4
- data/app/models/spree/gateway.rb +8 -7
- data/app/models/spree/image.rb +3 -3
- data/app/models/spree/inventory_unit.rb +13 -14
- data/app/models/spree/legacy_user.rb +1 -14
- data/app/models/spree/line_item.rb +79 -67
- data/app/models/spree/log_entry.rb +1 -4
- data/app/models/spree/option_type.rb +15 -6
- data/app/models/spree/option_type_prototype.rb +9 -0
- data/app/models/spree/option_value.rb +11 -3
- data/app/models/spree/option_value_variant.rb +6 -0
- data/app/models/spree/order/checkout.rb +10 -13
- data/app/models/spree/order/currency_updater.rb +1 -1
- data/app/models/spree/order/store_credit.rb +96 -0
- data/app/models/spree/order.rb +105 -68
- data/app/models/spree/order_contents.rb +13 -7
- data/app/models/spree/order_inventory.rb +16 -9
- data/app/models/spree/order_promotion.rb +6 -0
- data/app/models/spree/order_updater.rb +4 -8
- data/app/models/spree/payment/gateway_options.rb +8 -4
- data/app/models/spree/payment/processing.rb +1 -1
- data/app/models/spree/payment.rb +55 -29
- data/app/models/spree/payment_method/store_credit.rb +130 -0
- data/app/models/spree/payment_method.rb +18 -13
- data/app/models/spree/preference.rb +1 -1
- data/app/models/spree/preferences/store.rb +2 -2
- data/app/models/spree/price.rb +16 -6
- data/app/models/spree/product/scopes.rb +22 -13
- data/app/models/spree/product.rb +83 -52
- data/app/models/spree/product_option_type.rb +7 -2
- data/app/models/spree/product_promotion_rule.rb +9 -0
- data/app/models/spree/product_property.rb +9 -10
- data/app/models/spree/promotion/actions/create_adjustment.rb +1 -1
- 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/product.rb +3 -1
- data/app/models/spree/promotion/rules/taxon.rb +3 -2
- data/app/models/spree/promotion/rules/user.rb +4 -4
- data/app/models/spree/promotion.rb +55 -19
- data/app/models/spree/promotion_action.rb +3 -3
- data/app/models/spree/promotion_category.rb +1 -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/promotion_rule_taxon.rb +9 -0
- data/app/models/spree/promotion_rule_user.rb +9 -0
- data/app/models/spree/property.rb +2 -1
- data/app/models/spree/property_prototype.rb +9 -0
- data/app/models/spree/prototype.rb +8 -3
- data/app/models/spree/prototype_taxon.rb +9 -0
- data/app/models/spree/refund.rb +10 -7
- data/app/models/spree/refund_reason.rb +2 -2
- data/app/models/spree/reimbursement.rb +12 -16
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +23 -6
- data/app/models/spree/reimbursement_type/store_credit.rb +28 -0
- data/app/models/spree/reimbursement_type.rb +5 -1
- data/app/models/spree/return_authorization.rb +8 -13
- data/app/models/spree/return_authorization_reason.rb +1 -1
- data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +1 -1
- data/app/models/spree/return_item.rb +14 -13
- data/app/models/spree/role.rb +3 -2
- data/app/models/spree/role_user.rb +6 -0
- data/app/models/spree/shipment.rb +23 -30
- data/app/models/spree/shipment_handler.rb +2 -2
- data/app/models/spree/shipping_category.rb +6 -3
- data/app/models/spree/shipping_method.rb +12 -11
- data/app/models/spree/shipping_method_zone.rb +6 -0
- data/app/models/spree/shipping_rate.rb +16 -29
- data/app/models/spree/state.rb +3 -2
- data/app/models/spree/state_change.rb +1 -1
- data/app/models/spree/stock/adjuster.rb +9 -2
- data/app/models/spree/stock/content_item.rb +10 -12
- data/app/models/spree/stock/coordinator.rb +21 -15
- data/app/models/spree/stock/estimator.rb +28 -30
- data/app/models/spree/stock/inventory_unit_builder.rb +2 -10
- data/app/models/spree/stock/package.rb +11 -3
- data/app/models/spree/stock/packer.rb +16 -6
- data/app/models/spree/stock/prioritizer.rb +25 -15
- data/app/models/spree/stock/quantifier.rb +5 -5
- data/app/models/spree/stock/splitter/backordered.rb +2 -2
- data/app/models/spree/stock/splitter/shipping_category.rb +6 -1
- data/app/models/spree/stock_item.rb +15 -18
- data/app/models/spree/stock_location.rb +4 -7
- data/app/models/spree/stock_movement.rb +16 -9
- data/app/models/spree/stock_transfer.rb +11 -12
- data/app/models/spree/store.rb +15 -6
- data/app/models/spree/store_credit.rb +252 -0
- data/app/models/spree/store_credit_category.rb +22 -0
- data/app/models/spree/store_credit_event.rb +38 -0
- data/app/models/spree/store_credit_type.rb +6 -0
- data/app/models/spree/tag.rb +4 -0
- data/app/models/spree/tax_category.rb +3 -8
- data/app/models/spree/tax_rate.rb +61 -121
- data/app/models/spree/taxon.rb +12 -6
- data/app/models/spree/tracker.rb +12 -1
- data/app/models/spree/validations/db_maximum_length_validator.rb +2 -1
- data/app/models/spree/variant.rb +94 -49
- data/app/models/spree/zone.rb +23 -19
- data/app/models/spree/zone_member.rb +6 -0
- data/app/validators/db_maximum_length_validator.rb +11 -0
- data/app/views/layouts/spree/base_mailer.html.erb +38 -781
- data/app/views/spree/order_mailer/_adjustment.html.erb +8 -0
- data/app/views/spree/order_mailer/_subtotal.html.erb +8 -0
- data/app/views/spree/order_mailer/_total.html.erb +8 -0
- data/app/views/spree/order_mailer/cancel_email.html.erb +13 -28
- data/app/views/spree/order_mailer/cancel_email.text.erb +1 -1
- data/app/views/spree/order_mailer/confirm_email.html.erb +49 -63
- data/app/views/spree/order_mailer/confirm_email.text.erb +1 -1
- data/app/views/spree/shared/_base_mailer_header.html.erb +5 -7
- data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +777 -0
- data/app/views/spree/shared/_error_messages.html.erb +1 -1
- data/app/views/spree/shared/_mailer_line_item.html.erb +12 -0
- data/app/views/spree/shared/_paths.html.erb +8 -0
- data/app/views/spree/shipment_mailer/shipped_email.html.erb +21 -14
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +3 -3
- data/config/initializers/acts_as_taggable_on.rb +9 -0
- data/config/initializers/friendly_id.rb +0 -81
- data/config/initializers/user_class_extensions.rb +7 -38
- data/config/locales/en.yml +137 -12
- data/config/routes.rb +7 -0
- data/db/default/spree/countries.rb +5 -1
- data/db/default/spree/default_reimbursement_type.rb +1 -1
- data/db/default/spree/roles.rb +2 -2
- data/db/default/spree/states.rb +1 -1
- data/db/default/spree/zones.rb +4 -5
- 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 +2 -2
- 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 +24 -0
- data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +8 -0
- data/db/migrate/20150118212051_create_spree_store_credit_events.rb +17 -0
- data/db/migrate/20150118212101_create_spree_store_credit_types.rb +10 -0
- data/db/migrate/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 +67 -0
- data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb +18 -0
- data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb +14 -0
- data/db/migrate/20150515211137_fix_adjustment_order_id.rb +1 -1
- data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb +5 -0
- 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 +19 -0
- data/db/migrate/20150627090949_migrate_payment_methods_display.rb +12 -0
- data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb +1 -1
- data/db/migrate/20150714154102_spree_payment_method_store_credits.rb +12 -0
- data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb +18 -0
- data/db/migrate/20150727191614_spree_store_credit_types.rb +11 -0
- data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb +68 -0
- data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb +13 -0
- data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb +16 -0
- data/db/migrate/20160219165458_add_indexes.rb +14 -0
- data/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 +38 -28
- data/lib/generators/spree/dummy/templates/rails/test.rb +4 -3
- data/lib/generators/spree/install/install_generator.rb +37 -13
- data/lib/spree/core/controller_helpers/auth.rb +1 -1
- data/lib/spree/core/controller_helpers/common.rb +6 -6
- data/lib/spree/core/controller_helpers/order.rb +9 -10
- data/lib/spree/core/controller_helpers/respond_with.rb +1 -1
- data/lib/spree/core/controller_helpers/search.rb +1 -1
- data/lib/spree/core/controller_helpers/store.rb +29 -0
- data/lib/spree/core/delegate_belongs_to.rb +4 -4
- data/lib/spree/core/engine.rb +39 -20
- data/lib/spree/core/environment.rb +1 -1
- data/lib/spree/core/importer/order.rb +37 -40
- data/lib/spree/core/importer/product.rb +2 -2
- data/lib/spree/core/number_generator.rb +52 -0
- data/lib/spree/core/product_duplicator.rb +1 -1
- data/lib/spree/core/product_filters.rb +2 -2
- data/lib/spree/core/search/base.rb +4 -3
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/core.rb +16 -0
- data/lib/spree/i18n/initializer.rb +1 -1
- data/lib/spree/localized_number.rb +3 -1
- data/lib/spree/permitted_attributes.rb +6 -3
- data/lib/spree/testing_support/caching.rb +3 -3
- data/lib/spree/testing_support/common_rake.rb +3 -3
- data/lib/spree/testing_support/controller_requests.rb +4 -4
- data/lib/spree/testing_support/factories/address_factory.rb +1 -1
- data/lib/spree/testing_support/factories/country_factory.rb +2 -2
- data/lib/spree/testing_support/factories/line_item_factory.rb +0 -1
- data/lib/spree/testing_support/factories/order_factory.rb +3 -2
- data/lib/spree/testing_support/factories/payment_factory.rb +5 -0
- data/lib/spree/testing_support/factories/payment_method_factory.rb +8 -0
- data/lib/spree/testing_support/factories/promotion_rule_factory.rb +5 -0
- data/lib/spree/testing_support/factories/refund_factory.rb +9 -1
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +2 -0
- data/lib/spree/testing_support/factories/state_factory.rb +2 -2
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +9 -0
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +8 -0
- data/lib/spree/testing_support/factories/store_credit_factory.rb +17 -0
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +11 -0
- data/lib/spree/testing_support/factories/tag_factory.rb +5 -0
- data/lib/spree/testing_support/factories/user_factory.rb +1 -1
- data/lib/spree/testing_support/factories/zone_member_factory.rb +6 -0
- data/lib/spree/testing_support/factories.rb +3 -3
- data/lib/spree/testing_support/kernel.rb +18 -0
- data/lib/spree/testing_support/microdata.rb +189 -0
- data/lib/spree/testing_support/order_walkthrough.rb +4 -4
- data/lib/tasks/core.rake +69 -1
- data/lib/tasks/exchanges.rake +2 -2
- data/spec/fixtures/microdata.html +22 -0
- data/spec/fixtures/microdata_itemref.html +15 -0
- data/spec/fixtures/microdata_no_itemscope.html +20 -0
- data/spec/helpers/base_helper_spec.rb +74 -11
- data/spec/helpers/products_helper_spec.rb +80 -15
- data/spec/lib/i18n_spec.rb +13 -13
- data/spec/lib/search/base_spec.rb +18 -18
- data/spec/lib/spree/core/controller_helpers/auth_spec.rb +6 -4
- data/spec/lib/spree/core/controller_helpers/order_spec.rb +15 -0
- data/spec/lib/spree/core/controller_helpers/store_spec.rb +56 -0
- data/spec/lib/spree/core/importer/order_spec.rb +227 -124
- data/spec/lib/spree/core/number_generator_spec.rb +175 -0
- data/spec/lib/spree/core_spec.rb +23 -0
- data/spec/lib/spree/localized_number_spec.rb +11 -1
- data/spec/lib/spree/money_spec.rb +6 -6
- data/spec/mailers/order_mailer_spec.rb +11 -13
- data/spec/mailers/reimbursement_mailer_spec.rb +2 -2
- data/spec/mailers/shipment_mailer_spec.rb +26 -8
- data/spec/mailers/test_mailer_spec.rb +16 -2
- data/spec/models/option_type_prototype_spec.rb +9 -0
- data/spec/models/spree/ability_spec.rb +20 -15
- data/spec/models/spree/address_spec.rb +144 -33
- data/spec/models/spree/adjustable/adjuster/base_spec.rb +10 -0
- data/spec/models/spree/adjustable/adjuster/promotion_spec.rb +211 -0
- data/spec/models/spree/adjustable/adjuster/tax_spec.rb +86 -0
- data/spec/models/spree/adjustable/adjustments_updater_spec.rb +2 -262
- data/spec/models/spree/adjustment_spec.rb +28 -2
- data/spec/models/spree/app_configuration_spec.rb +6 -3
- data/spec/models/spree/asset_spec.rb +9 -6
- data/spec/models/spree/calculator/default_tax_spec.rb +39 -14
- data/spec/models/spree/calculator/flat_percent_item_total_spec.rb +1 -1
- data/spec/models/spree/calculator/flexi_rate_spec.rb +6 -6
- data/spec/models/spree/calculator/percent_on_line_item_spec.rb +1 -1
- data/spec/models/spree/calculator/price_sack_spec.rb +2 -2
- data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +4 -8
- data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +4 -4
- data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +2 -2
- data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +6 -6
- data/spec/models/spree/calculator/shipping/per_item_spec.rb +2 -2
- data/spec/models/spree/calculator/tiered_flat_rate_spec.rb +1 -1
- data/spec/models/spree/calculator/tiered_percent_spec.rb +1 -1
- data/spec/models/spree/calculator_spec.rb +3 -3
- data/spec/models/spree/classification_spec.rb +1 -1
- 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 +45 -8
- data/spec/models/spree/credit_card_spec.rb +13 -9
- data/spec/models/spree/customer_return_spec.rb +4 -26
- data/spec/models/spree/exchange_spec.rb +1 -1
- data/spec/models/spree/gateway/bogus_simple.rb +1 -1
- data/spec/models/spree/gateway/bogus_spec.rb +1 -1
- data/spec/models/spree/gateway_spec.rb +8 -1
- data/spec/models/spree/image_spec.rb +4 -1
- data/spec/models/spree/inventory_unit_spec.rb +35 -21
- data/spec/models/spree/line_item_spec.rb +100 -21
- data/spec/models/spree/option_type_spec.rb +3 -3
- data/spec/models/spree/option_value_spec.rb +8 -3
- data/spec/models/spree/order/address_spec.rb +1 -1
- data/spec/models/spree/order/adjustments_spec.rb +1 -1
- data/spec/models/spree/order/callbacks_spec.rb +3 -3
- data/spec/models/spree/order/checkout_spec.rb +99 -93
- data/spec/models/spree/order/currency_updater_spec.rb +4 -4
- data/spec/models/spree/order/finalizing_spec.rb +5 -8
- data/spec/models/spree/order/helpers_spec.rb +1 -1
- data/spec/models/spree/order/payment_spec.rb +21 -21
- data/spec/models/spree/order/risk_assessment_spec.rb +1 -1
- data/spec/models/spree/order/state_machine_spec.rb +4 -8
- data/spec/models/spree/order/store_credit_spec.rb +426 -0
- data/spec/models/spree/order/tax_spec.rb +13 -13
- data/spec/models/spree/order/totals_spec.rb +2 -2
- data/spec/models/spree/order/updating_spec.rb +4 -4
- data/spec/models/spree/order/validations_spec.rb +2 -2
- data/spec/models/spree/order_contents_spec.rb +45 -4
- data/spec/models/spree/order_inventory_spec.rb +28 -17
- data/spec/models/spree/order_merger_spec.rb +3 -1
- data/spec/models/spree/order_spec.rb +188 -96
- data/spec/models/spree/order_updater_spec.rb +43 -32
- data/spec/models/spree/payment/gateway_options_spec.rb +10 -2
- data/spec/models/spree/payment/store_credit_spec.rb +60 -0
- data/spec/models/spree/payment_method/store_credit_spec.rb +291 -0
- data/spec/models/spree/payment_method_spec.rb +22 -14
- data/spec/models/spree/payment_spec.rb +75 -82
- data/spec/models/spree/preference_spec.rb +1 -1
- data/spec/models/spree/preferences/configuration_spec.rb +2 -2
- data/spec/models/spree/preferences/preferable_spec.rb +15 -19
- data/spec/models/spree/preferences/scoped_store_spec.rb +1 -1
- data/spec/models/spree/preferences/store_spec.rb +3 -3
- data/spec/models/spree/price_spec.rb +87 -1
- data/spec/models/spree/product/scopes_spec.rb +39 -4
- data/spec/models/spree/product_duplicator_spec.rb +2 -2
- data/spec/models/spree/product_filter_spec.rb +2 -2
- data/spec/models/spree/product_option_type_spec.rb +6 -2
- data/spec/models/spree/product_promotion_rule_spec.rb +9 -0
- data/spec/models/spree/product_property_spec.rb +16 -1
- data/spec/models/spree/product_spec.rb +196 -41
- data/spec/models/spree/promotion/actions/create_adjustment_spec.rb +63 -0
- data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +6 -6
- data/spec/models/spree/promotion/actions/free_shipping_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/country_spec.rb +36 -0
- data/spec/models/spree/promotion/rules/first_order_spec.rb +11 -11
- data/spec/models/spree/promotion/rules/item_total_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/product_spec.rb +8 -8
- data/spec/models/spree/promotion/rules/taxon_spec.rb +1 -1
- data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +3 -3
- data/spec/models/spree/promotion/rules/user_spec.rb +15 -7
- data/spec/models/spree/promotion_action_spec.rb +2 -2
- data/spec/models/spree/promotion_category_spec.rb +1 -1
- data/spec/models/spree/promotion_handler/cart_spec.rb +1 -1
- data/spec/models/spree/promotion_handler/coupon_spec.rb +28 -28
- data/spec/models/spree/promotion_handler/page_spec.rb +6 -6
- data/spec/models/spree/promotion_rule_spec.rb +2 -2
- 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 +141 -65
- data/spec/models/spree/property_prototype_spec.rb +9 -0
- data/spec/models/spree/property_spec.rb +1 -1
- data/spec/models/spree/prototype_spec.rb +1 -1
- 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 +1 -1
- data/spec/models/spree/reimbursement/credit_spec.rb +1 -1
- data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb +1 -1
- data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb +1 -1
- data/spec/models/spree/reimbursement_performer_spec.rb +1 -1
- data/spec/models/spree/reimbursement_spec.rb +3 -30
- data/spec/models/spree/reimbursement_tax_calculator_spec.rb +18 -6
- data/spec/models/spree/reimbursement_type/credit_spec.rb +1 -1
- data/spec/models/spree/reimbursement_type/exchange_spec.rb +1 -1
- data/spec/models/spree/reimbursement_type/original_payment_spec.rb +1 -1
- 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 +3 -23
- data/spec/models/spree/return_item/eligibility_validator/default_spec.rb +1 -1
- data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb +1 -1
- data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb +1 -1
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb +1 -1
- data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +1 -1
- data/spec/models/spree/return_item_spec.rb +51 -2
- data/spec/models/spree/returns_calculator_spec.rb +2 -2
- data/spec/models/spree/role_spec.rb +7 -0
- data/spec/models/spree/shipment_spec.rb +24 -22
- data/spec/models/spree/shipping_calculator_spec.rb +5 -5
- data/spec/models/spree/shipping_category_spec.rb +15 -1
- data/spec/models/spree/shipping_method_spec.rb +11 -4
- data/spec/models/spree/shipping_rate_spec.rb +40 -41
- data/spec/models/spree/state_spec.rb +13 -2
- data/spec/models/spree/stock/availability_validator_spec.rb +1 -1
- data/spec/models/spree/stock/content_item_spec.rb +9 -0
- data/spec/models/spree/stock/coordinator_spec.rb +13 -3
- data/spec/models/spree/stock/differentiator_spec.rb +1 -1
- data/spec/models/spree/stock/estimator_spec.rb +60 -12
- data/spec/models/spree/stock/inventory_unit_builder_spec.rb +1 -1
- data/spec/models/spree/stock/package_spec.rb +6 -18
- data/spec/models/spree/stock/packer_spec.rb +1 -1
- data/spec/models/spree/stock/prioritizer_spec.rb +7 -7
- data/spec/models/spree/stock/quantifier_spec.rb +61 -32
- data/spec/models/spree/stock/splitter/backordered_spec.rb +1 -1
- data/spec/models/spree/stock/splitter/base_spec.rb +1 -1
- data/spec/models/spree/stock/splitter/shipping_category_spec.rb +3 -3
- data/spec/models/spree/stock_item_spec.rb +30 -8
- data/spec/models/spree/stock_location_spec.rb +5 -5
- data/spec/models/spree/stock_movement_spec.rb +101 -37
- data/spec/models/spree/stock_transfer_spec.rb +1 -1
- data/spec/models/spree/store_credit_event_spec.rb +101 -0
- data/spec/models/spree/store_credit_spec.rb +786 -0
- data/spec/models/spree/store_spec.rb +40 -12
- data/spec/models/spree/tax_category_spec.rb +7 -2
- data/spec/models/spree/tax_rate_spec.rb +288 -109
- data/spec/models/spree/taxon_spec.rb +15 -4
- data/spec/models/spree/taxonomy_spec.rb +2 -2
- data/spec/models/spree/tracker_spec.rb +1 -1
- data/spec/models/spree/user_spec.rb +114 -41
- data/spec/models/spree/variant_spec.rb +310 -15
- data/spec/models/spree/zone_member_spec.rb +38 -0
- data/spec/models/spree/zone_spec.rb +38 -10
- data/spec/spec_helper.rb +5 -0
- data/spec/support/concerns/{adjustment_source_spec.rb → adjustment_source.rb} +0 -0
- data/spec/support/concerns/{default_price_spec.rb → default_price.rb} +9 -0
- data/spree_core.gemspec +12 -13
- data/vendor/assets/javascripts/jquery.payment.js +239 -84
- metadata +136 -65
- data/CHANGELOG.md +0 -4
- data/app/models/concerns/spree/number_generator.rb +0 -39
- data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +0 -24
@@ -0,0 +1,101 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
module Spree
|
4
|
+
describe ReimbursementType::StoreCredit do
|
5
|
+
let(:reimbursement) { create(:reimbursement, return_items_count: 2) }
|
6
|
+
let(:return_item) { reimbursement.return_items.first }
|
7
|
+
let(:return_item2) { reimbursement.return_items.last }
|
8
|
+
let(:payment) { reimbursement.order.payments.first }
|
9
|
+
let(:simulate) { false }
|
10
|
+
let!(:default_refund_reason) do
|
11
|
+
Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON,
|
12
|
+
mutable: false)
|
13
|
+
end
|
14
|
+
|
15
|
+
let!(:primary_credit_type) { create(:primary_credit_type) }
|
16
|
+
let!(:created_by_user) { create(:user, email: Spree::StoreCredit::DEFAULT_CREATED_BY_EMAIL) }
|
17
|
+
let!(:default_reimbursement_category) { create(:store_credit_category) }
|
18
|
+
|
19
|
+
subject do
|
20
|
+
Spree::ReimbursementType::StoreCredit.reimburse(reimbursement, [return_item, return_item2],
|
21
|
+
simulate)
|
22
|
+
end
|
23
|
+
|
24
|
+
before { reimbursement.update!(total: reimbursement.calculated_total) }
|
25
|
+
|
26
|
+
describe '.reimburse' do
|
27
|
+
context 'simulate is true' do
|
28
|
+
let(:simulate) { true }
|
29
|
+
|
30
|
+
context 'for store credits that the customer used' do
|
31
|
+
before do
|
32
|
+
allow(Spree::ReimbursementType::StoreCredit).to receive(:store_credit_payments).and_return([payment])
|
33
|
+
end
|
34
|
+
|
35
|
+
it 'creates readonly refunds for all store credit payments' do
|
36
|
+
expect(subject.map(&:class)).to eq [Spree::Refund]
|
37
|
+
expect(subject.map(&:readonly?)).to eq [true]
|
38
|
+
end
|
39
|
+
|
40
|
+
it 'does not save to the database' do
|
41
|
+
expect { subject }.to_not change { payment.refunds.count }
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
context 'for return items that were not paid for with store credit' do
|
46
|
+
before do
|
47
|
+
allow(Spree::ReimbursementType::StoreCredit).to receive(:store_credit_payments).and_return([])
|
48
|
+
end
|
49
|
+
|
50
|
+
context 'creates one readonly lump credit for all outstanding balance payable to the customer' do
|
51
|
+
it 'creates a credit that is read only' do
|
52
|
+
expect(subject.map(&:class)).to eq [Spree::Reimbursement::Credit]
|
53
|
+
expect(subject.map(&:readonly?)).to eq [true]
|
54
|
+
end
|
55
|
+
|
56
|
+
it 'creates a credit which amounts to the sum of the return items rounded down' do
|
57
|
+
allow(return_item).to receive(:total).and_return(10.0076)
|
58
|
+
allow(return_item2).to receive(:total).and_return(10.0023)
|
59
|
+
expect(subject.sum(&:amount)).to eq 20.0
|
60
|
+
end
|
61
|
+
end
|
62
|
+
|
63
|
+
it 'does not save to the database' do
|
64
|
+
expect { subject }.to_not change { Spree::Reimbursement::Credit.count }
|
65
|
+
end
|
66
|
+
end
|
67
|
+
end
|
68
|
+
|
69
|
+
context 'simulate is false' do
|
70
|
+
let(:simulate) { false }
|
71
|
+
|
72
|
+
context 'for store credits that the customer used' do
|
73
|
+
before do
|
74
|
+
allow(Spree::ReimbursementType::StoreCredit).to receive(:store_credit_payments).and_return([payment])
|
75
|
+
end
|
76
|
+
|
77
|
+
it 'performs refunds for all store credit payments' do
|
78
|
+
expect { subject }.to change { payment.refunds.count }.by(1)
|
79
|
+
expect(payment.refunds.sum(:amount)).to eq reimbursement.return_items.to_a.sum(&:total)
|
80
|
+
end
|
81
|
+
end
|
82
|
+
|
83
|
+
context 'for return items that were not paid for with store credit' do
|
84
|
+
before do
|
85
|
+
allow(Spree::ReimbursementType::StoreCredit).to receive(:store_credit_payments).and_return([])
|
86
|
+
end
|
87
|
+
|
88
|
+
it 'creates one lump credit for all outstanding balance payable to the customer' do
|
89
|
+
expect { subject }.to change { Spree::Reimbursement::Credit.count }.by(1)
|
90
|
+
expect(subject.sum(&:amount)).to eq reimbursement.return_items.to_a.sum(&:total)
|
91
|
+
end
|
92
|
+
|
93
|
+
it "creates a store credit with the same currency as the reimbursement's order" do
|
94
|
+
expect { subject }.to change { Spree::StoreCredit.count }.by(1)
|
95
|
+
expect(Spree::StoreCredit.last.currency).to eq reimbursement.order.currency
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spree::ReturnAuthorization, :
|
3
|
+
describe Spree::ReturnAuthorization, type: :model do
|
4
4
|
let(:order) { create(:shipped_order) }
|
5
5
|
let(:stock_location) { create(:stock_location) }
|
6
6
|
let(:rma_reason) { create(:return_authorization_reason) }
|
@@ -84,28 +84,8 @@ describe Spree::ReturnAuthorization, :type => :model do
|
|
84
84
|
end
|
85
85
|
end
|
86
86
|
|
87
|
-
describe
|
88
|
-
|
89
|
-
context "number is assigned" do
|
90
|
-
let(:return_authorization) { Spree::ReturnAuthorization.new(number: '123') }
|
91
|
-
|
92
|
-
it "should return the assigned number" do
|
93
|
-
return_authorization.save
|
94
|
-
expect(return_authorization.number).to eq('123')
|
95
|
-
end
|
96
|
-
end
|
97
|
-
|
98
|
-
context "number is not assigned" do
|
99
|
-
let(:return_authorization) { Spree::ReturnAuthorization.new(number: nil) }
|
100
|
-
|
101
|
-
before { allow(return_authorization).to receive_messages valid?: true }
|
102
|
-
|
103
|
-
it "should assign number with random RA number" do
|
104
|
-
return_authorization.save
|
105
|
-
expect(return_authorization.number).to match(/RA\d{9}/)
|
106
|
-
end
|
107
|
-
end
|
108
|
-
end
|
87
|
+
describe 'whitelisted_ransackable_attributes' do
|
88
|
+
it { expect(Spree::ReturnAuthorization.whitelisted_ransackable_attributes).to eq(%w(memo number state)) }
|
109
89
|
end
|
110
90
|
|
111
91
|
context "#currency" do
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spree::ReturnItem::EligibilityValidator::Default, :
|
3
|
+
describe Spree::ReturnItem::EligibilityValidator::Default, type: :model do
|
4
4
|
let(:return_item) { create(:return_item) }
|
5
5
|
let(:validator) { Spree::ReturnItem::EligibilityValidator::Default.new(return_item) }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spree::ReturnItem::EligibilityValidator::RMARequired, :
|
3
|
+
describe Spree::ReturnItem::EligibilityValidator::RMARequired, type: :model do
|
4
4
|
let(:return_item) { create(:return_item) }
|
5
5
|
let(:validator) { Spree::ReturnItem::EligibilityValidator::RMARequired.new(return_item) }
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, :
|
3
|
+
describe Spree::ReturnItem::EligibilityValidator::TimeSincePurchase, type: :model do
|
4
4
|
let(:inventory_unit) { create(:inventory_unit, order: create(:shipped_order)) }
|
5
5
|
let(:return_item) { create(:return_item, inventory_unit: inventory_unit) }
|
6
6
|
let(:validator) { Spree::ReturnItem::EligibilityValidator::TimeSincePurchase.new(return_item) }
|
@@ -2,7 +2,7 @@ require 'spec_helper'
|
|
2
2
|
|
3
3
|
module Spree
|
4
4
|
module ReturnItem::ExchangeVariantEligibility
|
5
|
-
describe SameOptionValue, :
|
5
|
+
describe SameOptionValue, type: :model do
|
6
6
|
describe ".eligible_variants" do
|
7
7
|
let(:color_option_type) { create(:option_type, name: "color") }
|
8
8
|
let(:waist_option_type) { create(:option_type, name: "waist") }
|
@@ -8,7 +8,7 @@ shared_examples "an invalid state transition" do |status, expected_status|
|
|
8
8
|
end
|
9
9
|
end
|
10
10
|
|
11
|
-
describe Spree::ReturnItem, :
|
11
|
+
describe Spree::ReturnItem, type: :model do
|
12
12
|
|
13
13
|
all_reception_statuses = Spree::ReturnItem.state_machines[:reception_status].states.map(&:name).map(&:to_s)
|
14
14
|
all_acceptance_statuses = Spree::ReturnItem.state_machines[:acceptance_status].states.map(&:name).map(&:to_s)
|
@@ -18,7 +18,7 @@ describe Spree::ReturnItem, :type => :model do
|
|
18
18
|
end
|
19
19
|
|
20
20
|
describe '#receive!' do
|
21
|
-
let(:now) { Time.
|
21
|
+
let(:now) { Time.current }
|
22
22
|
let(:inventory_unit) { create(:inventory_unit, state: 'shipped') }
|
23
23
|
let(:return_item) { create(:return_item, inventory_unit: inventory_unit) }
|
24
24
|
|
@@ -679,4 +679,53 @@ describe Spree::ReturnItem, :type => :model do
|
|
679
679
|
expect(return_item.total).to eq 20
|
680
680
|
end
|
681
681
|
end
|
682
|
+
|
683
|
+
describe '#process_inventory_unit!' do
|
684
|
+
let(:inventory_unit) { create(:inventory_unit, state: 'shipped') }
|
685
|
+
let(:return_item) { create(:return_item, inventory_unit: inventory_unit, reception_status: 'awaiting') }
|
686
|
+
let!(:stock_item) { inventory_unit.find_stock_item }
|
687
|
+
before { return_item.update_attributes!(reception_status: 'awaiting') }
|
688
|
+
|
689
|
+
subject { return_item.send(:process_inventory_unit!) }
|
690
|
+
|
691
|
+
it { expect { subject }.to change { inventory_unit.state }.to('returned').from('shipped') }
|
692
|
+
|
693
|
+
context 'stock should restock' do
|
694
|
+
let(:stock_movement_attributes) do
|
695
|
+
{
|
696
|
+
stock_item_id: stock_item.id,
|
697
|
+
quantity: 1,
|
698
|
+
originator: return_item.return_authorization
|
699
|
+
}
|
700
|
+
end
|
701
|
+
|
702
|
+
it { expect(subject).to eq(Spree::StockMovement.find_by(stock_movement_attributes)) }
|
703
|
+
end
|
704
|
+
|
705
|
+
context 'stock should not restock' do
|
706
|
+
context 'return_item is not resellable' do
|
707
|
+
before { return_item.resellable = false }
|
708
|
+
it { expect(subject).to be_nil }
|
709
|
+
it { expect { subject }.to_not change { stock_item.reload.count_on_hand } }
|
710
|
+
end
|
711
|
+
|
712
|
+
context 'variant should not track inventory' do
|
713
|
+
before { return_item.variant.track_inventory = false }
|
714
|
+
it { expect(subject).to be_nil }
|
715
|
+
it { expect { subject }.to_not change { stock_item.reload.count_on_hand } }
|
716
|
+
end
|
717
|
+
|
718
|
+
context 'stock_item not present' do
|
719
|
+
before { stock_item.destroy }
|
720
|
+
it { expect(subject).to be_nil }
|
721
|
+
it { expect { subject }.to_not change { stock_item.reload.count_on_hand } }
|
722
|
+
end
|
723
|
+
|
724
|
+
context 'when restock inventory preference false' do
|
725
|
+
before { Spree::Config[:restock_inventory] = false }
|
726
|
+
it { expect(subject).to be_nil }
|
727
|
+
it { expect { subject }.to_not change { stock_item.reload.count_on_hand } }
|
728
|
+
end
|
729
|
+
end
|
730
|
+
end
|
682
731
|
end
|
@@ -1,14 +1,14 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
module Spree
|
4
|
-
describe ReturnsCalculator, :
|
4
|
+
describe ReturnsCalculator, type: :model do
|
5
5
|
let(:return_item) { build(:return_item) }
|
6
6
|
subject { ReturnsCalculator.new }
|
7
7
|
|
8
8
|
it 'compute_shipment must be overridden' do
|
9
9
|
expect {
|
10
10
|
subject.compute(return_item)
|
11
|
-
}.to raise_error
|
11
|
+
}.to raise_error(NotImplementedError)
|
12
12
|
end
|
13
13
|
end
|
14
14
|
end
|
@@ -1,14 +1,14 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
require 'benchmark'
|
3
3
|
|
4
|
-
describe Spree::Shipment, :
|
4
|
+
describe Spree::Shipment, type: :model do
|
5
5
|
let(:order) { mock_model Spree::Order, backordered?: false,
|
6
6
|
canceled?: false,
|
7
7
|
can_ship?: true,
|
8
8
|
currency: 'USD',
|
9
9
|
number: 'S12345',
|
10
10
|
paid?: false,
|
11
|
-
|
11
|
+
touch_later: false }
|
12
12
|
let(:shipping_method) { create(:shipping_method, name: "UPS") }
|
13
13
|
let(:shipment) do
|
14
14
|
shipment = Spree::Shipment.new(cost: 1, state: 'pending', stock_location: create(:stock_location))
|
@@ -31,9 +31,11 @@ describe Spree::Shipment, :type => :model do
|
|
31
31
|
end
|
32
32
|
|
33
33
|
describe "precision of pre_tax_amount" do
|
34
|
-
let
|
34
|
+
let(:line_item) { create :line_item, pre_tax_amount: 4.2051 }
|
35
35
|
|
36
36
|
it "keeps four digits of precision even when reloading" do
|
37
|
+
# prevent it from updating pre_tax_amount
|
38
|
+
allow_any_instance_of(Spree::LineItem).to receive(:update_tax_charge)
|
37
39
|
expect(line_item.reload.pre_tax_amount).to eq(4.2051)
|
38
40
|
end
|
39
41
|
end
|
@@ -41,7 +43,7 @@ describe Spree::Shipment, :type => :model do
|
|
41
43
|
# Regression test for #4063
|
42
44
|
context "number generation" do
|
43
45
|
before do
|
44
|
-
allow(order).to receive :
|
46
|
+
allow(order).to receive :update_with_updater!
|
45
47
|
end
|
46
48
|
|
47
49
|
it "generates a number containing a letter + 11 numbers" do
|
@@ -228,7 +230,7 @@ describe Spree::Shipment, :type => :model do
|
|
228
230
|
end
|
229
231
|
|
230
232
|
it "can't get rates without a shipping address" do
|
231
|
-
shipment.order
|
233
|
+
shipment.order.ship_address = nil
|
232
234
|
expect(shipment.refresh_rates).to eq([])
|
233
235
|
end
|
234
236
|
|
@@ -394,7 +396,7 @@ describe Spree::Shipment, :type => :model do
|
|
394
396
|
|
395
397
|
context "#cancel" do
|
396
398
|
it 'cancels the shipment' do
|
397
|
-
allow(shipment.order).to receive(:
|
399
|
+
allow(shipment.order).to receive(:update_with_updater!)
|
398
400
|
|
399
401
|
shipment.state = 'pending'
|
400
402
|
expect(shipment).to receive(:after_cancel)
|
@@ -439,33 +441,33 @@ describe Spree::Shipment, :type => :model do
|
|
439
441
|
end
|
440
442
|
|
441
443
|
context "#resume" do
|
442
|
-
it '
|
443
|
-
allow(shipment.order).to receive(:
|
444
|
+
it 'transitions state to ready if the order is ready' do
|
445
|
+
allow(shipment.order).to receive(:update_with_updater!)
|
444
446
|
|
445
447
|
shipment.state = 'canceled'
|
446
|
-
expect(shipment).to receive(:determine_state).and_return(
|
448
|
+
expect(shipment).to receive(:determine_state).and_return('ready')
|
447
449
|
expect(shipment).to receive(:after_resume)
|
448
450
|
shipment.resume!
|
449
451
|
expect(shipment.state).to eq 'ready'
|
450
452
|
end
|
451
453
|
|
452
|
-
it '
|
453
|
-
allow(shipment).to
|
454
|
-
shipment.stock_location = mock_model(Spree::StockLocation)
|
455
|
-
expect(shipment.stock_location).to receive(:unstock).with(variant, 1, shipment)
|
456
|
-
shipment.after_resume
|
457
|
-
end
|
458
|
-
|
459
|
-
it 'will determine new state based on order' do
|
460
|
-
allow(shipment.order).to receive(:update!)
|
454
|
+
it 'transitions state to pending if the order is not ready' do
|
455
|
+
allow(shipment.order).to receive(:update_with_updater!)
|
461
456
|
|
462
457
|
shipment.state = 'canceled'
|
463
|
-
expect(shipment).to receive(:determine_state).
|
458
|
+
expect(shipment).to receive(:determine_state).and_return('pending')
|
464
459
|
expect(shipment).to receive(:after_resume)
|
465
460
|
shipment.resume!
|
466
461
|
# Shipment is pending because order is already paid
|
467
462
|
expect(shipment.state).to eq 'pending'
|
468
463
|
end
|
464
|
+
|
465
|
+
it 'unstocks them items' do
|
466
|
+
allow(shipment).to receive_message_chain(inventory_units: [mock_model(Spree::InventoryUnit, line_item: line_item, variant: variant)])
|
467
|
+
shipment.stock_location = mock_model(Spree::StockLocation)
|
468
|
+
expect(shipment.stock_location).to receive(:unstock).with(variant, 1, shipment)
|
469
|
+
shipment.after_resume
|
470
|
+
end
|
469
471
|
end
|
470
472
|
|
471
473
|
context "#ship" do
|
@@ -473,7 +475,7 @@ describe Spree::Shipment, :type => :model do
|
|
473
475
|
let(:shipment_with_inventory_units) { create(:shipment, order: create(:order_with_line_items), state: 'canceled') }
|
474
476
|
let(:subject) { shipment_with_inventory_units.ship! }
|
475
477
|
before do
|
476
|
-
allow(order).to receive(:
|
478
|
+
allow(order).to receive(:update_with_updater!)
|
477
479
|
allow(shipment_with_inventory_units).to receive_messages(require_inventory: false, update_order: true)
|
478
480
|
end
|
479
481
|
|
@@ -489,7 +491,7 @@ describe Spree::Shipment, :type => :model do
|
|
489
491
|
['ready', 'canceled'].each do |state|
|
490
492
|
context "from #{state}" do
|
491
493
|
before do
|
492
|
-
allow(order).to receive(:
|
494
|
+
allow(order).to receive(:update_with_updater!)
|
493
495
|
allow(shipment).to receive_messages(require_inventory: false, update_order: true, state: state)
|
494
496
|
end
|
495
497
|
|
@@ -725,7 +727,7 @@ describe Spree::Shipment, :type => :model do
|
|
725
727
|
context "state changes" do
|
726
728
|
before do
|
727
729
|
# Must be stubbed so transition can succeed
|
728
|
-
allow(order).to receive_messages
|
730
|
+
allow(order).to receive_messages paid?: true
|
729
731
|
end
|
730
732
|
|
731
733
|
it "are logged to the database" do
|
@@ -1,9 +1,9 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
module Spree
|
4
|
-
describe ShippingCalculator, :
|
5
|
-
let(:variant1) { build(:variant, :
|
6
|
-
let(:variant2) { build(:variant, :
|
4
|
+
describe ShippingCalculator, type: :model do
|
5
|
+
let(:variant1) { build(:variant, price: 10) }
|
6
|
+
let(:variant2) { build(:variant, price: 20) }
|
7
7
|
|
8
8
|
let(:package) do
|
9
9
|
build(:stock_package, variants_contents: { variant1 => 2, variant2 => 1 })
|
@@ -25,13 +25,13 @@ module Spree
|
|
25
25
|
it 'compute_shipment must be overridden' do
|
26
26
|
expect {
|
27
27
|
subject.compute_shipment(shipment)
|
28
|
-
}.to raise_error
|
28
|
+
}.to raise_error(NameError)
|
29
29
|
end
|
30
30
|
|
31
31
|
it 'compute_package must be overridden' do
|
32
32
|
expect {
|
33
33
|
subject.compute_package(package)
|
34
|
-
}.to raise_error
|
34
|
+
}.to raise_error(NotImplementedError)
|
35
35
|
end
|
36
36
|
|
37
37
|
it 'checks availability for a package' do
|
@@ -1,5 +1,19 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
|
-
describe Spree::ShippingCategory, :
|
3
|
+
describe Spree::ShippingCategory, type: :model do
|
4
4
|
|
5
|
+
describe '#validations' do
|
6
|
+
it 'should have a valid factory' do
|
7
|
+
expect(FactoryGirl.build(:shipping_category)).to be_valid
|
8
|
+
end
|
9
|
+
|
10
|
+
it 'should require name' do
|
11
|
+
expect(FactoryGirl.build(:shipping_category, name: '')).not_to be_valid
|
12
|
+
end
|
13
|
+
|
14
|
+
it 'should validate uniqueness' do
|
15
|
+
FactoryGirl.create(:shipping_category, name: 'Test')
|
16
|
+
expect(FactoryGirl.build(:shipping_category, name: 'Test')).not_to be_valid
|
17
|
+
end
|
18
|
+
end
|
5
19
|
end
|
@@ -3,7 +3,7 @@ require 'spec_helper'
|
|
3
3
|
class DummyShippingCalculator < Spree::ShippingCalculator
|
4
4
|
end
|
5
5
|
|
6
|
-
describe Spree::ShippingMethod, :
|
6
|
+
describe Spree::ShippingMethod, type: :model do
|
7
7
|
let(:shipping_method){ create(:shipping_method) }
|
8
8
|
|
9
9
|
context 'calculators' do
|
@@ -25,7 +25,7 @@ describe Spree::ShippingMethod, :type => :model do
|
|
25
25
|
let!(:shipping_method) { create(:shipping_method) }
|
26
26
|
let!(:shipment) do
|
27
27
|
shipment = create(:shipment)
|
28
|
-
shipment.shipping_rates.create!(:
|
28
|
+
shipment.shipping_rates.create!(shipping_method: shipping_method)
|
29
29
|
shipment
|
30
30
|
end
|
31
31
|
|
@@ -42,8 +42,15 @@ describe Spree::ShippingMethod, :type => :model do
|
|
42
42
|
end
|
43
43
|
|
44
44
|
context "shipping category" do
|
45
|
-
|
46
|
-
expect(subject.error_on(:base).size).to eq(1)
|
45
|
+
context "is required" do
|
46
|
+
it { expect(subject.error_on(:base).size).to eq(1) }
|
47
|
+
it 'adds error to base' do
|
48
|
+
expect(subject.error_on(:base)).to include(I18n.t(:required_shipping_category,
|
49
|
+
scope: [
|
50
|
+
:activerecord, :errors, :models,
|
51
|
+
'spree/shipping_method', :attributes, :base
|
52
|
+
]))
|
53
|
+
end
|
47
54
|
end
|
48
55
|
|
49
56
|
context "one associated" do
|
@@ -2,29 +2,32 @@
|
|
2
2
|
|
3
3
|
require 'spec_helper'
|
4
4
|
|
5
|
-
describe Spree::ShippingRate, :
|
5
|
+
describe Spree::ShippingRate, type: :model do
|
6
6
|
let(:shipment) { create(:shipment) }
|
7
7
|
let(:shipping_method) { create(:shipping_method) }
|
8
|
-
let(:shipping_rate)
|
9
|
-
|
10
|
-
|
8
|
+
let(:shipping_rate) do
|
9
|
+
Spree::ShippingRate.new shipment: shipment,
|
10
|
+
shipping_method: shipping_method,
|
11
|
+
cost: 10
|
12
|
+
end
|
11
13
|
|
12
14
|
context "#display_price" do
|
13
15
|
context "when tax included in price" do
|
16
|
+
let!(:default_zone) { create(:zone, default_tax: true) }
|
17
|
+
let(:default_tax_rate) do
|
18
|
+
create :tax_rate,
|
19
|
+
name: "VAT",
|
20
|
+
amount: 0.1,
|
21
|
+
included_in_price: true,
|
22
|
+
zone: default_zone
|
23
|
+
end
|
14
24
|
context "when the tax rate is from the default zone" do
|
15
|
-
let!(:zone) { create(:zone, :default_tax => true) }
|
16
|
-
let(:tax_rate) do
|
17
|
-
create(:tax_rate,
|
18
|
-
:name => "VAT",
|
19
|
-
:amount => 0.1,
|
20
|
-
:included_in_price => true,
|
21
|
-
:zone => zone)
|
22
|
-
end
|
23
25
|
|
24
|
-
before { shipping_rate.tax_rate =
|
26
|
+
before { shipping_rate.tax_rate = default_tax_rate }
|
25
27
|
|
26
28
|
it "shows correct tax amount" do
|
27
|
-
expect(shipping_rate.display_price.to_s).
|
29
|
+
expect(shipping_rate.display_price.to_s).
|
30
|
+
to eq("$10.00 (incl. $0.91 #{default_tax_rate.name})")
|
28
31
|
end
|
29
32
|
|
30
33
|
context "when cost is zero" do
|
@@ -38,20 +41,21 @@ describe Spree::ShippingRate, :type => :model do
|
|
38
41
|
end
|
39
42
|
end
|
40
43
|
|
41
|
-
context "when the tax rate is from
|
42
|
-
let!(:
|
43
|
-
|
44
|
-
let(:
|
45
|
-
create
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
44
|
+
context "when the tax rate is from another zone" do
|
45
|
+
let!(:non_default_zone) { create(:zone, default_tax: false) }
|
46
|
+
|
47
|
+
let(:non_default_tax_rate) do
|
48
|
+
create :tax_rate,
|
49
|
+
name: "VAT",
|
50
|
+
amount: 0.2,
|
51
|
+
included_in_price: true,
|
52
|
+
zone: non_default_zone
|
50
53
|
end
|
51
|
-
before { shipping_rate.tax_rate =
|
54
|
+
before { shipping_rate.tax_rate = non_default_tax_rate }
|
52
55
|
|
53
|
-
it "
|
54
|
-
expect(shipping_rate.display_price.to_s).
|
56
|
+
it "deducts the other zone's VAT from the calculated shipping rate" do
|
57
|
+
expect(shipping_rate.display_price.to_s).
|
58
|
+
to eq("$10.00 (incl. $1.67 #{non_default_tax_rate.name})")
|
55
59
|
end
|
56
60
|
|
57
61
|
context "when cost is zero" do
|
@@ -67,11 +71,12 @@ describe Spree::ShippingRate, :type => :model do
|
|
67
71
|
end
|
68
72
|
|
69
73
|
context "when tax is additional to price" do
|
70
|
-
let(:tax_rate) { create(:tax_rate, :
|
74
|
+
let(:tax_rate) { create(:tax_rate, name: "Sales Tax", amount: 0.1) }
|
71
75
|
before { shipping_rate.tax_rate = tax_rate }
|
72
76
|
|
73
77
|
it "shows correct tax amount" do
|
74
|
-
expect(shipping_rate.display_price.to_s).
|
78
|
+
expect(shipping_rate.display_price.to_s).
|
79
|
+
to eq("$10.00 (+ $1.00 #{tax_rate.name})")
|
75
80
|
end
|
76
81
|
|
77
82
|
context "when cost is zero" do
|
@@ -86,9 +91,9 @@ describe Spree::ShippingRate, :type => :model do
|
|
86
91
|
end
|
87
92
|
|
88
93
|
context "when the currency is JPY" do
|
89
|
-
let(:shipping_rate) {
|
90
|
-
|
91
|
-
|
94
|
+
let(:shipping_rate) { Spree::ShippingRate.new(cost: 205) }
|
95
|
+
|
96
|
+
before { allow(shipping_rate).to receive_messages(currency: "JPY") }
|
92
97
|
|
93
98
|
it "displays the price in yen" do
|
94
99
|
expect(shipping_rate.display_price.to_s).to eq("¥205")
|
@@ -103,7 +108,7 @@ describe Spree::ShippingRate, :type => :model do
|
|
103
108
|
end
|
104
109
|
|
105
110
|
it "can be retrieved even when deleted" do
|
106
|
-
shipping_method.update_column(:deleted_at, Time.
|
111
|
+
shipping_method.update_column(:deleted_at, Time.current)
|
107
112
|
shipping_rate.save
|
108
113
|
shipping_rate.reload
|
109
114
|
expect(shipping_rate.shipping_method).to eq(shipping_method)
|
@@ -122,20 +127,14 @@ describe Spree::ShippingRate, :type => :model do
|
|
122
127
|
end
|
123
128
|
|
124
129
|
it "can be retrieved even when deleted" do
|
125
|
-
tax_rate.update_column(:deleted_at, Time.
|
130
|
+
tax_rate.update_column(:deleted_at, Time.current)
|
126
131
|
shipping_rate.save
|
127
132
|
shipping_rate.reload
|
128
133
|
expect(shipping_rate.tax_rate).to eq(tax_rate)
|
129
134
|
end
|
130
135
|
end
|
131
136
|
|
132
|
-
|
133
|
-
|
134
|
-
shipping_method.code = "THE_CODE"
|
135
|
-
end
|
136
|
-
|
137
|
-
it 'should be shipping_method.code' do
|
138
|
-
expect(shipping_rate.shipping_method_code).to eq("THE_CODE")
|
139
|
-
end
|
137
|
+
describe 'delegate' do
|
138
|
+
it { is_expected.to delegate_method(:code).to(:shipping_method).with_prefix(true) }
|
140
139
|
end
|
141
140
|
end
|