solidus_core 4.6.3 → 4.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (332) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +13 -13
  3. data/app/controllers/spree/base_controller.rb +2 -2
  4. data/app/helpers/spree/base_helper.rb +24 -24
  5. data/app/helpers/spree/checkout_helper.rb +7 -7
  6. data/app/helpers/spree/core/controller_helpers/auth.rb +1 -1
  7. data/app/helpers/spree/core/controller_helpers/common.rb +3 -2
  8. data/app/helpers/spree/core/controller_helpers/order.rb +3 -5
  9. data/app/helpers/spree/core/controller_helpers/payment_parameters.rb +1 -2
  10. data/app/helpers/spree/core/controller_helpers/strong_parameters.rb +10 -10
  11. data/app/helpers/spree/products_helper.rb +5 -5
  12. data/app/helpers/spree/store_helper.rb +1 -1
  13. data/app/mailers/spree/carton_mailer.rb +3 -3
  14. data/app/mailers/spree/order_mailer.rb +4 -4
  15. data/app/mailers/spree/reimbursement_mailer.rb +2 -2
  16. data/app/models/concerns/spree/active_storage_adapter/attachment.rb +5 -5
  17. data/app/models/concerns/spree/active_storage_adapter/normalization.rb +5 -5
  18. data/app/models/concerns/spree/active_storage_adapter.rb +2 -2
  19. data/app/models/concerns/spree/adjustment_source.rb +4 -4
  20. data/app/models/concerns/spree/display_money.rb +2 -2
  21. data/app/models/concerns/spree/named_type.rb +1 -1
  22. data/app/models/concerns/spree/ordered_property_value_list.rb +2 -2
  23. data/app/models/concerns/spree/preferences/persistable.rb +1 -1
  24. data/app/models/concerns/spree/ransackable_attributes.rb +1 -0
  25. data/app/models/concerns/spree/soft_deletable.rb +2 -1
  26. data/app/models/concerns/spree/state_change_tracking.rb +1 -1
  27. data/app/models/concerns/spree/user_address_book.rb +12 -12
  28. data/app/models/concerns/spree/user_methods.rb +9 -9
  29. data/app/models/concerns/spree/user_reporting.rb +1 -0
  30. data/app/models/spree/ability.rb +1 -1
  31. data/app/models/spree/address/name.rb +1 -1
  32. data/app/models/spree/address.rb +7 -7
  33. data/app/models/spree/adjustment.rb +11 -10
  34. data/app/models/spree/adjustment_reason.rb +2 -2
  35. data/app/models/spree/billing_integration.rb +2 -2
  36. data/app/models/spree/calculator/default_tax.rb +2 -2
  37. data/app/models/spree/calculator/flat_fee.rb +1 -1
  38. data/app/models/spree/calculator/flat_rate.rb +2 -2
  39. data/app/models/spree/calculator/returns/default_refund_amount.rb +3 -3
  40. data/app/models/spree/calculator/shipping/flat_percent_item_total.rb +2 -2
  41. data/app/models/spree/calculator/shipping/flat_rate.rb +3 -3
  42. data/app/models/spree/calculator/shipping/flexi_rate.rb +8 -8
  43. data/app/models/spree/calculator/shipping/per_item.rb +3 -3
  44. data/app/models/spree/calculator/shipping/price_sack.rb +3 -3
  45. data/app/models/spree/calculator.rb +31 -6
  46. data/app/models/spree/carton.rb +4 -4
  47. data/app/models/spree/classification.rb +2 -2
  48. data/app/models/spree/core/state_machines/order/class_methods.rb +3 -3
  49. data/app/models/spree/core/state_machines/return_item/acceptance_status.rb +1 -1
  50. data/app/models/spree/country.rb +1 -1
  51. data/app/models/spree/credit_card.rb +27 -27
  52. data/app/models/spree/customer_return.rb +5 -4
  53. data/app/models/spree/distributed_amounts_handler.rb +1 -1
  54. data/app/models/spree/fulfilment_changer.rb +22 -22
  55. data/app/models/spree/image/active_storage_attachment.rb +2 -2
  56. data/app/models/spree/image/paperclip_attachment.rb +8 -8
  57. data/app/models/spree/in_memory_order_updater.rb +262 -0
  58. data/app/models/spree/inventory_unit.rb +11 -11
  59. data/app/models/spree/item_total.rb +1 -1
  60. data/app/models/spree/legacy_user.rb +2 -2
  61. data/app/models/spree/line_item.rb +21 -11
  62. data/app/models/spree/log_entry.rb +3 -3
  63. data/app/models/spree/mergeable_orders_finder.rb +44 -0
  64. data/app/models/spree/money.rb +2 -1
  65. data/app/models/spree/null_promotion_adjuster.rb +1 -1
  66. data/app/models/spree/option_type.rb +1 -1
  67. data/app/models/spree/option_value.rb +2 -2
  68. data/app/models/spree/order/number_generator.rb +1 -1
  69. data/app/models/spree/order.rb +66 -64
  70. data/app/models/spree/order_cancellations.rb +1 -3
  71. data/app/models/spree/order_inventory.rb +5 -8
  72. data/app/models/spree/order_mutex.rb +1 -1
  73. data/app/models/spree/order_shipping.rb +1 -1
  74. data/app/models/spree/order_updater.rb +59 -37
  75. data/app/models/spree/payment/cancellation.rb +2 -2
  76. data/app/models/spree/payment/processing.rb +22 -22
  77. data/app/models/spree/payment.rb +25 -25
  78. data/app/models/spree/payment_capture_event.rb +2 -2
  79. data/app/models/spree/payment_create.rb +1 -1
  80. data/app/models/spree/payment_method/bogus_credit_card.rb +18 -18
  81. data/app/models/spree/payment_method/check.rb +3 -3
  82. data/app/models/spree/payment_method/credit_card.rb +1 -1
  83. data/app/models/spree/payment_method/simple_bogus_credit_card.rb +3 -3
  84. data/app/models/spree/payment_method/store_credit.rb +13 -13
  85. data/app/models/spree/payment_method.rb +12 -11
  86. data/app/models/spree/payment_source.rb +2 -2
  87. data/app/models/spree/permission_sets/dashboard_display.rb +3 -3
  88. data/app/models/spree/permission_sets/default_customer.rb +4 -4
  89. data/app/models/spree/preference.rb +1 -1
  90. data/app/models/spree/price.rb +7 -6
  91. data/app/models/spree/product/scopes.rb +23 -23
  92. data/app/models/spree/product.rb +32 -41
  93. data/app/models/spree/product_option_type.rb +2 -2
  94. data/app/models/spree/product_property.rb +3 -3
  95. data/app/models/spree/refund.rb +10 -10
  96. data/app/models/spree/refund_reason.rb +2 -2
  97. data/app/models/spree/reimbursement/credit.rb +1 -1
  98. data/app/models/spree/reimbursement.rb +8 -8
  99. data/app/models/spree/reimbursement_tax_calculator.rb +1 -1
  100. data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +1 -1
  101. data/app/models/spree/reimbursement_type.rb +2 -2
  102. data/app/models/spree/return_authorization.rb +7 -6
  103. data/app/models/spree/return_item/eligibility_validator/base_validator.rb +2 -2
  104. data/app/models/spree/return_item/eligibility_validator/default.rb +1 -1
  105. data/app/models/spree/return_item/eligibility_validator/inventory_shipped.rb +1 -1
  106. data/app/models/spree/return_item/eligibility_validator/no_reimbursements.rb +1 -1
  107. data/app/models/spree/return_item/eligibility_validator/order_completed.rb +1 -1
  108. data/app/models/spree/return_item/eligibility_validator/rma_required.rb +1 -1
  109. data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +1 -1
  110. data/app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb +6 -6
  111. data/app/models/spree/return_item.rb +27 -26
  112. data/app/models/spree/return_reason.rb +1 -1
  113. data/app/models/spree/role.rb +1 -1
  114. data/app/models/spree/role_user.rb +1 -1
  115. data/app/models/spree/shipment.rb +37 -29
  116. data/app/models/spree/shipping_method.rb +9 -9
  117. data/app/models/spree/shipping_method_category.rb +2 -2
  118. data/app/models/spree/shipping_rate.rb +12 -10
  119. data/app/models/spree/shipping_rate_tax.rb +5 -4
  120. data/app/models/spree/simple_order_contents.rb +2 -2
  121. data/app/models/spree/state.rb +1 -1
  122. data/app/models/spree/stock/availability.rb +9 -9
  123. data/app/models/spree/stock/availability_validator.rb +3 -3
  124. data/app/models/spree/stock/differentiator.rb +2 -2
  125. data/app/models/spree/stock/estimator.rb +4 -4
  126. data/app/models/spree/stock/inventory_validator.rb +1 -1
  127. data/app/models/spree/stock/package.rb +3 -3
  128. data/app/models/spree/stock_item.rb +5 -5
  129. data/app/models/spree/stock_location.rb +6 -6
  130. data/app/models/spree/stock_movement.rb +2 -2
  131. data/app/models/spree/stock_quantities.rb +2 -2
  132. data/app/models/spree/store.rb +3 -3
  133. data/app/models/spree/store_credit.rb +30 -29
  134. data/app/models/spree/store_credit_category.rb +2 -2
  135. data/app/models/spree/store_credit_event.rb +6 -6
  136. data/app/models/spree/store_credit_reason.rb +1 -1
  137. data/app/models/spree/store_credit_type.rb +3 -3
  138. data/app/models/spree/store_selector/by_server_name.rb +1 -1
  139. data/app/models/spree/store_selector/legacy.rb +1 -1
  140. data/app/models/spree/tax/item_tax.rb +1 -0
  141. data/app/models/spree/tax/order_tax.rb +1 -0
  142. data/app/models/spree/tax_category.rb +3 -3
  143. data/app/models/spree/tax_rate.rb +5 -5
  144. data/app/models/spree/tax_rate_tax_category.rb +2 -2
  145. data/app/models/spree/taxon/active_storage_attachment.rb +2 -2
  146. data/app/models/spree/taxon/paperclip_attachment.rb +4 -4
  147. data/app/models/spree/taxon.rb +16 -17
  148. data/app/models/spree/taxon_brand_selector.rb +3 -3
  149. data/app/models/spree/unauthorized_redirect_handler.rb +1 -1
  150. data/app/models/spree/unit_cancel.rb +4 -4
  151. data/app/models/spree/user_address.rb +3 -3
  152. data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb +6 -8
  153. data/app/models/spree/user_last_url_storer.rb +1 -1
  154. data/app/models/spree/variant/price_selector.rb +1 -1
  155. data/app/models/spree/variant/scopes.rb +9 -9
  156. data/app/models/spree/variant.rb +25 -25
  157. data/app/models/spree/variant_property_rule.rb +2 -2
  158. data/app/models/spree/variant_property_rule_condition.rb +1 -1
  159. data/app/models/spree/wallet/add_payment_sources_to_wallet.rb +4 -4
  160. data/app/models/spree/wallet/default_payment_builder.rb +1 -1
  161. data/app/models/spree/wallet_payment_source.rb +2 -2
  162. data/app/models/spree/zone.rb +18 -18
  163. data/app/models/spree/zone_member.rb +1 -1
  164. data/app/subscribers/spree/carton_shipped_mailer_subscriber.rb +2 -2
  165. data/app/subscribers/spree/order_cancel_mailer_subscriber.rb +2 -2
  166. data/app/subscribers/spree/order_confirmation_mailer_subscriber.rb +2 -2
  167. data/app/subscribers/spree/order_inventory_cancellation_mailer_subscriber.rb +2 -2
  168. data/app/subscribers/spree/reimbursement_mailer_subscriber.rb +2 -2
  169. data/app/views/layouts/spree/base_mailer.html.erb +0 -1
  170. data/config/initializers/assets.rb +1 -1
  171. data/config/initializers/db_query_matchers.rb +9 -0
  172. data/config/initializers/friendly_id.rb +2 -2
  173. data/config/initializers/inflections.rb +1 -1
  174. data/config/initializers/money.rb +1 -1
  175. data/config/locales/en.yml +1 -0
  176. data/db/default/spree/countries.rb +7 -7
  177. data/db/default/spree/return_reasons.rb +11 -11
  178. data/db/default/spree/stock_locations.rb +1 -1
  179. data/db/default/spree/store_credit.rb +3 -4
  180. data/db/default/spree/stores.rb +1 -1
  181. data/db/default/spree/zones.rb +5 -5
  182. data/db/migrate/20160101010000_solidus_one_four.rb +16 -16
  183. data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb +3 -3
  184. data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb +7 -6
  185. data/db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb +10 -10
  186. data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb +6 -6
  187. data/db/migrate/20161129035810_add_index_to_spree_payments_number.rb +1 -1
  188. data/db/migrate/20170319191942_remove_order_id_from_inventory_units.rb +4 -4
  189. data/db/migrate/20180322142651_add_amount_remaining_to_store_credit_events.rb +9 -16
  190. data/db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb +1 -0
  191. data/db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb +3 -3
  192. data/db/migrate/20250207104016_add_primary_taxon_to_products.rb +1 -1
  193. data/db/migrate/20250214094207_add_reverse_charge_status_to_store.rb +1 -1
  194. data/db/migrate/20250225051308_add_vat_id_email_and_reverse_charge_status_to_addresses.rb +1 -1
  195. data/db/seeds.rb +3 -3
  196. data/lib/generators/solidus/install/app_templates/authentication/custom.rb +2 -2
  197. data/lib/generators/solidus/install/app_templates/authentication/devise.rb +3 -3
  198. data/lib/generators/solidus/install/app_templates/authentication/existing.rb +1 -1
  199. data/lib/generators/solidus/install/app_templates/frontend/starter.rb +1 -1
  200. data/lib/generators/solidus/install/app_templates/payment_method/braintree.rb +1 -1
  201. data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb +1 -1
  202. data/lib/generators/solidus/install/app_templates/payment_method/stripe.rb +2 -2
  203. data/lib/generators/solidus/install/install_generator.rb +51 -51
  204. data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt +3 -0
  205. data/lib/generators/solidus/update/update_generator.rb +29 -29
  206. data/lib/generators/spree/custom_user/custom_user_generator.rb +6 -6
  207. data/lib/generators/spree/dummy/dummy_generator.rb +22 -24
  208. data/lib/generators/spree/dummy/templates/rails/boot.rb +3 -3
  209. data/lib/generators/spree/dummy/templates/rails/test.rb +4 -4
  210. data/lib/solidus_core.rb +1 -1
  211. data/lib/spree/app_configuration.rb +59 -47
  212. data/lib/spree/bus.rb +1 -1
  213. data/lib/spree/config.rb +1 -1
  214. data/lib/spree/core/active_merchant_dependencies.rb +8 -8
  215. data/lib/spree/core/class_constantizer.rb +1 -1
  216. data/lib/spree/core/engine.rb +15 -15
  217. data/lib/spree/core/environment.rb +1 -1
  218. data/lib/spree/core/environment_extension.rb +2 -2
  219. data/lib/spree/core/importer/order.rb +15 -15
  220. data/lib/spree/core/importer/product.rb +4 -4
  221. data/lib/spree/core/importer.rb +2 -2
  222. data/lib/spree/core/null_promotion_configuration.rb +7 -7
  223. data/lib/spree/core/permalinks.rb +1 -1
  224. data/lib/spree/core/product_filters.rb +94 -93
  225. data/lib/spree/core/role_configuration.rb +3 -3
  226. data/lib/spree/core/search/base.rb +5 -6
  227. data/lib/spree/core/search/variant.rb +3 -3
  228. data/lib/spree/core/stock_configuration.rb +10 -49
  229. data/lib/spree/core/validators/email.rb +1 -1
  230. data/lib/spree/core/version.rb +3 -3
  231. data/lib/spree/core/versioned_value.rb +4 -6
  232. data/lib/spree/core.rb +49 -49
  233. data/lib/spree/deprecated_instance_variable_proxy.rb +1 -1
  234. data/lib/spree/deprecation.rb +1 -1
  235. data/lib/spree/deprecator.rb +2 -2
  236. data/lib/spree/i18n.rb +2 -2
  237. data/lib/spree/localized_number.rb +3 -3
  238. data/lib/spree/manipulative_query_monitor.rb +19 -0
  239. data/lib/spree/migrations.rb +2 -2
  240. data/lib/spree/permitted_attributes.rb +11 -12
  241. data/lib/spree/preferences/configuration.rb +5 -5
  242. data/lib/spree/preferences/preferable.rb +8 -10
  243. data/lib/spree/preferences/preferable_class_methods.rb +16 -16
  244. data/lib/spree/preferences/preference_differentiator.rb +1 -1
  245. data/lib/spree/preferences/scoped_store.rb +2 -2
  246. data/lib/spree/preferences/static_model_preferences.rb +2 -2
  247. data/lib/spree/preferences/store.rb +6 -6
  248. data/lib/spree/testing_support/ability_helpers.rb +30 -30
  249. data/lib/spree/testing_support/authorization_helpers.rb +6 -5
  250. data/lib/spree/testing_support/blacklist_urls.rb +1 -1
  251. data/lib/spree/testing_support/bus_helpers.rb +1 -1
  252. data/lib/spree/testing_support/capybara_driver.rb +1 -1
  253. data/lib/spree/testing_support/capybara_ext.rb +12 -12
  254. data/lib/spree/testing_support/common_rake.rb +17 -16
  255. data/lib/spree/testing_support/dummy_ability.rb +1 -1
  256. data/lib/spree/testing_support/dummy_app/migrations.rb +1 -1
  257. data/lib/spree/testing_support/dummy_app/rake_tasks.rb +5 -5
  258. data/lib/spree/testing_support/dummy_app/routes.rb +1 -1
  259. data/lib/spree/testing_support/dummy_app.rb +34 -34
  260. data/lib/spree/testing_support/extension_rake.rb +2 -2
  261. data/lib/spree/testing_support/factories/address_factory.rb +12 -12
  262. data/lib/spree/testing_support/factories/adjustment_factory.rb +7 -7
  263. data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +1 -1
  264. data/lib/spree/testing_support/factories/calculator_factory.rb +6 -6
  265. data/lib/spree/testing_support/factories/carton_factory.rb +1 -1
  266. data/lib/spree/testing_support/factories/country_factory.rb +3 -3
  267. data/lib/spree/testing_support/factories/credit_card_factory.rb +3 -3
  268. data/lib/spree/testing_support/factories/customer_return_factory.rb +2 -2
  269. data/lib/spree/testing_support/factories/image_factory.rb +2 -2
  270. data/lib/spree/testing_support/factories/inventory_unit_factory.rb +4 -4
  271. data/lib/spree/testing_support/factories/line_item_factory.rb +2 -2
  272. data/lib/spree/testing_support/factories/option_type_factory.rb +2 -2
  273. data/lib/spree/testing_support/factories/option_value_factory.rb +2 -2
  274. data/lib/spree/testing_support/factories/order_factory.rb +16 -16
  275. data/lib/spree/testing_support/factories/payment_factory.rb +9 -9
  276. data/lib/spree/testing_support/factories/payment_method_factory.rb +10 -10
  277. data/lib/spree/testing_support/factories/price_factory.rb +2 -2
  278. data/lib/spree/testing_support/factories/product_factory.rb +2 -2
  279. data/lib/spree/testing_support/factories/product_option_type_factory.rb +1 -1
  280. data/lib/spree/testing_support/factories/product_property_factory.rb +1 -1
  281. data/lib/spree/testing_support/factories/property_factory.rb +3 -3
  282. data/lib/spree/testing_support/factories/refund_factory.rb +2 -2
  283. data/lib/spree/testing_support/factories/refund_reason_factory.rb +1 -1
  284. data/lib/spree/testing_support/factories/reimbursement_factory.rb +1 -1
  285. data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +1 -1
  286. data/lib/spree/testing_support/factories/return_authorization_factory.rb +3 -3
  287. data/lib/spree/testing_support/factories/return_item_factory.rb +1 -1
  288. data/lib/spree/testing_support/factories/return_reason_factory.rb +1 -1
  289. data/lib/spree/testing_support/factories/role_factory.rb +2 -2
  290. data/lib/spree/testing_support/factories/shipment_factory.rb +3 -3
  291. data/lib/spree/testing_support/factories/shipping_category_factory.rb +1 -1
  292. data/lib/spree/testing_support/factories/shipping_method_factory.rb +7 -7
  293. data/lib/spree/testing_support/factories/shipping_rate_factory.rb +1 -1
  294. data/lib/spree/testing_support/factories/state_factory.rb +4 -4
  295. data/lib/spree/testing_support/factories/stock_item_factory.rb +1 -1
  296. data/lib/spree/testing_support/factories/stock_location_factory.rb +7 -7
  297. data/lib/spree/testing_support/factories/stock_movement_factory.rb +3 -3
  298. data/lib/spree/testing_support/factories/stock_package_factory.rb +3 -3
  299. data/lib/spree/testing_support/factories/store_credit_category_factory.rb +1 -1
  300. data/lib/spree/testing_support/factories/store_credit_event_factory.rb +8 -8
  301. data/lib/spree/testing_support/factories/store_credit_factory.rb +1 -1
  302. data/lib/spree/testing_support/factories/store_credit_reason_factory.rb +1 -1
  303. data/lib/spree/testing_support/factories/store_credit_type_factory.rb +6 -6
  304. data/lib/spree/testing_support/factories/store_factory.rb +2 -2
  305. data/lib/spree/testing_support/factories/tax_category_factory.rb +1 -1
  306. data/lib/spree/testing_support/factories/tax_rate_factory.rb +1 -1
  307. data/lib/spree/testing_support/factories/taxon_factory.rb +3 -3
  308. data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -1
  309. data/lib/spree/testing_support/factories/user_factory.rb +2 -2
  310. data/lib/spree/testing_support/factories/variant_factory.rb +2 -2
  311. data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +1 -1
  312. data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +1 -1
  313. data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +1 -1
  314. data/lib/spree/testing_support/factories/zone_factory.rb +3 -3
  315. data/lib/spree/testing_support/factory_bot.rb +1 -1
  316. data/lib/spree/testing_support/flaky.rb +3 -2
  317. data/lib/spree/testing_support/flash.rb +2 -2
  318. data/lib/spree/testing_support/order_walkthrough.rb +6 -6
  319. data/lib/spree/testing_support/preferences.rb +1 -1
  320. data/lib/spree/testing_support/rake.rb +1 -1
  321. data/lib/spree/testing_support/shared_examples/calculator.rb +1 -1
  322. data/lib/spree/testing_support/shared_examples/gallery.rb +7 -7
  323. data/lib/spree/testing_support/shared_examples/order_factory.rb +9 -9
  324. data/lib/spree/testing_support/shared_examples/working_factory.rb +1 -1
  325. data/lib/spree/testing_support/translations.rb +1 -1
  326. data/lib/spree_core.rb +1 -1
  327. data/lib/tasks/payment_method.rake +2 -2
  328. data/solidus_core.gemspec +49 -49
  329. metadata +60 -57
  330. data/app/views/layouts/spree/ink.license.txt +0 -28
  331. data/vendor/assets/javascripts/jquery.payment.license.txt +0 -25
  332. data/vendor/assets/javascripts/jsuri.license.txt +0 -12
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.3
4
+ version: 4.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
+ autorequire:
8
9
  bindir: bin
9
10
  cert_chain: []
10
- date: 1980-01-02 00:00:00.000000000 Z
11
+ date: 2026-04-15 00:00:00.000000000 Z
11
12
  dependencies:
12
13
  - !ruby/object:Gem::Dependency
13
14
  name: actionmailer
@@ -15,180 +16,180 @@ dependencies:
15
16
  requirements:
16
17
  - - ">="
17
18
  - !ruby/object:Gem::Version
18
- version: '7.0'
19
+ version: '7.2'
19
20
  - - "<"
20
21
  - !ruby/object:Gem::Version
21
- version: 8.1.0.beta1
22
+ version: '8.2'
22
23
  type: :runtime
23
24
  prerelease: false
24
25
  version_requirements: !ruby/object:Gem::Requirement
25
26
  requirements:
26
27
  - - ">="
27
28
  - !ruby/object:Gem::Version
28
- version: '7.0'
29
+ version: '7.2'
29
30
  - - "<"
30
31
  - !ruby/object:Gem::Version
31
- version: 8.1.0.beta1
32
+ version: '8.2'
32
33
  - !ruby/object:Gem::Dependency
33
34
  name: actionpack
34
35
  requirement: !ruby/object:Gem::Requirement
35
36
  requirements:
36
37
  - - ">="
37
38
  - !ruby/object:Gem::Version
38
- version: '7.0'
39
+ version: '7.2'
39
40
  - - "<"
40
41
  - !ruby/object:Gem::Version
41
- version: 8.1.0.beta1
42
+ version: '8.2'
42
43
  type: :runtime
43
44
  prerelease: false
44
45
  version_requirements: !ruby/object:Gem::Requirement
45
46
  requirements:
46
47
  - - ">="
47
48
  - !ruby/object:Gem::Version
48
- version: '7.0'
49
+ version: '7.2'
49
50
  - - "<"
50
51
  - !ruby/object:Gem::Version
51
- version: 8.1.0.beta1
52
+ version: '8.2'
52
53
  - !ruby/object:Gem::Dependency
53
54
  name: actionview
54
55
  requirement: !ruby/object:Gem::Requirement
55
56
  requirements:
56
57
  - - ">="
57
58
  - !ruby/object:Gem::Version
58
- version: '7.0'
59
+ version: '7.2'
59
60
  - - "<"
60
61
  - !ruby/object:Gem::Version
61
- version: 8.1.0.beta1
62
+ version: '8.2'
62
63
  type: :runtime
63
64
  prerelease: false
64
65
  version_requirements: !ruby/object:Gem::Requirement
65
66
  requirements:
66
67
  - - ">="
67
68
  - !ruby/object:Gem::Version
68
- version: '7.0'
69
+ version: '7.2'
69
70
  - - "<"
70
71
  - !ruby/object:Gem::Version
71
- version: 8.1.0.beta1
72
+ version: '8.2'
72
73
  - !ruby/object:Gem::Dependency
73
74
  name: activejob
74
75
  requirement: !ruby/object:Gem::Requirement
75
76
  requirements:
76
77
  - - ">="
77
78
  - !ruby/object:Gem::Version
78
- version: '7.0'
79
+ version: '7.2'
79
80
  - - "<"
80
81
  - !ruby/object:Gem::Version
81
- version: 8.1.0.beta1
82
+ version: '8.2'
82
83
  type: :runtime
83
84
  prerelease: false
84
85
  version_requirements: !ruby/object:Gem::Requirement
85
86
  requirements:
86
87
  - - ">="
87
88
  - !ruby/object:Gem::Version
88
- version: '7.0'
89
+ version: '7.2'
89
90
  - - "<"
90
91
  - !ruby/object:Gem::Version
91
- version: 8.1.0.beta1
92
+ version: '8.2'
92
93
  - !ruby/object:Gem::Dependency
93
94
  name: activemodel
94
95
  requirement: !ruby/object:Gem::Requirement
95
96
  requirements:
96
97
  - - ">="
97
98
  - !ruby/object:Gem::Version
98
- version: '7.0'
99
+ version: '7.2'
99
100
  - - "<"
100
101
  - !ruby/object:Gem::Version
101
- version: 8.1.0.beta1
102
+ version: '8.2'
102
103
  type: :runtime
103
104
  prerelease: false
104
105
  version_requirements: !ruby/object:Gem::Requirement
105
106
  requirements:
106
107
  - - ">="
107
108
  - !ruby/object:Gem::Version
108
- version: '7.0'
109
+ version: '7.2'
109
110
  - - "<"
110
111
  - !ruby/object:Gem::Version
111
- version: 8.1.0.beta1
112
+ version: '8.2'
112
113
  - !ruby/object:Gem::Dependency
113
114
  name: activerecord
114
115
  requirement: !ruby/object:Gem::Requirement
115
116
  requirements:
116
117
  - - ">="
117
118
  - !ruby/object:Gem::Version
118
- version: '7.0'
119
+ version: '7.2'
119
120
  - - "<"
120
121
  - !ruby/object:Gem::Version
121
- version: 8.1.0.beta1
122
+ version: '8.2'
122
123
  type: :runtime
123
124
  prerelease: false
124
125
  version_requirements: !ruby/object:Gem::Requirement
125
126
  requirements:
126
127
  - - ">="
127
128
  - !ruby/object:Gem::Version
128
- version: '7.0'
129
+ version: '7.2'
129
130
  - - "<"
130
131
  - !ruby/object:Gem::Version
131
- version: 8.1.0.beta1
132
+ version: '8.2'
132
133
  - !ruby/object:Gem::Dependency
133
134
  name: activestorage
134
135
  requirement: !ruby/object:Gem::Requirement
135
136
  requirements:
136
137
  - - ">="
137
138
  - !ruby/object:Gem::Version
138
- version: '7.0'
139
+ version: '7.2'
139
140
  - - "<"
140
141
  - !ruby/object:Gem::Version
141
- version: 8.1.0.beta1
142
+ version: '8.2'
142
143
  type: :runtime
143
144
  prerelease: false
144
145
  version_requirements: !ruby/object:Gem::Requirement
145
146
  requirements:
146
147
  - - ">="
147
148
  - !ruby/object:Gem::Version
148
- version: '7.0'
149
+ version: '7.2'
149
150
  - - "<"
150
151
  - !ruby/object:Gem::Version
151
- version: 8.1.0.beta1
152
+ version: '8.2'
152
153
  - !ruby/object:Gem::Dependency
153
154
  name: activesupport
154
155
  requirement: !ruby/object:Gem::Requirement
155
156
  requirements:
156
157
  - - ">="
157
158
  - !ruby/object:Gem::Version
158
- version: '7.0'
159
+ version: '7.2'
159
160
  - - "<"
160
161
  - !ruby/object:Gem::Version
161
- version: 8.1.0.beta1
162
+ version: '8.2'
162
163
  type: :runtime
163
164
  prerelease: false
164
165
  version_requirements: !ruby/object:Gem::Requirement
165
166
  requirements:
166
167
  - - ">="
167
168
  - !ruby/object:Gem::Version
168
- version: '7.0'
169
+ version: '7.2'
169
170
  - - "<"
170
171
  - !ruby/object:Gem::Version
171
- version: 8.1.0.beta1
172
+ version: '8.2'
172
173
  - !ruby/object:Gem::Dependency
173
174
  name: railties
174
175
  requirement: !ruby/object:Gem::Requirement
175
176
  requirements:
176
177
  - - ">="
177
178
  - !ruby/object:Gem::Version
178
- version: '7.0'
179
+ version: '7.2'
179
180
  - - "<"
180
181
  - !ruby/object:Gem::Version
181
- version: 8.1.0.beta1
182
+ version: '8.2'
182
183
  type: :runtime
183
184
  prerelease: false
184
185
  version_requirements: !ruby/object:Gem::Requirement
185
186
  requirements:
186
187
  - - ">="
187
188
  - !ruby/object:Gem::Version
188
- version: '7.0'
189
+ version: '7.2'
189
190
  - - "<"
190
191
  - !ruby/object:Gem::Version
191
- version: 8.1.0.beta1
192
+ version: '8.2'
192
193
  - !ruby/object:Gem::Dependency
193
194
  name: activemerchant
194
195
  requirement: !ruby/object:Gem::Requirement
@@ -271,6 +272,20 @@ dependencies:
271
272
  - - "~>"
272
273
  - !ruby/object:Gem::Version
273
274
  version: 1.1.0
275
+ - !ruby/object:Gem::Dependency
276
+ name: db-query-matchers
277
+ requirement: !ruby/object:Gem::Requirement
278
+ requirements:
279
+ - - "~>"
280
+ - !ruby/object:Gem::Version
281
+ version: '0.14'
282
+ type: :runtime
283
+ prerelease: false
284
+ version_requirements: !ruby/object:Gem::Requirement
285
+ requirements:
286
+ - - "~>"
287
+ - !ruby/object:Gem::Version
288
+ version: '0.14'
274
289
  - !ruby/object:Gem::Dependency
275
290
  name: discard
276
291
  requirement: !ruby/object:Gem::Requirement
@@ -415,20 +430,6 @@ dependencies:
415
430
  - - "<"
416
431
  - !ruby/object:Gem::Version
417
432
  version: '5'
418
- - !ruby/object:Gem::Dependency
419
- name: sprockets-rails
420
- requirement: !ruby/object:Gem::Requirement
421
- requirements:
422
- - - "!="
423
- - !ruby/object:Gem::Version
424
- version: 3.5.0
425
- type: :runtime
426
- prerelease: false
427
- version_requirements: !ruby/object:Gem::Requirement
428
- requirements:
429
- - - "!="
430
- - !ruby/object:Gem::Version
431
- version: 3.5.0
432
433
  - !ruby/object:Gem::Dependency
433
434
  name: state_machines
434
435
  requirement: !ruby/object:Gem::Requirement
@@ -580,11 +581,13 @@ files:
580
581
  - app/models/spree/image.rb
581
582
  - app/models/spree/image/active_storage_attachment.rb
582
583
  - app/models/spree/image/paperclip_attachment.rb
584
+ - app/models/spree/in_memory_order_updater.rb
583
585
  - app/models/spree/inventory_unit.rb
584
586
  - app/models/spree/item_total.rb
585
587
  - app/models/spree/legacy_user.rb
586
588
  - app/models/spree/line_item.rb
587
589
  - app/models/spree/log_entry.rb
590
+ - app/models/spree/mergeable_orders_finder.rb
588
591
  - app/models/spree/money.rb
589
592
  - app/models/spree/null_promotion_adjuster.rb
590
593
  - app/models/spree/null_promotion_advertiser.rb
@@ -768,7 +771,6 @@ files:
768
771
  - app/subscribers/spree/order_mailer_subscriber.rb
769
772
  - app/subscribers/spree/reimbursement_mailer_subscriber.rb
770
773
  - app/views/layouts/spree/base_mailer.html.erb
771
- - app/views/layouts/spree/ink.license.txt
772
774
  - app/views/spree/carton_mailer/shipped_email.html.erb
773
775
  - app/views/spree/carton_mailer/shipped_email.text.erb
774
776
  - app/views/spree/order_mailer/cancel_email.html.erb
@@ -786,6 +788,7 @@ files:
786
788
  - app/views/spree/test_mailer/test_email.text.erb
787
789
  - config/i18n-tasks.yml
788
790
  - config/initializers/assets.rb
791
+ - config/initializers/db_query_matchers.rb
789
792
  - config/initializers/friendly_id.rb
790
793
  - config/initializers/inflections.rb
791
794
  - config/initializers/money.rb
@@ -940,6 +943,7 @@ files:
940
943
  - lib/spree/mailer_previews/carton_preview.rb
941
944
  - lib/spree/mailer_previews/order_preview.rb
942
945
  - lib/spree/mailer_previews/reimbursement_preview.rb
946
+ - lib/spree/manipulative_query_monitor.rb
943
947
  - lib/spree/migration_helpers.rb
944
948
  - lib/spree/migrations.rb
945
949
  - lib/spree/money.rb
@@ -1071,9 +1075,7 @@ files:
1071
1075
  - lib/tasks/solidus/delete_prices_with_nil_amount.rake
1072
1076
  - solidus_core.gemspec
1073
1077
  - vendor/assets/javascripts/jquery.payment.js
1074
- - vendor/assets/javascripts/jquery.payment.license.txt
1075
1078
  - vendor/assets/javascripts/jsuri.js
1076
- - vendor/assets/javascripts/jsuri.license.txt
1077
1079
  - vendor/assets/stylesheets/normalize.css
1078
1080
  homepage: http://solidus.io
1079
1081
  licenses:
@@ -1110,14 +1112,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
1110
1112
  requirements:
1111
1113
  - - ">="
1112
1114
  - !ruby/object:Gem::Version
1113
- version: 3.1.0
1115
+ version: 3.2.0
1114
1116
  required_rubygems_version: !ruby/object:Gem::Requirement
1115
1117
  requirements:
1116
1118
  - - ">="
1117
1119
  - !ruby/object:Gem::Version
1118
1120
  version: 1.8.23
1119
1121
  requirements: []
1120
- rubygems_version: 4.0.10
1122
+ rubygems_version: 3.5.22
1123
+ signing_key:
1121
1124
  specification_version: 4
1122
1125
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.
1123
1126
  test_files: []
data/app/views/layouts/spree/ink.license.txt DELETED
@@ -1,28 +0,0 @@
1
- The mailer layout in this directory (base_mailer.html.erb) inlines the
2
- CSS of Ink v1.0.5, ZURB's responsive email framework, from
3
- https://github.com/foundation/foundation-emails (formerly zurb/ink).
4
-
5
- --------------------------------------------------------------------------------
6
-
7
- Copyright (c) 2013 ZURB, inc.
8
-
9
- MIT License
10
-
11
- Permission is hereby granted, free of charge, to any person obtaining
12
- a copy of this software and associated documentation files (the
13
- "Software"), to deal in the Software without restriction, including
14
- without limitation the rights to use, copy, modify, merge, publish,
15
- distribute, sublicense, and/or sell copies of the Software, and to
16
- permit persons to whom the Software is furnished to do so, subject to
17
- the following conditions:
18
-
19
- The above copyright notice and this permission notice shall be
20
- included in all copies or substantial portions of the Software.
21
-
22
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
23
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
24
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
25
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
26
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
27
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
28
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/vendor/assets/javascripts/jquery.payment.license.txt DELETED
@@ -1,25 +0,0 @@
1
- This license covers the vendored jQuery.payment v1.3.2 (jquery.payment.js
2
- in this directory), from https://github.com/stripe-archive/jquery.payment.
3
-
4
- --------------------------------------------------------------------------------
5
-
6
- Copyright (c) 2014 Stripe
7
-
8
- Permission is hereby granted, free of charge, to any person obtaining
9
- a copy of this software and associated documentation files (the
10
- "Software"), to deal in the Software without restriction, including
11
- without limitation the rights to use, copy, modify, merge, publish,
12
- distribute, sublicense, and/or sell copies of the Software, and to
13
- permit persons to whom the Software is furnished to do so, subject to
14
- the following conditions:
15
-
16
- The above copyright notice and this permission notice shall be
17
- included in all copies or substantial portions of the Software.
18
-
19
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
20
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
22
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
23
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
24
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
25
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/vendor/assets/javascripts/jsuri.license.txt DELETED
@@ -1,12 +0,0 @@
1
- This license covers the vendored jsUri v1.1.1 (jsuri.js in this
2
- directory), from https://github.com/derek-watson/jsUri.
3
-
4
- --------------------------------------------------------------------------------
5
-
6
- Copyright (c) 2014, Derek Watson
7
-
8
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
9
-
10
- The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11
-
12
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.