spree_core 4.3.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/finders/spree/option_values/find_available.rb +9 -1
- data/app/finders/spree/products/find.rb +2 -4
- data/app/finders/spree/taxons/find.rb +1 -1
- data/app/helpers/spree/base_helper.rb +12 -13
- data/app/helpers/spree/currency_helper.rb +1 -1
- data/app/helpers/spree/locale_helper.rb +6 -2
- data/app/helpers/spree/products_helper.rb +10 -19
- 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 +1 -1
- data/app/models/concerns/spree/display_link.rb +17 -29
- data/app/models/concerns/spree/display_money.rb +3 -1
- data/app/models/concerns/spree/image_methods.rb +21 -9
- data/app/models/concerns/spree/memoized_data.rb +1 -1
- data/app/models/concerns/spree/metadata.rb +23 -0
- data/app/models/concerns/spree/multi_store_resource.rb +1 -1
- 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 +59 -27
- data/app/models/concerns/spree/unique_name.rb +10 -0
- data/app/models/concerns/spree/user_methods.rb +9 -0
- data/app/models/concerns/spree/user_reporting.rb +1 -1
- data/app/models/concerns/spree/user_roles.rb +20 -2
- data/app/models/spree/ability.rb +11 -3
- data/app/models/spree/address.rb +11 -3
- data/app/models/spree/adjustment.rb +1 -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 +14 -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/cms_page.rb +7 -3
- data/app/models/spree/cms_section.rb +13 -13
- 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 +4 -2
- data/app/models/spree/credit_card.rb +17 -1
- data/app/models/spree/customer_return.rb +6 -1
- data/app/models/spree/digital.rb +19 -0
- data/app/models/spree/digital_link.rb +57 -0
- data/app/models/spree/fulfilment_changer.rb +1 -1
- data/app/models/spree/gateway/bogus.rb +5 -1
- data/app/models/spree/icon.rb +5 -1
- data/app/models/spree/image/configuration/active_storage.rb +6 -19
- data/app/models/spree/image.rb +3 -3
- data/app/models/spree/inventory_unit.rb +5 -2
- data/app/models/spree/legacy_user.rb +2 -2
- data/app/models/spree/line_item.rb +15 -4
- 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 +3 -0
- data/app/models/spree/menu_item.rb +7 -11
- data/app/models/spree/option_type.rb +8 -4
- data/app/models/spree/option_value.rb +7 -0
- data/app/models/spree/order/address_book.rb +1 -0
- data/app/models/spree/order/checkout.rb +7 -1
- data/app/models/spree/order/digital.rb +33 -0
- data/app/models/spree/order.rb +45 -24
- 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 +2 -1
- data/app/models/spree/payment.rb +32 -5
- 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 +6 -1
- data/app/models/spree/payment_source.rb +10 -0
- data/app/models/spree/preference.rb +6 -1
- data/app/models/spree/price.rb +4 -1
- data/app/models/spree/product.rb +73 -30
- data/app/models/spree/product_property.rb +1 -0
- data/app/models/spree/promotion/rules/option_value.rb +2 -2
- data/app/models/spree/promotion/rules/product.rb +1 -1
- data/app/models/spree/promotion.rb +9 -1
- data/app/models/spree/promotion_action.rb +1 -1
- data/app/models/spree/promotion_rule.rb +1 -1
- data/app/models/spree/promotion_rule_user.rb +1 -1
- data/app/models/spree/property.rb +4 -0
- data/app/models/spree/prototype.rb +5 -0
- data/app/models/spree/refund.rb +10 -0
- data/app/models/spree/reimbursement.rb +4 -1
- data/app/models/spree/return_authorization.rb +7 -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 +11 -30
- data/app/models/spree/shipping_category.rb +4 -1
- data/app/models/spree/shipping_method.rb +8 -0
- 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 -3
- data/app/models/spree/stock/content_item.rb +1 -1
- data/app/models/spree/stock/quantifier.rb +2 -2
- data/app/models/spree/stock/splitter/digital.rb +35 -0
- data/app/models/spree/stock_item.rb +7 -2
- data/app/models/spree/stock_location.rb +23 -31
- data/app/models/spree/stock_movement.rb +7 -0
- data/app/models/spree/stock_transfer.rb +6 -6
- data/app/models/spree/store.rb +58 -20
- data/app/models/spree/store_credit.rb +10 -3
- data/app/models/spree/store_credit_category.rb +2 -0
- data/app/models/spree/store_credit_event.rb +2 -7
- 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/tax_category.rb +9 -1
- data/app/models/spree/tax_rate.rb +9 -2
- data/app/models/spree/taxon.rb +14 -0
- data/app/models/spree/taxon_image/configuration/active_storage.rb +6 -12
- data/app/models/spree/taxon_image.rb +3 -2
- data/app/models/spree/taxonomy.rb +11 -1
- data/app/models/spree/variant.rb +63 -24
- data/app/models/spree/wished_item.rb +33 -0
- data/app/models/spree/wishlist.rb +38 -0
- data/app/models/spree/zone.rb +11 -6
- data/app/services/spree/account/addresses/create.rb +1 -17
- data/app/services/spree/account/addresses/update.rb +1 -22
- 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/create.rb +4 -2
- 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 +4 -1
- data/app/services/spree/checkout/select_shipping_method.rb +49 -0
- data/app/services/spree/checkout/update.rb +3 -10
- 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/validators/spree/url_validator.rb +23 -0
- data/brakeman.ignore +20 -0
- data/config/initializers/active_storage.rb +0 -6
- data/config/locales/en.yml +19 -170
- data/config/routes.rb +43 -0
- 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 +14 -3
- 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 +2 -0
- data/lib/spree/core/configuration.rb +90 -0
- data/lib/spree/core/controller_helpers/auth.rb +7 -5
- data/lib/spree/core/controller_helpers/common.rb +15 -1
- data/lib/spree/core/controller_helpers/currency.rb +8 -6
- data/lib/spree/core/controller_helpers/locale.rb +8 -6
- data/lib/spree/core/controller_helpers/order.rb +4 -2
- data/lib/spree/core/controller_helpers/search.rb +1 -1
- data/lib/spree/core/controller_helpers/store.rb +5 -3
- data/lib/spree/core/dependencies.rb +130 -0
- data/lib/spree/core/engine.rb +54 -45
- data/lib/spree/core/importer/product.rb +1 -1
- data/lib/spree/core/number_generator.rb +0 -2
- data/{app/models/spree → lib/spree/core}/preferences/configuration.rb +5 -2
- data/{app/models/spree → lib/spree/core}/preferences/preferable.rb +3 -0
- data/{app/models/spree → lib/spree/core}/preferences/preferable_class_methods.rb +2 -0
- data/{app/models/spree → lib/spree/core}/preferences/store.rb +1 -1
- data/lib/spree/core/search/base.rb +9 -5
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/core.rb +41 -13
- data/lib/spree/money.rb +2 -2
- data/lib/spree/permitted_attributes.rb +36 -16
- data/lib/spree/testing_support/authorization_helpers.rb +3 -1
- data/lib/spree/testing_support/capybara_config.rb +14 -19
- data/lib/spree/testing_support/capybara_ext.rb +1 -6
- data/lib/spree/testing_support/common_rake.rb +23 -4
- data/lib/spree/testing_support/factories/asset_factory.rb +15 -0
- data/lib/spree/testing_support/factories/cms_section_factory.rb +2 -2
- 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 +3 -1
- data/lib/spree/testing_support/factories/image_factory.rb +3 -1
- data/lib/spree/testing_support/factories/log_entry_factory.rb +6 -0
- data/lib/spree/testing_support/factories/menu_item_factory.rb +1 -1
- data/lib/spree/testing_support/factories/order_factory.rb +6 -2
- 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/product_factory.rb +6 -1
- data/lib/spree/testing_support/factories/product_property_factory.rb +1 -0
- data/lib/spree/testing_support/factories/promotion_action_factory.rb +5 -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/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 +4 -3
- data/lib/spree/testing_support/factories/stock_transfer_factory.rb +9 -0
- data/lib/spree/testing_support/factories/store_credit_factory.rb +1 -1
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +5 -0
- data/lib/spree/testing_support/factories/store_factory.rb +1 -1
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +1 -0
- data/lib/spree/testing_support/factories/taxon_image_factory.rb +3 -1
- data/lib/spree/testing_support/factories/user_factory.rb +6 -0
- data/lib/spree/testing_support/factories/variant_factory.rb +4 -0
- 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/jobs.rb +9 -0
- data/lib/spree/testing_support/metadata.rb +54 -0
- data/lib/spree_core.rb +2 -1
- data/lib/tasks/core.rake +16 -4
- data/spree_core.gemspec +4 -4
- metadata +160 -366
- data/app/models/friendly_id/slug_decorator.rb +0 -9
- data/app/models/spree/app_configuration.rb +0 -89
- data/app/models/spree/app_dependencies.rb +0 -98
- data/app/services/spree/account/addresses/helper.rb +0 -43
- data/app/services/spree/build_localized_redirect_url.rb +0 -101
- data/db/default/spree/countries.rb +0 -24
- 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 -49
- data/db/default/spree/store_credit_categories.rb +0 -1
- data/db/default/spree/stores.rb +0 -21
- data/db/default/spree/zones.rb +0 -29
- 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 -42
- 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/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/db/migrate/20191005121504_add_store_id_to_payment_methods.rb +0 -7
- data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb +0 -5
- data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +0 -11
- data/db/migrate/20200102141311_add_social_to_spree_stores.rb +0 -10
- data/db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb +0 -5
- data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +0 -7
- data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +0 -7
- data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +0 -7
- data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +0 -9
- data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +0 -8
- data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +0 -5
- data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +0 -7
- data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +0 -7
- data/db/migrate/20200610113542_add_label_to_spree_addresses.rb +0 -5
- data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +0 -5
- data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb +0 -12
- data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb +0 -10
- data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb +0 -5
- data/db/migrate/20201023152810_add_filterable_to_spree_properties.rb +0 -8
- data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb +0 -5
- data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb +0 -5
- data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb +0 -10
- data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb +0 -15
- data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb +0 -5
- data/db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb +0 -5
- data/db/migrate/20210205211040_add_supported_locales_to_spree_stores.rb +0 -11
- data/db/migrate/20210215202602_migrate_spree_i18n_globalize_config.rb +0 -22
- data/db/migrate/20210407200948_create_spree_menus.rb +0 -16
- data/db/migrate/20210408092939_create_spree_menu_items.rb +0 -31
- data/db/migrate/20210504163720_add_filter_param_to_spree_product_properties.rb +0 -8
- data/db/migrate/20210505114659_add_filter_param_to_spree_properties.rb +0 -8
- data/db/migrate/20210512191732_create_spree_cms_pages.rb +0 -24
- data/db/migrate/20210514204251_create_spree_cms_sections.rb +0 -22
- data/db/migrate/20210527094055_create_spree_products_stores.rb +0 -36
- data/db/migrate/20210608045519_ensure_store_default_country_is_set.rb +0 -5
- data/db/migrate/20210702112334_add_missing_timestamp_columns.rb +0 -46
- data/db/migrate/20210713131614_add_unique_index_on_property_id_and_product_id_to_product_properties.rb +0 -29
- data/db/migrate/20210715091956_add_store_id_to_spree_store_credits.rb +0 -10
- data/db/migrate/20210716093151_add_store_id_to_spree_taxonomies.rb +0 -11
- data/db/migrate/20210716104141_add_index_on_name_parent_id_and_taxonomy_id_on_spree_taxons.rb +0 -31
- data/db/migrate/20210721120857_add_index_on_permalink_parent_id_and_taxonomy_id_on_spree_taxons.rb +0 -31
- data/db/migrate/20210721125657_create_spree_promotions_stores.rb +0 -29
- data/db/migrate/20210722090705_add_store_id_to_spree_customer_returns.rb +0 -11
- data/db/migrate/20210726065456_change_integer_id_columns_into_bigint.rb +0 -305
- data/db/migrate/20210730154425_fix_promotion_code_and_path_unique_indexes.rb +0 -9
- data/lib/friendly_id/slug_rails5_patch.rb +0 -11
- /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
data/lib/spree/core/version.rb
CHANGED
data/lib/spree/core.rb
CHANGED
@@ -14,17 +14,18 @@ require 'friendly_id'
|
|
14
14
|
require 'kaminari'
|
15
15
|
require 'monetize'
|
16
16
|
require 'paranoia'
|
17
|
-
require 'mini_magick'
|
18
17
|
require 'ransack'
|
19
18
|
require 'state_machines-activerecord'
|
20
19
|
require 'active_storage_validations'
|
20
|
+
require 'activerecord-typedstore'
|
21
21
|
|
22
22
|
# This is required because ActiveModel::Validations#invalid? conflicts with the
|
23
23
|
# invalid state of a Payment. In the future this should be removed.
|
24
24
|
StateMachines::Machine.ignore_method_conflicts = true
|
25
25
|
|
26
26
|
module Spree
|
27
|
-
mattr_accessor :user_class
|
27
|
+
mattr_accessor :user_class, :admin_user_class, :private_storage_service_name,
|
28
|
+
:public_storage_service_name, :cdn_host, :searcher_class
|
28
29
|
|
29
30
|
def self.user_class(constantize: true)
|
30
31
|
if @@user_class.is_a?(Class)
|
@@ -34,19 +35,44 @@ module Spree
|
|
34
35
|
end
|
35
36
|
end
|
36
37
|
|
37
|
-
def self.
|
38
|
-
|
38
|
+
def self.admin_user_class(constantize: true)
|
39
|
+
@@admin_user_class ||= @@user_class
|
40
|
+
|
41
|
+
if @@admin_user_class.is_a?(Class)
|
42
|
+
raise 'Spree.admin_user_class MUST be a String or Symbol object, not a Class object.'
|
43
|
+
elsif @@admin_user_class.is_a?(String) || @@admin_user_class.is_a?(Symbol)
|
44
|
+
constantize ? @@admin_user_class.to_s.constantize : @@admin_user_class.to_s
|
45
|
+
end
|
39
46
|
end
|
40
47
|
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
48
|
+
def self.private_storage_service_name
|
49
|
+
if @@private_storage_service_name
|
50
|
+
if @@private_storage_service_name.is_a?(String) || @@private_storage_service_name.is_a?(Symbol)
|
51
|
+
@@private_storage_service_name.to_sym
|
52
|
+
else
|
53
|
+
raise 'Spree.private_storage_service_name MUST be a String or Symbol object.'
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
47
57
|
|
48
|
-
def self.
|
49
|
-
|
58
|
+
def self.public_storage_service_name
|
59
|
+
if @@public_storage_service_name
|
60
|
+
if @@public_storage_service_name.is_a?(String) || @@public_storage_service_name.is_a?(Symbol)
|
61
|
+
@@public_storage_service_name.to_sym
|
62
|
+
else
|
63
|
+
raise 'Spree.public_storage_service_name MUST be a String or Symbol object.'
|
64
|
+
end
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
68
|
+
def self.searcher_class(constantize: true)
|
69
|
+
@@searcher_class ||= 'Spree::Core::Search::Base'
|
70
|
+
|
71
|
+
if @@searcher_class.is_a?(Class)
|
72
|
+
raise 'Spree.searcher_class MUST be a String or Symbol object, not a Class object.'
|
73
|
+
elsif @@searcher_class.is_a?(String) || @@searcher_class.is_a?(Symbol)
|
74
|
+
constantize ? @@searcher_class.to_s.constantize : @@searcher_class.to_s
|
75
|
+
end
|
50
76
|
end
|
51
77
|
|
52
78
|
# Used to configure Spree.
|
@@ -97,7 +123,6 @@ require 'spree/localized_number'
|
|
97
123
|
require 'spree/money'
|
98
124
|
require 'spree/permitted_attributes'
|
99
125
|
require 'spree/service_module'
|
100
|
-
require 'spree/dependencies_helper'
|
101
126
|
require 'spree/database_type_utilities'
|
102
127
|
|
103
128
|
require 'spree/core/importer'
|
@@ -111,3 +136,6 @@ require 'spree/core/controller_helpers/store'
|
|
111
136
|
require 'spree/core/controller_helpers/strong_parameters'
|
112
137
|
require 'spree/core/controller_helpers/locale'
|
113
138
|
require 'spree/core/controller_helpers/currency'
|
139
|
+
|
140
|
+
require 'spree/core/preferences/store'
|
141
|
+
require 'spree/core/preferences/scoped_store'
|
data/lib/spree/money.rb
CHANGED
@@ -21,7 +21,7 @@ module Spree
|
|
21
21
|
|
22
22
|
def initialize(amount, options = {})
|
23
23
|
use_default_currency
|
24
|
-
@money = Monetize.parse([amount, (options[:currency] || Spree::
|
24
|
+
@money = Monetize.parse([amount, (options[:currency] || Spree::Store.default.default_currency)].join)
|
25
25
|
@options = Spree::Money.default_formatting_rules.merge(options)
|
26
26
|
end
|
27
27
|
|
@@ -66,7 +66,7 @@ module Spree
|
|
66
66
|
end
|
67
67
|
|
68
68
|
def use_default_currency
|
69
|
-
currency = Spree::Store.default.default_currency
|
69
|
+
currency = Spree::Store.default.default_currency
|
70
70
|
::Money.default_currency = currency
|
71
71
|
end
|
72
72
|
|
@@ -2,9 +2,13 @@ module Spree
|
|
2
2
|
module PermittedAttributes
|
3
3
|
ATTRIBUTES = [
|
4
4
|
:address_attributes,
|
5
|
-
:classification_attributes,
|
6
5
|
:checkout_attributes,
|
6
|
+
:classification_attributes,
|
7
|
+
:cms_page_attributes,
|
8
|
+
:cms_section_attributes,
|
7
9
|
:customer_return_attributes,
|
10
|
+
:digital_attributes,
|
11
|
+
:digital_link_attributes,
|
8
12
|
:image_attributes,
|
9
13
|
:inventory_unit_attributes,
|
10
14
|
:line_item_attributes,
|
@@ -28,19 +32,19 @@ module Spree
|
|
28
32
|
:taxonomy_attributes,
|
29
33
|
:user_attributes,
|
30
34
|
:variant_attributes,
|
31
|
-
:
|
32
|
-
:
|
35
|
+
:wishlist_attributes,
|
36
|
+
:wished_item_attributes
|
33
37
|
]
|
34
38
|
|
35
|
-
mattr_reader
|
39
|
+
mattr_reader(*ATTRIBUTES)
|
36
40
|
|
37
41
|
@@address_attributes = [
|
38
42
|
:id, :firstname, :lastname, :first_name, :last_name,
|
39
43
|
:address1, :address2, :city, :country_iso, :country_id, :state_id,
|
40
44
|
:zipcode, :phone, :state_name, :alternative_phone, :company,
|
41
45
|
:user_id, :deleted_at, :label,
|
42
|
-
country: [:iso, :name, :iso3, :iso_name],
|
43
|
-
|
46
|
+
{ country: [:iso, :name, :iso3, :iso_name],
|
47
|
+
state: [:name, :abbr] }
|
44
48
|
]
|
45
49
|
|
46
50
|
@@checkout_attributes = [
|
@@ -54,9 +58,16 @@ module Spree
|
|
54
58
|
|
55
59
|
@@cms_page_attributes = [:title, :meta_title, :content, :meta_description, :visible, :slug, :locale]
|
56
60
|
|
57
|
-
@@cms_section_attributes = [:name, :
|
61
|
+
@@cms_section_attributes = [:name, :cms_page_id, :fit, :destination, { content: {}, settings: {} }]
|
58
62
|
|
59
|
-
@@customer_return_attributes = [:stock_location_id,
|
63
|
+
@@customer_return_attributes = [:stock_location_id, {
|
64
|
+
return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
|
65
|
+
:acceptance_status, :exchange_variant_id, :resellable]
|
66
|
+
}]
|
67
|
+
|
68
|
+
@@digital_attributes = [:attachment, :variant_id]
|
69
|
+
|
70
|
+
@@digital_link_attributes = [:access_counter]
|
60
71
|
|
61
72
|
@@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
|
62
73
|
|
@@ -78,17 +89,18 @@ module Spree
|
|
78
89
|
@@product_properties_attributes = [:property_name, :value, :position]
|
79
90
|
|
80
91
|
@@product_attributes = [
|
81
|
-
:name, :description, :available_on, :discontinue_on, :permalink, :meta_description,
|
92
|
+
:name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
|
82
93
|
:meta_keywords, :price, :sku, :deleted_at, :prototype_id,
|
83
94
|
:option_values_hash, :weight, :height, :width, :depth,
|
84
95
|
:shipping_category_id, :tax_category_id,
|
85
96
|
:cost_currency, :cost_price, :compare_at_price,
|
86
|
-
option_type_ids: [], taxon_ids: []
|
97
|
+
{ option_type_ids: [], taxon_ids: [] }
|
87
98
|
]
|
88
99
|
|
89
100
|
@@property_attributes = [:name, :presentation]
|
90
101
|
|
91
|
-
@@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
|
102
|
+
@@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
|
103
|
+
:return_authorization_reason_id]
|
92
104
|
|
93
105
|
@@shipment_attributes = [
|
94
106
|
:order, :special_instructions, :stock_location_id, :id,
|
@@ -114,12 +126,15 @@ module Spree
|
|
114
126
|
:quantity, :stock_item, :stock_item_id, :originator, :action
|
115
127
|
]
|
116
128
|
|
117
|
-
@@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
|
129
|
+
@@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
|
118
130
|
:meta_description, :default_currency, :mail_from_address,
|
119
131
|
:customer_support_email, :facebook, :twitter, :instagram,
|
120
132
|
:description, :address, :contact_phone, :supported_locales,
|
121
133
|
:default_locale, :default_country_id, :supported_currencies,
|
122
|
-
:new_order_notifications_email, :
|
134
|
+
:new_order_notifications_email, :checkout_zone_id, :seo_robots,
|
135
|
+
:digital_asset_authorized_clicks, :digital_asset_authorized_days,
|
136
|
+
:limit_digital_download_count, :limit_digital_download_days, :digital_asset_link_expire_time,
|
137
|
+
{ mailer_logo_attributes: {}, favicon_image_attributes: {}, logo_attributes: {} }]
|
123
138
|
|
124
139
|
@@store_credit_attributes = %i[amount currency category_id memo]
|
125
140
|
|
@@ -131,14 +146,19 @@ module Spree
|
|
131
146
|
]
|
132
147
|
|
133
148
|
# TODO: Should probably use something like Spree.user_class.attributes
|
134
|
-
@@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :
|
149
|
+
@@user_attributes = [:email, :bill_address_id, :ship_address_id, :password, :first_name, :last_name,
|
150
|
+
:password_confirmation, { public_metadata: {}, private_metadata: {} }]
|
135
151
|
|
136
152
|
@@variant_attributes = [
|
137
153
|
:name, :presentation, :cost_price, :discontinue_on, :lock_version,
|
138
154
|
:position, :track_inventory,
|
139
155
|
:product_id, :product, :option_values_attributes, :price, :compare_at_price,
|
140
|
-
:weight, :height, :width, :depth, :sku, :cost_currency,
|
141
|
-
options: [:name, :value], option_value_ids: []
|
156
|
+
:weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
|
157
|
+
{ options: [:name, :value], option_value_ids: [] }
|
142
158
|
]
|
159
|
+
|
160
|
+
@@wishlist_attributes = [:name, :is_default, :is_private]
|
161
|
+
|
162
|
+
@@wished_item_attributes = [:variant_id, :quantity]
|
143
163
|
end
|
144
164
|
end
|
@@ -37,11 +37,13 @@ module Spree
|
|
37
37
|
ability_class.register_ability(ability)
|
38
38
|
end
|
39
39
|
|
40
|
-
let(:
|
40
|
+
let(:admin_app) { Spree::OauthApplication.create!(name: 'Admin Panel', scopes: 'admin') }
|
41
|
+
let(:admin_token) { Spree::OauthAccessToken.create!(application: admin_app, scopes: 'admin').token }
|
41
42
|
|
42
43
|
before do
|
43
44
|
allow(Spree.user_class).to receive(:find_by).and_return(Spree.user_class.new)
|
44
45
|
if defined?(Spree::Admin)
|
46
|
+
allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_application).and_return(admin_app)
|
45
47
|
allow_any_instance_of(Spree::Admin::BaseController).to receive(:admin_oauth_token).and_return(admin_token)
|
46
48
|
end
|
47
49
|
end
|
@@ -1,28 +1,23 @@
|
|
1
1
|
require 'capybara-screenshot/rspec'
|
2
2
|
|
3
|
-
Capybara.
|
3
|
+
Capybara.configure do |config|
|
4
|
+
config.save_path = ENV['CIRCLE_ARTIFACTS'] if ENV['CIRCLE_ARTIFACTS']
|
5
|
+
config.server = :puma
|
6
|
+
config.default_driver = :rack_test
|
7
|
+
config.javascript_driver = :selenium_chrome_headless
|
8
|
+
config.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
|
9
|
+
config.always_include_port = true
|
10
|
+
config.match = :smart
|
11
|
+
config.ignore_hidden_elements = true
|
12
|
+
end
|
4
13
|
|
5
14
|
if ENV['WEBDRIVER'] == 'accessible'
|
6
15
|
require 'capybara/accessible'
|
7
16
|
Capybara.javascript_driver = :accessible
|
8
|
-
|
9
|
-
Capybara.register_driver :chrome do |app|
|
10
|
-
Selenium::WebDriver.logger.level = :error
|
11
|
-
|
12
|
-
Capybara::Selenium::Driver.new app,
|
13
|
-
browser: :chrome,
|
14
|
-
options: Selenium::WebDriver::Chrome::Options.new(
|
15
|
-
args: %w[no-sandbox disable-dev-shm-usage disable-popup-blocking headless disable-gpu window-size=1920,1080 --enable-features=NetworkService,NetworkServiceInProcess --disable-features=VizDisplayCompositor],
|
16
|
-
log_level: :error
|
17
|
-
)
|
18
|
-
end
|
19
|
-
Capybara.javascript_driver = :chrome
|
17
|
+
end
|
20
18
|
|
21
|
-
|
22
|
-
|
19
|
+
RSpec.configure do |config|
|
20
|
+
config.before(:each, js: true) do
|
21
|
+
Capybara.page.driver.browser.manage.window.resize_to(1400, 900)
|
23
22
|
end
|
24
23
|
end
|
25
|
-
Capybara.default_max_wait_time = ENV.fetch('CAPYBARA_MAX_WAIT_TIME', 45).to_i
|
26
|
-
Capybara.server = :puma
|
27
|
-
|
28
|
-
Capybara.always_include_port = true
|
@@ -59,15 +59,10 @@ def wait_for(options = {})
|
|
59
59
|
default_options = { error: nil, seconds: 5 }.merge(options)
|
60
60
|
|
61
61
|
Selenium::WebDriver::Wait.new(timeout: default_options[:seconds]).until { yield }
|
62
|
-
rescue Selenium::WebDriver::Error::
|
62
|
+
rescue Selenium::WebDriver::Error::TimeoutError
|
63
63
|
default_options[:error].nil? ? false : raise(default_options[:error])
|
64
64
|
end
|
65
65
|
|
66
|
-
Capybara.configure do |config|
|
67
|
-
config.match = :smart
|
68
|
-
config.ignore_hidden_elements = true
|
69
|
-
end
|
70
|
-
|
71
66
|
RSpec::Matchers.define :have_meta do |name, expected|
|
72
67
|
match do |_actual|
|
73
68
|
has_css?("meta[name='#{name}'][content='#{expected}']", visible: false)
|
@@ -14,6 +14,13 @@ namespace :common do
|
|
14
14
|
ENV['RAILS_ENV'] = 'test'
|
15
15
|
Rails.env = 'test'
|
16
16
|
|
17
|
+
if ENV['LIB_NAME'] == 'spree/backend'
|
18
|
+
puts 'Preparing NPM package...'
|
19
|
+
system('yarn install')
|
20
|
+
system('yarn build')
|
21
|
+
system('yarn link')
|
22
|
+
end
|
23
|
+
|
17
24
|
Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']
|
18
25
|
Spree::InstallGenerator.start [
|
19
26
|
"--lib_name=#{ENV['LIB_NAME']}",
|
@@ -29,9 +36,16 @@ namespace :common do
|
|
29
36
|
]
|
30
37
|
|
31
38
|
puts 'Setting up dummy database...'
|
32
|
-
system(
|
39
|
+
system('bin/rails db:environment:set RAILS_ENV=test')
|
40
|
+
system('bundle exec rake db:drop db:create')
|
33
41
|
Spree::DummyModelGenerator.start
|
34
|
-
system(
|
42
|
+
system('bundle exec rake db:migrate')
|
43
|
+
|
44
|
+
unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])
|
45
|
+
puts 'Setting up node environment'
|
46
|
+
system('bin/rails javascript:install:esbuild')
|
47
|
+
system('bin/rails turbo:install')
|
48
|
+
end
|
35
49
|
|
36
50
|
begin
|
37
51
|
require "generators/#{ENV['LIB_NAME']}/install/install_generator"
|
@@ -42,13 +56,18 @@ namespace :common do
|
|
42
56
|
end
|
43
57
|
|
44
58
|
unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])
|
59
|
+
if ENV['LIB_NAME'] == 'spree/backend'
|
60
|
+
puts 'Installing node dependencies...'
|
61
|
+
system('yarn link @spree/dashboard')
|
62
|
+
system('yarn install')
|
63
|
+
end
|
45
64
|
puts 'Precompiling assets...'
|
46
|
-
system(
|
65
|
+
system('bundle exec rake assets:precompile')
|
47
66
|
end
|
48
67
|
end
|
49
68
|
|
50
69
|
task :seed do |_t|
|
51
70
|
puts 'Seeding ...'
|
52
|
-
system(
|
71
|
+
system('bundle exec rake db:seed RAILS_ENV=test')
|
53
72
|
end
|
54
73
|
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
FactoryBot.define do
|
2
|
+
factory :asset, class: Spree::Asset do
|
3
|
+
viewable_type {}
|
4
|
+
viewable_id {}
|
5
|
+
attachment_width { 340 }
|
6
|
+
attachment_height { 280 }
|
7
|
+
attachment_file_size { 128 }
|
8
|
+
position { 1 }
|
9
|
+
attachment_content_type { '.jpg' }
|
10
|
+
attachment_file_name { 'attachment.jpg' }
|
11
|
+
type {}
|
12
|
+
attachment_updated_at {}
|
13
|
+
alt {}
|
14
|
+
end
|
15
|
+
end
|
@@ -1,8 +1,8 @@
|
|
1
1
|
FactoryBot.define do
|
2
|
-
factory :
|
2
|
+
factory :base_cms_section, class: Spree::CmsSection do
|
3
3
|
name { generate(:random_string) }
|
4
4
|
|
5
|
-
association :cms_page, factory: :
|
5
|
+
association :cms_page, factory: :cms_feature_page
|
6
6
|
|
7
7
|
factory :cms_hero_image_section do
|
8
8
|
type { 'Spree::Cms::Sections::HeroImage' }
|
@@ -0,0 +1,10 @@
|
|
1
|
+
FactoryBot.define do
|
2
|
+
factory :digital, class: Spree::Digital do
|
3
|
+
after(:build) do |digital|
|
4
|
+
digital.attachment.attach(io: File.new("#{Spree::Core::Engine.root}/spec/fixtures/thinking-cat.jpg"),
|
5
|
+
filename: 'thinking-cat.jpg')
|
6
|
+
end
|
7
|
+
|
8
|
+
variant
|
9
|
+
end
|
10
|
+
end
|
@@ -1,7 +1,9 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :icon, class: Spree::Icon do
|
3
3
|
before(:create) do |icon|
|
4
|
-
icon.
|
4
|
+
if icon.respond_to? :attachment
|
5
|
+
icon.attachment.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'), filename: 'thinking-cat.jpg')
|
6
|
+
end
|
5
7
|
end
|
6
8
|
end
|
7
9
|
end
|
@@ -1,7 +1,9 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :image, class: Spree::Image do
|
3
3
|
before(:create) do |image|
|
4
|
-
image.
|
4
|
+
if image.class.method_defined?(:attachment)
|
5
|
+
image.attachment.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures' + 'thinking-cat.jpg'), filename: 'thinking-cat.jpg')
|
6
|
+
end
|
5
7
|
end
|
6
8
|
end
|
7
9
|
end
|
@@ -55,7 +55,8 @@ FactoryBot.define do
|
|
55
55
|
order.line_items.reload
|
56
56
|
end
|
57
57
|
|
58
|
-
|
58
|
+
stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
|
59
|
+
create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
|
59
60
|
order.shipments.reload
|
60
61
|
|
61
62
|
order.update_with_updater!
|
@@ -77,7 +78,10 @@ FactoryBot.define do
|
|
77
78
|
|
78
79
|
factory :completed_order_with_store_credit_payment do
|
79
80
|
after(:create) do |order|
|
80
|
-
create(:
|
81
|
+
store_credit = create(:store_credit, amount: order.total, store: order.store, user: order.user)
|
82
|
+
payment_method = create(:store_credit_payment_method, stores: [order.store])
|
83
|
+
|
84
|
+
create(:store_credit_payment, amount: order.total, order: order, source: store_credit, payment_method: payment_method)
|
81
85
|
end
|
82
86
|
end
|
83
87
|
|
@@ -5,7 +5,7 @@ FactoryBot.define do
|
|
5
5
|
state { 'checkout' }
|
6
6
|
response_code { '12345' }
|
7
7
|
|
8
|
-
|
8
|
+
payment_method { create(:credit_card_payment_method, stores: [order.store]) }
|
9
9
|
association(:source, factory: :credit_card)
|
10
10
|
|
11
11
|
factory :payment_with_refund do
|
@@ -24,7 +24,7 @@ FactoryBot.define do
|
|
24
24
|
end
|
25
25
|
|
26
26
|
factory :store_credit_payment, class: Spree::Payment, parent: :payment do
|
27
|
-
|
28
|
-
|
27
|
+
payment_method { create(:store_credit_payment_method, stores: [order.store]) }
|
28
|
+
source { create(:store_credit, store: order.store, user: order.user) }
|
29
29
|
end
|
30
30
|
end
|
@@ -1,13 +1,15 @@
|
|
1
1
|
FactoryBot.define do
|
2
2
|
factory :base_product, class: Spree::Product do
|
3
|
-
sequence(:name) { |n| "Product
|
3
|
+
sequence(:name) { |n| "Product #{n}#{Kernel.rand(9999)}" }
|
4
4
|
description { generate(:random_description) }
|
5
5
|
price { 19.99 }
|
6
6
|
cost_price { 17.00 }
|
7
7
|
sku { generate(:sku) }
|
8
8
|
available_on { 1.year.ago }
|
9
|
+
make_active_at { 1.year.ago }
|
9
10
|
deleted_at { nil }
|
10
11
|
shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
|
12
|
+
status { 'active' }
|
11
13
|
|
12
14
|
# ensure stock item will be created for this products master
|
13
15
|
# also attach this product to the default store if no stores are passed in
|
@@ -21,6 +23,9 @@ FactoryBot.define do
|
|
21
23
|
product.stores << [store]
|
22
24
|
end
|
23
25
|
end
|
26
|
+
after(:create) do |product|
|
27
|
+
Spree::StockLocation.all.each { |stock_location| stock_location.propagate_variant(product.master) unless stock_location.stock_items.exists?(variant: product.master) }
|
28
|
+
end
|
24
29
|
|
25
30
|
factory :custom_product do
|
26
31
|
name { 'Custom Product' }
|
@@ -4,6 +4,13 @@ FactoryBot.define do
|
|
4
4
|
stock_location
|
5
5
|
variant
|
6
6
|
|
7
|
+
before(:create) do |stock_item|
|
8
|
+
Spree::StockItem.find_by(
|
9
|
+
variant: stock_item.variant,
|
10
|
+
stock_location: stock_item.stock_location
|
11
|
+
)&.destroy
|
12
|
+
end
|
13
|
+
|
7
14
|
after(:create) { |object| object.adjust_count_on_hand(10) }
|
8
15
|
end
|
9
16
|
end
|