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
@@ -1,12 +1,12 @@
|
|
1
1
|
module Spree
|
2
2
|
module Stock
|
3
3
|
class Prioritizer
|
4
|
-
attr_reader :packages
|
4
|
+
attr_reader :packages
|
5
5
|
|
6
|
-
def initialize(
|
7
|
-
@inventory_units = inventory_units
|
6
|
+
def initialize(packages, adjuster_class=Adjuster)
|
8
7
|
@packages = packages
|
9
8
|
@adjuster_class = adjuster_class
|
9
|
+
@adjusters = Hash.new
|
10
10
|
end
|
11
11
|
|
12
12
|
def prioritized_packages
|
@@ -17,22 +17,32 @@ module Spree
|
|
17
17
|
end
|
18
18
|
|
19
19
|
private
|
20
|
-
def adjust_packages
|
21
|
-
inventory_units.each do |inventory_unit|
|
22
|
-
adjuster = @adjuster_class.new(inventory_unit, :on_hand)
|
23
|
-
|
24
|
-
visit_packages(adjuster)
|
25
20
|
|
26
|
-
|
27
|
-
|
21
|
+
def adjust_packages
|
22
|
+
packages.each do |package|
|
23
|
+
package.contents.each do |item|
|
24
|
+
adjuster = find_adjuster(item)
|
25
|
+
|
26
|
+
if adjuster.nil?
|
27
|
+
adjuster = build_adjuster(item, package)
|
28
|
+
elsif item.state == :on_hand && adjuster.status == :backordered
|
29
|
+
# Remove item from backordered package
|
30
|
+
adjuster.package.remove(item.inventory_unit)
|
31
|
+
# Reassign adjuster's status package
|
32
|
+
adjuster.reassign(:on_hand, package)
|
33
|
+
end
|
34
|
+
|
35
|
+
adjuster.adjust(package)
|
36
|
+
end
|
28
37
|
end
|
29
38
|
end
|
30
39
|
|
31
|
-
def
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
40
|
+
def build_adjuster(item, package)
|
41
|
+
@adjusters[item.inventory_unit] = @adjuster_class.new(item.inventory_unit, item.state, package)
|
42
|
+
end
|
43
|
+
|
44
|
+
def find_adjuster(item)
|
45
|
+
@adjusters[item.inventory_unit]
|
36
46
|
end
|
37
47
|
|
38
48
|
def sort_packages
|
@@ -1,15 +1,15 @@
|
|
1
1
|
module Spree
|
2
2
|
module Stock
|
3
3
|
class Quantifier
|
4
|
-
attr_reader :stock_items
|
4
|
+
attr_reader :stock_items, :variant
|
5
5
|
|
6
6
|
def initialize(variant)
|
7
7
|
@variant = variant
|
8
|
-
@stock_items =
|
8
|
+
@stock_items = @variant.stock_items.with_active_stock_location
|
9
9
|
end
|
10
10
|
|
11
11
|
def total_on_hand
|
12
|
-
if
|
12
|
+
if variant.should_track_inventory?
|
13
13
|
stock_items.sum(:count_on_hand)
|
14
14
|
else
|
15
15
|
Float::INFINITY
|
@@ -20,8 +20,8 @@ module Spree
|
|
20
20
|
stock_items.any?(&:backorderable)
|
21
21
|
end
|
22
22
|
|
23
|
-
def can_supply?(required)
|
24
|
-
total_on_hand >= required || backorderable?
|
23
|
+
def can_supply?(required = 1)
|
24
|
+
variant.available? && (total_on_hand >= required || backorderable?)
|
25
25
|
end
|
26
26
|
|
27
27
|
end
|
@@ -6,11 +6,11 @@ module Spree
|
|
6
6
|
def split(packages)
|
7
7
|
split_packages = []
|
8
8
|
packages.each do |package|
|
9
|
-
if package.on_hand.
|
9
|
+
if package.on_hand.size > 0
|
10
10
|
split_packages << build_package(package.on_hand)
|
11
11
|
end
|
12
12
|
|
13
|
-
if package.backordered.
|
13
|
+
if package.backordered.size > 0
|
14
14
|
split_packages << build_package(package.backordered)
|
15
15
|
end
|
16
16
|
end
|
@@ -14,7 +14,7 @@ module Spree
|
|
14
14
|
def split_by_category(package)
|
15
15
|
categories = Hash.new { |hash, key| hash[key] = [] }
|
16
16
|
package.contents.each do |item|
|
17
|
-
categories[item
|
17
|
+
categories[shipping_category_for(item)] << item
|
18
18
|
end
|
19
19
|
hash_to_packages(categories)
|
20
20
|
end
|
@@ -26,6 +26,11 @@ module Spree
|
|
26
26
|
end
|
27
27
|
packages
|
28
28
|
end
|
29
|
+
|
30
|
+
def shipping_category_for(item)
|
31
|
+
@item_shipping_category ||= {}
|
32
|
+
@item_shipping_category[item.inventory_unit.variant_id] ||= item.variant.shipping_category_id
|
33
|
+
end
|
29
34
|
end
|
30
35
|
end
|
31
36
|
end
|
@@ -2,39 +2,40 @@ module Spree
|
|
2
2
|
class StockItem < Spree::Base
|
3
3
|
acts_as_paranoid
|
4
4
|
|
5
|
-
|
6
|
-
|
5
|
+
with_options inverse_of: :stock_items do
|
6
|
+
belongs_to :stock_location, class_name: 'Spree::StockLocation'
|
7
|
+
belongs_to :variant, class_name: 'Spree::Variant'
|
8
|
+
end
|
7
9
|
has_many :stock_movements, inverse_of: :stock_item
|
8
10
|
|
9
|
-
|
10
|
-
|
11
|
+
validates :stock_location, :variant, presence: true
|
12
|
+
validates :variant_id, uniqueness: { scope: [:stock_location_id, :deleted_at] }, allow_blank: true
|
11
13
|
|
12
|
-
|
14
|
+
validates :count_on_hand, numericality: {
|
13
15
|
greater_than_or_equal_to: 0,
|
14
16
|
less_than_or_equal_to: 2**31 - 1,
|
15
|
-
only_integer: true, if: :verify_count_on_hand?
|
17
|
+
only_integer: true }, if: :verify_count_on_hand?
|
16
18
|
|
17
19
|
delegate :weight, :should_track_inventory?, to: :variant
|
20
|
+
delegate :name, to: :variant, prefix: true
|
21
|
+
delegate :product, to: :variant
|
18
22
|
|
19
23
|
after_save :conditional_variant_touch, if: :changed?
|
20
24
|
after_touch { variant.touch }
|
25
|
+
after_destroy { variant.touch }
|
21
26
|
|
22
27
|
self.whitelisted_ransackable_attributes = ['count_on_hand', 'stock_location_id']
|
28
|
+
self.whitelisted_ransackable_associations = ['variant']
|
29
|
+
|
30
|
+
scope :with_active_stock_location, -> { joins(:stock_location).merge(Spree::StockLocation.active) }
|
23
31
|
|
24
32
|
def backordered_inventory_units
|
25
33
|
Spree::InventoryUnit.backordered_for_stock_item(self)
|
26
34
|
end
|
27
35
|
|
28
|
-
def variant_name
|
29
|
-
variant.name
|
30
|
-
end
|
31
|
-
|
32
36
|
def adjust_count_on_hand(value)
|
33
37
|
self.with_lock do
|
34
|
-
|
35
|
-
process_backorders(count_on_hand - count_on_hand_was)
|
36
|
-
|
37
|
-
self.save!
|
38
|
+
set_count_on_hand(count_on_hand + value)
|
38
39
|
end
|
39
40
|
end
|
40
41
|
|
@@ -67,10 +68,6 @@ module Spree
|
|
67
68
|
count_on_hand_changed? && !backorderable? && (count_on_hand < count_on_hand_was) && (count_on_hand < 0)
|
68
69
|
end
|
69
70
|
|
70
|
-
def count_on_hand=(value)
|
71
|
-
write_attribute(:count_on_hand, value)
|
72
|
-
end
|
73
|
-
|
74
71
|
# Process backorders based on amount of stock received
|
75
72
|
# If stock was -20 and is now -15 (increase of 5 units), then we should process 5 inventory orders.
|
76
73
|
# If stock was -20 but then was -25 (decrease of 5 units), do nothing.
|
@@ -7,12 +7,12 @@ module Spree
|
|
7
7
|
belongs_to :state, class_name: 'Spree::State'
|
8
8
|
belongs_to :country, class_name: 'Spree::Country'
|
9
9
|
|
10
|
-
|
10
|
+
validates :name, presence: true
|
11
11
|
|
12
12
|
scope :active, -> { where(active: true) }
|
13
13
|
scope :order_default, -> { order(default: :desc, name: :asc) }
|
14
14
|
|
15
|
-
after_create :create_stock_items, :
|
15
|
+
after_create :create_stock_items, if: :propagate_all_variants?
|
16
16
|
after_save :ensure_one_default
|
17
17
|
|
18
18
|
def state_text
|
@@ -68,7 +68,7 @@ module Spree
|
|
68
68
|
item = stock_item_or_create(variant)
|
69
69
|
item.update_columns(
|
70
70
|
count_on_hand: item.count_on_hand + quantity,
|
71
|
-
updated_at: Time.
|
71
|
+
updated_at: Time.current
|
72
72
|
)
|
73
73
|
end
|
74
74
|
|
@@ -108,10 +108,7 @@ module Spree
|
|
108
108
|
|
109
109
|
def ensure_one_default
|
110
110
|
if self.default
|
111
|
-
StockLocation.where(default: true).where.not(id: self.id).
|
112
|
-
stock_location.default = false
|
113
|
-
stock_location.save!
|
114
|
-
end
|
111
|
+
StockLocation.where(default: true).where.not(id: self.id).update_all(default: false)
|
115
112
|
end
|
116
113
|
end
|
117
114
|
end
|
@@ -1,24 +1,31 @@
|
|
1
1
|
module Spree
|
2
2
|
class StockMovement < Spree::Base
|
3
|
+
QUANTITY_LIMITS = {
|
4
|
+
max: 2**31 - 1,
|
5
|
+
min: -2**31
|
6
|
+
}.freeze
|
7
|
+
|
3
8
|
belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements
|
4
9
|
belongs_to :originator, polymorphic: true
|
5
10
|
|
6
11
|
after_create :update_stock_item_quantity
|
7
12
|
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
13
|
+
with_options presence: true do
|
14
|
+
validates :stock_item
|
15
|
+
validates :quantity, numericality: {
|
16
|
+
greater_than_or_equal_to: QUANTITY_LIMITS[:min],
|
17
|
+
less_than_or_equal_to: QUANTITY_LIMITS[:max],
|
18
|
+
only_integer: true,
|
19
|
+
allow_nil: true
|
20
|
+
}
|
21
|
+
end
|
15
22
|
|
16
|
-
scope :recent, -> { order(
|
23
|
+
scope :recent, -> { order(created_at: :desc) }
|
17
24
|
|
18
25
|
self.whitelisted_ransackable_attributes = ['quantity']
|
19
26
|
|
20
27
|
def readonly?
|
21
|
-
|
28
|
+
persisted?
|
22
29
|
end
|
23
30
|
|
24
31
|
private
|
@@ -1,34 +1,27 @@
|
|
1
1
|
module Spree
|
2
2
|
class StockTransfer < Spree::Base
|
3
|
+
include Spree::Core::NumberGenerator.new(prefix: 'T')
|
4
|
+
|
3
5
|
extend FriendlyId
|
4
6
|
friendly_id :number, slug_column: :number, use: :slugged
|
5
7
|
|
6
|
-
include Spree::NumberGenerator
|
7
|
-
|
8
|
-
def generate_number(options = {})
|
9
|
-
options[:prefix] ||= 'T'
|
10
|
-
super(options)
|
11
|
-
end
|
12
|
-
|
13
8
|
has_many :stock_movements, as: :originator
|
14
9
|
|
15
10
|
belongs_to :source_location, class_name: 'StockLocation'
|
16
11
|
belongs_to :destination_location, class_name: 'StockLocation'
|
17
12
|
|
18
|
-
self.whitelisted_ransackable_attributes = %w[reference source_location_id destination_location_id
|
13
|
+
self.whitelisted_ransackable_attributes = %w[reference source_location_id destination_location_id number]
|
19
14
|
|
20
15
|
def to_param
|
21
16
|
number
|
22
17
|
end
|
23
18
|
|
24
19
|
def source_movements
|
25
|
-
|
26
|
-
.where('spree_stock_items.stock_location_id' => source_location_id)
|
20
|
+
find_stock_location_with_location_id(source_location_id)
|
27
21
|
end
|
28
22
|
|
29
23
|
def destination_movements
|
30
|
-
|
31
|
-
.where('spree_stock_items.stock_location_id' => destination_location_id)
|
24
|
+
find_stock_location_with_location_id(destination_location_id)
|
32
25
|
end
|
33
26
|
|
34
27
|
def transfer(source_location, destination_location, variants)
|
@@ -47,5 +40,11 @@ module Spree
|
|
47
40
|
def receive(destination_location, variants)
|
48
41
|
transfer(nil, destination_location, variants)
|
49
42
|
end
|
43
|
+
|
44
|
+
private
|
45
|
+
|
46
|
+
def find_stock_location_with_location_id(location_id)
|
47
|
+
stock_movements.joins(:stock_item).where('spree_stock_items.stock_location_id' => location_id)
|
48
|
+
end
|
50
49
|
end
|
51
50
|
end
|
data/app/models/spree/store.rb
CHANGED
@@ -2,23 +2,27 @@ module Spree
|
|
2
2
|
class Store < Spree::Base
|
3
3
|
has_many :orders, class_name: "Spree::Order"
|
4
4
|
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
5
|
+
with_options presence: true do
|
6
|
+
validates :code, uniqueness: { allow_blank: true }
|
7
|
+
validates :name, :url, :mail_from_address
|
8
|
+
end
|
9
9
|
|
10
10
|
before_save :ensure_default_exists_and_is_unique
|
11
11
|
before_destroy :validate_not_default
|
12
12
|
|
13
13
|
scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
|
14
14
|
|
15
|
+
after_commit :clear_cache
|
16
|
+
|
15
17
|
def self.current(domain = nil)
|
16
18
|
current_store = domain ? Store.by_url(domain).first : nil
|
17
19
|
current_store || Store.default
|
18
20
|
end
|
19
21
|
|
20
22
|
def self.default
|
21
|
-
|
23
|
+
Rails.cache.fetch("default_store") do
|
24
|
+
where(default: true).first_or_initialize
|
25
|
+
end
|
22
26
|
end
|
23
27
|
|
24
28
|
private
|
@@ -26,7 +30,7 @@ module Spree
|
|
26
30
|
def ensure_default_exists_and_is_unique
|
27
31
|
if default
|
28
32
|
Store.where.not(id: id).update_all(default: false)
|
29
|
-
elsif Store.where(default: true).count
|
33
|
+
elsif Store.where(default: true).count.zero?
|
30
34
|
self.default = true
|
31
35
|
end
|
32
36
|
end
|
@@ -34,7 +38,12 @@ module Spree
|
|
34
38
|
def validate_not_default
|
35
39
|
if default
|
36
40
|
errors.add(:base, :cannot_destroy_default_store)
|
41
|
+
throw(:abort)
|
37
42
|
end
|
38
43
|
end
|
44
|
+
|
45
|
+
def clear_cache
|
46
|
+
Rails.cache.delete("default_store")
|
47
|
+
end
|
39
48
|
end
|
40
49
|
end
|
@@ -0,0 +1,252 @@
|
|
1
|
+
module Spree
|
2
|
+
class StoreCredit < Spree::Base
|
3
|
+
acts_as_paranoid
|
4
|
+
|
5
|
+
VOID_ACTION = 'void'.freeze
|
6
|
+
CANCEL_ACTION = 'cancel'.freeze
|
7
|
+
CREDIT_ACTION = 'credit'.freeze
|
8
|
+
CAPTURE_ACTION = 'capture'.freeze
|
9
|
+
ELIGIBLE_ACTION = 'eligible'.freeze
|
10
|
+
AUTHORIZE_ACTION = 'authorize'.freeze
|
11
|
+
ALLOCATION_ACTION = 'allocation'.freeze
|
12
|
+
|
13
|
+
DEFAULT_CREATED_BY_EMAIL = 'spree@example.com'.freeze
|
14
|
+
|
15
|
+
belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id'
|
16
|
+
belongs_to :category, class_name: "Spree::StoreCreditCategory"
|
17
|
+
belongs_to :created_by, class_name: Spree.user_class.to_s, foreign_key: 'created_by_id'
|
18
|
+
belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
|
19
|
+
has_many :store_credit_events
|
20
|
+
|
21
|
+
validates_presence_of :user, :category, :credit_type, :created_by, :currency
|
22
|
+
validates_numericality_of :amount, greater_than: 0
|
23
|
+
validates_numericality_of :amount_used, greater_than_or_equal_to: 0
|
24
|
+
validate :amount_used_less_than_or_equal_to_amount
|
25
|
+
validate :amount_authorized_less_than_or_equal_to_amount
|
26
|
+
|
27
|
+
delegate :name, to: :category, prefix: true
|
28
|
+
delegate :email, to: :created_by, prefix: true
|
29
|
+
|
30
|
+
scope :order_by_priority, -> { includes(:credit_type).order('spree_store_credit_types.priority ASC') }
|
31
|
+
|
32
|
+
before_validation :associate_credit_type
|
33
|
+
after_save :store_event
|
34
|
+
before_destroy :validate_no_amount_used
|
35
|
+
|
36
|
+
attr_accessor :action, :action_amount, :action_originator, :action_authorization_code
|
37
|
+
|
38
|
+
def display_amount
|
39
|
+
Spree::Money.new(amount)
|
40
|
+
end
|
41
|
+
|
42
|
+
def display_amount_used
|
43
|
+
Spree::Money.new(amount_used)
|
44
|
+
end
|
45
|
+
|
46
|
+
def amount_remaining
|
47
|
+
amount - amount_used - amount_authorized
|
48
|
+
end
|
49
|
+
|
50
|
+
def authorize(amount, order_currency, options = {})
|
51
|
+
authorization_code = options[:action_authorization_code]
|
52
|
+
if authorization_code
|
53
|
+
if store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
|
54
|
+
# Don't authorize again on capture
|
55
|
+
return true
|
56
|
+
end
|
57
|
+
else
|
58
|
+
authorization_code = generate_authorization_code
|
59
|
+
end
|
60
|
+
|
61
|
+
if validate_authorization(amount, order_currency)
|
62
|
+
update_attributes!(
|
63
|
+
action: AUTHORIZE_ACTION,
|
64
|
+
action_amount: amount,
|
65
|
+
action_originator: options[:action_originator],
|
66
|
+
action_authorization_code: authorization_code,
|
67
|
+
amount_authorized: amount_authorized + amount
|
68
|
+
)
|
69
|
+
authorization_code
|
70
|
+
else
|
71
|
+
errors.add(:base, Spree.t('store_credit_payment_method.insufficient_authorized_amount'))
|
72
|
+
false
|
73
|
+
end
|
74
|
+
end
|
75
|
+
|
76
|
+
def validate_authorization(amount, order_currency)
|
77
|
+
if amount_remaining.to_d < amount.to_d
|
78
|
+
errors.add(:base, Spree.t('store_credit_payment_method.insufficient_funds'))
|
79
|
+
elsif currency != order_currency
|
80
|
+
errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))
|
81
|
+
end
|
82
|
+
errors.blank?
|
83
|
+
end
|
84
|
+
|
85
|
+
def capture(amount, authorization_code, order_currency, options = {})
|
86
|
+
return false unless authorize(amount, order_currency, action_authorization_code: authorization_code)
|
87
|
+
|
88
|
+
if amount <= amount_authorized
|
89
|
+
if currency != order_currency
|
90
|
+
errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))
|
91
|
+
false
|
92
|
+
else
|
93
|
+
update_attributes!(
|
94
|
+
action: CAPTURE_ACTION,
|
95
|
+
action_amount: amount,
|
96
|
+
action_originator: options[:action_originator],
|
97
|
+
action_authorization_code: authorization_code,
|
98
|
+
amount_used: amount_used + amount,
|
99
|
+
amount_authorized: amount_authorized - amount
|
100
|
+
)
|
101
|
+
authorization_code
|
102
|
+
end
|
103
|
+
else
|
104
|
+
errors.add(:base, Spree.t('store_credit_payment_method.insufficient_authorized_amount'))
|
105
|
+
false
|
106
|
+
end
|
107
|
+
end
|
108
|
+
|
109
|
+
def void(authorization_code, options = {})
|
110
|
+
if auth_event = store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
|
111
|
+
update_attributes!(
|
112
|
+
action: VOID_ACTION,
|
113
|
+
action_amount: auth_event.amount,
|
114
|
+
action_authorization_code: authorization_code,
|
115
|
+
action_originator: options[:action_originator],
|
116
|
+
amount_authorized: amount_authorized - auth_event.amount
|
117
|
+
)
|
118
|
+
true
|
119
|
+
else
|
120
|
+
errors.add(:base, Spree.t('store_credit_payment_method.unable_to_void', auth_code: authorization_code))
|
121
|
+
false
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
def credit(amount, authorization_code, order_currency, options = {})
|
126
|
+
# Find the amount related to this authorization_code in order to add the store credit back
|
127
|
+
capture_event = store_credit_events.find_by(action: CAPTURE_ACTION, authorization_code: authorization_code)
|
128
|
+
|
129
|
+
if currency != order_currency # sanity check to make sure the order currency hasn't changed since the auth
|
130
|
+
errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))
|
131
|
+
false
|
132
|
+
elsif capture_event && amount <= capture_event.amount
|
133
|
+
action_attributes = {
|
134
|
+
action: CREDIT_ACTION,
|
135
|
+
action_amount: amount,
|
136
|
+
action_originator: options[:action_originator],
|
137
|
+
action_authorization_code: authorization_code
|
138
|
+
}
|
139
|
+
create_credit_record(amount, action_attributes)
|
140
|
+
true
|
141
|
+
else
|
142
|
+
errors.add(:base, Spree.t('store_credit_payment_method.unable_to_credit', auth_code: authorization_code))
|
143
|
+
false
|
144
|
+
end
|
145
|
+
end
|
146
|
+
|
147
|
+
def actions
|
148
|
+
[CAPTURE_ACTION, VOID_ACTION, CREDIT_ACTION]
|
149
|
+
end
|
150
|
+
|
151
|
+
def can_capture?(payment)
|
152
|
+
payment.pending? || payment.checkout?
|
153
|
+
end
|
154
|
+
|
155
|
+
def can_void?(payment)
|
156
|
+
payment.pending?
|
157
|
+
end
|
158
|
+
|
159
|
+
def can_credit?(payment)
|
160
|
+
payment.completed? && payment.credit_allowed > 0
|
161
|
+
end
|
162
|
+
|
163
|
+
def generate_authorization_code
|
164
|
+
"#{id}-SC-#{Time.now.utc.strftime('%Y%m%d%H%M%S%6N')}"
|
165
|
+
end
|
166
|
+
|
167
|
+
class << self
|
168
|
+
def default_created_by
|
169
|
+
Spree.user_class.find_by(email: DEFAULT_CREATED_BY_EMAIL)
|
170
|
+
end
|
171
|
+
end
|
172
|
+
|
173
|
+
private
|
174
|
+
|
175
|
+
def create_credit_record(amount, action_attributes = {})
|
176
|
+
# Setting credit_to_new_allocation to true will create a new allocation anytime #credit is called
|
177
|
+
# If it is not set, it will update the store credit's amount in place
|
178
|
+
credit = if Spree::Config.credit_to_new_allocation
|
179
|
+
Spree::StoreCredit.new(create_credit_record_params(amount))
|
180
|
+
else
|
181
|
+
self.amount_used = amount_used - amount
|
182
|
+
self
|
183
|
+
end
|
184
|
+
|
185
|
+
credit.assign_attributes(action_attributes)
|
186
|
+
credit.save!
|
187
|
+
end
|
188
|
+
|
189
|
+
def create_credit_record_params(amount)
|
190
|
+
{
|
191
|
+
amount: amount,
|
192
|
+
user_id: user_id,
|
193
|
+
category_id: category_id,
|
194
|
+
created_by_id: created_by_id,
|
195
|
+
currency: currency,
|
196
|
+
type_id: type_id,
|
197
|
+
memo: credit_allocation_memo
|
198
|
+
}
|
199
|
+
end
|
200
|
+
|
201
|
+
def credit_allocation_memo
|
202
|
+
"This is a credit from store credit ID #{id}"
|
203
|
+
end
|
204
|
+
|
205
|
+
def store_event
|
206
|
+
return unless amount_changed? || amount_used_changed? || amount_authorized_changed? || action == ELIGIBLE_ACTION
|
207
|
+
|
208
|
+
event = if action
|
209
|
+
store_credit_events.build(action: action)
|
210
|
+
else
|
211
|
+
store_credit_events.where(action: ALLOCATION_ACTION).first_or_initialize
|
212
|
+
end
|
213
|
+
|
214
|
+
event.update_attributes!(
|
215
|
+
amount: action_amount || amount,
|
216
|
+
authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
|
217
|
+
user_total_amount: user.total_available_store_credit,
|
218
|
+
originator: action_originator
|
219
|
+
)
|
220
|
+
end
|
221
|
+
|
222
|
+
def amount_used_less_than_or_equal_to_amount
|
223
|
+
return true if amount_used.nil?
|
224
|
+
|
225
|
+
if amount_used > amount
|
226
|
+
errors.add(:amount_used, :cannot_be_greater_than_amount)
|
227
|
+
false
|
228
|
+
end
|
229
|
+
end
|
230
|
+
|
231
|
+
def amount_authorized_less_than_or_equal_to_amount
|
232
|
+
if (amount_used + amount_authorized) > amount
|
233
|
+
errors.add(:amount_authorized, :exceeds_total_credits)
|
234
|
+
false
|
235
|
+
end
|
236
|
+
end
|
237
|
+
|
238
|
+
def validate_no_amount_used
|
239
|
+
if amount_used > 0
|
240
|
+
errors.add(:amount_used, :greater_than_zero_restrict_delete)
|
241
|
+
throw(:abort)
|
242
|
+
end
|
243
|
+
end
|
244
|
+
|
245
|
+
def associate_credit_type
|
246
|
+
unless type_id
|
247
|
+
credit_type_name = category.try(:non_expiring?) ? 'Non-expiring' : 'Expiring'
|
248
|
+
self.credit_type = Spree::StoreCreditType.find_by_name(credit_type_name)
|
249
|
+
end
|
250
|
+
end
|
251
|
+
end
|
252
|
+
end
|
@@ -0,0 +1,22 @@
|
|
1
|
+
module Spree
|
2
|
+
class StoreCreditCategory < Spree::Base
|
3
|
+
validates_presence_of :name
|
4
|
+
|
5
|
+
GIFT_CARD_CATEGORY_NAME = 'Gift Card'.freeze
|
6
|
+
DEFAULT_NON_EXPIRING_TYPES = [GIFT_CARD_CATEGORY_NAME]
|
7
|
+
|
8
|
+
def non_expiring?
|
9
|
+
non_expiring_category_types.include? name
|
10
|
+
end
|
11
|
+
|
12
|
+
def non_expiring_category_types
|
13
|
+
DEFAULT_NON_EXPIRING_TYPES | Spree::Config[:non_expiring_credit_types]
|
14
|
+
end
|
15
|
+
|
16
|
+
class << self
|
17
|
+
def default_reimbursement_category(_options = {})
|
18
|
+
Spree::StoreCreditCategory.first
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|