solidus_core 4.6.2 → 4.7.1

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 (334) 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 +260 -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 +22 -12
  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 +60 -38
  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 +37 -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 +31 -30
  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 +44 -31
  116. data/app/models/spree/shipping_manifest.rb +44 -9
  117. data/app/models/spree/shipping_method.rb +9 -9
  118. data/app/models/spree/shipping_method_category.rb +2 -2
  119. data/app/models/spree/shipping_rate.rb +12 -10
  120. data/app/models/spree/shipping_rate_tax.rb +5 -4
  121. data/app/models/spree/simple_order_contents.rb +2 -2
  122. data/app/models/spree/state.rb +1 -1
  123. data/app/models/spree/stock/availability.rb +9 -9
  124. data/app/models/spree/stock/availability_validator.rb +3 -3
  125. data/app/models/spree/stock/differentiator.rb +2 -2
  126. data/app/models/spree/stock/estimator.rb +5 -5
  127. data/app/models/spree/stock/inventory_validator.rb +1 -1
  128. data/app/models/spree/stock/package.rb +3 -3
  129. data/app/models/spree/stock_item.rb +5 -5
  130. data/app/models/spree/stock_location.rb +6 -6
  131. data/app/models/spree/stock_movement.rb +2 -2
  132. data/app/models/spree/stock_quantities.rb +2 -2
  133. data/app/models/spree/store.rb +4 -4
  134. data/app/models/spree/store_credit.rb +30 -29
  135. data/app/models/spree/store_credit_category.rb +2 -2
  136. data/app/models/spree/store_credit_event.rb +6 -6
  137. data/app/models/spree/store_credit_reason.rb +1 -1
  138. data/app/models/spree/store_credit_type.rb +3 -3
  139. data/app/models/spree/store_selector/by_server_name.rb +1 -1
  140. data/app/models/spree/store_selector/legacy.rb +1 -1
  141. data/app/models/spree/tax/item_tax.rb +1 -0
  142. data/app/models/spree/tax/order_tax.rb +1 -0
  143. data/app/models/spree/tax_category.rb +3 -3
  144. data/app/models/spree/tax_rate.rb +5 -5
  145. data/app/models/spree/tax_rate_tax_category.rb +2 -2
  146. data/app/models/spree/taxon/active_storage_attachment.rb +2 -2
  147. data/app/models/spree/taxon/paperclip_attachment.rb +4 -4
  148. data/app/models/spree/taxon.rb +16 -17
  149. data/app/models/spree/taxon_brand_selector.rb +3 -3
  150. data/app/models/spree/unauthorized_redirect_handler.rb +1 -1
  151. data/app/models/spree/unit_cancel.rb +4 -4
  152. data/app/models/spree/user_address.rb +3 -3
  153. data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb +6 -8
  154. data/app/models/spree/user_last_url_storer.rb +1 -1
  155. data/app/models/spree/variant/price_selector.rb +1 -1
  156. data/app/models/spree/variant/pricing_options.rb +1 -1
  157. data/app/models/spree/variant/scopes.rb +9 -9
  158. data/app/models/spree/variant.rb +25 -25
  159. data/app/models/spree/variant_property_rule.rb +2 -2
  160. data/app/models/spree/variant_property_rule_condition.rb +1 -1
  161. data/app/models/spree/wallet/add_payment_sources_to_wallet.rb +4 -4
  162. data/app/models/spree/wallet/default_payment_builder.rb +1 -1
  163. data/app/models/spree/wallet_payment_source.rb +2 -2
  164. data/app/models/spree/zone.rb +18 -18
  165. data/app/models/spree/zone_member.rb +1 -1
  166. data/app/subscribers/spree/carton_shipped_mailer_subscriber.rb +2 -2
  167. data/app/subscribers/spree/order_cancel_mailer_subscriber.rb +2 -2
  168. data/app/subscribers/spree/order_confirmation_mailer_subscriber.rb +2 -2
  169. data/app/subscribers/spree/order_inventory_cancellation_mailer_subscriber.rb +2 -2
  170. data/app/subscribers/spree/reimbursement_mailer_subscriber.rb +2 -2
  171. data/app/views/layouts/spree/base_mailer.html.erb +1 -0
  172. data/app/views/layouts/spree/ink.license.txt +28 -0
  173. data/config/initializers/assets.rb +1 -1
  174. data/config/initializers/db_query_matchers.rb +9 -0
  175. data/config/initializers/friendly_id.rb +2 -2
  176. data/config/initializers/inflections.rb +1 -1
  177. data/config/initializers/money.rb +1 -1
  178. data/config/locales/en.yml +1 -0
  179. data/db/default/spree/countries.rb +7 -7
  180. data/db/default/spree/return_reasons.rb +11 -11
  181. data/db/default/spree/stock_locations.rb +1 -1
  182. data/db/default/spree/store_credit.rb +3 -4
  183. data/db/default/spree/stores.rb +1 -1
  184. data/db/default/spree/zones.rb +5 -5
  185. data/db/migrate/20160101010000_solidus_one_four.rb +16 -16
  186. data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb +3 -3
  187. data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb +7 -6
  188. data/db/migrate/20161014221052_add_available_to_columns_and_remove_display_on_from_payment_methods.rb +10 -10
  189. data/db/migrate/20161123154034_add_available_to_users_and_remove_display_on_from_shipping_methods.rb +6 -6
  190. data/db/migrate/20161129035810_add_index_to_spree_payments_number.rb +1 -1
  191. data/db/migrate/20170319191942_remove_order_id_from_inventory_units.rb +4 -4
  192. data/db/migrate/20180322142651_add_amount_remaining_to_store_credit_events.rb +9 -16
  193. data/db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb +1 -0
  194. data/db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb +3 -3
  195. data/db/migrate/20250207104016_add_primary_taxon_to_products.rb +1 -1
  196. data/db/migrate/20250214094207_add_reverse_charge_status_to_store.rb +1 -1
  197. data/db/migrate/20250225051308_add_vat_id_email_and_reverse_charge_status_to_addresses.rb +1 -1
  198. data/db/seeds.rb +3 -3
  199. data/lib/generators/solidus/install/app_templates/authentication/custom.rb +2 -2
  200. data/lib/generators/solidus/install/app_templates/authentication/devise.rb +3 -3
  201. data/lib/generators/solidus/install/app_templates/authentication/existing.rb +1 -1
  202. data/lib/generators/solidus/install/app_templates/frontend/starter.rb +1 -1
  203. data/lib/generators/solidus/install/app_templates/payment_method/braintree.rb +1 -1
  204. data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb +1 -1
  205. data/lib/generators/solidus/install/app_templates/payment_method/stripe.rb +2 -2
  206. data/lib/generators/solidus/install/install_generator.rb +51 -51
  207. data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt +3 -0
  208. data/lib/generators/solidus/update/update_generator.rb +29 -29
  209. data/lib/generators/spree/custom_user/custom_user_generator.rb +6 -6
  210. data/lib/generators/spree/dummy/dummy_generator.rb +22 -24
  211. data/lib/generators/spree/dummy/templates/rails/boot.rb +3 -3
  212. data/lib/generators/spree/dummy/templates/rails/test.rb +4 -4
  213. data/lib/solidus_core.rb +1 -1
  214. data/lib/spree/app_configuration.rb +59 -47
  215. data/lib/spree/bus.rb +1 -1
  216. data/lib/spree/config.rb +1 -1
  217. data/lib/spree/core/active_merchant_dependencies.rb +8 -8
  218. data/lib/spree/core/class_constantizer.rb +1 -1
  219. data/lib/spree/core/engine.rb +15 -15
  220. data/lib/spree/core/environment.rb +1 -1
  221. data/lib/spree/core/environment_extension.rb +2 -2
  222. data/lib/spree/core/importer/order.rb +15 -15
  223. data/lib/spree/core/importer/product.rb +4 -4
  224. data/lib/spree/core/importer.rb +2 -2
  225. data/lib/spree/core/null_promotion_configuration.rb +7 -7
  226. data/lib/spree/core/permalinks.rb +1 -1
  227. data/lib/spree/core/product_filters.rb +94 -93
  228. data/lib/spree/core/role_configuration.rb +3 -3
  229. data/lib/spree/core/search/base.rb +5 -6
  230. data/lib/spree/core/search/variant.rb +3 -3
  231. data/lib/spree/core/stock_configuration.rb +10 -49
  232. data/lib/spree/core/validators/email.rb +1 -1
  233. data/lib/spree/core/version.rb +3 -3
  234. data/lib/spree/core/versioned_value.rb +4 -6
  235. data/lib/spree/core.rb +49 -49
  236. data/lib/spree/deprecated_instance_variable_proxy.rb +1 -1
  237. data/lib/spree/deprecation.rb +1 -1
  238. data/lib/spree/deprecator.rb +2 -2
  239. data/lib/spree/i18n.rb +2 -2
  240. data/lib/spree/localized_number.rb +3 -3
  241. data/lib/spree/manipulative_query_monitor.rb +19 -0
  242. data/lib/spree/migrations.rb +2 -2
  243. data/lib/spree/permitted_attributes.rb +12 -11
  244. data/lib/spree/preferences/configuration.rb +5 -5
  245. data/lib/spree/preferences/preferable.rb +8 -10
  246. data/lib/spree/preferences/preferable_class_methods.rb +16 -16
  247. data/lib/spree/preferences/preference_differentiator.rb +1 -1
  248. data/lib/spree/preferences/scoped_store.rb +2 -2
  249. data/lib/spree/preferences/static_model_preferences.rb +2 -2
  250. data/lib/spree/preferences/store.rb +6 -6
  251. data/lib/spree/testing_support/ability_helpers.rb +30 -30
  252. data/lib/spree/testing_support/authorization_helpers.rb +6 -5
  253. data/lib/spree/testing_support/blacklist_urls.rb +1 -1
  254. data/lib/spree/testing_support/bus_helpers.rb +1 -1
  255. data/lib/spree/testing_support/capybara_driver.rb +1 -1
  256. data/lib/spree/testing_support/capybara_ext.rb +21 -13
  257. data/lib/spree/testing_support/common_rake.rb +17 -16
  258. data/lib/spree/testing_support/dummy_ability.rb +1 -1
  259. data/lib/spree/testing_support/dummy_app/migrations.rb +1 -1
  260. data/lib/spree/testing_support/dummy_app/rake_tasks.rb +5 -5
  261. data/lib/spree/testing_support/dummy_app/routes.rb +1 -1
  262. data/lib/spree/testing_support/dummy_app.rb +49 -34
  263. data/lib/spree/testing_support/extension_rake.rb +2 -2
  264. data/lib/spree/testing_support/factories/address_factory.rb +12 -12
  265. data/lib/spree/testing_support/factories/adjustment_factory.rb +7 -7
  266. data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +1 -1
  267. data/lib/spree/testing_support/factories/calculator_factory.rb +6 -6
  268. data/lib/spree/testing_support/factories/carton_factory.rb +1 -1
  269. data/lib/spree/testing_support/factories/country_factory.rb +3 -3
  270. data/lib/spree/testing_support/factories/credit_card_factory.rb +3 -3
  271. data/lib/spree/testing_support/factories/customer_return_factory.rb +2 -2
  272. data/lib/spree/testing_support/factories/image_factory.rb +2 -2
  273. data/lib/spree/testing_support/factories/inventory_unit_factory.rb +4 -4
  274. data/lib/spree/testing_support/factories/line_item_factory.rb +2 -2
  275. data/lib/spree/testing_support/factories/option_type_factory.rb +2 -2
  276. data/lib/spree/testing_support/factories/option_value_factory.rb +2 -2
  277. data/lib/spree/testing_support/factories/order_factory.rb +16 -16
  278. data/lib/spree/testing_support/factories/payment_factory.rb +9 -9
  279. data/lib/spree/testing_support/factories/payment_method_factory.rb +10 -10
  280. data/lib/spree/testing_support/factories/price_factory.rb +2 -2
  281. data/lib/spree/testing_support/factories/product_factory.rb +2 -2
  282. data/lib/spree/testing_support/factories/product_option_type_factory.rb +1 -1
  283. data/lib/spree/testing_support/factories/product_property_factory.rb +1 -1
  284. data/lib/spree/testing_support/factories/property_factory.rb +3 -3
  285. data/lib/spree/testing_support/factories/refund_factory.rb +2 -2
  286. data/lib/spree/testing_support/factories/refund_reason_factory.rb +1 -1
  287. data/lib/spree/testing_support/factories/reimbursement_factory.rb +1 -1
  288. data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +1 -1
  289. data/lib/spree/testing_support/factories/return_authorization_factory.rb +3 -3
  290. data/lib/spree/testing_support/factories/return_item_factory.rb +1 -1
  291. data/lib/spree/testing_support/factories/return_reason_factory.rb +1 -1
  292. data/lib/spree/testing_support/factories/role_factory.rb +2 -2
  293. data/lib/spree/testing_support/factories/shipment_factory.rb +3 -3
  294. data/lib/spree/testing_support/factories/shipping_category_factory.rb +1 -1
  295. data/lib/spree/testing_support/factories/shipping_method_factory.rb +7 -7
  296. data/lib/spree/testing_support/factories/shipping_rate_factory.rb +1 -1
  297. data/lib/spree/testing_support/factories/state_factory.rb +4 -4
  298. data/lib/spree/testing_support/factories/stock_item_factory.rb +1 -1
  299. data/lib/spree/testing_support/factories/stock_location_factory.rb +7 -7
  300. data/lib/spree/testing_support/factories/stock_movement_factory.rb +3 -3
  301. data/lib/spree/testing_support/factories/stock_package_factory.rb +3 -3
  302. data/lib/spree/testing_support/factories/store_credit_category_factory.rb +1 -1
  303. data/lib/spree/testing_support/factories/store_credit_event_factory.rb +8 -8
  304. data/lib/spree/testing_support/factories/store_credit_factory.rb +1 -1
  305. data/lib/spree/testing_support/factories/store_credit_reason_factory.rb +1 -1
  306. data/lib/spree/testing_support/factories/store_credit_type_factory.rb +6 -6
  307. data/lib/spree/testing_support/factories/store_factory.rb +2 -2
  308. data/lib/spree/testing_support/factories/tax_category_factory.rb +1 -1
  309. data/lib/spree/testing_support/factories/tax_rate_factory.rb +1 -1
  310. data/lib/spree/testing_support/factories/taxon_factory.rb +3 -3
  311. data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -1
  312. data/lib/spree/testing_support/factories/user_factory.rb +2 -2
  313. data/lib/spree/testing_support/factories/variant_factory.rb +2 -2
  314. data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +1 -1
  315. data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +1 -1
  316. data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +1 -1
  317. data/lib/spree/testing_support/factories/zone_factory.rb +3 -3
  318. data/lib/spree/testing_support/factory_bot.rb +1 -1
  319. data/lib/spree/testing_support/flaky.rb +3 -2
  320. data/lib/spree/testing_support/flash.rb +2 -2
  321. data/lib/spree/testing_support/order_walkthrough.rb +7 -7
  322. data/lib/spree/testing_support/preferences.rb +1 -1
  323. data/lib/spree/testing_support/rake.rb +1 -1
  324. data/lib/spree/testing_support/shared_examples/calculator.rb +1 -1
  325. data/lib/spree/testing_support/shared_examples/gallery.rb +7 -7
  326. data/lib/spree/testing_support/shared_examples/order_factory.rb +9 -9
  327. data/lib/spree/testing_support/shared_examples/working_factory.rb +1 -1
  328. data/lib/spree/testing_support/translations.rb +1 -1
  329. data/lib/spree_core.rb +1 -1
  330. data/lib/tasks/payment_method.rake +2 -2
  331. data/solidus_core.gemspec +49 -49
  332. data/vendor/assets/javascripts/jquery.payment.license.txt +25 -0
  333. data/vendor/assets/javascripts/jsuri.license.txt +12 -0
  334. metadata +60 -53
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.2
4
+ version: 4.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
@@ -15,180 +15,180 @@ dependencies:
15
15
  requirements:
16
16
  - - ">="
17
17
  - !ruby/object:Gem::Version
18
- version: '7.0'
18
+ version: '7.2'
19
19
  - - "<"
20
20
  - !ruby/object:Gem::Version
21
- version: 8.1.0.beta1
21
+ version: '8.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - ">="
27
27
  - !ruby/object:Gem::Version
28
- version: '7.0'
28
+ version: '7.2'
29
29
  - - "<"
30
30
  - !ruby/object:Gem::Version
31
- version: 8.1.0.beta1
31
+ version: '8.2'
32
32
  - !ruby/object:Gem::Dependency
33
33
  name: actionpack
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
36
  - - ">="
37
37
  - !ruby/object:Gem::Version
38
- version: '7.0'
38
+ version: '7.2'
39
39
  - - "<"
40
40
  - !ruby/object:Gem::Version
41
- version: 8.1.0.beta1
41
+ version: '8.2'
42
42
  type: :runtime
43
43
  prerelease: false
44
44
  version_requirements: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - ">="
47
47
  - !ruby/object:Gem::Version
48
- version: '7.0'
48
+ version: '7.2'
49
49
  - - "<"
50
50
  - !ruby/object:Gem::Version
51
- version: 8.1.0.beta1
51
+ version: '8.2'
52
52
  - !ruby/object:Gem::Dependency
53
53
  name: actionview
54
54
  requirement: !ruby/object:Gem::Requirement
55
55
  requirements:
56
56
  - - ">="
57
57
  - !ruby/object:Gem::Version
58
- version: '7.0'
58
+ version: '7.2'
59
59
  - - "<"
60
60
  - !ruby/object:Gem::Version
61
- version: 8.1.0.beta1
61
+ version: '8.2'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: '7.0'
68
+ version: '7.2'
69
69
  - - "<"
70
70
  - !ruby/object:Gem::Version
71
- version: 8.1.0.beta1
71
+ version: '8.2'
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: activejob
74
74
  requirement: !ruby/object:Gem::Requirement
75
75
  requirements:
76
76
  - - ">="
77
77
  - !ruby/object:Gem::Version
78
- version: '7.0'
78
+ version: '7.2'
79
79
  - - "<"
80
80
  - !ruby/object:Gem::Version
81
- version: 8.1.0.beta1
81
+ version: '8.2'
82
82
  type: :runtime
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - ">="
87
87
  - !ruby/object:Gem::Version
88
- version: '7.0'
88
+ version: '7.2'
89
89
  - - "<"
90
90
  - !ruby/object:Gem::Version
91
- version: 8.1.0.beta1
91
+ version: '8.2'
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: activemodel
94
94
  requirement: !ruby/object:Gem::Requirement
95
95
  requirements:
96
96
  - - ">="
97
97
  - !ruby/object:Gem::Version
98
- version: '7.0'
98
+ version: '7.2'
99
99
  - - "<"
100
100
  - !ruby/object:Gem::Version
101
- version: 8.1.0.beta1
101
+ version: '8.2'
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
105
105
  requirements:
106
106
  - - ">="
107
107
  - !ruby/object:Gem::Version
108
- version: '7.0'
108
+ version: '7.2'
109
109
  - - "<"
110
110
  - !ruby/object:Gem::Version
111
- version: 8.1.0.beta1
111
+ version: '8.2'
112
112
  - !ruby/object:Gem::Dependency
113
113
  name: activerecord
114
114
  requirement: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - ">="
117
117
  - !ruby/object:Gem::Version
118
- version: '7.0'
118
+ version: '7.2'
119
119
  - - "<"
120
120
  - !ruby/object:Gem::Version
121
- version: 8.1.0.beta1
121
+ version: '8.2'
122
122
  type: :runtime
123
123
  prerelease: false
124
124
  version_requirements: !ruby/object:Gem::Requirement
125
125
  requirements:
126
126
  - - ">="
127
127
  - !ruby/object:Gem::Version
128
- version: '7.0'
128
+ version: '7.2'
129
129
  - - "<"
130
130
  - !ruby/object:Gem::Version
131
- version: 8.1.0.beta1
131
+ version: '8.2'
132
132
  - !ruby/object:Gem::Dependency
133
133
  name: activestorage
134
134
  requirement: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - ">="
137
137
  - !ruby/object:Gem::Version
138
- version: '7.0'
138
+ version: '7.2'
139
139
  - - "<"
140
140
  - !ruby/object:Gem::Version
141
- version: 8.1.0.beta1
141
+ version: '8.2'
142
142
  type: :runtime
143
143
  prerelease: false
144
144
  version_requirements: !ruby/object:Gem::Requirement
145
145
  requirements:
146
146
  - - ">="
147
147
  - !ruby/object:Gem::Version
148
- version: '7.0'
148
+ version: '7.2'
149
149
  - - "<"
150
150
  - !ruby/object:Gem::Version
151
- version: 8.1.0.beta1
151
+ version: '8.2'
152
152
  - !ruby/object:Gem::Dependency
153
153
  name: activesupport
154
154
  requirement: !ruby/object:Gem::Requirement
155
155
  requirements:
156
156
  - - ">="
157
157
  - !ruby/object:Gem::Version
158
- version: '7.0'
158
+ version: '7.2'
159
159
  - - "<"
160
160
  - !ruby/object:Gem::Version
161
- version: 8.1.0.beta1
161
+ version: '8.2'
162
162
  type: :runtime
163
163
  prerelease: false
164
164
  version_requirements: !ruby/object:Gem::Requirement
165
165
  requirements:
166
166
  - - ">="
167
167
  - !ruby/object:Gem::Version
168
- version: '7.0'
168
+ version: '7.2'
169
169
  - - "<"
170
170
  - !ruby/object:Gem::Version
171
- version: 8.1.0.beta1
171
+ version: '8.2'
172
172
  - !ruby/object:Gem::Dependency
173
173
  name: railties
174
174
  requirement: !ruby/object:Gem::Requirement
175
175
  requirements:
176
176
  - - ">="
177
177
  - !ruby/object:Gem::Version
178
- version: '7.0'
178
+ version: '7.2'
179
179
  - - "<"
180
180
  - !ruby/object:Gem::Version
181
- version: 8.1.0.beta1
181
+ version: '8.2'
182
182
  type: :runtime
183
183
  prerelease: false
184
184
  version_requirements: !ruby/object:Gem::Requirement
185
185
  requirements:
186
186
  - - ">="
187
187
  - !ruby/object:Gem::Version
188
- version: '7.0'
188
+ version: '7.2'
189
189
  - - "<"
190
190
  - !ruby/object:Gem::Version
191
- version: 8.1.0.beta1
191
+ version: '8.2'
192
192
  - !ruby/object:Gem::Dependency
193
193
  name: activemerchant
194
194
  requirement: !ruby/object:Gem::Requirement
@@ -271,6 +271,20 @@ dependencies:
271
271
  - - "~>"
272
272
  - !ruby/object:Gem::Version
273
273
  version: 1.1.0
274
+ - !ruby/object:Gem::Dependency
275
+ name: db-query-matchers
276
+ requirement: !ruby/object:Gem::Requirement
277
+ requirements:
278
+ - - "~>"
279
+ - !ruby/object:Gem::Version
280
+ version: '0.14'
281
+ type: :runtime
282
+ prerelease: false
283
+ version_requirements: !ruby/object:Gem::Requirement
284
+ requirements:
285
+ - - "~>"
286
+ - !ruby/object:Gem::Version
287
+ version: '0.14'
274
288
  - !ruby/object:Gem::Dependency
275
289
  name: discard
276
290
  requirement: !ruby/object:Gem::Requirement
@@ -415,20 +429,6 @@ dependencies:
415
429
  - - "<"
416
430
  - !ruby/object:Gem::Version
417
431
  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
432
  - !ruby/object:Gem::Dependency
433
433
  name: state_machines
434
434
  requirement: !ruby/object:Gem::Requirement
@@ -580,11 +580,13 @@ files:
580
580
  - app/models/spree/image.rb
581
581
  - app/models/spree/image/active_storage_attachment.rb
582
582
  - app/models/spree/image/paperclip_attachment.rb
583
+ - app/models/spree/in_memory_order_updater.rb
583
584
  - app/models/spree/inventory_unit.rb
584
585
  - app/models/spree/item_total.rb
585
586
  - app/models/spree/legacy_user.rb
586
587
  - app/models/spree/line_item.rb
587
588
  - app/models/spree/log_entry.rb
589
+ - app/models/spree/mergeable_orders_finder.rb
588
590
  - app/models/spree/money.rb
589
591
  - app/models/spree/null_promotion_adjuster.rb
590
592
  - app/models/spree/null_promotion_advertiser.rb
@@ -768,6 +770,7 @@ files:
768
770
  - app/subscribers/spree/order_mailer_subscriber.rb
769
771
  - app/subscribers/spree/reimbursement_mailer_subscriber.rb
770
772
  - app/views/layouts/spree/base_mailer.html.erb
773
+ - app/views/layouts/spree/ink.license.txt
771
774
  - app/views/spree/carton_mailer/shipped_email.html.erb
772
775
  - app/views/spree/carton_mailer/shipped_email.text.erb
773
776
  - app/views/spree/order_mailer/cancel_email.html.erb
@@ -785,6 +788,7 @@ files:
785
788
  - app/views/spree/test_mailer/test_email.text.erb
786
789
  - config/i18n-tasks.yml
787
790
  - config/initializers/assets.rb
791
+ - config/initializers/db_query_matchers.rb
788
792
  - config/initializers/friendly_id.rb
789
793
  - config/initializers/inflections.rb
790
794
  - config/initializers/money.rb
@@ -939,6 +943,7 @@ files:
939
943
  - lib/spree/mailer_previews/carton_preview.rb
940
944
  - lib/spree/mailer_previews/order_preview.rb
941
945
  - lib/spree/mailer_previews/reimbursement_preview.rb
946
+ - lib/spree/manipulative_query_monitor.rb
942
947
  - lib/spree/migration_helpers.rb
943
948
  - lib/spree/migrations.rb
944
949
  - lib/spree/money.rb
@@ -1070,7 +1075,9 @@ files:
1070
1075
  - lib/tasks/solidus/delete_prices_with_nil_amount.rake
1071
1076
  - solidus_core.gemspec
1072
1077
  - vendor/assets/javascripts/jquery.payment.js
1078
+ - vendor/assets/javascripts/jquery.payment.license.txt
1073
1079
  - vendor/assets/javascripts/jsuri.js
1080
+ - vendor/assets/javascripts/jsuri.license.txt
1074
1081
  - vendor/assets/stylesheets/normalize.css
1075
1082
  homepage: http://solidus.io
1076
1083
  licenses:
@@ -1107,14 +1114,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
1107
1114
  requirements:
1108
1115
  - - ">="
1109
1116
  - !ruby/object:Gem::Version
1110
- version: 3.1.0
1117
+ version: 3.2.0
1111
1118
  required_rubygems_version: !ruby/object:Gem::Requirement
1112
1119
  requirements:
1113
1120
  - - ">="
1114
1121
  - !ruby/object:Gem::Version
1115
1122
  version: 1.8.23
1116
1123
  requirements: []
1117
- rubygems_version: 3.7.2
1124
+ rubygems_version: 4.0.10
1118
1125
  specification_version: 4
1119
1126
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.
1120
1127
  test_files: []