spree_core 4.0.0 → 4.5.1
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 +147 -27
- data/app/finders/spree/stores/find_current.rb +24 -0
- data/app/finders/spree/taxons/find.rb +28 -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 +185 -29
- 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 +127 -32
- data/app/models/concerns/spree/single_store_resource.rb +19 -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 +37 -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/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 +18 -4
- data/app/models/spree/option_value.rb +18 -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 +160 -47
- data/app/models/spree/product_property.rb +20 -4
- 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 +32 -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 +15 -36
- 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 +209 -9
- 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 +45 -7
- 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 +14 -2
- data/app/models/spree/variant.rb +117 -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/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 +28 -35
- 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 +20 -0
- data/config/initializers/active_storage.rb +1 -5
- data/config/initializers/inflections.rb +3 -0
- data/config/initializers/rails61_fixes.rb +3 -0
- data/config/locales/en.yml +319 -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/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 +90 -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 +60 -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 +130 -0
- data/lib/spree/core/engine.rb +54 -39
- 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 +1 -0
- data/lib/spree/core/product_filters.rb +3 -3
- data/lib/spree/core/search/base.rb +74 -38
- data/lib/spree/core/version.rb +3 -1
- data/lib/spree/core.rb +53 -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/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 +23 -2
- data/lib/spree/testing_support/factories/product_property_factory.rb +2 -1
- 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 +23 -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 +6 -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_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 +34 -26
- metadata +370 -441
- 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/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/lib/spree/{dependencies_helper.rb → core/dependencies_helper.rb} +0 -0
- /data/{app/models/spree → lib/spree/core}/preferences/scoped_store.rb +0 -0
@@ -0,0 +1,103 @@
|
|
1
|
+
module Spree::Cms::Sections
|
2
|
+
class ImageGallery < Spree::CmsSection
|
3
|
+
after_initialize :default_values
|
4
|
+
validate :reset_multiple_link_attributes
|
5
|
+
|
6
|
+
LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
|
7
|
+
['Spree::Taxon'].freeze
|
8
|
+
else
|
9
|
+
['Spree::Taxon', 'Spree::Product'].freeze
|
10
|
+
end
|
11
|
+
|
12
|
+
LAYOUT_OPTIONS = ['Default', 'Reversed'].freeze
|
13
|
+
LABEL_OPTIONS = ['Show', 'Hide'].freeze
|
14
|
+
|
15
|
+
store :content, accessors: [:link_type_one, :link_one, :title_one,
|
16
|
+
:link_type_two, :link_two, :title_two,
|
17
|
+
:link_type_three, :link_three, :title_three], coder: JSON
|
18
|
+
|
19
|
+
store :settings, accessors: [:layout_style, :display_labels], coder: JSON
|
20
|
+
|
21
|
+
#
|
22
|
+
# img_one sizing
|
23
|
+
def img_one_md(dimensions = '270x195>')
|
24
|
+
super
|
25
|
+
end
|
26
|
+
|
27
|
+
def img_one_lg(dimensions = '540x390>')
|
28
|
+
super
|
29
|
+
end
|
30
|
+
|
31
|
+
def img_one_xl(dimensions = '1080x780>')
|
32
|
+
super
|
33
|
+
end
|
34
|
+
|
35
|
+
#
|
36
|
+
# img_two sizing
|
37
|
+
def img_two_md(dimensions = '270x400>')
|
38
|
+
super
|
39
|
+
end
|
40
|
+
|
41
|
+
def img_two_lg(dimensions = '540x800>')
|
42
|
+
super
|
43
|
+
end
|
44
|
+
|
45
|
+
def img_two_xl(dimensions = '1080x1600>')
|
46
|
+
super
|
47
|
+
end
|
48
|
+
|
49
|
+
#
|
50
|
+
# img_three sizing
|
51
|
+
def img_three_md(dimensions = '270x195>')
|
52
|
+
super
|
53
|
+
end
|
54
|
+
|
55
|
+
def img_three_lg(dimensions = '540x390>')
|
56
|
+
super
|
57
|
+
end
|
58
|
+
|
59
|
+
def img_three_xl(dimensions = '1080x780>')
|
60
|
+
super
|
61
|
+
end
|
62
|
+
|
63
|
+
def default_layout?
|
64
|
+
layout_style == 'Default'
|
65
|
+
end
|
66
|
+
|
67
|
+
def show_labels?
|
68
|
+
display_labels == 'Show'
|
69
|
+
end
|
70
|
+
|
71
|
+
private
|
72
|
+
|
73
|
+
def reset_multiple_link_attributes
|
74
|
+
return if Rails::VERSION::STRING < '6.0'
|
75
|
+
|
76
|
+
if link_type_one_changed?
|
77
|
+
return if link_type_one_was.nil?
|
78
|
+
|
79
|
+
self.link_one = nil
|
80
|
+
end
|
81
|
+
|
82
|
+
if link_type_two_changed?
|
83
|
+
return if link_type_two_was.nil?
|
84
|
+
|
85
|
+
self.link_two = nil
|
86
|
+
end
|
87
|
+
|
88
|
+
if link_type_three_changed?
|
89
|
+
return if link_type_three_was.nil?
|
90
|
+
|
91
|
+
self.link_three = nil
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
95
|
+
def default_values
|
96
|
+
self.layout_style ||= 'Default'
|
97
|
+
self.fit ||= 'Container'
|
98
|
+
self.link_type_one ||= 'Spree::Taxon'
|
99
|
+
self.link_type_two ||= 'Spree::Taxon'
|
100
|
+
self.link_type_three ||= 'Spree::Taxon'
|
101
|
+
end
|
102
|
+
end
|
103
|
+
end
|
@@ -0,0 +1,14 @@
|
|
1
|
+
module Spree::Cms::Sections
|
2
|
+
class ProductCarousel < Spree::CmsSection
|
3
|
+
after_initialize :default_values
|
4
|
+
|
5
|
+
LINKED_RESOURCE_TYPE = ['Spree::Taxon']
|
6
|
+
|
7
|
+
private
|
8
|
+
|
9
|
+
def default_values
|
10
|
+
self.fit ||= 'Screen'
|
11
|
+
self.linked_resource_type ||= 'Spree::Taxon'
|
12
|
+
end
|
13
|
+
end
|
14
|
+
end
|
@@ -0,0 +1,74 @@
|
|
1
|
+
module Spree::Cms::Sections
|
2
|
+
class SideBySideImages < Spree::CmsSection
|
3
|
+
after_initialize :default_values
|
4
|
+
validate :reset_multiple_link_attributes
|
5
|
+
|
6
|
+
LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
|
7
|
+
['Spree::Taxon'].freeze
|
8
|
+
else
|
9
|
+
['Spree::Taxon', 'Spree::Product'].freeze
|
10
|
+
end
|
11
|
+
|
12
|
+
store :content, accessors: [:link_type_one, :link_one, :title_one, :subtitle_one,
|
13
|
+
:link_type_two, :link_two, :title_two, :subtitle_two], coder: JSON
|
14
|
+
|
15
|
+
store :settings, accessors: [:gutters], coder: JSON
|
16
|
+
|
17
|
+
def gutters?
|
18
|
+
gutters == 'Gutters'
|
19
|
+
end
|
20
|
+
|
21
|
+
#
|
22
|
+
# img_one sizing
|
23
|
+
def img_one_md(dimensions = '387x250>')
|
24
|
+
super
|
25
|
+
end
|
26
|
+
|
27
|
+
def img_one_lg(dimensions = '540x390>')
|
28
|
+
super
|
29
|
+
end
|
30
|
+
|
31
|
+
def img_one_xl(dimensions = '1468x952>')
|
32
|
+
super
|
33
|
+
end
|
34
|
+
|
35
|
+
#
|
36
|
+
# img_two sizing
|
37
|
+
def img_two_md(dimensions = '387x250>')
|
38
|
+
super
|
39
|
+
end
|
40
|
+
|
41
|
+
def img_two_lg(dimensions = '734x476>')
|
42
|
+
super
|
43
|
+
end
|
44
|
+
|
45
|
+
def img_two_xl(dimensions = '1468x952>')
|
46
|
+
super
|
47
|
+
end
|
48
|
+
|
49
|
+
private
|
50
|
+
|
51
|
+
def reset_multiple_link_attributes
|
52
|
+
return if Rails::VERSION::STRING < '6.0'
|
53
|
+
|
54
|
+
if link_type_one_changed?
|
55
|
+
return if link_type_one_was.nil?
|
56
|
+
|
57
|
+
self.link_one = nil
|
58
|
+
end
|
59
|
+
|
60
|
+
if link_type_two_changed?
|
61
|
+
return if link_type_two_was.nil?
|
62
|
+
|
63
|
+
self.link_two = nil
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
67
|
+
def default_values
|
68
|
+
self.gutters ||= 'Gutters'
|
69
|
+
self.fit ||= 'Container'
|
70
|
+
self.link_type_one ||= 'Spree::Taxon'
|
71
|
+
self.link_type_two ||= 'Spree::Taxon'
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
@@ -0,0 +1,70 @@
|
|
1
|
+
module Spree
|
2
|
+
class CmsPage < Base
|
3
|
+
include SingleStoreResource
|
4
|
+
include DisplayLink
|
5
|
+
|
6
|
+
if defined?(Spree::Webhooks)
|
7
|
+
include Spree::Webhooks::HasWebhooks
|
8
|
+
end
|
9
|
+
|
10
|
+
acts_as_paranoid
|
11
|
+
|
12
|
+
TYPES = ['Spree::Cms::Pages::StandardPage',
|
13
|
+
'Spree::Cms::Pages::FeaturePage',
|
14
|
+
'Spree::Cms::Pages::Homepage']
|
15
|
+
|
16
|
+
belongs_to :store, touch: true
|
17
|
+
|
18
|
+
has_many :cms_sections, class_name: 'Spree::CmsSection'
|
19
|
+
has_many :menu_items, as: :linked_resource
|
20
|
+
|
21
|
+
before_validation :handle_slug
|
22
|
+
|
23
|
+
validates :title, :store, :locale, :type, presence: true
|
24
|
+
validates :slug, uniqueness: { scope: :store_id, allow_nil: true, case_sensitive: true }
|
25
|
+
validates :locale, uniqueness: { scope: [:store, :type] }, if: :homepage?
|
26
|
+
|
27
|
+
scope :visible, -> { where(visible: true) }
|
28
|
+
scope :by_locale, ->(locale) { where(locale: locale) }
|
29
|
+
scope :by_slug, ->(slug) { where(slug: slug) }
|
30
|
+
|
31
|
+
scope :home, -> { where(type: 'Spree::Cms::Pages::Homepage') }
|
32
|
+
scope :standard, -> { where(type: 'Spree::Cms::Pages::StandardPage') }
|
33
|
+
scope :feature, -> { where(type: 'Spree::Cms::Pages::FeaturePage') }
|
34
|
+
|
35
|
+
self.whitelisted_ransackable_attributes = %w[title type locale]
|
36
|
+
|
37
|
+
def seo_title
|
38
|
+
if meta_title.present?
|
39
|
+
meta_title
|
40
|
+
else
|
41
|
+
title
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
# Override this if your page type uses cms_sections
|
46
|
+
def sections?
|
47
|
+
false
|
48
|
+
end
|
49
|
+
|
50
|
+
def homepage?
|
51
|
+
type == 'Spree::Cms::Pages::Homepage'
|
52
|
+
end
|
53
|
+
|
54
|
+
def draft_mode?
|
55
|
+
!visible
|
56
|
+
end
|
57
|
+
|
58
|
+
private
|
59
|
+
|
60
|
+
def handle_slug
|
61
|
+
self.slug = if homepage?
|
62
|
+
nil
|
63
|
+
elsif slug.blank?
|
64
|
+
title&.downcase&.to_url
|
65
|
+
else
|
66
|
+
slug&.downcase&.to_url
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
70
|
+
end
|
@@ -0,0 +1,69 @@
|
|
1
|
+
module Spree
|
2
|
+
class CmsSection < Base
|
3
|
+
include DisplayLink
|
4
|
+
|
5
|
+
acts_as_list scope: :cms_page
|
6
|
+
belongs_to :cms_page, touch: true
|
7
|
+
|
8
|
+
validate :reset_link_attributes
|
9
|
+
|
10
|
+
has_one :image_one, class_name: 'Spree::CmsSectionImageOne', dependent: :destroy, as: :viewable
|
11
|
+
accepts_nested_attributes_for :image_one, reject_if: :all_blank
|
12
|
+
|
13
|
+
has_one :image_two, class_name: 'Spree::CmsSectionImageTwo', dependent: :destroy, as: :viewable
|
14
|
+
accepts_nested_attributes_for :image_two, reject_if: :all_blank
|
15
|
+
|
16
|
+
has_one :image_three, class_name: 'Spree::CmsSectionImageThree', dependent: :destroy, as: :viewable
|
17
|
+
accepts_nested_attributes_for :image_three, reject_if: :all_blank
|
18
|
+
|
19
|
+
Spree::CmsSectionImage::IMAGE_COUNT.each do |count|
|
20
|
+
Spree::CmsSectionImage::IMAGE_SIZE.each do |size|
|
21
|
+
define_method("img_#{count}_#{size}") do |dimensions = nil|
|
22
|
+
image = send("image_#{count}")&.attachment
|
23
|
+
return if !image&.attached? || dimensions.nil?
|
24
|
+
|
25
|
+
image.variant(resize_to_limit: dimensions.split('x').map(&:to_i))
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
default_scope { order(position: :asc) }
|
31
|
+
|
32
|
+
validates :name, :cms_page, :type, presence: true
|
33
|
+
|
34
|
+
LINKED_RESOURCE_TYPE = []
|
35
|
+
|
36
|
+
TYPES = ['Spree::Cms::Sections::HeroImage',
|
37
|
+
'Spree::Cms::Sections::FeaturedArticle',
|
38
|
+
'Spree::Cms::Sections::ProductCarousel',
|
39
|
+
'Spree::Cms::Sections::ImageGallery',
|
40
|
+
'Spree::Cms::Sections::SideBySideImages',
|
41
|
+
'Spree::Cms::Sections::RichTextContent']
|
42
|
+
|
43
|
+
def boundaries
|
44
|
+
['Container', 'Screen']
|
45
|
+
end
|
46
|
+
|
47
|
+
def css_classes
|
48
|
+
['row', 'section-row'].compact
|
49
|
+
end
|
50
|
+
|
51
|
+
def gutters_sizes
|
52
|
+
['Gutters', 'No Gutters']
|
53
|
+
end
|
54
|
+
|
55
|
+
def fullscreen?
|
56
|
+
fit == 'Screen'
|
57
|
+
end
|
58
|
+
|
59
|
+
private
|
60
|
+
|
61
|
+
def reset_link_attributes
|
62
|
+
if linked_resource_type_changed?
|
63
|
+
return if linked_resource_id_was.nil?
|
64
|
+
|
65
|
+
self.linked_resource_id = nil
|
66
|
+
end
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
module Spree
|
2
|
+
class CmsSectionImage < 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
|
+
IMAGE_COUNT = ['one', 'two', 'three']
|
10
|
+
IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
|
11
|
+
IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
|
12
|
+
|
13
|
+
validates :attachment, attached: true, content_type: IMAGE_TYPES
|
14
|
+
end
|
15
|
+
end
|
data/app/models/spree/country.rb
CHANGED
@@ -2,22 +2,29 @@ module Spree
|
|
2
2
|
class Country < Spree::Base
|
3
3
|
# we need to have this callback before any dependent: :destroy associations
|
4
4
|
# https://github.com/rails/rails/issues/3458
|
5
|
-
before_destroy :ensure_not_default
|
5
|
+
# before_destroy :ensure_not_default
|
6
6
|
|
7
7
|
has_many :addresses, dependent: :restrict_with_error
|
8
|
-
has_many :states,
|
8
|
+
has_many :states,
|
9
|
+
-> { order name: :asc },
|
10
|
+
inverse_of: :country,
|
11
|
+
dependent: :destroy
|
9
12
|
has_many :zone_members,
|
10
13
|
-> { where(zoneable_type: 'Spree::Country') },
|
11
14
|
class_name: 'Spree::ZoneMember',
|
12
15
|
dependent: :destroy,
|
13
16
|
foreign_key: :zoneable_id
|
14
|
-
|
15
17
|
has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
|
16
18
|
|
17
|
-
validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false }
|
19
|
+
validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
|
18
20
|
|
19
|
-
def self.default
|
20
|
-
|
21
|
+
def self.default(store = nil)
|
22
|
+
ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
|
23
|
+
`Country#default` is deprecated and will be removed in Spree 5.0.
|
24
|
+
Please use `current_store.default_country` instead
|
25
|
+
DEPRECATION
|
26
|
+
store ||= Spree::Store.default
|
27
|
+
country_id = store.default_country_id
|
21
28
|
default = find_by(id: country_id) if country_id.present?
|
22
29
|
default || find_by(iso: 'US') || first
|
23
30
|
end
|
@@ -26,8 +33,9 @@ module Spree
|
|
26
33
|
where(['LOWER(iso) = ?', iso.downcase]).or(where(['LOWER(iso3) = ?', iso.downcase])).take
|
27
34
|
end
|
28
35
|
|
29
|
-
def default?
|
30
|
-
|
36
|
+
def default?(store = nil)
|
37
|
+
store ||= Spree::Store.default
|
38
|
+
self == store.default_country
|
31
39
|
end
|
32
40
|
|
33
41
|
def <=>(other)
|
@@ -41,6 +49,8 @@ module Spree
|
|
41
49
|
private
|
42
50
|
|
43
51
|
def ensure_not_default
|
52
|
+
ActiveSupport::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
|
53
|
+
|
44
54
|
if id.eql?(Spree::Config[:default_country_id])
|
45
55
|
errors.add(:base, Spree.t(:default_country_cannot_be_deleted))
|
46
56
|
throw(:abort)
|
@@ -1,18 +1,18 @@
|
|
1
1
|
module Spree
|
2
2
|
class CreditCard < Spree::Base
|
3
3
|
include ActiveMerchant::Billing::CreditCardMethods
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
connection.column_exists?(:spree_credit_cards, :deleted_at)
|
11
|
-
acts_as_paranoid
|
4
|
+
include Metadata
|
5
|
+
if defined?(Spree::Webhooks)
|
6
|
+
include Spree::Webhooks::HasWebhooks
|
7
|
+
end
|
8
|
+
if defined?(Spree::Security::CreditCards)
|
9
|
+
include Spree::Security::CreditCards
|
12
10
|
end
|
13
11
|
|
12
|
+
acts_as_paranoid
|
13
|
+
|
14
14
|
belongs_to :payment_method
|
15
|
-
belongs_to :user, class_name: Spree.user_class
|
15
|
+
belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id',
|
16
16
|
optional: true
|
17
17
|
has_many :payments, as: :source
|
18
18
|
|
@@ -24,10 +24,9 @@ module Spree
|
|
24
24
|
attribute :month, ActiveRecord::Type::Integer.new
|
25
25
|
attribute :year, ActiveRecord::Type::Integer.new
|
26
26
|
|
27
|
-
attr_reader :number
|
27
|
+
attr_reader :number, :verification_value
|
28
28
|
attr_accessor :encrypted_data,
|
29
29
|
:imported,
|
30
|
-
:verification_value,
|
31
30
|
:manual_entry
|
32
31
|
|
33
32
|
with_options if: :require_card_numbers?, on: :create do
|
@@ -38,6 +37,12 @@ module Spree
|
|
38
37
|
|
39
38
|
scope :with_payment_profile, -> { where.not(gateway_customer_profile_id: nil) }
|
40
39
|
scope :default, -> { where(default: true) }
|
40
|
+
scope :not_expired, lambda {
|
41
|
+
where('CAST(spree_credit_cards.year AS DECIMAL) > ?', Time.current.year).
|
42
|
+
or(where('CAST(spree_credit_cards.year AS DECIMAL) = ?', Time.current.year).
|
43
|
+
where('CAST(spree_credit_cards.month AS DECIMAL) >= ?', Time.current.month))
|
44
|
+
}
|
45
|
+
scope :not_removed, -> { where(deleted_at: nil) }
|
41
46
|
|
42
47
|
# needed for some of the ActiveMerchant gateways (eg. SagePay)
|
43
48
|
alias_attribute :brand, :cc_type
|
@@ -101,9 +106,11 @@ module Spree
|
|
101
106
|
end
|
102
107
|
end
|
103
108
|
|
109
|
+
def verification_value=(value)
|
110
|
+
@verification_value = value.to_s.gsub(/\s/, '')
|
111
|
+
end
|
112
|
+
|
104
113
|
def set_last_digits
|
105
|
-
number.to_s.gsub!(/\s/, '')
|
106
|
-
verification_value.to_s.gsub!(/\s/, '')
|
107
114
|
self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
|
108
115
|
end
|
109
116
|
|
@@ -121,6 +128,10 @@ module Spree
|
|
121
128
|
"XXXX-XXXX-XXXX-#{last_digits}"
|
122
129
|
end
|
123
130
|
|
131
|
+
def display_brand
|
132
|
+
brand.present? ? brand.upcase : Spree.t(:no_cc_type)
|
133
|
+
end
|
134
|
+
|
124
135
|
def actions
|
125
136
|
%w{capture void credit}
|
126
137
|
end
|
@@ -167,6 +178,15 @@ module Spree
|
|
167
178
|
)
|
168
179
|
end
|
169
180
|
|
181
|
+
def self.json_api_permitted_attributes
|
182
|
+
[
|
183
|
+
'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name',
|
184
|
+
'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits',
|
185
|
+
'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id',
|
186
|
+
'payment_method_id', 'default', 'deleted_at'
|
187
|
+
]
|
188
|
+
end
|
189
|
+
|
170
190
|
private
|
171
191
|
|
172
192
|
def require_card_numbers?
|
@@ -1,7 +1,14 @@
|
|
1
1
|
module Spree
|
2
2
|
class CustomerReturn < Spree::Base
|
3
3
|
include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
|
4
|
+
include NumberIdentifier
|
5
|
+
include Metadata
|
6
|
+
if defined?(Spree::Webhooks)
|
7
|
+
include Spree::Webhooks::HasWebhooks
|
8
|
+
end
|
9
|
+
|
4
10
|
belongs_to :stock_location
|
11
|
+
belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returns
|
5
12
|
|
6
13
|
has_many :reimbursements, inverse_of: :customer_return
|
7
14
|
has_many :return_items, inverse_of: :customer_return
|
@@ -9,7 +16,7 @@ module Spree
|
|
9
16
|
|
10
17
|
after_create :process_return!
|
11
18
|
|
12
|
-
validates :
|
19
|
+
validates :store, presence: true
|
13
20
|
validates :return_items, :stock_location, presence: true
|
14
21
|
validate :must_have_return_authorization, on: :create
|
15
22
|
validate :return_items_belong_to_same_order
|
@@ -17,7 +24,7 @@ module Spree
|
|
17
24
|
accepts_nested_attributes_for :return_items
|
18
25
|
|
19
26
|
extend DisplayMoney
|
20
|
-
money_methods pre_tax_total
|
27
|
+
money_methods :pre_tax_total
|
21
28
|
|
22
29
|
self.whitelisted_ransackable_attributes = ['number']
|
23
30
|
|
@@ -31,6 +38,10 @@ module Spree
|
|
31
38
|
completely_decided? && return_items.accepted.includes(:reimbursement).all? { |return_item| return_item.reimbursement.try(:reimbursed?) }
|
32
39
|
end
|
33
40
|
|
41
|
+
def currency
|
42
|
+
order&.currency
|
43
|
+
end
|
44
|
+
|
34
45
|
# Temporarily tie a customer_return to one order
|
35
46
|
def order
|
36
47
|
return nil if return_items.blank?
|
@@ -49,7 +60,7 @@ module Spree
|
|
49
60
|
end
|
50
61
|
|
51
62
|
def must_have_return_authorization
|
52
|
-
if item = return_items.find { |ri| ri.return_authorization.blank? }
|
63
|
+
if (item = return_items.find { |ri| ri.return_authorization.blank? })
|
53
64
|
errors.add(:base, Spree.t(:missing_return_authorization, item_name: item.inventory_unit.variant.name))
|
54
65
|
end
|
55
66
|
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
module Spree
|
2
|
+
class Digital < Spree::Base
|
3
|
+
belongs_to :variant
|
4
|
+
has_many :digital_links, dependent: :destroy
|
5
|
+
|
6
|
+
if defined?(Spree::Webhooks)
|
7
|
+
include Spree::Webhooks::HasWebhooks
|
8
|
+
end
|
9
|
+
|
10
|
+
if Spree.private_storage_service_name
|
11
|
+
has_one_attached :attachment, service: Spree.private_storage_service_name
|
12
|
+
else
|
13
|
+
has_one_attached :attachment
|
14
|
+
end
|
15
|
+
|
16
|
+
validates :attachment, attached: true
|
17
|
+
validates :variant, presence: true
|
18
|
+
end
|
19
|
+
end
|
@@ -0,0 +1,57 @@
|
|
1
|
+
module Spree
|
2
|
+
class DigitalLink < Spree::Base
|
3
|
+
has_secure_token
|
4
|
+
|
5
|
+
if defined?(Spree::Webhooks)
|
6
|
+
include Spree::Webhooks::HasWebhooks
|
7
|
+
end
|
8
|
+
if defined?(Spree::Security::DigitalLinks)
|
9
|
+
include Spree::Security::DigitalLinks
|
10
|
+
end
|
11
|
+
|
12
|
+
belongs_to :digital
|
13
|
+
belongs_to :line_item
|
14
|
+
|
15
|
+
before_validation :set_defaults, on: :create
|
16
|
+
validates :digital, :line_item, presence: true
|
17
|
+
validates :access_counter, numericality: { greater_than_or_equal_to: 0 }
|
18
|
+
|
19
|
+
def authorizable?
|
20
|
+
!(expired? || access_limit_exceeded?)
|
21
|
+
end
|
22
|
+
|
23
|
+
def expired?
|
24
|
+
if line_item.order.store.limit_digital_download_days
|
25
|
+
created_at <= line_item.order.store.digital_asset_authorized_days.day.ago
|
26
|
+
else
|
27
|
+
false
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def access_limit_exceeded?
|
32
|
+
if line_item.order.store.limit_digital_download_count
|
33
|
+
access_counter >= line_item.order.store.digital_asset_authorized_clicks
|
34
|
+
else
|
35
|
+
false
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
# This method should be called when a download is initiated.
|
40
|
+
# It returns +true+ or +false+ depending on whether the authorization is granted.
|
41
|
+
def authorize!
|
42
|
+
authorizable? && increment!(:access_counter, touch: true) ? true : false
|
43
|
+
end
|
44
|
+
|
45
|
+
def reset!
|
46
|
+
self.access_counter = 0
|
47
|
+
self.created_at = Time.current
|
48
|
+
save!
|
49
|
+
end
|
50
|
+
|
51
|
+
private
|
52
|
+
|
53
|
+
def set_defaults
|
54
|
+
self.access_counter ||= 0
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|