spree_core 4.0.0 → 4.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/spree/base_controller.rb +2 -2
- data/app/finders/concerns/spree/product_filterable.rb +9 -0
- data/app/finders/spree/addresses/find.rb +6 -0
- data/app/finders/spree/base_finder.rb +14 -0
- data/app/finders/spree/cms_pages/find.rb +41 -0
- data/app/finders/spree/countries/find.rb +11 -3
- data/app/finders/spree/credit_cards/find.rb +2 -2
- data/app/finders/spree/menus/find.rb +11 -0
- data/app/finders/spree/option_values/find_available.rb +28 -0
- data/app/finders/spree/orders/find_complete.rb +14 -2
- data/app/finders/spree/orders/find_current.rb +2 -14
- data/app/finders/spree/product_properties/find_available.rb +20 -0
- data/app/finders/spree/products/find.rb +155 -27
- data/app/finders/spree/stores/find_current.rb +24 -0
- data/app/finders/spree/taxons/find.rb +31 -8
- data/app/finders/spree/variants/option_types_finder.rb +21 -0
- data/app/finders/spree/variants/visible_finder.rb +22 -0
- data/app/helpers/spree/base_helper.rb +187 -31
- data/app/helpers/spree/currency_helper.rb +34 -0
- data/app/helpers/spree/locale_helper.rb +39 -0
- data/app/helpers/spree/products_helper.rb +112 -21
- data/app/jobs/spree/base_job.rb +4 -0
- data/app/jobs/spree/stock_locations/stock_items/create_job.rb +13 -0
- data/app/jobs/spree/variants/remove_from_incomplete_orders_job.rb +9 -0
- data/app/jobs/spree/variants/remove_line_item_job.rb +9 -0
- data/app/models/concerns/spree/calculated_adjustments.rb +1 -1
- data/app/models/concerns/spree/default_price.rb +3 -6
- data/app/models/concerns/spree/display_link.rb +30 -0
- data/app/models/concerns/spree/display_money.rb +8 -2
- data/app/models/concerns/spree/filter_param.rb +21 -0
- data/app/models/concerns/spree/image_methods.rb +36 -0
- data/app/models/concerns/spree/memoized_data.rb +24 -0
- data/app/models/concerns/spree/metadata.rb +23 -0
- data/app/models/concerns/spree/multi_store_resource.rb +24 -0
- data/app/models/concerns/spree/named_type.rb +1 -1
- data/app/models/concerns/spree/number_identifier.rb +18 -0
- data/app/models/concerns/spree/product_scopes.rb +135 -36
- data/app/models/concerns/spree/single_store_resource.rb +19 -0
- data/app/models/concerns/spree/translatable_resource.rb +25 -0
- data/app/models/concerns/spree/translatable_resource_scopes.rb +24 -0
- data/app/models/concerns/spree/translatable_resource_slug.rb +17 -0
- data/app/models/concerns/spree/unique_name.rb +10 -0
- data/app/models/concerns/spree/user_address.rb +19 -0
- data/app/models/concerns/spree/user_methods.rb +40 -12
- data/app/models/concerns/spree/user_payment_source.rb +1 -1
- data/app/models/concerns/spree/user_reporting.rb +35 -10
- data/app/models/concerns/spree/user_roles.rb +43 -0
- data/app/models/spree/ability.rb +58 -37
- data/app/models/spree/address.rb +56 -9
- data/app/models/spree/adjustment.rb +2 -0
- data/app/models/spree/asset/support/active_storage.rb +3 -2
- data/app/models/spree/asset.rb +4 -0
- data/app/models/spree/base.rb +38 -0
- data/app/models/spree/calculator/flat_rate.rb +1 -1
- data/app/models/spree/calculator/flexi_rate.rb +1 -1
- data/app/models/spree/calculator/price_sack.rb +1 -1
- data/app/models/spree/calculator/shipping/digital_delivery.rb +22 -0
- data/app/models/spree/calculator/shipping/flat_rate.rb +1 -1
- data/app/models/spree/calculator/shipping/flexi_rate.rb +1 -1
- data/app/models/spree/calculator/shipping/per_item.rb +1 -1
- data/app/models/spree/calculator/shipping/price_sack.rb +1 -1
- data/app/models/spree/calculator.rb +2 -2
- data/app/models/spree/classification.rb +3 -0
- data/app/models/spree/cms/pages/feature_page.rb +7 -0
- data/app/models/spree/cms/pages/homepage.rb +20 -0
- data/app/models/spree/cms/pages/standard_page.rb +4 -0
- data/app/models/spree/cms/sections/featured_article.rb +22 -0
- data/app/models/spree/cms/sections/hero_image.rb +38 -0
- data/app/models/spree/cms/sections/image_gallery.rb +103 -0
- data/app/models/spree/cms/sections/product_carousel.rb +14 -0
- data/app/models/spree/cms/sections/rich_text_content.rb +13 -0
- data/app/models/spree/cms/sections/side_by_side_images.rb +74 -0
- data/app/models/spree/cms_page.rb +70 -0
- data/app/models/spree/cms_section.rb +69 -0
- data/app/models/spree/cms_section_image.rb +15 -0
- data/app/models/spree/cms_section_image_one.rb +4 -0
- data/app/models/spree/cms_section_image_three.rb +4 -0
- data/app/models/spree/cms_section_image_two.rb +4 -0
- data/app/models/spree/country.rb +18 -8
- data/app/models/spree/credit_card.rb +33 -13
- data/app/models/spree/customer_return.rb +14 -3
- data/app/models/spree/data_feed/google.rb +15 -0
- data/app/models/spree/data_feed.rb +40 -0
- data/app/models/spree/digital.rb +19 -0
- data/app/models/spree/digital_link.rb +57 -0
- data/app/models/spree/fulfilment_changer.rb +58 -16
- data/app/models/spree/gateway/bogus.rb +11 -5
- data/app/models/spree/icon.rb +13 -0
- data/app/models/spree/image/configuration/active_storage.rb +17 -20
- data/app/models/spree/image.rb +33 -3
- data/app/models/spree/inventory_unit.rb +8 -10
- data/app/models/spree/legacy_user.rb +2 -2
- data/app/models/spree/line_item.rb +34 -14
- data/app/models/spree/linkable/homepage.rb +3 -0
- data/app/models/spree/linkable/uri.rb +3 -0
- data/app/models/spree/log_entry.rb +9 -1
- data/app/models/spree/menu.rb +66 -0
- data/app/models/spree/menu_item.rb +72 -0
- data/app/models/spree/option_type.rb +22 -4
- data/app/models/spree/option_value.rb +22 -0
- data/app/models/spree/option_value_variant.rb +1 -1
- data/app/models/spree/order/address_book.rb +11 -25
- data/app/models/spree/order/checkout.rb +7 -1
- data/app/models/spree/order/currency_updater.rb +1 -1
- data/app/models/spree/order/digital.rb +33 -0
- data/app/models/spree/order/emails.rb +32 -0
- data/app/models/spree/order/payments.rb +11 -3
- data/app/models/spree/order/store_credit.rb +3 -1
- data/app/models/spree/order.rb +126 -61
- data/app/models/spree/order_inventory.rb +1 -1
- data/app/models/spree/order_merger.rb +1 -1
- data/app/models/spree/order_promotion.rb +1 -1
- data/app/models/spree/payment/processing.rb +4 -3
- data/app/models/spree/payment.rb +57 -9
- data/app/models/spree/payment_capture_event.rb +4 -0
- data/app/models/spree/payment_method/store_credit.rb +1 -1
- data/app/models/spree/payment_method.rb +29 -0
- data/app/models/spree/payment_source.rb +10 -0
- data/app/models/spree/preference.rb +6 -1
- data/app/models/spree/price.rb +30 -8
- data/app/models/spree/product.rb +197 -53
- data/app/models/spree/product_property.rb +31 -6
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +1 -1
- data/app/models/spree/promotion/rules/country.rb +1 -1
- data/app/models/spree/promotion/rules/first_order.rb +4 -3
- data/app/models/spree/promotion/rules/option_value.rb +3 -3
- data/app/models/spree/promotion/rules/product.rb +3 -2
- data/app/models/spree/promotion/rules/taxon.rb +10 -7
- data/app/models/spree/promotion/rules/user.rb +2 -1
- data/app/models/spree/promotion.rb +18 -24
- data/app/models/spree/promotion_action.rb +1 -1
- data/app/models/spree/promotion_handler/cart.rb +7 -2
- data/app/models/spree/promotion_handler/coupon.rb +6 -6
- data/app/models/spree/promotion_handler/free_shipping.rb +5 -6
- data/app/models/spree/promotion_handler/page.rb +3 -2
- data/app/models/spree/promotion_handler/promotion_duplicator.rb +10 -3
- data/app/models/spree/promotion_rule.rb +3 -1
- data/app/models/spree/promotion_rule_user.rb +1 -1
- data/app/models/spree/property.rb +38 -1
- data/app/models/spree/prototype.rb +5 -0
- data/app/models/spree/refund.rb +12 -2
- data/app/models/spree/reimbursement.rb +9 -2
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +2 -1
- data/app/models/spree/return_authorization.rb +7 -2
- data/app/models/spree/return_item/eligibility_validator/base_validator.rb +1 -1
- data/app/models/spree/return_item/eligibility_validator/default.rb +0 -2
- data/app/models/spree/return_item.rb +5 -1
- data/app/models/spree/role.rb +3 -3
- data/app/models/spree/role_user.rb +1 -1
- data/app/models/spree/shipment.rb +16 -37
- data/app/models/spree/shipment_handler.rb +4 -2
- data/app/models/spree/shipping_category.rb +4 -1
- data/app/models/spree/shipping_method.rb +9 -5
- data/app/models/spree/shipping_rate.rb +2 -11
- data/app/models/spree/state.rb +1 -1
- data/app/models/spree/state_change.rb +1 -1
- data/app/models/spree/stock/availability_validator.rb +9 -4
- data/app/models/spree/stock/content_item.rb +1 -1
- data/app/models/spree/stock/quantifier.rb +7 -7
- data/app/models/spree/stock/splitter/digital.rb +35 -0
- data/app/models/spree/stock_item.rb +8 -7
- data/app/models/spree/stock_location.rb +32 -13
- data/app/models/spree/stock_movement.rb +7 -0
- data/app/models/spree/stock_transfer.rb +6 -6
- data/app/models/spree/store.rb +229 -10
- data/app/models/spree/store_credit.rb +18 -7
- data/app/models/spree/store_credit_category.rb +2 -0
- data/app/models/spree/store_credit_event.rb +4 -9
- data/app/models/spree/store_credit_type.rb +2 -0
- data/app/models/spree/store_favicon_image.rb +17 -0
- data/app/models/spree/store_logo.rb +9 -0
- data/app/models/spree/store_mailer_logo.rb +13 -0
- data/app/models/spree/store_payment_method.rb +11 -0
- data/app/models/spree/store_product.rb +11 -0
- data/app/models/spree/store_promotion.rb +11 -0
- data/app/models/spree/tax_category.rb +9 -1
- data/app/models/spree/tax_rate.rb +9 -2
- data/app/models/spree/taxon.rb +67 -13
- data/app/models/spree/taxon_image/configuration/active_storage.rb +8 -12
- data/app/models/spree/taxon_image.rb +4 -2
- data/app/models/spree/taxonomy.rb +18 -2
- data/app/models/spree/variant.rb +114 -51
- data/app/models/spree/wished_item.rb +33 -0
- data/app/models/spree/wishlist.rb +38 -0
- data/app/models/spree/zone.rb +33 -12
- data/app/paginators/spree/shared/paginate.rb +8 -1
- data/app/presenters/spree/filters/options_presenter.rb +47 -0
- data/app/presenters/spree/filters/price_presenter.rb +22 -0
- data/app/presenters/spree/filters/price_range_presenter.rb +29 -0
- data/app/presenters/spree/filters/properties_presenter.rb +23 -0
- data/app/presenters/spree/filters/property_presenter.rb +42 -0
- data/app/presenters/spree/filters/quantified_price_range_presenter.rb +44 -0
- data/app/presenters/spree/product_summary_presenter.rb +26 -0
- data/app/presenters/spree/variant_presenter.rb +80 -0
- data/app/presenters/spree/variants/option_types_presenter.rb +87 -0
- data/app/presenters/spree/variants/options_presenter.rb +49 -0
- data/app/services/spree/account/addresses/create.rb +8 -0
- data/app/services/spree/account/addresses/update.rb +8 -0
- data/app/services/spree/account/create.rb +17 -0
- data/app/services/spree/account/update.rb +15 -0
- data/app/services/spree/addresses/create.rb +24 -0
- data/app/services/spree/addresses/helper.rb +41 -0
- data/app/services/spree/addresses/update.rb +32 -0
- data/app/services/spree/cart/add_item.rb +4 -2
- data/app/services/spree/cart/associate.rb +16 -0
- data/app/services/spree/cart/change_currency.rb +27 -0
- data/app/services/spree/cart/create.rb +9 -5
- data/app/services/spree/cart/destroy.rb +40 -0
- data/app/services/spree/cart/empty.rb +36 -0
- data/app/services/spree/cart/estimate_shipping_rates.rb +3 -3
- data/app/services/spree/cart/remove_line_item.rb +1 -0
- data/app/services/spree/cart/update.rb +2 -2
- data/app/services/spree/checkout/add_store_credit.rb +5 -2
- data/app/services/spree/checkout/get_shipping_rates.rb +7 -10
- data/app/services/spree/checkout/select_shipping_method.rb +49 -0
- data/app/services/spree/checkout/update.rb +11 -7
- data/app/services/spree/classifications/reposition.rb +18 -0
- data/app/services/spree/compare_line_items.rb +4 -2
- data/app/services/spree/credit_cards/destroy.rb +41 -0
- data/app/services/spree/data_feeds/google/optional_attributes.rb +23 -0
- data/app/services/spree/data_feeds/google/optional_sub_attributes.rb +21 -0
- data/app/services/spree/data_feeds/google/products_list.rb +14 -0
- data/app/services/spree/data_feeds/google/required_attributes.rb +67 -0
- data/app/services/spree/data_feeds/google/rss.rb +107 -0
- data/app/services/spree/line_items/create.rb +20 -0
- data/app/services/spree/line_items/destroy.rb +18 -0
- data/app/services/spree/line_items/helper.rb +11 -0
- data/app/services/spree/line_items/update.rb +17 -0
- data/app/services/spree/orders/approve.rb +18 -0
- data/app/services/spree/orders/cancel.rb +18 -0
- data/app/services/spree/payments/create.rb +66 -0
- data/app/services/spree/seeds/all.rb +26 -0
- data/app/services/spree/seeds/countries.rb +50 -0
- data/app/services/spree/seeds/default_reimbursement_types.rb +12 -0
- data/app/services/spree/seeds/roles.rb +11 -0
- data/app/services/spree/seeds/shipping_categories.rb +12 -0
- data/app/services/spree/seeds/states.rb +72 -0
- data/app/services/spree/seeds/stock_locations.rb +18 -0
- data/app/services/spree/seeds/store_credit_categories.rb +14 -0
- data/app/services/spree/seeds/stores.rb +31 -0
- data/app/services/spree/seeds/zones.rb +39 -0
- data/app/services/spree/shipments/add_item.rb +32 -0
- data/app/services/spree/shipments/change_state.rb +14 -0
- data/app/services/spree/shipments/create.rb +48 -0
- data/app/services/spree/shipments/helper.rb +23 -0
- data/app/services/spree/shipments/remove_item.rb +55 -0
- data/app/services/spree/shipments/update.rb +40 -0
- data/app/services/spree/stock_locations/stock_items/create.rb +31 -0
- data/app/services/spree/variants/remove_line_items.rb +15 -0
- data/app/services/spree/wallet/create_payment_source.rb +26 -0
- data/app/sorters/spree/base_sorter.rb +47 -0
- data/app/sorters/spree/orders/sort.rb +1 -37
- data/app/sorters/spree/products/sort.rb +47 -31
- data/app/validators/db_maximum_length_validator.rb +5 -0
- data/app/validators/email_validator.rb +4 -2
- data/app/validators/spree/url_validator.rb +23 -0
- data/brakeman.ignore +328 -0
- data/config/initializers/active_storage.rb +1 -5
- data/config/initializers/friendly_id.rb +2 -0
- data/config/initializers/inflections.rb +3 -0
- data/config/initializers/mobility.rb +18 -0
- data/config/initializers/rails61_fixes.rb +3 -0
- data/config/locales/en.yml +320 -71
- data/config/routes.rb +41 -2
- data/db/migrate/20210914000000_spree_four_three.rb +1205 -0
- data/db/migrate/20210915064321_add_metadata_to_spree_orders.rb +13 -0
- data/db/migrate/20210915064322_add_metadata_to_spree_products.rb +13 -0
- data/db/migrate/20210915064323_add_metadata_to_spree_variants.rb +13 -0
- data/db/migrate/20210915064324_add_metadata_to_spree_line_items.rb +13 -0
- data/db/migrate/20210915064325_add_metadata_to_spree_shipments.rb +13 -0
- data/db/migrate/20210915064326_add_metadata_to_spree_payments.rb +13 -0
- data/db/migrate/20210915064327_add_metadata_to_spree_taxons_and_taxonomies.rb +18 -0
- data/db/migrate/20210915064328_add_metadata_to_spree_stock_transfers.rb +13 -0
- data/db/migrate/20210915064329_add_metadata_to_spree_multiple_tables.rb +30 -0
- data/db/migrate/20210920090344_add_deleted_at_to_spree_stores.rb +8 -0
- data/db/migrate/20210921070812_rename_column_access_hash_to_token.rb +8 -0
- data/db/migrate/20210921070813_create_spree_wishlists.rb +18 -0
- data/db/migrate/20210921070814_create_spree_wished_products.rb +16 -0
- data/db/migrate/20210921070815_rename_spree_wished_products_to_spree_wished_items.rb +5 -0
- data/db/migrate/20210921090344_add_unique_stock_item_stock_location_variant_deleted_at_index.rb +5 -0
- data/db/migrate/20210929090344_create_stock_item_stock_location_id_variant_id_coalesce_deleted_at_unique_index.rb +32 -0
- data/db/migrate/20210929091444_create_spree_digital_links.rb +13 -0
- data/db/migrate/20210929093238_create_spree_digitals.rb +9 -0
- data/db/migrate/20210930143043_rename_secret_to_token_on_spree_digital_links.rb +5 -0
- data/db/migrate/20210930155649_add_settings_to_spree_stores.rb +11 -0
- data/db/migrate/20211201202851_update_linkable_resource_types.rb +10 -0
- data/db/migrate/20211203082008_add_settings_to_payment_methods.rb +11 -0
- data/db/migrate/20211229162122_disable_propagate_all_variants_by_default.rb +5 -0
- data/db/migrate/20220103082046_add_status_and_make_active_at_to_spree_products.rb +7 -0
- data/db/migrate/20220106230929_add_internal_note_to_spree_orders.rb +5 -0
- data/db/migrate/20220113052823_create_payment_sources.rb +22 -0
- data/db/migrate/20220117100333_add_make_active_at_to_spree_products.rb +17 -0
- data/db/migrate/20220120092821_add_metadata_to_spree_tax_rates.rb +13 -0
- data/db/migrate/20220201103922_add_first_name_and_last_name_to_spree_users.rb +9 -0
- data/db/migrate/20220222083546_add_barcode_to_spree_variants.rb +6 -0
- data/db/migrate/20220329113557_fix_cms_pages_unique_indexes.rb +8 -0
- data/db/migrate/20220613133029_add_metadata_to_spree_stock_items.rb +13 -0
- data/db/migrate/20220706112554_create_product_name_and_description_translations_for_mobility_table_backend.rb +27 -0
- data/db/migrate/20220715083542_create_spree_product_translations_for_mobility.rb +7 -0
- data/db/migrate/20220715120222_change_product_name_null_to_true.rb +5 -0
- data/db/migrate/20220718100743_create_spree_taxon_name_and_description_translations_for_mobility_table_backend.rb +27 -0
- data/db/migrate/20220718100948_change_taxon_name_null_to_true.rb +5 -0
- data/db/migrate/20220802070609_add_locale_to_friendly_id_slugs.rb +11 -0
- data/db/migrate/20220802073225_create_spree_product_slug_translations_for_mobility_table_backend.rb +5 -0
- data/db/migrate/20220804073928_transfer_data_to_translatable_tables.rb +66 -0
- data/db/migrate/20221215151408_add_selected_locale_to_spree_users.rb +8 -0
- data/db/migrate/20221219123957_add_deleted_at_to_product_translations.rb +6 -0
- data/db/migrate/20221220133432_add_uniqueness_constraint_to_product_translations.rb +5 -0
- data/db/migrate/20221229132350_create_spree_data_feed_settings.rb +14 -0
- data/db/migrate/20230103144439_create_option_type_translations.rb +26 -0
- data/db/migrate/20230103151034_create_option_value_translations.rb +26 -0
- data/db/migrate/20230109084253_create_product_property_translations.rb +25 -0
- data/db/migrate/20230109094907_transfer_options_data_to_translatable_tables.rb +58 -0
- data/db/migrate/20230109105943_create_property_translations.rb +26 -0
- data/db/migrate/20230109110840_transfer_property_data_to_translatable_tables.rb +59 -0
- data/db/migrate/20230110142344_backfill_friendly_id_slug_locale.rb +15 -0
- data/db/migrate/20230111121534_add_additional_taxon_translation_fields.rb +8 -0
- data/db/migrate/20230111122511_transfer_product_and_taxon_data_to_translatable_tables.rb +82 -0
- data/db/migrate/20230117115531_create_taxonomy_translations.rb +24 -0
- data/db/migrate/20230117120430_allow_null_taxonomy_name.rb +5 -0
- data/db/migrate/20230117121303_transfer_taxonomy_data_to_translatable_tables.rb +11 -0
- data/db/migrate/20230210142732_create_store_translations.rb +50 -0
- data/db/migrate/20230210142849_transfer_store_data_to_translatable_tables.rb +11 -0
- data/db/migrate/20230210230434_add_deleted_at_to_store_translations.rb +6 -0
- data/db/migrate/20230415155958_rename_data_feed_settings_table.rb +5 -0
- data/db/migrate/20230415160828_rename_data_feed_table_columns.rb +7 -0
- data/db/migrate/20230415161226_add_indexes_to_data_feeds_table.rb +5 -0
- data/db/migrate/20230512094803_rename_data_feeds_column_provider_to_type.rb +5 -0
- data/db/migrate/20230514162157_add_index_on_locale_and_permalink_to_spree_taxons.rb +5 -0
- data/db/seeds.rb +1 -5
- data/lib/friendly_id/paranoia.rb +4 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +25 -9
- data/lib/generators/spree/dummy/templates/package.json +12 -0
- data/lib/generators/spree/dummy/templates/rails/database.yml +20 -18
- data/lib/generators/spree/dummy/templates/rails/test.rb +4 -0
- data/lib/generators/spree/dummy_model/templates/model.rb.tt +1 -1
- data/lib/generators/spree/install/install_generator.rb +25 -26
- data/lib/generators/spree/install/templates/config/initializers/spree.rb +1 -0
- data/lib/spree/core/components.rb +8 -0
- data/lib/spree/core/configuration.rb +91 -0
- data/lib/spree/core/controller_helpers/auth.rb +14 -4
- data/lib/spree/core/controller_helpers/common.rb +22 -9
- data/lib/spree/core/controller_helpers/currency.rb +56 -0
- data/lib/spree/core/controller_helpers/locale.rb +84 -0
- data/lib/spree/core/controller_helpers/order.rb +28 -15
- data/lib/spree/core/controller_helpers/search.rb +3 -2
- data/lib/spree/core/controller_helpers/store.rb +32 -8
- data/lib/spree/core/dependencies.rb +106 -0
- data/lib/spree/core/dependencies_helper.rb +30 -0
- data/lib/spree/core/engine.rb +60 -40
- data/lib/spree/core/importer/order.rb +9 -9
- data/lib/spree/core/importer/product.rb +4 -2
- data/lib/spree/core/number_generator.rb +5 -6
- data/{app/models/spree → lib/spree/core}/preferences/configuration.rb +5 -2
- data/{app/models/spree → lib/spree/core}/preferences/preferable.rb +16 -1
- data/{app/models/spree → lib/spree/core}/preferences/preferable_class_methods.rb +12 -1
- data/{app/models/spree → lib/spree/core}/preferences/store.rb +2 -2
- data/lib/spree/core/product_duplicator.rb +2 -1
- data/lib/spree/core/product_filters.rb +10 -7
- data/lib/spree/core/search/base.rb +74 -38
- data/lib/spree/core/version.rb +3 -1
- data/lib/spree/core.rb +55 -17
- data/lib/spree/database_type_utilities.rb +12 -0
- data/lib/spree/i18n.rb +17 -19
- data/lib/spree/money.rb +11 -3
- data/lib/spree/permitted_attributes.rb +60 -18
- data/lib/spree/service_module.rb +8 -4
- data/lib/spree/testing_support/authorization_helpers.rb +15 -7
- data/lib/spree/testing_support/capybara_config.rb +14 -17
- data/lib/spree/testing_support/capybara_ext.rb +1 -51
- data/lib/spree/testing_support/common_rake.rb +39 -7
- data/lib/spree/testing_support/controller_requests.rb +10 -10
- data/lib/spree/testing_support/extension_rake.rb +2 -2
- data/lib/spree/testing_support/factories/address_factory.rb +1 -1
- data/lib/spree/testing_support/factories/asset_factory.rb +15 -0
- data/lib/spree/testing_support/factories/classification_factory.rb +8 -0
- data/lib/spree/testing_support/factories/cms_page_factory.rb +20 -0
- data/lib/spree/testing_support/factories/cms_section_factory.rb +31 -0
- data/lib/spree/testing_support/factories/customer_return_factory.rb +24 -17
- data/lib/spree/testing_support/factories/digital_factory.rb +10 -0
- data/lib/spree/testing_support/factories/digital_link_factory.rb +6 -0
- data/lib/spree/testing_support/factories/favicon_image_factory.rb +9 -0
- data/lib/spree/testing_support/factories/google_data_feed_factory.rb +8 -0
- data/lib/spree/testing_support/factories/icon_factory.rb +9 -0
- data/lib/spree/testing_support/factories/image_factory.rb +3 -1
- data/lib/spree/testing_support/factories/line_item_factory.rb +6 -2
- data/lib/spree/testing_support/factories/log_entry_factory.rb +6 -0
- data/lib/spree/testing_support/factories/menu_factory.rb +16 -0
- data/lib/spree/testing_support/factories/menu_item_factory.rb +10 -0
- data/lib/spree/testing_support/factories/options_factory.rb +15 -0
- data/lib/spree/testing_support/factories/order_factory.rb +17 -4
- data/lib/spree/testing_support/factories/payment_capture_event_factory.rb +6 -0
- data/lib/spree/testing_support/factories/payment_factory.rb +3 -3
- data/lib/spree/testing_support/factories/payment_method_factory.rb +21 -4
- data/lib/spree/testing_support/factories/product_factory.rb +29 -2
- data/lib/spree/testing_support/factories/product_property_factory.rb +2 -1
- data/lib/spree/testing_support/factories/product_translation_factory.rb +6 -0
- data/lib/spree/testing_support/factories/promotion_action_factory.rb +5 -0
- data/lib/spree/testing_support/factories/promotion_factory.rb +44 -23
- data/lib/spree/testing_support/factories/property_factory.rb +22 -0
- data/lib/spree/testing_support/factories/refund_factory.rb +1 -1
- data/lib/spree/testing_support/factories/reimbursement_credit_factory.rb +7 -0
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +1 -1
- data/lib/spree/testing_support/factories/role_factory.rb +1 -1
- data/lib/spree/testing_support/factories/shipment_factory.rb +7 -9
- data/lib/spree/testing_support/factories/shipping_category_factory.rb +1 -1
- data/lib/spree/testing_support/factories/shipping_rate_factory.rb +7 -0
- data/lib/spree/testing_support/factories/state_change_factory.rb +8 -0
- data/lib/spree/testing_support/factories/stock_item_factory.rb +7 -0
- data/lib/spree/testing_support/factories/stock_location_factory.rb +6 -4
- data/lib/spree/testing_support/factories/stock_transfer_factory.rb +9 -0
- data/lib/spree/testing_support/factories/store_credit_factory.rb +1 -0
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +5 -0
- data/lib/spree/testing_support/factories/store_factory.rb +24 -5
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +1 -0
- data/lib/spree/testing_support/factories/taxon_factory.rb +3 -1
- data/lib/spree/testing_support/factories/taxon_image_factory.rb +9 -0
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -0
- data/lib/spree/testing_support/factories/user_factory.rb +13 -2
- data/lib/spree/testing_support/factories/variant_factory.rb +10 -2
- data/lib/spree/testing_support/factories/wished_variant_factory.rb +6 -0
- data/lib/spree/testing_support/factories/wishlist_factory.rb +18 -0
- data/lib/spree/testing_support/factories/zone_factory.rb +16 -13
- data/lib/spree/testing_support/flatpickr_capybara.rb +124 -0
- data/lib/spree/testing_support/i18n.rb +1 -1
- data/lib/spree/testing_support/jobs.rb +9 -0
- data/lib/spree/testing_support/locale_helpers.rb +78 -0
- data/lib/spree/testing_support/metadata.rb +54 -0
- data/lib/spree/testing_support/next_instance_of.rb +38 -0
- data/lib/spree/testing_support/order_walkthrough.rb +16 -7
- data/lib/spree/testing_support/rspec_retry_config.rb +15 -0
- data/lib/spree/translation_migrations.rb +40 -0
- data/lib/spree_core.rb +2 -1
- data/lib/tasks/core.rake +17 -5
- data/spec/fixtures/favicon.ico +0 -0
- data/spec/fixtures/files/icon_256x256.gif +0 -0
- data/spec/fixtures/files/icon_256x256.png +0 -0
- data/spec/fixtures/files/icon_512x512.png +0 -0
- data/spec/fixtures/files/img_256x128.png +0 -0
- data/spree_core.gemspec +37 -26
- metadata +443 -426
- data/app/assets/images/logo/spree_50.png +0 -0
- data/app/assets/images/noimage/large.png +0 -0
- data/app/assets/images/noimage/mini.png +0 -0
- data/app/assets/images/noimage/product.png +0 -0
- data/app/assets/images/noimage/small.png +0 -0
- data/app/assets/javascripts/spree.js +0 -60
- data/app/mailers/spree/base_mailer.rb +0 -32
- data/app/mailers/spree/order_mailer.rb +0 -17
- data/app/mailers/spree/reimbursement_mailer.rb +0 -10
- data/app/mailers/spree/shipment_mailer.rb +0 -10
- data/app/mailers/spree/test_mailer.rb +0 -8
- data/app/models/friendly_id/slug_decorator.rb +0 -9
- data/app/models/spree/app_configuration.rb +0 -76
- data/app/models/spree/app_dependencies.rb +0 -74
- data/app/models/spree/validations/db_maximum_length_validator.rb +0 -22
- data/app/views/layouts/spree/base_mailer.html.erb +0 -41
- data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
- data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
- data/app/views/spree/order_mailer/_total.html.erb +0 -8
- data/app/views/spree/order_mailer/cancel_email.html.erb +0 -30
- data/app/views/spree/order_mailer/cancel_email.text.erb +0 -16
- data/app/views/spree/order_mailer/confirm_email.html.erb +0 -70
- data/app/views/spree/order_mailer/confirm_email.text.erb +0 -38
- data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +0 -61
- data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +0 -22
- data/app/views/spree/shared/_base_mailer_footer.html.erb +0 -20
- data/app/views/spree/shared/_base_mailer_header.html.erb +0 -33
- data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +0 -777
- data/app/views/spree/shared/_error_messages.html.erb +0 -11
- data/app/views/spree/shared/_mailer_line_item.html.erb +0 -16
- data/app/views/spree/shared/_paths.html.erb +0 -8
- data/app/views/spree/shipment_mailer/shipped_email.html.erb +0 -41
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +0 -16
- data/app/views/spree/test_mailer/test_email.html.erb +0 -40
- data/app/views/spree/test_mailer/test_email.text.erb +0 -4
- data/config/initializers/assets.rb +0 -1
- data/config/initializers/premailer_assets.rb +0 -1
- data/config/initializers/premailer_rails.rb +0 -3
- data/db/default/spree/countries.rb +0 -18
- data/db/default/spree/default_reimbursement_type.rb +0 -1
- data/db/default/spree/roles.rb +0 -2
- data/db/default/spree/states.rb +0 -12
- data/db/default/spree/stores.rb +0 -10
- data/db/default/spree/zones.rb +0 -26
- data/db/migrate/20120831092320_spree_one_two.rb +0 -481
- data/db/migrate/20120831092359_spree_promo_one_two.rb +0 -45
- data/db/migrate/20120905145253_add_tax_rate_label.rb +0 -5
- data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb +0 -5
- data/db/migrate/20120929093553_remove_unused_preference_columns.rb +0 -8
- data/db/migrate/20121009142519_add_lock_version_to_variant.rb +0 -5
- data/db/migrate/20121010142909_add_states_required_to_countries.rb +0 -5
- data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +0 -6
- data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +0 -11
- data/db/migrate/20121031162139_split_prices_from_variants.rb +0 -31
- data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +0 -9
- data/db/migrate/20121107184631_add_currency_to_line_items.rb +0 -5
- data/db/migrate/20121107194006_add_currency_to_orders.rb +0 -5
- data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +0 -5
- data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +0 -5
- data/db/migrate/20121124203911_add_position_to_taxonomies.rb +0 -5
- data/db/migrate/20121126040517_add_last_ip_to_spree_orders.rb +0 -5
- data/db/migrate/20121213162028_add_state_to_spree_adjustments.rb +0 -6
- data/db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb +0 -9
- data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb +0 -6
- data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +0 -5
- data/db/migrate/20130207155350_add_order_id_index_to_payments.rb +0 -9
- data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb +0 -5
- data/db/migrate/20130211190146_create_spree_stock_items.rb +0 -14
- data/db/migrate/20130211191120_create_spree_stock_locations.rb +0 -11
- data/db/migrate/20130213191427_create_default_stock.rb +0 -33
- data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +0 -5
- data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb +0 -5
- data/db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb +0 -5
- data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb +0 -6
- data/db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb +0 -6
- data/db/migrate/20130228210442_create_shipping_method_zone.rb +0 -21
- data/db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb +0 -5
- data/db/migrate/20130301162924_create_shipping_method_categories.rb +0 -13
- data/db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb +0 -5
- data/db/migrate/20130304162240_create_spree_shipping_rates.rb +0 -24
- data/db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb +0 -7
- data/db/migrate/20130305143310_create_stock_movements.rb +0 -12
- data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb +0 -22
- data/db/migrate/20130306191917_add_active_field_to_stock_locations.rb +0 -5
- data/db/migrate/20130306195650_add_backorderable_to_stock_item.rb +0 -5
- data/db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb +0 -5
- data/db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb +0 -8
- data/db/migrate/20130319062004_change_orders_total_precision.rb +0 -8
- data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb +0 -7
- data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb +0 -7
- data/db/migrate/20130319082943_change_adjustments_amount_precision.rb +0 -7
- data/db/migrate/20130319183250_add_originator_to_stock_movement.rb +0 -7
- data/db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb +0 -15
- data/db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb +0 -9
- data/db/migrate/20130326175857_add_stock_location_to_rma.rb +0 -5
- data/db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb +0 -15
- data/db/migrate/20130328195253_add_seo_metas_to_taxons.rb +0 -9
- data/db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb +0 -14
- data/db/migrate/20130413230529_add_name_to_spree_credit_cards.rb +0 -5
- data/db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb +0 -13
- data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb +0 -5
- data/db/migrate/20130417120035_update_adjustment_states.rb +0 -16
- data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb +0 -15
- data/db/migrate/20130418125341_create_spree_stock_transfers.rb +0 -14
- data/db/migrate/20130423110707_drop_products_count_on_hand.rb +0 -5
- data/db/migrate/20130423223847_set_default_shipping_rate_cost.rb +0 -5
- data/db/migrate/20130509115210_add_number_to_stock_transfer.rb +0 -23
- data/db/migrate/20130514151929_add_sku_index_to_spree_variants.rb +0 -5
- data/db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb +0 -5
- data/db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb +0 -5
- data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb +0 -5
- data/db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb +0 -5
- data/db/migrate/20130618041418_add_updated_at_to_spree_countries.rb +0 -9
- data/db/migrate/20130619012236_add_updated_at_to_spree_states.rb +0 -9
- data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb +0 -6
- data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +0 -5
- data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +0 -7
- data/db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb +0 -5
- data/db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb +0 -6
- data/db/migrate/20130718042445_add_cost_price_to_line_item.rb +0 -5
- data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb +0 -6
- data/db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb +0 -5
- data/db/migrate/20130729214043_index_completed_at_on_spree_orders.rb +0 -5
- data/db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb +0 -5
- data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +0 -10
- data/db/migrate/20130806022521_drop_spree_mail_methods.rb +0 -12
- data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb +0 -8
- data/db/migrate/20130807024301_upgrade_adjustments.rb +0 -46
- data/db/migrate/20130807024302_rename_adjustment_fields.rb +0 -20
- data/db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb +0 -5
- data/db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb +0 -5
- data/db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb +0 -5
- data/db/migrate/20130813140619_expand_order_number_size.rb +0 -9
- data/db/migrate/20130813232134_rename_activators_to_promotions.rb +0 -5
- data/db/migrate/20130815000406_add_adjustment_total_to_line_items.rb +0 -5
- data/db/migrate/20130815024413_add_adjustment_total_to_shipments.rb +0 -5
- data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb +0 -16
- data/db/migrate/20130828234942_add_tax_total_to_line_items_shipments_and_orders.rb +0 -8
- data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +0 -15
- data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +0 -19
- data/db/migrate/20130903183026_add_code_to_spree_promotion_rules.rb +0 -5
- data/db/migrate/20130909115621_change_states_required_for_countries.rb +0 -9
- data/db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb +0 -5
- data/db/migrate/20130917024658_remove_promotions_event_name_field.rb +0 -5
- data/db/migrate/20130924040529_add_promo_total_to_line_items_and_shipments_and_orders.rb +0 -7
- data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +0 -16
- data/db/migrate/20131026154747_add_track_inventory_to_variant.rb +0 -5
- data/db/migrate/20131107132123_add_tax_category_to_variants.rb +0 -6
- data/db/migrate/20131113035136_add_channel_to_spree_orders.rb +0 -5
- data/db/migrate/20131118043959_add_included_to_adjustments.rb +0 -5
- data/db/migrate/20131118050234_rename_tax_total_fields.rb +0 -11
- data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb +0 -21
- data/db/migrate/20131120234456_add_updated_at_to_variants.rb +0 -5
- data/db/migrate/20131127001002_add_position_to_classifications.rb +0 -5
- data/db/migrate/20131211112807_create_spree_orders_promotions.rb +0 -8
- data/db/migrate/20131211192741_unique_shipping_method_categories.rb +0 -24
- data/db/migrate/20131218054603_add_item_count_to_spree_orders.rb +0 -5
- data/db/migrate/20140106065820_remove_value_type_from_spree_preferences.rb +0 -8
- data/db/migrate/20140106224208_rename_permalink_to_slug_for_products.rb +0 -5
- data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb +0 -5
- data/db/migrate/20140124023232_rename_activator_id_in_rules_and_actions_to_promotion_id.rb +0 -6
- data/db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb +0 -5
- data/db/migrate/20140203161722_add_approver_id_and_approved_at_to_orders.rb +0 -6
- data/db/migrate/20140204115338_add_confirmation_delivered_to_spree_orders.rb +0 -5
- data/db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb +0 -5
- data/db/migrate/20140205120320_create_spree_payment_capture_events.rb +0 -12
- data/db/migrate/20140205144710_add_uncaptured_amount_to_payments.rb +0 -5
- data/db/migrate/20140205181631_default_variant_weight_to_zero.rb +0 -11
- data/db/migrate/20140207085910_add_tax_category_id_to_shipping_methods.rb +0 -5
- data/db/migrate/20140207093021_add_tax_rate_id_to_shipping_rates.rb +0 -5
- data/db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb +0 -6
- data/db/migrate/20140213184916_add_more_indexes.rb +0 -13
- data/db/migrate/20140219060952_add_considered_risky_to_orders.rb +0 -5
- data/db/migrate/20140227112348_add_preference_store_to_everything.rb +0 -8
- data/db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb +0 -13
- data/db/migrate/20140309023735_migrate_old_preferences.rb +0 -27
- data/db/migrate/20140309024355_create_spree_stores.rb +0 -25
- data/db/migrate/20140309033438_create_store_from_preferences.rb +0 -37
- data/db/migrate/20140315053743_add_timestamps_to_spree_assets.rb +0 -6
- data/db/migrate/20140318191500_create_spree_taxons_promotion_rules.rb +0 -8
- data/db/migrate/20140331100557_add_additional_store_fields.rb +0 -8
- data/db/migrate/20140410141842_add_many_missing_indexes.rb +0 -18
- data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb +0 -66
- data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb +0 -5
- data/db/migrate/20140508151342_change_spree_price_amount_precision.rb +0 -8
- data/db/migrate/20140518174634_add_token_to_spree_orders.rb +0 -5
- data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb +0 -29
- data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb +0 -10
- data/db/migrate/20140604135309_drop_credit_card_first_name_and_last_name.rb +0 -6
- data/db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb +0 -6
- data/db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb +0 -5
- data/db/migrate/20140625214618_create_spree_refunds.rb +0 -12
- data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb +0 -12
- data/db/migrate/20140707125621_rename_return_authorization_inventory_unit_to_return_items.rb +0 -5
- data/db/migrate/20140709160534_backfill_line_item_pre_tax_amount.rb +0 -10
- data/db/migrate/20140710041921_recreate_spree_return_authorizations.rb +0 -55
- data/db/migrate/20140710181204_add_amount_fields_to_return_items.rb +0 -7
- data/db/migrate/20140710190048_drop_return_authorization_amount.rb +0 -5
- data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb +0 -28
- data/db/migrate/20140713140527_create_spree_refund_reasons.rb +0 -14
- data/db/migrate/20140713142214_rename_return_authorization_reason.rb +0 -5
- data/db/migrate/20140715182625_create_spree_promotion_categories.rb +0 -11
- data/db/migrate/20140716204111_drop_received_at_on_return_items.rb +0 -9
- data/db/migrate/20140716212330_add_reception_and_acceptance_status_to_return_items.rb +0 -6
- data/db/migrate/20140717155155_create_default_refund_reason.rb +0 -9
- data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb +0 -7
- data/db/migrate/20140718133010_create_spree_customer_returns.rb +0 -9
- data/db/migrate/20140718133349_add_customer_return_id_to_return_item.rb +0 -6
- data/db/migrate/20140718195325_create_friendly_id_slugs.rb +0 -15
- data/db/migrate/20140723004419_rename_spree_refund_return_authorization_id.rb +0 -5
- data/db/migrate/20140723152808_increase_return_item_pre_tax_amount_precision.rb +0 -13
- data/db/migrate/20140723214541_copy_product_slugs_to_slug_history.rb +0 -15
- data/db/migrate/20140725131539_create_spree_reimbursements.rb +0 -21
- data/db/migrate/20140728225422_add_promotionable_to_spree_products.rb +0 -5
- data/db/migrate/20140729133613_add_exchange_inventory_unit_foreign_keys.rb +0 -7
- data/db/migrate/20140730155938_add_acceptance_status_errors_to_return_item.rb +0 -5
- data/db/migrate/20140731150017_create_spree_reimbursement_types.rb +0 -20
- data/db/migrate/20140804185157_add_default_to_shipment_cost.rb +0 -10
- data/db/migrate/20140805171035_add_default_to_spree_credit_cards.rb +0 -5
- data/db/migrate/20140805171219_make_existing_credit_cards_default.rb +0 -10
- data/db/migrate/20140806144901_add_type_to_reimbursement_type.rb +0 -9
- data/db/migrate/20140808184039_create_spree_reimbursement_credits.rb +0 -10
- data/db/migrate/20140827170513_add_meta_title_to_spree_products.rb +0 -7
- data/db/migrate/20140911173301_add_kind_to_zone.rb +0 -11
- data/db/migrate/20140924164824_add_code_to_spree_tax_categories.rb +0 -5
- data/db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb +0 -6
- data/db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb +0 -5
- data/db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb +0 -6
- data/db/migrate/20141009204607_add_store_id_to_orders.rb +0 -8
- data/db/migrate/20141012083513_create_spree_taxons_prototypes.rb +0 -8
- data/db/migrate/20141021194502_add_state_lock_version_to_order.rb +0 -5
- data/db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb +0 -8
- data/db/migrate/20141101231208_fix_adjustment_order_presence.rb +0 -13
- data/db/migrate/20141105213646_update_classifications_positions.rb +0 -9
- data/db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb +0 -5
- data/db/migrate/20141215232040_remove_token_permissions_table.rb +0 -6
- data/db/migrate/20141215235502_remove_extra_products_slug_index.rb +0 -5
- data/db/migrate/20141217215630_update_product_slug_index.rb +0 -6
- data/db/migrate/20141218025915_rename_identifier_to_number_for_payment.rb +0 -5
- data/db/migrate/20150118210639_create_spree_store_credits.rb +0 -24
- data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +0 -8
- data/db/migrate/20150118212051_create_spree_store_credit_events.rb +0 -17
- data/db/migrate/20150118212101_create_spree_store_credit_types.rb +0 -10
- data/db/migrate/20150121022521_remove_environment_from_payment_method.rb +0 -6
- data/db/migrate/20150122145607_add_resellable_to_return_items.rb +0 -5
- data/db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb +0 -5
- data/db/migrate/20150128032538_remove_environment_from_tracker.rb +0 -8
- data/db/migrate/20150128060325_remove_spree_configurations.rb +0 -16
- data/db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb +0 -13
- data/db/migrate/20150309161154_ensure_payments_have_numbers.rb +0 -13
- data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb +0 -67
- data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb +0 -18
- data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb +0 -14
- data/db/migrate/20150515211137_fix_adjustment_order_id.rb +0 -70
- data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb +0 -5
- data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb +0 -6
- data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb +0 -16
- data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb +0 -19
- data/db/migrate/20150627090949_migrate_payment_methods_display.rb +0 -12
- data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb +0 -6
- data/db/migrate/20150714154102_spree_payment_method_store_credits.rb +0 -12
- data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb +0 -18
- data/db/migrate/20150727191614_spree_store_credit_types.rb +0 -11
- data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb +0 -68
- data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb +0 -13
- data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb +0 -16
- data/db/migrate/20160219165458_add_indexes.rb +0 -14
- data/db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb +0 -10
- data/db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb +0 -7
- data/db/migrate/20161014145148_add_created_at_to_variant.rb +0 -8
- data/db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb +0 -6
- data/db/migrate/20161125065505_add_quantity_to_inventory_units.rb +0 -5
- data/db/migrate/20170119122701_add_original_return_item_id_to_spree_inventory_units.rb +0 -29
- data/db/migrate/20170315152755_add_unique_index_on_number_to_spree_orders.rb +0 -16
- data/db/migrate/20170316154338_add_unique_index_on_number_to_spree_stock_transfer.rb +0 -16
- data/db/migrate/20170316205511_add_unique_index_on_number_to_spree_shipment.rb +0 -16
- data/db/migrate/20170320134043_add_unique_index_on_number_to_spree_payments.rb +0 -17
- data/db/migrate/20170320142750_add_unique_index_on_number_to_spree_return_authorizations.rb +0 -16
- data/db/migrate/20170320145040_add_unique_index_on_number_to_spree_customer_returns.rb +0 -16
- data/db/migrate/20170320145518_add_unique_index_on_number_to_spree_reimbursements.rb +0 -16
- data/db/migrate/20170323151450_add_missing_unique_indexes_for_unique_attributes.rb +0 -37
- data/db/migrate/20170329110859_add_index_on_stock_location_to_spree_customer_returns.rb +0 -5
- data/db/migrate/20170329113917_add_index_on_prototype_to_spree_option_type_prototype.rb +0 -19
- data/db/migrate/20170330082155_add_indexes_to_spree_option_value_variant.rb +0 -19
- data/db/migrate/20170330132215_add_index_on_promotion_id_to_order_promotions.rb +0 -5
- data/db/migrate/20170331101758_add_indexes_for_property_prototype.rb +0 -20
- data/db/migrate/20170331103334_add_index_for_prototype_id_to_prototype_taxons.rb +0 -5
- data/db/migrate/20170331110454_add_indexes_to_refunds.rb +0 -6
- data/db/migrate/20170331111757_add_indexes_to_reimbursement_credits.rb +0 -6
- data/db/migrate/20170331115246_add_indexes_to_return_authorizations.rb +0 -6
- data/db/migrate/20170331120125_add_indexes_to_return_items.rb +0 -11
- data/db/migrate/20170331121725_add_index_to_role_users.rb +0 -18
- data/db/migrate/20170331123625_add_index_to_shipping_method_categories.rb +0 -5
- data/db/migrate/20170331123832_add_index_to_shipping_method_zones.rb +0 -20
- data/db/migrate/20170331124251_add_index_to_spree_shipping_rates.rb +0 -6
- data/db/migrate/20170331124513_add_index_to_spree_stock_items.rb +0 -5
- data/db/migrate/20170331124924_add_index_to_spree_stock_movement.rb +0 -5
- data/db/migrate/20170413211707_change_indexes_on_friendly_id_slugs.rb +0 -10
- data/db/migrate/20170722102643_add_analytics_kind_to_spree_trackers.rb +0 -5
- data/db/migrate/20170727103056_rename_tracker_kind_field.rb +0 -5
- data/db/migrate/20171004223836_remove_icon_from_taxons.rb +0 -8
- data/db/migrate/20180222133746_add_unique_index_on_spree_promotions_code.rb +0 -6
- data/db/migrate/20180613080857_rename_guest_token_to_token_in_orders.rb +0 -5
- data/db/migrate/20180915160001_add_timestamps_to_spree_prices.rb +0 -12
- data/db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb +0 -6
- data/db/migrate/20190305121659_add_iso_and_iso3_validation_on_presence_and_uniqueness.rb +0 -18
- data/db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb +0 -12
- data/lib/friendly_id/slug_rails5_patch.rb +0 -11
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -17
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -18
- data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css +0 -16
- data/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css +0 -16
- data/lib/spree/dependencies_helper.rb +0 -11
- data/lib/spree/i18n/base.rb +0 -17
- data/lib/spree/i18n/initializer.rb +0 -1
- data/lib/tasks/email.rake +0 -10
- data/vendor/assets/javascripts/fetch.umd.js +0 -531
- data/vendor/assets/javascripts/jquery.payment.js +0 -652
- data/vendor/assets/javascripts/jsuri.js +0 -458
- data/vendor/assets/javascripts/polyfill.min.js +0 -1
- /data/app/models/spree/return_item/eligibility_validator/{r_m_a_required.rb → rma_required.rb} +0 -0
- /data/{app/models/spree → lib/spree/core}/preferences/scoped_store.rb +0 -0
data/app/models/spree/store.rb
CHANGED
@@ -1,30 +1,214 @@
|
|
1
1
|
module Spree
|
2
2
|
class Store < Spree::Base
|
3
|
+
include TranslatableResource
|
4
|
+
if defined?(Spree::Webhooks)
|
5
|
+
include Spree::Webhooks::HasWebhooks
|
6
|
+
end
|
7
|
+
if defined?(Spree::Security::Stores)
|
8
|
+
include Spree::Security::Stores
|
9
|
+
end
|
10
|
+
|
11
|
+
TRANSLATABLE_FIELDS = %i[name meta_description meta_keywords seo_title facebook
|
12
|
+
twitter instagram customer_support_email description
|
13
|
+
address contact_phone new_order_notifications_email].freeze
|
14
|
+
translates(*TRANSLATABLE_FIELDS)
|
15
|
+
|
16
|
+
self::Translation.class_eval do
|
17
|
+
acts_as_paranoid
|
18
|
+
# deleted translation values still need to be accessible - remove deleted_at scope
|
19
|
+
default_scope { unscope(where: :deleted_at) }
|
20
|
+
end
|
21
|
+
|
22
|
+
typed_store :settings, coder: ActiveRecord::TypedStore::IdentityCoder do |s|
|
23
|
+
# Spree Digital Asset Configurations
|
24
|
+
s.boolean :limit_digital_download_count, default: true, null: false
|
25
|
+
s.boolean :limit_digital_download_days, default: true, null: false
|
26
|
+
s.integer :digital_asset_authorized_clicks, default: 5, null: false # number of times a customer can download a digital file.
|
27
|
+
s.integer :digital_asset_authorized_days, default: 7, null: false # number of days after initial purchase the customer can download a file.
|
28
|
+
s.integer :digital_asset_link_expire_time, default: 300, null: false # 5 minutes in seconds
|
29
|
+
end
|
30
|
+
|
31
|
+
attr_accessor :skip_validate_not_last
|
32
|
+
|
33
|
+
acts_as_paranoid
|
34
|
+
|
3
35
|
has_many :orders, class_name: 'Spree::Order'
|
36
|
+
has_many :line_items, through: :orders, class_name: 'Spree::LineItem'
|
37
|
+
has_many :shipments, through: :orders, class_name: 'Spree::Shipment'
|
38
|
+
has_many :payments, through: :orders, class_name: 'Spree::Payment'
|
39
|
+
has_many :return_authorizations, through: :orders, class_name: 'Spree::ReturnAuthorization'
|
40
|
+
# has_many :reimbursements, through: :orders, class_name: 'Spree::Reimbursement' FIXME: we should fetch this via Customer Return
|
41
|
+
|
42
|
+
has_many :store_payment_methods, class_name: 'Spree::StorePaymentMethod'
|
43
|
+
has_many :payment_methods, through: :store_payment_methods, class_name: 'Spree::PaymentMethod'
|
44
|
+
|
45
|
+
has_many :cms_pages, class_name: 'Spree::CmsPage'
|
46
|
+
has_many :cms_sections, through: :cms_pages, class_name: 'Spree::CmsSection'
|
47
|
+
|
48
|
+
has_many :menus, class_name: 'Spree::Menu'
|
49
|
+
has_many :menu_items, through: :menus, class_name: 'Spree::MenuItem'
|
50
|
+
|
51
|
+
has_many :store_products, class_name: 'Spree::StoreProduct'
|
52
|
+
has_many :products, through: :store_products, class_name: 'Spree::Product'
|
53
|
+
has_many :product_properties, through: :products, class_name: 'Spree::ProductProperty'
|
54
|
+
has_many :variants, through: :products, class_name: 'Spree::Variant', source: :variants_including_master
|
55
|
+
has_many :stock_items, through: :variants, class_name: 'Spree::StockItem'
|
56
|
+
has_many :inventory_units, through: :variants, class_name: 'Spree::InventoryUnit'
|
57
|
+
has_many :customer_returns, class_name: 'Spree::CustomerReturn', inverse_of: :store
|
58
|
+
|
59
|
+
has_many :store_credits, class_name: 'Spree::StoreCredit'
|
60
|
+
has_many :store_credit_events, through: :store_credits, class_name: 'Spree::StoreCreditEvent'
|
61
|
+
|
62
|
+
has_many :taxonomies, class_name: 'Spree::Taxonomy'
|
63
|
+
has_many :taxons, through: :taxonomies, class_name: 'Spree::Taxon'
|
64
|
+
|
65
|
+
has_many :store_promotions, class_name: 'Spree::StorePromotion'
|
66
|
+
has_many :promotions, through: :store_promotions, class_name: 'Spree::Promotion'
|
67
|
+
|
68
|
+
has_many :wishlists, class_name: 'Spree::Wishlist'
|
69
|
+
|
70
|
+
has_many :data_feeds, class_name: 'Spree::DataFeed'
|
71
|
+
|
72
|
+
belongs_to :default_country, class_name: 'Spree::Country'
|
73
|
+
belongs_to :checkout_zone, class_name: 'Spree::Zone'
|
4
74
|
|
5
75
|
with_options presence: true do
|
6
|
-
validates :
|
7
|
-
validates :name, :url, :mail_from_address
|
76
|
+
validates :name, :url, :mail_from_address, :default_currency, :code
|
8
77
|
end
|
9
78
|
|
79
|
+
validates :digital_asset_authorized_clicks, numericality: { only_integer: true, greater_than: 0 }
|
80
|
+
validates :digital_asset_authorized_days, numericality: { only_integer: true, greater_than: 0 }
|
81
|
+
validates :code, uniqueness: { case_sensitive: false, conditions: -> { with_deleted } }
|
82
|
+
validates :mail_from_address, email: { allow_blank: false }
|
83
|
+
|
84
|
+
# FIXME: we should remove this condition in v5
|
85
|
+
if !ENV['SPREE_DISABLE_DB_CONNECTION'] &&
|
86
|
+
connected? &&
|
87
|
+
table_exists? &&
|
88
|
+
connection.column_exists?(:spree_stores, :new_order_notifications_email)
|
89
|
+
validates :new_order_notifications_email, email: { allow_blank: true }
|
90
|
+
end
|
91
|
+
|
92
|
+
default_scope { order(created_at: :asc) }
|
93
|
+
|
94
|
+
has_one :logo, class_name: 'Spree::StoreLogo', dependent: :destroy, as: :viewable
|
95
|
+
accepts_nested_attributes_for :logo, reject_if: :all_blank
|
96
|
+
|
97
|
+
has_one :mailer_logo, class_name: 'Spree::StoreMailerLogo', dependent: :destroy, as: :viewable
|
98
|
+
accepts_nested_attributes_for :mailer_logo, reject_if: :all_blank
|
99
|
+
|
100
|
+
has_one :favicon_image, class_name: 'Spree::StoreFaviconImage', dependent: :destroy, as: :viewable
|
101
|
+
accepts_nested_attributes_for :favicon_image, reject_if: :all_blank
|
102
|
+
|
10
103
|
before_save :ensure_default_exists_and_is_unique
|
11
|
-
|
104
|
+
before_save :ensure_supported_currencies, :ensure_supported_locales, :ensure_default_country
|
105
|
+
before_destroy :validate_not_last, unless: :skip_validate_not_last
|
106
|
+
before_destroy :pass_default_flag_to_other_store
|
12
107
|
|
13
108
|
scope :by_url, ->(url) { where('url like ?', "%#{url}%") }
|
14
109
|
|
15
110
|
after_commit :clear_cache
|
16
111
|
|
17
|
-
|
18
|
-
|
19
|
-
|
112
|
+
alias_attribute :contact_email, :customer_support_email
|
113
|
+
|
114
|
+
def self.current(url = nil)
|
115
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
|
116
|
+
`Spree::Store.current` is deprecated and will be removed in Spree 5.0
|
117
|
+
Please use `Spree::Stores::FindCurrent.new(url: "https://example.com").execute` instead
|
118
|
+
DEPRECATION
|
119
|
+
Stores::FindCurrent.new(url: url).execute
|
20
120
|
end
|
21
121
|
|
122
|
+
# FIXME: we need to drop `or_initialize` in v5
|
123
|
+
# this behaviour is very buggy and unpredictable
|
22
124
|
def self.default
|
23
125
|
Rails.cache.fetch('default_store') do
|
24
|
-
|
126
|
+
# workaround for Mobility bug with first_or_initialize
|
127
|
+
if where(default: true).any?
|
128
|
+
where(default: true).first
|
129
|
+
else
|
130
|
+
new(default: true)
|
131
|
+
end
|
25
132
|
end
|
26
133
|
end
|
27
134
|
|
135
|
+
def self.available_locales
|
136
|
+
Rails.cache.fetch('stores_available_locales') do
|
137
|
+
Spree::Store.all.map(&:supported_locales_list).flatten.uniq
|
138
|
+
end
|
139
|
+
end
|
140
|
+
|
141
|
+
def default_menu(location)
|
142
|
+
menu = menus.find_by(location: location, locale: default_locale) || menus.find_by(location: location)
|
143
|
+
|
144
|
+
menu.root if menu.present?
|
145
|
+
end
|
146
|
+
|
147
|
+
def supported_currencies_list
|
148
|
+
@supported_currencies_list ||= (read_attribute(:supported_currencies).to_s.split(',') << default_currency).sort.map(&:to_s).map do |code|
|
149
|
+
::Money::Currency.find(code.strip)
|
150
|
+
end.uniq.compact
|
151
|
+
end
|
152
|
+
|
153
|
+
def homepage(requested_locale)
|
154
|
+
cms_pages.by_locale(requested_locale).find_by(type: 'Spree::Cms::Pages::Homepage') ||
|
155
|
+
cms_pages.by_locale(default_locale).find_by(type: 'Spree::Cms::Pages::Homepage') ||
|
156
|
+
cms_pages.find_by(type: 'Spree::Cms::Pages::Homepage')
|
157
|
+
end
|
158
|
+
|
159
|
+
def seo_meta_description
|
160
|
+
if meta_description.present?
|
161
|
+
meta_description
|
162
|
+
elsif seo_title.present?
|
163
|
+
seo_title
|
164
|
+
else
|
165
|
+
name
|
166
|
+
end
|
167
|
+
end
|
168
|
+
|
169
|
+
def supported_locales_list
|
170
|
+
# TODO: add support of multiple supported languages to a single Store
|
171
|
+
@supported_locales_list ||= (read_attribute(:supported_locales).to_s.split(',') << default_locale).compact.uniq.sort
|
172
|
+
end
|
173
|
+
|
174
|
+
def unique_name
|
175
|
+
@unique_name ||= "#{name} (#{code})"
|
176
|
+
end
|
177
|
+
|
178
|
+
def formatted_url
|
179
|
+
return if url.blank?
|
180
|
+
|
181
|
+
@formatted_url ||= if url.match(/http:\/\/|https:\/\//)
|
182
|
+
url
|
183
|
+
else
|
184
|
+
Rails.env.development? || Rails.env.test? ? "http://#{url}" : "https://#{url}"
|
185
|
+
end
|
186
|
+
end
|
187
|
+
|
188
|
+
def countries_available_for_checkout
|
189
|
+
@countries_available_for_checkout ||= checkout_zone.try(:country_list) || Spree::Country.all
|
190
|
+
end
|
191
|
+
|
192
|
+
def states_available_for_checkout(country)
|
193
|
+
checkout_zone.try(:state_list_for, country) || country.states
|
194
|
+
end
|
195
|
+
|
196
|
+
def checkout_zone_or_default
|
197
|
+
ActiveSupport::Deprecation.warn('Store#checkout_zone_or_default is deprecated and will be removed in Spree 5')
|
198
|
+
|
199
|
+
@checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
|
200
|
+
end
|
201
|
+
|
202
|
+
def favicon
|
203
|
+
return unless favicon_image&.attachment&.attached?
|
204
|
+
|
205
|
+
favicon_image.attachment.variant(resize_to_limit: [32, 32])
|
206
|
+
end
|
207
|
+
|
208
|
+
def can_be_deleted?
|
209
|
+
self.class.where.not(id: id).any?
|
210
|
+
end
|
211
|
+
|
28
212
|
private
|
29
213
|
|
30
214
|
def ensure_default_exists_and_is_unique
|
@@ -35,15 +219,50 @@ module Spree
|
|
35
219
|
end
|
36
220
|
end
|
37
221
|
|
38
|
-
def
|
39
|
-
|
40
|
-
|
222
|
+
def ensure_supported_locales
|
223
|
+
return unless attributes.keys.include?('supported_locales')
|
224
|
+
return if supported_locales.present?
|
225
|
+
return if default_locale.blank?
|
226
|
+
|
227
|
+
self.supported_locales = default_locale
|
228
|
+
end
|
229
|
+
|
230
|
+
def ensure_supported_currencies
|
231
|
+
return unless attributes.keys.include?('supported_currencies')
|
232
|
+
return if supported_currencies.present?
|
233
|
+
return if default_currency.blank?
|
234
|
+
|
235
|
+
self.supported_currencies = default_currency
|
236
|
+
end
|
237
|
+
|
238
|
+
def validate_not_last
|
239
|
+
unless can_be_deleted?
|
240
|
+
errors.add(:base, :cannot_destroy_only_store)
|
41
241
|
throw(:abort)
|
42
242
|
end
|
43
243
|
end
|
44
244
|
|
245
|
+
def pass_default_flag_to_other_store
|
246
|
+
if default? && can_be_deleted?
|
247
|
+
self.class.where.not(id: id).first.update!(default: true)
|
248
|
+
self.default = false
|
249
|
+
end
|
250
|
+
end
|
251
|
+
|
45
252
|
def clear_cache
|
46
253
|
Rails.cache.delete('default_store')
|
254
|
+
Rails.cache.delete('stores_available_locales')
|
255
|
+
end
|
256
|
+
|
257
|
+
def ensure_default_country
|
258
|
+
return unless has_attribute?(:default_country_id)
|
259
|
+
return if default_country.present? && (checkout_zone.blank? || checkout_zone.country_list.blank? || checkout_zone.country_list.include?(default_country))
|
260
|
+
|
261
|
+
self.default_country = if checkout_zone.present? && checkout_zone.country_list.any?
|
262
|
+
checkout_zone.country_list.first
|
263
|
+
else
|
264
|
+
Country.find_by(iso: 'US') || Country.first
|
265
|
+
end
|
47
266
|
end
|
48
267
|
end
|
49
268
|
end
|
@@ -1,5 +1,11 @@
|
|
1
1
|
module Spree
|
2
2
|
class StoreCredit < Spree::Base
|
3
|
+
include SingleStoreResource
|
4
|
+
include Metadata
|
5
|
+
if defined?(Spree::Webhooks)
|
6
|
+
include Spree::Webhooks::HasWebhooks
|
7
|
+
end
|
8
|
+
|
3
9
|
acts_as_paranoid
|
4
10
|
|
5
11
|
VOID_ACTION = 'void'.freeze
|
@@ -12,13 +18,14 @@ module Spree
|
|
12
18
|
|
13
19
|
DEFAULT_CREATED_BY_EMAIL = 'spree@example.com'.freeze
|
14
20
|
|
15
|
-
belongs_to :user, class_name: Spree.user_class
|
21
|
+
belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id'
|
16
22
|
belongs_to :category, class_name: 'Spree::StoreCreditCategory'
|
17
|
-
belongs_to :created_by, class_name: Spree.
|
23
|
+
belongs_to :created_by, class_name: Spree.admin_user_class.to_s, foreign_key: 'created_by_id'
|
18
24
|
belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
|
19
|
-
|
25
|
+
belongs_to :store, class_name: 'Spree::Store'
|
26
|
+
has_many :store_credit_events, class_name: 'Spree::StoreCreditEvent'
|
20
27
|
|
21
|
-
validates :user, :category, :credit_type, :created_by, :currency, presence: true
|
28
|
+
validates :user, :category, :credit_type, :created_by, :currency, :store, presence: true
|
22
29
|
validates :amount, numericality: { greater_than: 0 }
|
23
30
|
validates :amount_used, numericality: { greater_than_or_equal_to: 0 }
|
24
31
|
validate :amount_used_less_than_or_equal_to_amount
|
@@ -38,6 +45,9 @@ module Spree
|
|
38
45
|
extend Spree::DisplayMoney
|
39
46
|
money_methods :amount, :amount_used
|
40
47
|
|
48
|
+
self.whitelisted_ransackable_attributes = %w[user_id created_by_id amount currency type_id]
|
49
|
+
self.whitelisted_ransackable_associations = %w[type user created_by]
|
50
|
+
|
41
51
|
def amount_remaining
|
42
52
|
amount - amount_used - amount_authorized
|
43
53
|
end
|
@@ -68,7 +78,7 @@ module Spree
|
|
68
78
|
end
|
69
79
|
|
70
80
|
def validate_authorization(amount, order_currency)
|
71
|
-
if amount_remaining
|
81
|
+
if BigDecimal(amount_remaining, 3) < BigDecimal(amount, 3)
|
72
82
|
errors.add(:base, Spree.t('store_credit_payment_method.insufficient_funds'))
|
73
83
|
elsif currency != order_currency
|
74
84
|
errors.add(:base, Spree.t('store_credit_payment_method.currency_mismatch'))
|
@@ -188,7 +198,8 @@ module Spree
|
|
188
198
|
created_by_id: created_by_id,
|
189
199
|
currency: currency,
|
190
200
|
type_id: type_id,
|
191
|
-
memo: credit_allocation_memo
|
201
|
+
memo: credit_allocation_memo,
|
202
|
+
store: store
|
192
203
|
}
|
193
204
|
end
|
194
205
|
|
@@ -242,7 +253,7 @@ module Spree
|
|
242
253
|
def associate_credit_type
|
243
254
|
unless type_id
|
244
255
|
credit_type_name = category.try(:non_expiring?) ? 'Non-expiring' : 'Expiring'
|
245
|
-
self.credit_type = Spree::StoreCreditType.
|
256
|
+
self.credit_type = Spree::StoreCreditType.find_or_create_by(name: credit_type_name)
|
246
257
|
end
|
247
258
|
end
|
248
259
|
end
|
@@ -8,15 +8,10 @@ module Spree
|
|
8
8
|
scope :exposed_events, -> { where.not(action: [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]) }
|
9
9
|
scope :reverse_chronological, -> { order(created_at: :desc) }
|
10
10
|
|
11
|
-
delegate :currency, to: :store_credit
|
11
|
+
delegate :currency, :store, to: :store_credit
|
12
12
|
|
13
|
-
|
14
|
-
|
15
|
-
end
|
16
|
-
|
17
|
-
def display_user_total_amount
|
18
|
-
Spree::Money.new(user_total_amount, currency: currency)
|
19
|
-
end
|
13
|
+
extend DisplayMoney
|
14
|
+
money_methods :amount, :user_total_amount
|
20
15
|
|
21
16
|
def display_action
|
22
17
|
case action
|
@@ -32,7 +27,7 @@ module Spree
|
|
32
27
|
end
|
33
28
|
|
34
29
|
def order
|
35
|
-
|
30
|
+
store.payments.find_by(response_code: authorization_code).try(:order)
|
36
31
|
end
|
37
32
|
end
|
38
33
|
end
|
@@ -0,0 +1,17 @@
|
|
1
|
+
module Spree
|
2
|
+
class StoreFaviconImage < Asset
|
3
|
+
if Spree.public_storage_service_name
|
4
|
+
has_one_attached :attachment, service: Spree.public_storage_service_name
|
5
|
+
else
|
6
|
+
has_one_attached :attachment
|
7
|
+
end
|
8
|
+
|
9
|
+
VALID_CONTENT_TYPES = ['image/png', 'image/x-icon', 'image/vnd.microsoft.icon'].freeze
|
10
|
+
|
11
|
+
validates :attachment,
|
12
|
+
content_type: VALID_CONTENT_TYPES,
|
13
|
+
dimension: { max: 256..256 },
|
14
|
+
aspect_ratio: :square,
|
15
|
+
size: { less_than_or_equal_to: 1.megabyte }
|
16
|
+
end
|
17
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
module Spree
|
2
|
+
class StoreMailerLogo < Asset
|
3
|
+
if Spree.public_storage_service_name
|
4
|
+
has_one_attached :attachment, service: Spree.public_storage_service_name
|
5
|
+
else
|
6
|
+
has_one_attached :attachment
|
7
|
+
end
|
8
|
+
|
9
|
+
VALID_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freeze
|
10
|
+
|
11
|
+
validates :attachment, content_type: VALID_CONTENT_TYPES
|
12
|
+
end
|
13
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
module Spree
|
2
|
+
class StorePaymentMethod < Spree::Base
|
3
|
+
self.table_name = 'spree_payment_methods_stores'
|
4
|
+
|
5
|
+
belongs_to :store, class_name: 'Spree::Store', touch: true
|
6
|
+
belongs_to :payment_method, class_name: 'Spree::PaymentMethod', touch: true
|
7
|
+
|
8
|
+
validates :store, :payment_method, presence: true
|
9
|
+
validates :store_id, uniqueness: { scope: :payment_method_id }
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
module Spree
|
2
|
+
class StoreProduct < Spree::Base
|
3
|
+
self.table_name = 'spree_products_stores'
|
4
|
+
|
5
|
+
belongs_to :store, class_name: 'Spree::Store', touch: true
|
6
|
+
belongs_to :product, class_name: 'Spree::Product', touch: true
|
7
|
+
|
8
|
+
validates :store, :product, presence: true
|
9
|
+
validates :store_id, uniqueness: { scope: :product_id }
|
10
|
+
end
|
11
|
+
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
module Spree
|
2
|
+
class StorePromotion < Spree::Base
|
3
|
+
self.table_name = 'spree_promotions_stores'
|
4
|
+
|
5
|
+
belongs_to :store, class_name: 'Spree::Store', touch: true
|
6
|
+
belongs_to :promotion, class_name: 'Spree::Promotion', touch: true
|
7
|
+
|
8
|
+
validates :store, :promotion, presence: true
|
9
|
+
validates :store_id, uniqueness: { scope: :promotion_id }
|
10
|
+
end
|
11
|
+
end
|
@@ -1,12 +1,20 @@
|
|
1
1
|
module Spree
|
2
2
|
class TaxCategory < Spree::Base
|
3
|
+
if defined?(Spree::Webhooks)
|
4
|
+
include Spree::Webhooks::HasWebhooks
|
5
|
+
end
|
6
|
+
|
3
7
|
acts_as_paranoid
|
4
|
-
validates :name, presence: true, uniqueness: { case_sensitive: false, scope: :deleted_at }
|
8
|
+
validates :name, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope.push(:deleted_at) }
|
5
9
|
|
6
10
|
has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
|
11
|
+
has_many :products, dependent: :nullify
|
12
|
+
has_many :variants, dependent: :nullify
|
7
13
|
|
8
14
|
before_save :set_default_category
|
9
15
|
|
16
|
+
self.whitelisted_ransackable_attributes = %w[name is_default tax_code]
|
17
|
+
|
10
18
|
def set_default_category
|
11
19
|
# set existing default tax category to false if this one has been marked as default
|
12
20
|
|
@@ -4,6 +4,10 @@ module Spree
|
|
4
4
|
|
5
5
|
include Spree::CalculatedAdjustments
|
6
6
|
include Spree::AdjustmentSource
|
7
|
+
include Spree::Metadata
|
8
|
+
if defined?(Spree::Webhooks)
|
9
|
+
include Spree::Webhooks::HasWebhooks
|
10
|
+
end
|
7
11
|
|
8
12
|
with_options inverse_of: :tax_rates do
|
9
13
|
belongs_to :zone, class_name: 'Spree::Zone', optional: true
|
@@ -13,7 +17,7 @@ module Spree
|
|
13
17
|
|
14
18
|
with_options presence: true do
|
15
19
|
validates :amount, numericality: { allow_nil: true }
|
16
|
-
validates :tax_category
|
20
|
+
validates :tax_category, :name
|
17
21
|
end
|
18
22
|
|
19
23
|
scope :by_zone, ->(zone) { where(zone_id: zone.id) }
|
@@ -27,6 +31,8 @@ module Spree
|
|
27
31
|
->(category) { where(tax_category_id: category.try(:id)) }
|
28
32
|
scope :included_in_price, -> { where(included_in_price: true) }
|
29
33
|
|
34
|
+
self.whitelisted_ransackable_attributes = %w[amount zone_id tax_category_id included_in_price name]
|
35
|
+
|
30
36
|
# Gets the array of TaxRates appropriate for the specified tax zone
|
31
37
|
def self.match(order_tax_zone)
|
32
38
|
return [] unless order_tax_zone
|
@@ -112,7 +118,8 @@ module Spree
|
|
112
118
|
|
113
119
|
' ' + ActiveSupport::NumberHelper::NumberToPercentageConverter.convert(
|
114
120
|
amount * 100,
|
115
|
-
locale: I18n.locale
|
121
|
+
locale: I18n.locale,
|
122
|
+
strip_insignificant_zeros: true
|
116
123
|
)
|
117
124
|
end
|
118
125
|
end
|
data/app/models/spree/taxon.rb
CHANGED
@@ -3,6 +3,13 @@ require 'stringex'
|
|
3
3
|
|
4
4
|
module Spree
|
5
5
|
class Taxon < Spree::Base
|
6
|
+
include TranslatableResource
|
7
|
+
include TranslatableResourceSlug
|
8
|
+
include Metadata
|
9
|
+
if defined?(Spree::Webhooks)
|
10
|
+
include Spree::Webhooks::HasWebhooks
|
11
|
+
end
|
12
|
+
|
6
13
|
extend FriendlyId
|
7
14
|
friendly_id :permalink, slug_column: :permalink, use: :history
|
8
15
|
before_validation :set_permalink, on: :create, if: :name
|
@@ -13,28 +20,59 @@ module Spree
|
|
13
20
|
has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
|
14
21
|
has_many :products, through: :classifications
|
15
22
|
|
23
|
+
has_many :menu_items, as: :linked_resource
|
24
|
+
has_many :cms_sections, as: :linked_resource
|
25
|
+
|
16
26
|
has_many :prototype_taxons, class_name: 'Spree::PrototypeTaxon', dependent: :destroy
|
17
27
|
has_many :prototypes, through: :prototype_taxons, class_name: 'Spree::Prototype'
|
18
28
|
|
19
29
|
has_many :promotion_rule_taxons, class_name: 'Spree::PromotionRuleTaxon', dependent: :destroy
|
20
30
|
has_many :promotion_rules, through: :promotion_rule_taxons, class_name: 'Spree::PromotionRule'
|
21
31
|
|
22
|
-
validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id],
|
23
|
-
validates :
|
32
|
+
validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id], case_sensitive: false }
|
33
|
+
validates :taxonomy, presence: true
|
34
|
+
validates :permalink, uniqueness: { case_sensitive: false, scope: [:parent_id, :taxonomy_id] }
|
35
|
+
validates :hide_from_nav, inclusion: { in: [true, false] }
|
24
36
|
validates_associated :icon
|
25
37
|
validate :check_for_root, on: :create
|
38
|
+
validate :parent_belongs_to_same_taxonomy
|
26
39
|
with_options length: { maximum: 255 }, allow_blank: true do
|
27
40
|
validates :meta_keywords
|
28
41
|
validates :meta_description
|
29
42
|
validates :meta_title
|
30
43
|
end
|
31
44
|
|
45
|
+
before_validation :copy_taxonomy_from_parent
|
32
46
|
after_save :touch_ancestors_and_taxonomy
|
47
|
+
after_update :sync_taxonomy_name
|
33
48
|
after_touch :touch_ancestors_and_taxonomy
|
34
49
|
|
35
50
|
has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonImage'
|
36
51
|
|
52
|
+
scope :for_store, ->(store) { joins(:taxonomy).where(spree_taxonomies: { store_id: store.id }) }
|
53
|
+
|
37
54
|
self.whitelisted_ransackable_associations = %w[taxonomy]
|
55
|
+
self.whitelisted_ransackable_attributes = %w[name permalink]
|
56
|
+
|
57
|
+
scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
|
58
|
+
|
59
|
+
TRANSLATABLE_FIELDS = %i[name description permalink].freeze
|
60
|
+
translates(*TRANSLATABLE_FIELDS)
|
61
|
+
|
62
|
+
self::Translation.class_eval do
|
63
|
+
alias_attribute :slug, :permalink
|
64
|
+
|
65
|
+
before_create :set_permalink
|
66
|
+
|
67
|
+
def set_permalink
|
68
|
+
parent = translated_model.parent
|
69
|
+
if parent.present?
|
70
|
+
self.permalink = [parent.permalink, (permalink.blank? ? name.to_url : permalink.split('/').last)].join('/')
|
71
|
+
else
|
72
|
+
self.permalink = name.to_url if permalink.blank?
|
73
|
+
end
|
74
|
+
end
|
75
|
+
end
|
38
76
|
|
39
77
|
# indicate which filters should be used for a taxon
|
40
78
|
# this method should be customized to your own site
|
@@ -48,22 +86,14 @@ module Spree
|
|
48
86
|
fs
|
49
87
|
end
|
50
88
|
|
51
|
-
# Return meta_title if set otherwise generates from
|
89
|
+
# Return meta_title if set otherwise generates from taxon name
|
52
90
|
def seo_title
|
53
|
-
|
54
|
-
root? ? name : "#{root.name} - #{name}"
|
55
|
-
else
|
56
|
-
meta_title
|
57
|
-
end
|
91
|
+
meta_title.blank? ? name : meta_title
|
58
92
|
end
|
59
93
|
|
60
94
|
# Creates permalink base for friendly_id
|
61
95
|
def set_permalink
|
62
|
-
|
63
|
-
self.permalink = [parent.permalink, (permalink.blank? ? name.to_url : permalink.split('/').last)].join('/')
|
64
|
-
else
|
65
|
-
self.permalink = name.to_url if permalink.blank?
|
66
|
-
end
|
96
|
+
translations.each(&:set_permalink)
|
67
97
|
end
|
68
98
|
|
69
99
|
def active_products
|
@@ -77,6 +107,12 @@ module Spree
|
|
77
107
|
ancestor_chain + name.to_s
|
78
108
|
end
|
79
109
|
|
110
|
+
def cached_self_and_descendants_ids
|
111
|
+
Rails.cache.fetch("#{cache_key_with_version}/descendant-ids") do
|
112
|
+
self_and_descendants.ids
|
113
|
+
end
|
114
|
+
end
|
115
|
+
|
80
116
|
# awesome_nested_set sorts by :lft and :rgt. This call re-inserts the child
|
81
117
|
# node so that its resulting position matches the observable 0-indexed position.
|
82
118
|
# ** Note ** no :position column needed - a_n_s doesn't handle the reordering if
|
@@ -89,6 +125,14 @@ module Spree
|
|
89
125
|
|
90
126
|
private
|
91
127
|
|
128
|
+
def sync_taxonomy_name
|
129
|
+
if saved_change_to_name? && root?
|
130
|
+
return if taxonomy.name.to_s == name.to_s
|
131
|
+
|
132
|
+
taxonomy.update(name: name)
|
133
|
+
end
|
134
|
+
end
|
135
|
+
|
92
136
|
def touch_ancestors_and_taxonomy
|
93
137
|
# Touches all ancestors at once to avoid recursive taxonomy touch, and reduce queries.
|
94
138
|
ancestors.update_all(updated_at: Time.current)
|
@@ -101,5 +145,15 @@ module Spree
|
|
101
145
|
errors.add(:root_conflict, 'this taxonomy already has a root taxon')
|
102
146
|
end
|
103
147
|
end
|
148
|
+
|
149
|
+
def parent_belongs_to_same_taxonomy
|
150
|
+
if parent.present? && parent.taxonomy_id != taxonomy_id
|
151
|
+
errors.add(:parent, 'must belong to the same taxonomy')
|
152
|
+
end
|
153
|
+
end
|
154
|
+
|
155
|
+
def copy_taxonomy_from_parent
|
156
|
+
self.taxonomy = parent.taxonomy if parent.present? && taxonomy.blank?
|
157
|
+
end
|
104
158
|
end
|
105
159
|
end
|