solidus_core 2.3.1 → 2.4.0.beta1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of solidus_core might be problematic. Click here for more details.

Files changed (799) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/spree/base_controller.rb +0 -1
  3. data/app/models/concerns/spree/calculated_adjustments.rb +2 -0
  4. data/app/models/concerns/spree/user_methods.rb +19 -3
  5. data/app/models/spree/address.rb +5 -11
  6. data/app/models/spree/adjustment.rb +10 -1
  7. data/app/models/spree/base.rb +4 -0
  8. data/app/models/spree/calculator/default_tax.rb +7 -18
  9. data/app/models/spree/calculator/returns/default_refund_amount.rb +3 -3
  10. data/app/models/spree/calculator.rb +2 -3
  11. data/app/models/spree/customer_return.rb +6 -3
  12. data/app/models/spree/exchange.rb +1 -1
  13. data/app/models/spree/fulfilment_changer.rb +125 -0
  14. data/app/models/spree/legacy_user.rb +0 -8
  15. data/app/models/spree/line_item.rb +24 -7
  16. data/app/models/spree/order/checkout.rb +2 -2
  17. data/app/models/spree/order.rb +42 -47
  18. data/app/models/spree/order_cancellations.rb +1 -1
  19. data/app/models/spree/order_capturing.rb +2 -0
  20. data/app/models/spree/order_shipping.rb +1 -1
  21. data/app/models/spree/order_update_attributes.rb +0 -2
  22. data/app/models/spree/order_updater.rb +4 -4
  23. data/app/models/spree/payment/cancellation.rb +60 -0
  24. data/app/models/spree/payment/processing.rb +1 -2
  25. data/app/models/spree/payment.rb +4 -7
  26. data/app/models/spree/payment_method/bogus_credit_card.rb +2 -1
  27. data/app/models/spree/payment_method/check.rb +1 -2
  28. data/app/models/spree/payment_method/store_credit.rb +4 -3
  29. data/app/models/spree/payment_method.rb +19 -2
  30. data/app/models/spree/promotion.rb +1 -1
  31. data/app/models/spree/promotion_action.rb +2 -1
  32. data/app/models/spree/promotion_handler/coupon.rb +1 -1
  33. data/app/models/spree/promotion_handler/free_shipping.rb +6 -58
  34. data/app/models/spree/promotion_handler/shipping.rb +55 -0
  35. data/app/models/spree/refund.rb +4 -2
  36. data/app/models/spree/reimbursement/credit.rb +17 -15
  37. data/app/models/spree/return_authorization.rb +8 -5
  38. data/app/models/spree/return_item/eligibility_validator/base_validator.rb +19 -15
  39. data/app/models/spree/return_item/eligibility_validator/default.rb +25 -21
  40. data/app/models/spree/return_item/eligibility_validator/inventory_shipped.rb +15 -11
  41. data/app/models/spree/return_item/eligibility_validator/no_reimbursements.rb +16 -11
  42. data/app/models/spree/return_item/eligibility_validator/order_completed.rb +15 -11
  43. data/app/models/spree/return_item/eligibility_validator/rma_required.rb +15 -11
  44. data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +15 -11
  45. data/app/models/spree/return_item/exchange_variant_eligibility/same_option_value.rb +37 -35
  46. data/app/models/spree/return_item/exchange_variant_eligibility/same_product.rb +6 -4
  47. data/app/models/spree/return_item.rb +6 -3
  48. data/app/models/spree/shipment.rb +63 -45
  49. data/app/models/spree/shipping_method.rb +1 -1
  50. data/app/models/spree/shipping_rate.rb +2 -0
  51. data/app/models/spree/shipping_rate_tax.rb +1 -5
  52. data/app/models/spree/stock/availability.rb +70 -0
  53. data/app/models/spree/stock/estimator.rb +1 -1
  54. data/app/models/spree/stock/simple_coordinator.rb +105 -0
  55. data/app/models/spree/stock/splitter/base.rb +8 -4
  56. data/app/models/spree/stock/splitter/weight.rb +0 -2
  57. data/app/models/spree/stock/splitter_chain.rb +32 -0
  58. data/app/models/spree/stock_quantities.rb +81 -0
  59. data/app/models/spree/store_credit.rb +7 -15
  60. data/app/models/spree/store_credit_category.rb +1 -1
  61. data/app/models/spree/store_credit_type.rb +3 -1
  62. data/app/models/spree/tax/tax_helpers.rb +3 -35
  63. data/app/models/spree/tax_rate.rb +2 -5
  64. data/app/models/spree/taxon.rb +2 -0
  65. data/app/models/spree/zone.rb +1 -50
  66. data/app/views/spree/order_mailer/confirm_email.html.erb +1 -1
  67. data/app/views/spree/order_mailer/confirm_email.text.erb +1 -1
  68. data/config/locales/en.yml +77 -45
  69. data/db/default/spree/countries.rb +40 -10
  70. data/db/default/spree/store_credit.rb +2 -2
  71. data/db/migrate/20160101010000_solidus_one_four.rb +1153 -0
  72. data/db/migrate/20170831201542_remove_default_tax_from_spree_zones.rb +5 -0
  73. data/db/seeds.rb +15 -2
  74. data/lib/generators/spree/dummy/templates/rails/database.yml +4 -0
  75. data/lib/generators/spree/install/install_generator.rb +0 -1
  76. data/lib/generators/spree/install/templates/config/initializers/spree.rb +0 -12
  77. data/{app/models → lib}/spree/app_configuration.rb +26 -59
  78. data/lib/spree/config.rb +3 -0
  79. data/lib/spree/core/controller_helpers/order.rb +0 -2
  80. data/lib/spree/core/engine.rb +6 -1
  81. data/lib/spree/core/environment.rb +3 -1
  82. data/lib/spree/core/search/base.rb +13 -5
  83. data/lib/spree/core/search/variant.rb +2 -0
  84. data/lib/spree/core/stock_configuration.rb +1 -1
  85. data/lib/spree/core/version.rb +1 -1
  86. data/lib/spree/core.rb +8 -7
  87. data/lib/spree/deprecation.rb +2 -0
  88. data/lib/spree/i18n.rb +1 -0
  89. data/lib/spree/money.rb +2 -0
  90. data/lib/spree/permission_sets/product_management.rb +6 -5
  91. data/{app/models → lib}/spree/preferences/configuration.rb +29 -2
  92. data/lib/spree/preferences/preferable.rb +142 -0
  93. data/{app/models → lib}/spree/preferences/preferable_class_methods.rb +0 -0
  94. data/{app/models → lib}/spree/preferences/scoped_store.rb +0 -0
  95. data/{app/models → lib}/spree/preferences/static_model_preferences.rb +0 -0
  96. data/{app/models → lib}/spree/preferences/statically_configurable.rb +0 -0
  97. data/{app/models → lib}/spree/preferences/store.rb +0 -0
  98. data/lib/spree/promo/environment.rb +1 -0
  99. data/lib/spree/testing_support/ability_helpers.rb +9 -9
  100. data/lib/spree/testing_support/factories/address_factory.rb +2 -3
  101. data/lib/spree/testing_support/factories/adjustment_factory.rb +2 -2
  102. data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +1 -1
  103. data/lib/spree/testing_support/factories/calculator_factory.rb +6 -6
  104. data/lib/spree/testing_support/factories/carton_factory.rb +1 -1
  105. data/lib/spree/testing_support/factories/country_factory.rb +1 -1
  106. data/lib/spree/testing_support/factories/credit_card_factory.rb +1 -1
  107. data/lib/spree/testing_support/factories/customer_return_factory.rb +1 -1
  108. data/lib/spree/testing_support/factories/image_factory.rb +1 -1
  109. data/lib/spree/testing_support/factories/inventory_unit_factory.rb +1 -1
  110. data/lib/spree/testing_support/factories/line_item_factory.rb +1 -1
  111. data/lib/spree/testing_support/factories/option_type_factory.rb +1 -1
  112. data/lib/spree/testing_support/factories/option_value_factory.rb +1 -1
  113. data/lib/spree/testing_support/factories/order_factory.rb +2 -2
  114. data/lib/spree/testing_support/factories/order_promotion_factory.rb +1 -1
  115. data/lib/spree/testing_support/factories/payment_factory.rb +3 -3
  116. data/lib/spree/testing_support/factories/payment_method_factory.rb +4 -4
  117. data/lib/spree/testing_support/factories/price_factory.rb +1 -1
  118. data/lib/spree/testing_support/factories/product_factory.rb +1 -1
  119. data/lib/spree/testing_support/factories/product_option_type_factory.rb +1 -1
  120. data/lib/spree/testing_support/factories/product_property_factory.rb +1 -1
  121. data/lib/spree/testing_support/factories/promotion_category_factory.rb +1 -1
  122. data/lib/spree/testing_support/factories/promotion_factory.rb +1 -1
  123. data/lib/spree/testing_support/factories/property_factory.rb +1 -1
  124. data/lib/spree/testing_support/factories/refund_factory.rb +1 -1
  125. data/lib/spree/testing_support/factories/refund_reason_factory.rb +1 -1
  126. data/lib/spree/testing_support/factories/reimbursement_factory.rb +1 -1
  127. data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +1 -1
  128. data/lib/spree/testing_support/factories/return_authorization_factory.rb +2 -2
  129. data/lib/spree/testing_support/factories/return_item_factory.rb +1 -1
  130. data/lib/spree/testing_support/factories/return_reason_factory.rb +1 -1
  131. data/lib/spree/testing_support/factories/role_factory.rb +1 -1
  132. data/lib/spree/testing_support/factories/shipment_factory.rb +1 -1
  133. data/lib/spree/testing_support/factories/shipping_category_factory.rb +1 -1
  134. data/lib/spree/testing_support/factories/shipping_method_factory.rb +3 -3
  135. data/lib/spree/testing_support/factories/shipping_rate_factory.rb +1 -1
  136. data/lib/spree/testing_support/factories/state_factory.rb +1 -1
  137. data/lib/spree/testing_support/factories/stock_item_factory.rb +1 -1
  138. data/lib/spree/testing_support/factories/stock_location_factory.rb +1 -1
  139. data/lib/spree/testing_support/factories/stock_movement_factory.rb +1 -1
  140. data/lib/spree/testing_support/factories/stock_package_factory.rb +1 -1
  141. data/lib/spree/testing_support/factories/stock_transfer_factory.rb +1 -1
  142. data/lib/spree/testing_support/factories/store_credit_category_factory.rb +1 -1
  143. data/lib/spree/testing_support/factories/store_credit_event_factory.rb +2 -2
  144. data/lib/spree/testing_support/factories/store_credit_factory.rb +1 -1
  145. data/lib/spree/testing_support/factories/store_credit_type_factory.rb +3 -3
  146. data/lib/spree/testing_support/factories/store_credit_update_reason_factory.rb +1 -1
  147. data/lib/spree/testing_support/factories/store_factory.rb +1 -1
  148. data/lib/spree/testing_support/factories/tax_category_factory.rb +1 -1
  149. data/lib/spree/testing_support/factories/tax_rate_factory.rb +1 -1
  150. data/lib/spree/testing_support/factories/taxon_factory.rb +1 -1
  151. data/lib/spree/testing_support/factories/taxonomy_factory.rb +1 -1
  152. data/lib/spree/testing_support/factories/variant_factory.rb +1 -1
  153. data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +1 -1
  154. data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +1 -1
  155. data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +1 -1
  156. data/lib/spree/testing_support/factories/zone_factory.rb +2 -2
  157. data/lib/spree/testing_support/preferences.rb +1 -2
  158. data/lib/spree/testing_support/sequences.rb +6 -1
  159. data/lib/tasks/core.rake +17 -10
  160. data/solidus_core.gemspec +0 -6
  161. data/spec/helpers/base_helper_spec.rb +2 -2
  162. data/spec/helpers/products_helper_spec.rb +2 -2
  163. data/spec/helpers/taxons_helper_spec.rb +2 -2
  164. data/spec/jobs/promotion_code_batch_job_spec.rb +2 -2
  165. data/spec/lib/calculated_adjustments_spec.rb +2 -2
  166. data/spec/lib/i18n_spec.rb +2 -2
  167. data/spec/lib/search/base_spec.rb +10 -8
  168. data/spec/lib/search/variant_spec.rb +2 -2
  169. data/spec/lib/spree/core/class_constantizer_spec.rb +2 -1
  170. data/spec/lib/spree/core/controller_helpers/auth_spec.rb +2 -2
  171. data/spec/lib/spree/core/controller_helpers/order_spec.rb +2 -2
  172. data/spec/lib/spree/core/controller_helpers/payment_parameters_spec.rb +2 -2
  173. data/spec/lib/spree/core/controller_helpers/pricing_spec.rb +2 -2
  174. data/spec/lib/spree/core/controller_helpers/search_spec.rb +2 -2
  175. data/spec/lib/spree/core/controller_helpers/store_spec.rb +2 -2
  176. data/spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb +2 -2
  177. data/spec/lib/spree/core/current_store_spec.rb +2 -2
  178. data/spec/lib/spree/core/environment_extension_spec.rb +2 -1
  179. data/spec/lib/spree/core/importer/order_spec.rb +2 -2
  180. data/spec/lib/spree/core/role_configuration_spec.rb +2 -2
  181. data/spec/lib/spree/core/stock_configuration_spec.rb +2 -2
  182. data/spec/lib/spree/core/testing_support/factories/address_factory_spec.rb +1 -1
  183. data/spec/lib/spree/core/testing_support/factories/adjustment_factory_spec.rb +1 -1
  184. data/spec/lib/spree/core/testing_support/factories/adjustment_reason_factory_spec.rb +1 -1
  185. data/spec/lib/spree/core/testing_support/factories/calculator_factory_spec.rb +1 -1
  186. data/spec/lib/spree/core/testing_support/factories/carton_factory_spec.rb +1 -1
  187. data/spec/lib/spree/core/testing_support/factories/country_factory_spec.rb +1 -1
  188. data/spec/lib/spree/core/testing_support/factories/credit_card_factory_spec.rb +1 -1
  189. data/spec/lib/spree/core/testing_support/factories/customer_return_factory_spec.rb +1 -1
  190. data/spec/lib/spree/core/testing_support/factories/image_factory_spec.rb +1 -1
  191. data/spec/lib/spree/core/testing_support/factories/inventory_unit_factory_spec.rb +1 -1
  192. data/spec/lib/spree/core/testing_support/factories/line_item_factory_spec.rb +1 -1
  193. data/spec/lib/spree/core/testing_support/factories/option_type_factory_spec.rb +1 -1
  194. data/spec/lib/spree/core/testing_support/factories/option_value_factory_spec.rb +1 -1
  195. data/spec/lib/spree/core/testing_support/factories/order_factory_spec.rb +2 -2
  196. data/spec/lib/spree/core/testing_support/factories/order_promotion_factory_spec.rb +1 -1
  197. data/spec/lib/spree/core/testing_support/factories/payment_factory_spec.rb +1 -1
  198. data/spec/lib/spree/core/testing_support/factories/payment_method_factory_spec.rb +1 -1
  199. data/spec/lib/spree/core/testing_support/factories/price_factory_spec.rb +1 -1
  200. data/spec/lib/spree/core/testing_support/factories/product_factory_spec.rb +1 -1
  201. data/spec/lib/spree/core/testing_support/factories/product_option_type_factory_spec.rb +1 -1
  202. data/spec/lib/spree/core/testing_support/factories/product_property_factory_spec.rb +1 -1
  203. data/spec/lib/spree/core/testing_support/factories/promotion_category_factory_spec.rb +1 -1
  204. data/spec/lib/spree/core/testing_support/factories/promotion_code_factory_spec.rb +1 -1
  205. data/spec/lib/spree/core/testing_support/factories/promotion_factory_spec.rb +1 -1
  206. data/spec/lib/spree/core/testing_support/factories/property_factory_spec.rb +1 -1
  207. data/spec/lib/spree/core/testing_support/factories/refund_factory_spec.rb +1 -1
  208. data/spec/lib/spree/core/testing_support/factories/refund_reason_factory_spec.rb +1 -1
  209. data/spec/lib/spree/core/testing_support/factories/reimbursement_factory_spec.rb +1 -1
  210. data/spec/lib/spree/core/testing_support/factories/reimbursement_type_factory_spec.rb +1 -1
  211. data/spec/lib/spree/core/testing_support/factories/return_authorization_factory_spec.rb +1 -1
  212. data/spec/lib/spree/core/testing_support/factories/return_item_factory_spec.rb +1 -1
  213. data/spec/lib/spree/core/testing_support/factories/return_reason_factory_spec.rb +1 -1
  214. data/spec/lib/spree/core/testing_support/factories/role_factory_spec.rb +1 -1
  215. data/spec/lib/spree/core/testing_support/factories/shipment_factory_spec.rb +1 -1
  216. data/spec/lib/spree/core/testing_support/factories/shipping_category_factory_spec.rb +1 -1
  217. data/spec/lib/spree/core/testing_support/factories/shipping_method_factory_spec.rb +10 -1
  218. data/spec/lib/spree/core/testing_support/factories/shipping_rate_factory_spec.rb +1 -1
  219. data/spec/lib/spree/core/testing_support/factories/state_factory_spec.rb +1 -1
  220. data/spec/lib/spree/core/testing_support/factories/stock_item_factory_spec.rb +1 -1
  221. data/spec/lib/spree/core/testing_support/factories/stock_location_factory_spec.rb +1 -1
  222. data/spec/lib/spree/core/testing_support/factories/stock_movement_factory_spec.rb +1 -1
  223. data/spec/lib/spree/core/testing_support/factories/stock_package_factory_spec.rb +1 -1
  224. data/spec/lib/spree/core/testing_support/factories/stock_transfer_factory_spec.rb +1 -1
  225. data/spec/lib/spree/core/testing_support/factories/store_credit_category_factory_spec.rb +1 -1
  226. data/spec/lib/spree/core/testing_support/factories/store_credit_event_factory_spec.rb +1 -1
  227. data/spec/lib/spree/core/testing_support/factories/store_credit_factory_spec.rb +1 -1
  228. data/spec/lib/spree/core/testing_support/factories/store_credit_type_factory_spec.rb +1 -1
  229. data/spec/lib/spree/core/testing_support/factories/store_credit_update_reason_factory_spec.rb +1 -1
  230. data/spec/lib/spree/core/testing_support/factories/store_factory_spec.rb +1 -1
  231. data/spec/lib/spree/core/testing_support/factories/tax_category_factory_spec.rb +1 -1
  232. data/spec/lib/spree/core/testing_support/factories/tax_rate_factory_spec.rb +1 -1
  233. data/spec/lib/spree/core/testing_support/factories/taxon_factory_spec.rb +1 -1
  234. data/spec/lib/spree/core/testing_support/factories/taxonomy_factory_spec.rb +1 -1
  235. data/spec/lib/spree/core/testing_support/factories/user_factory_spec.rb +1 -1
  236. data/spec/lib/spree/core/testing_support/factories/variant_factory_spec.rb +1 -1
  237. data/spec/lib/spree/core/testing_support/factories/variant_property_rule_condition_factory_spec.rb +1 -1
  238. data/spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb +1 -1
  239. data/spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb +1 -1
  240. data/spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb +1 -1
  241. data/spec/lib/spree/core/testing_support/preferences_spec.rb +1 -1
  242. data/spec/lib/spree/core/validators/email_spec.rb +3 -2
  243. data/spec/lib/spree/core/version_spec.rb +1 -1
  244. data/spec/lib/spree/localized_number_spec.rb +2 -1
  245. data/spec/lib/spree/migrations_spec.rb +2 -2
  246. data/spec/lib/spree/money_spec.rb +3 -1
  247. data/spec/lib/spree/permission_sets/default_customer_spec.rb +2 -2
  248. data/spec/lib/tasks/dummy_task_spec.rb +2 -2
  249. data/spec/lib/tasks/migrations/migrate_shipping_rate_taxes_spec.rb +2 -2
  250. data/spec/mailers/carton_mailer_spec.rb +2 -2
  251. data/spec/mailers/order_mailer_spec.rb +2 -2
  252. data/spec/mailers/promotion_code_batch_mailer_spec.rb +2 -2
  253. data/spec/mailers/reimbursement_mailer_spec.rb +2 -2
  254. data/spec/mailers/test_mailer_spec.rb +2 -2
  255. data/spec/models/spree/ability_spec.rb +2 -2
  256. data/spec/models/spree/address_spec.rb +2 -37
  257. data/spec/models/spree/adjustment_reason_spec.rb +2 -2
  258. data/spec/models/spree/adjustment_spec.rb +4 -4
  259. data/spec/models/spree/app_configuration_spec.rb +2 -2
  260. data/spec/models/spree/asset_spec.rb +2 -2
  261. data/spec/models/spree/calculator/default_tax_spec.rb +21 -56
  262. data/spec/models/spree/calculator/distributed_amount_spec.rb +2 -2
  263. data/spec/models/spree/calculator/flat_percent_item_total_spec.rb +2 -2
  264. data/spec/models/spree/calculator/flat_rate_spec.rb +2 -2
  265. data/spec/models/spree/calculator/flexi_rate_spec.rb +2 -2
  266. data/spec/models/spree/calculator/free_shipping_spec.rb +2 -2
  267. data/spec/models/spree/calculator/percent_on_line_item_spec.rb +2 -2
  268. data/spec/models/spree/calculator/percent_per_item_spec.rb +2 -2
  269. data/spec/models/spree/calculator/price_sack_spec.rb +2 -2
  270. data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +2 -2
  271. data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +2 -2
  272. data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +2 -2
  273. data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +2 -2
  274. data/spec/models/spree/calculator/shipping/per_item_spec.rb +2 -2
  275. data/spec/models/spree/calculator/shipping/price_sack_spec.rb +2 -2
  276. data/spec/models/spree/calculator/tiered_flat_rate_spec.rb +2 -2
  277. data/spec/models/spree/calculator/tiered_percent_spec.rb +2 -2
  278. data/spec/models/spree/calculator_spec.rb +12 -2
  279. data/spec/models/spree/carton_spec.rb +2 -2
  280. data/spec/models/spree/classification_spec.rb +2 -2
  281. data/spec/models/spree/concerns/display_money_spec.rb +2 -2
  282. data/spec/models/spree/concerns/ordered_property_value_list_spec.rb +2 -2
  283. data/spec/models/spree/concerns/user_address_book_spec.rb +26 -26
  284. data/spec/models/spree/concerns/user_methods_spec.rb +80 -2
  285. data/spec/models/spree/country_spec.rb +2 -2
  286. data/spec/models/spree/credit_card_spec.rb +2 -2
  287. data/spec/models/spree/customer_return_spec.rb +2 -2
  288. data/spec/models/spree/distributed_amounts_handler_spec.rb +1 -1
  289. data/spec/models/spree/exchange_spec.rb +2 -2
  290. data/spec/models/spree/fulfilment_changer_spec.rb +273 -0
  291. data/spec/models/spree/gateway/bogus_simple.rb +2 -2
  292. data/spec/models/spree/gateway/bogus_spec.rb +2 -2
  293. data/spec/models/spree/gateway_spec.rb +2 -2
  294. data/spec/models/spree/image_spec.rb +2 -2
  295. data/spec/models/spree/inventory_unit_spec.rb +3 -3
  296. data/spec/models/spree/line_item_spec.rb +23 -6
  297. data/spec/models/spree/option_type_spec.rb +2 -2
  298. data/spec/models/spree/option_value_spec.rb +2 -2
  299. data/spec/models/spree/order/address_spec.rb +2 -2
  300. data/spec/models/spree/order/adjustments_spec.rb +2 -2
  301. data/spec/models/spree/order/callbacks_spec.rb +2 -2
  302. data/spec/models/spree/order/checkout_spec.rb +6 -6
  303. data/spec/models/spree/order/finalizing_spec.rb +3 -3
  304. data/spec/models/spree/order/number_generator_spec.rb +1 -1
  305. data/spec/models/spree/order/outstanding_balance_integration_spec.rb +3 -3
  306. data/spec/models/spree/order/payment_spec.rb +61 -30
  307. data/spec/models/spree/order/risk_assessment_spec.rb +2 -2
  308. data/spec/models/spree/order/state_machine_spec.rb +2 -2
  309. data/spec/models/spree/order/totals_spec.rb +2 -2
  310. data/spec/models/spree/order/updating_spec.rb +3 -3
  311. data/spec/models/spree/order/validations_spec.rb +2 -2
  312. data/spec/models/spree/order_cancellations_spec.rb +3 -3
  313. data/spec/models/spree/order_capturing_spec.rb +7 -143
  314. data/spec/models/spree/order_contents_spec.rb +2 -2
  315. data/spec/models/spree/order_inventory_spec.rb +2 -2
  316. data/spec/models/spree/order_merger_spec.rb +2 -2
  317. data/spec/models/spree/order_mutex_spec.rb +2 -2
  318. data/spec/models/spree/order_promotion_spec.rb +2 -2
  319. data/spec/models/spree/order_shipping_spec.rb +2 -2
  320. data/spec/models/spree/order_spec.rb +60 -108
  321. data/spec/models/spree/order_stock_location_spec.rb +2 -2
  322. data/spec/models/spree/order_taxation_spec.rb +1 -1
  323. data/spec/models/spree/order_update_attributes_spec.rb +2 -6
  324. data/spec/models/spree/order_updater_spec.rb +16 -16
  325. data/spec/models/spree/payment/cancellation_spec.rb +81 -0
  326. data/spec/models/spree/payment_create_spec.rb +1 -1
  327. data/spec/models/spree/payment_method/bogus_credit_card_spec.rb +2 -2
  328. data/spec/models/spree/payment_method/check_spec.rb +8 -8
  329. data/spec/models/spree/payment_method/credit_card_spec.rb +2 -2
  330. data/spec/models/spree/payment_method/simple_bogus_credit_card_spec.rb +2 -2
  331. data/spec/models/spree/payment_method/store_credit_spec.rb +39 -27
  332. data/spec/models/spree/payment_method_spec.rb +2 -2
  333. data/spec/models/spree/payment_spec.rb +71 -17
  334. data/spec/models/spree/permission_sets/base_spec.rb +2 -2
  335. data/spec/models/spree/permission_sets/configuration_display.rb +2 -2
  336. data/spec/models/spree/permission_sets/configuration_management_spec.rb +2 -2
  337. data/spec/models/spree/permission_sets/dashboard_display_spec.rb +2 -2
  338. data/spec/models/spree/permission_sets/order_display_spec.rb +2 -2
  339. data/spec/models/spree/permission_sets/order_management_spec.rb +2 -2
  340. data/spec/models/spree/permission_sets/product_display_spec.rb +2 -2
  341. data/spec/models/spree/permission_sets/product_management_spec.rb +2 -2
  342. data/spec/models/spree/permission_sets/promotion_display_spec.rb +2 -2
  343. data/spec/models/spree/permission_sets/promotion_management_spec.rb +2 -2
  344. data/spec/models/spree/permission_sets/report_display_spec.rb +2 -2
  345. data/spec/models/spree/permission_sets/restricted_stock_display_spec.rb +2 -2
  346. data/spec/models/spree/permission_sets/restricted_stock_management_spec.rb +2 -2
  347. data/spec/models/spree/permission_sets/restricted_stock_transfer_display_spec.rb +2 -2
  348. data/spec/models/spree/permission_sets/restricted_stock_transfer_management_spec.rb +2 -2
  349. data/spec/models/spree/permission_sets/stock_display_spec.rb +2 -2
  350. data/spec/models/spree/permission_sets/stock_management_spec.rb +2 -2
  351. data/spec/models/spree/permission_sets/stock_transfer_display_spec.rb +2 -2
  352. data/spec/models/spree/permission_sets/stock_transfer_management_spec.rb +2 -2
  353. data/spec/models/spree/permission_sets/user_display_spec.rb +2 -2
  354. data/spec/models/spree/permission_sets/user_management_spec.rb +2 -2
  355. data/spec/models/spree/preference_spec.rb +2 -2
  356. data/spec/models/spree/preferences/configuration_spec.rb +2 -2
  357. data/spec/models/spree/preferences/preferable_spec.rb +2 -2
  358. data/spec/models/spree/preferences/scoped_store_spec.rb +2 -2
  359. data/spec/models/spree/preferences/static_model_preferences_spec.rb +1 -1
  360. data/spec/models/spree/preferences/statically_configurable_spec.rb +1 -1
  361. data/spec/models/spree/preferences/store_spec.rb +2 -2
  362. data/spec/models/spree/price_spec.rb +2 -2
  363. data/spec/models/spree/product/scopes_spec.rb +2 -2
  364. data/spec/models/spree/product_duplicator_spec.rb +2 -2
  365. data/spec/models/spree/product_filter_spec.rb +2 -2
  366. data/spec/models/spree/product_property_spec.rb +2 -2
  367. data/spec/models/spree/product_spec.rb +2 -2
  368. data/spec/models/spree/promotion/actions/create_adjustment_spec.rb +2 -2
  369. data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +2 -2
  370. data/spec/models/spree/promotion/actions/create_quantity_adjustments_spec.rb +4 -4
  371. data/spec/models/spree/promotion/actions/free_shipping_spec.rb +2 -2
  372. data/spec/models/spree/promotion/rules/first_order_spec.rb +2 -2
  373. data/spec/models/spree/promotion/rules/first_repeat_purchase_since_spec.rb +2 -2
  374. data/spec/models/spree/promotion/rules/item_total_spec.rb +2 -2
  375. data/spec/models/spree/promotion/rules/nth_order_spec.rb +2 -2
  376. data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +2 -2
  377. data/spec/models/spree/promotion/rules/option_value_spec.rb +2 -2
  378. data/spec/models/spree/promotion/rules/product_spec.rb +2 -2
  379. data/spec/models/spree/promotion/rules/taxon_spec.rb +2 -2
  380. data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +2 -2
  381. data/spec/models/spree/promotion/rules/user_role_spec.rb +2 -2
  382. data/spec/models/spree/promotion/rules/user_spec.rb +2 -2
  383. data/spec/models/spree/promotion_action_spec.rb +2 -2
  384. data/spec/models/spree/promotion_category_spec.rb +2 -2
  385. data/spec/models/spree/promotion_code/batch_builder_spec.rb +2 -2
  386. data/spec/models/spree/promotion_code_batch_spec.rb +2 -2
  387. data/spec/models/spree/promotion_code_spec.rb +1 -1
  388. data/spec/models/spree/promotion_handler/cart_spec.rb +3 -3
  389. data/spec/models/spree/promotion_handler/coupon_spec.rb +2 -2
  390. data/spec/models/spree/promotion_handler/page_spec.rb +2 -2
  391. data/spec/models/spree/promotion_handler/{free_shipping_spec.rb → shipping_spec.rb} +28 -3
  392. data/spec/models/spree/promotion_rule_spec.rb +2 -2
  393. data/spec/models/spree/promotion_spec.rb +4 -4
  394. data/spec/models/spree/refund_spec.rb +10 -2
  395. data/spec/models/spree/reimbursement/credit_spec.rb +2 -2
  396. data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb +2 -2
  397. data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb +2 -2
  398. data/spec/models/spree/reimbursement_performer_spec.rb +2 -2
  399. data/spec/models/spree/reimbursement_spec.rb +5 -5
  400. data/spec/models/spree/reimbursement_tax_calculator_spec.rb +2 -2
  401. data/spec/models/spree/reimbursement_type/credit_spec.rb +2 -2
  402. data/spec/models/spree/reimbursement_type/exchange_spec.rb +2 -2
  403. data/spec/models/spree/reimbursement_type/original_payment_spec.rb +2 -2
  404. data/spec/models/spree/reimbursement_type/store_credit_spec.rb +2 -2
  405. data/spec/models/spree/return_authorization_spec.rb +19 -7
  406. data/spec/models/spree/return_item/eligibility_validator/default_spec.rb +2 -2
  407. data/spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb +2 -2
  408. data/spec/models/spree/return_item/eligibility_validator/no_reimbursements_spec.rb +2 -2
  409. data/spec/models/spree/return_item/eligibility_validator/order_completed_spec.rb +2 -2
  410. data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb +2 -2
  411. data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb +2 -2
  412. data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb +2 -2
  413. data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +2 -2
  414. data/spec/models/spree/return_item_spec.rb +6 -6
  415. data/spec/models/spree/returns_calculator_spec.rb +2 -2
  416. data/spec/models/spree/shipment_spec.rb +35 -18
  417. data/spec/models/spree/shipping_calculator_spec.rb +2 -2
  418. data/spec/models/spree/shipping_manifest_spec.rb +2 -2
  419. data/spec/models/spree/shipping_method_spec.rb +2 -2
  420. data/spec/models/spree/shipping_rate_spec.rb +3 -37
  421. data/spec/models/spree/shipping_rate_tax_spec.rb +1 -7
  422. data/spec/models/spree/state_spec.rb +2 -2
  423. data/spec/models/spree/stock/availability_spec.rb +127 -0
  424. data/spec/models/spree/stock/availability_validator_spec.rb +2 -2
  425. data/spec/models/spree/stock/differentiator_spec.rb +2 -2
  426. data/spec/models/spree/stock/estimator_spec.rb +2 -2
  427. data/spec/models/spree/stock/inventory_unit_builder_spec.rb +2 -2
  428. data/spec/models/spree/stock/package_spec.rb +2 -2
  429. data/spec/models/spree/stock/quantifier_spec.rb +3 -3
  430. data/spec/models/spree/stock/shipping_rate_selector_spec.rb +2 -2
  431. data/spec/models/spree/stock/shipping_rate_sorter_spec.rb +2 -2
  432. data/spec/models/spree/stock/{coordinator_spec.rb → simple_coordinator_spec.rb} +47 -28
  433. data/spec/models/spree/stock/splitter/backordered_spec.rb +5 -5
  434. data/spec/models/spree/stock/splitter/base_spec.rb +5 -5
  435. data/spec/models/spree/stock/splitter/shipping_category_spec.rb +6 -6
  436. data/spec/models/spree/stock/splitter/weight_spec.rb +6 -6
  437. data/spec/models/spree/stock/splitter_chain_spec.rb +64 -0
  438. data/spec/models/spree/stock_item_spec.rb +2 -2
  439. data/spec/models/spree/stock_location_spec.rb +2 -2
  440. data/spec/models/spree/stock_movement_spec.rb +2 -2
  441. data/spec/models/spree/stock_quantities_spec.rb +247 -0
  442. data/spec/models/spree/stock_transfer_spec.rb +2 -2
  443. data/spec/models/spree/store_credit_category_spec.rb +2 -2
  444. data/spec/models/spree/store_credit_event_spec.rb +2 -2
  445. data/spec/models/spree/store_credit_spec.rb +2 -2
  446. data/spec/models/spree/store_selector/by_server_name_spec.rb +2 -2
  447. data/spec/models/spree/store_selector/legacy_spec.rb +2 -2
  448. data/spec/models/spree/store_spec.rb +2 -2
  449. data/spec/models/spree/tax/order_adjuster_spec.rb +1 -1
  450. data/spec/models/spree/tax/shipping_rate_taxer_spec.rb +2 -2
  451. data/spec/models/spree/tax/tax_location_spec.rb +1 -1
  452. data/spec/models/spree/tax/taxation_integration_spec.rb +9 -10
  453. data/spec/models/spree/tax_calculator/default_spec.rb +1 -1
  454. data/spec/models/spree/tax_category_spec.rb +2 -2
  455. data/spec/models/spree/tax_rate_spec.rb +21 -65
  456. data/spec/models/spree/taxon_spec.rb +2 -2
  457. data/spec/models/spree/taxonomy_spec.rb +2 -2
  458. data/spec/models/spree/transfer_item_spec.rb +2 -2
  459. data/spec/models/spree/unit_cancel_spec.rb +2 -2
  460. data/spec/models/spree/user_spec.rb +12 -3
  461. data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +2 -2
  462. data/spec/models/spree/variant/price_selector_spec.rb +2 -2
  463. data/spec/models/spree/variant/pricing_options_spec.rb +2 -2
  464. data/spec/models/spree/variant/scopes_spec.rb +2 -2
  465. data/spec/models/spree/variant/vat_price_generator_spec.rb +2 -2
  466. data/spec/models/spree/variant_property_rule_condition_spec.rb +2 -2
  467. data/spec/models/spree/variant_property_rule_spec.rb +2 -2
  468. data/spec/models/spree/variant_property_rule_value_spec.rb +2 -2
  469. data/spec/models/spree/variant_spec.rb +2 -2
  470. data/spec/models/spree/wallet_payment_source_spec.rb +2 -2
  471. data/spec/models/spree/wallet_spec.rb +2 -2
  472. data/spec/models/spree/zone_spec.rb +2 -260
  473. data/spec/rails_helper.rb +49 -0
  474. data/spec/shared_examples/calculator_shared_examples.rb +1 -1
  475. data/spec/spec_helper.rb +3 -40
  476. data/spec/support/concerns/default_price.rb +1 -1
  477. data/spec/support/shared_contexts/rake.rb +1 -1
  478. metadata +28 -414
  479. data/app/helpers/spree/orders_helper.rb +0 -16
  480. data/app/models/spree/preferences/preferable.rb +0 -133
  481. data/app/models/spree/stock/adjuster.rb +0 -28
  482. data/app/models/spree/stock/coordinator.rb +0 -150
  483. data/app/models/spree/stock/packer.rb +0 -63
  484. data/app/models/spree/stock/prioritizer.rb +0 -48
  485. data/db/migrate/20120831092320_spree_one_two.rb +0 -473
  486. data/db/migrate/20120831092359_spree_promo_one_two.rb +0 -45
  487. data/db/migrate/20120905145253_add_tax_rate_label.rb +0 -5
  488. data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb +0 -5
  489. data/db/migrate/20120929093553_remove_unused_preference_columns.rb +0 -8
  490. data/db/migrate/20121009142519_add_lock_version_to_variant.rb +0 -5
  491. data/db/migrate/20121010142909_add_states_required_to_countries.rb +0 -5
  492. data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +0 -6
  493. data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +0 -11
  494. data/db/migrate/20121031162139_split_prices_from_variants.rb +0 -31
  495. data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +0 -9
  496. data/db/migrate/20121107184631_add_currency_to_line_items.rb +0 -5
  497. data/db/migrate/20121107194006_add_currency_to_orders.rb +0 -5
  498. data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +0 -5
  499. data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +0 -5
  500. data/db/migrate/20121124203911_add_position_to_taxonomies.rb +0 -5
  501. data/db/migrate/20121126040517_add_last_ip_to_spree_orders.rb +0 -5
  502. data/db/migrate/20121213162028_add_state_to_spree_adjustments.rb +0 -6
  503. data/db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb +0 -9
  504. data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb +0 -5
  505. data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +0 -5
  506. data/db/migrate/20130207155350_add_order_id_index_to_payments.rb +0 -9
  507. data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb +0 -5
  508. data/db/migrate/20130211190146_create_spree_stock_items.rb +0 -14
  509. data/db/migrate/20130211191120_create_spree_stock_locations.rb +0 -11
  510. data/db/migrate/20130213191427_create_default_stock.rb +0 -25
  511. data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +0 -5
  512. data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb +0 -5
  513. data/db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb +0 -5
  514. data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb +0 -6
  515. data/db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb +0 -6
  516. data/db/migrate/20130228210442_create_shipping_method_zone.rb +0 -21
  517. data/db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb +0 -5
  518. data/db/migrate/20130301162924_create_shipping_method_categories.rb +0 -13
  519. data/db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb +0 -5
  520. data/db/migrate/20130304162240_create_spree_shipping_rates.rb +0 -24
  521. data/db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb +0 -7
  522. data/db/migrate/20130305143310_create_stock_movements.rb +0 -12
  523. data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb +0 -21
  524. data/db/migrate/20130306191917_add_active_field_to_stock_locations.rb +0 -5
  525. data/db/migrate/20130306195650_add_backorderable_to_stock_item.rb +0 -5
  526. data/db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb +0 -5
  527. data/db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb +0 -8
  528. data/db/migrate/20130319062004_change_orders_total_precision.rb +0 -8
  529. data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb +0 -5
  530. data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb +0 -5
  531. data/db/migrate/20130319082943_change_adjustments_amount_precision.rb +0 -5
  532. data/db/migrate/20130319183250_add_originator_to_stock_movement.rb +0 -7
  533. data/db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb +0 -15
  534. data/db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb +0 -9
  535. data/db/migrate/20130326175857_add_stock_location_to_rma.rb +0 -5
  536. data/db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb +0 -15
  537. data/db/migrate/20130328195253_add_seo_metas_to_taxons.rb +0 -9
  538. data/db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb +0 -14
  539. data/db/migrate/20130413230529_add_name_to_spree_credit_cards.rb +0 -5
  540. data/db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb +0 -13
  541. data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb +0 -5
  542. data/db/migrate/20130417120035_update_adjustment_states.rb +0 -16
  543. data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb +0 -15
  544. data/db/migrate/20130418125341_create_spree_stock_transfers.rb +0 -14
  545. data/db/migrate/20130423110707_drop_products_count_on_hand.rb +0 -5
  546. data/db/migrate/20130423223847_set_default_shipping_rate_cost.rb +0 -5
  547. data/db/migrate/20130509115210_add_number_to_stock_transfer.rb +0 -23
  548. data/db/migrate/20130514151929_add_sku_index_to_spree_variants.rb +0 -5
  549. data/db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb +0 -5
  550. data/db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb +0 -5
  551. data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb +0 -5
  552. data/db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb +0 -5
  553. data/db/migrate/20130618041418_add_updated_at_to_spree_countries.rb +0 -9
  554. data/db/migrate/20130619012236_add_updated_at_to_spree_states.rb +0 -9
  555. data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb +0 -6
  556. data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +0 -5
  557. data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +0 -7
  558. data/db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb +0 -5
  559. data/db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb +0 -6
  560. data/db/migrate/20130718042445_add_cost_price_to_line_item.rb +0 -5
  561. data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb +0 -6
  562. data/db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb +0 -5
  563. data/db/migrate/20130729214043_index_completed_at_on_spree_orders.rb +0 -5
  564. data/db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb +0 -5
  565. data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +0 -10
  566. data/db/migrate/20130806022521_drop_spree_mail_methods.rb +0 -12
  567. data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb +0 -8
  568. data/db/migrate/20130807024301_upgrade_adjustments.rb +0 -40
  569. data/db/migrate/20130807024302_rename_adjustment_fields.rb +0 -14
  570. data/db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb +0 -5
  571. data/db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb +0 -5
  572. data/db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb +0 -5
  573. data/db/migrate/20130813140619_expand_order_number_size.rb +0 -9
  574. data/db/migrate/20130813232134_rename_activators_to_promotions.rb +0 -5
  575. data/db/migrate/20130815000406_add_adjustment_total_to_line_items.rb +0 -5
  576. data/db/migrate/20130815024413_add_adjustment_total_to_shipments.rb +0 -5
  577. data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb +0 -14
  578. data/db/migrate/20130828234942_add_tax_total_to_line_items_shipments_and_orders.rb +0 -8
  579. data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +0 -15
  580. data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +0 -19
  581. data/db/migrate/20130903183026_add_code_to_spree_promotion_rules.rb +0 -5
  582. data/db/migrate/20130909115621_change_states_required_for_countries.rb +0 -9
  583. data/db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb +0 -5
  584. data/db/migrate/20130917024658_remove_promotions_event_name_field.rb +0 -5
  585. data/db/migrate/20130924040529_add_promo_total_to_line_items_and_shipments_and_orders.rb +0 -7
  586. data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +0 -17
  587. data/db/migrate/20131026154747_add_track_inventory_to_variant.rb +0 -5
  588. data/db/migrate/20131107132123_add_tax_category_to_variants.rb +0 -6
  589. data/db/migrate/20131113035136_add_channel_to_spree_orders.rb +0 -5
  590. data/db/migrate/20131118043959_add_included_to_adjustments.rb +0 -5
  591. data/db/migrate/20131118050234_rename_tax_total_fields.rb +0 -11
  592. data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb +0 -20
  593. data/db/migrate/20131120234456_add_updated_at_to_variants.rb +0 -5
  594. data/db/migrate/20131127001002_add_position_to_classifications.rb +0 -5
  595. data/db/migrate/20131211112807_create_spree_orders_promotions.rb +0 -8
  596. data/db/migrate/20131211192741_unique_shipping_method_categories.rb +0 -24
  597. data/db/migrate/20131218054603_add_item_count_to_spree_orders.rb +0 -5
  598. data/db/migrate/20140106065820_remove_value_type_from_spree_preferences.rb +0 -9
  599. data/db/migrate/20140106224208_rename_permalink_to_slug_for_products.rb +0 -5
  600. data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb +0 -5
  601. data/db/migrate/20140124023232_rename_activator_id_in_rules_and_actions_to_promotion_id.rb +0 -6
  602. data/db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb +0 -5
  603. data/db/migrate/20140203161722_add_approver_id_and_approved_at_to_orders.rb +0 -6
  604. data/db/migrate/20140204115338_add_confirmation_delivered_to_spree_orders.rb +0 -5
  605. data/db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb +0 -5
  606. data/db/migrate/20140205120320_create_spree_payment_capture_events.rb +0 -12
  607. data/db/migrate/20140205144710_add_uncaptured_amount_to_payments.rb +0 -5
  608. data/db/migrate/20140205181631_default_variant_weight_to_zero.rb +0 -11
  609. data/db/migrate/20140207085910_add_tax_category_id_to_shipping_methods.rb +0 -5
  610. data/db/migrate/20140207093021_add_tax_rate_id_to_shipping_rates.rb +0 -5
  611. data/db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb +0 -6
  612. data/db/migrate/20140213184916_add_more_indexes.rb +0 -13
  613. data/db/migrate/20140219060952_add_considered_risky_to_orders.rb +0 -5
  614. data/db/migrate/20140227112348_add_preference_store_to_everything.rb +0 -8
  615. data/db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb +0 -13
  616. data/db/migrate/20140309023735_migrate_old_preferences.rb +0 -52
  617. data/db/migrate/20140309024355_create_spree_stores.rb +0 -25
  618. data/db/migrate/20140309033438_create_store_from_preferences.rb +0 -34
  619. data/db/migrate/20140315053743_add_timestamps_to_spree_assets.rb +0 -6
  620. data/db/migrate/20140318191500_create_spree_taxons_promotion_rules.rb +0 -8
  621. data/db/migrate/20140331100557_add_additional_store_fields.rb +0 -8
  622. data/db/migrate/20140410141842_add_many_missing_indexes.rb +0 -19
  623. data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb +0 -65
  624. data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb +0 -5
  625. data/db/migrate/20140508151342_change_spree_price_amount_precision.rb +0 -8
  626. data/db/migrate/20140518174634_add_token_to_spree_orders.rb +0 -5
  627. data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb +0 -29
  628. data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb +0 -22
  629. data/db/migrate/20140604135309_drop_credit_card_first_name_and_last_name.rb +0 -6
  630. data/db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb +0 -6
  631. data/db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb +0 -5
  632. data/db/migrate/20140625214618_create_spree_refunds.rb +0 -12
  633. data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb +0 -12
  634. data/db/migrate/20140707125621_rename_return_authorization_inventory_unit_to_return_items.rb +0 -5
  635. data/db/migrate/20140708132019_create_order_mutex.rb +0 -11
  636. data/db/migrate/20140709160534_backfill_line_item_pre_tax_amount.rb +0 -10
  637. data/db/migrate/20140710041921_recreate_spree_return_authorizations.rb +0 -54
  638. data/db/migrate/20140710181204_add_amount_fields_to_return_items.rb +0 -7
  639. data/db/migrate/20140710190048_drop_return_authorization_amount.rb +0 -5
  640. data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb +0 -32
  641. data/db/migrate/20140713140527_create_spree_refund_reasons.rb +0 -14
  642. data/db/migrate/20140713142214_rename_return_authorization_reason.rb +0 -5
  643. data/db/migrate/20140715182625_create_spree_promotion_categories.rb +0 -11
  644. data/db/migrate/20140716204111_drop_received_at_on_return_items.rb +0 -9
  645. data/db/migrate/20140716212330_add_reception_and_acceptance_status_to_return_items.rb +0 -6
  646. data/db/migrate/20140717155155_create_default_refund_reason.rb +0 -9
  647. data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb +0 -7
  648. data/db/migrate/20140718133010_create_spree_customer_returns.rb +0 -9
  649. data/db/migrate/20140718133349_add_customer_return_id_to_return_item.rb +0 -6
  650. data/db/migrate/20140718195325_create_friendly_id_slugs.rb +0 -15
  651. data/db/migrate/20140723004419_rename_spree_refund_return_authorization_id.rb +0 -5
  652. data/db/migrate/20140723152808_increase_return_item_pre_tax_amount_precision.rb +0 -13
  653. data/db/migrate/20140723214541_copy_product_slugs_to_slug_history.rb +0 -13
  654. data/db/migrate/20140725131539_create_spree_reimbursements.rb +0 -21
  655. data/db/migrate/20140728225422_add_promotionable_to_spree_products.rb +0 -5
  656. data/db/migrate/20140729133613_add_exchange_inventory_unit_foreign_keys.rb +0 -7
  657. data/db/migrate/20140730155938_add_acceptance_status_errors_to_return_item.rb +0 -5
  658. data/db/migrate/20140731150017_create_spree_reimbursement_types.rb +0 -20
  659. data/db/migrate/20140804185157_add_default_to_shipment_cost.rb +0 -10
  660. data/db/migrate/20140805171035_add_default_to_spree_credit_cards.rb +0 -5
  661. data/db/migrate/20140805171219_make_existing_credit_cards_default.rb +0 -11
  662. data/db/migrate/20140806144901_add_type_to_reimbursement_type.rb +0 -9
  663. data/db/migrate/20140808184039_create_spree_reimbursement_credits.rb +0 -10
  664. data/db/migrate/20140827170513_add_meta_title_to_spree_products.rb +0 -7
  665. data/db/migrate/20140924164824_add_code_to_spree_tax_categories.rb +0 -5
  666. data/db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb +0 -6
  667. data/db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb +0 -5
  668. data/db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb +0 -6
  669. data/db/migrate/20141009204607_add_store_id_to_orders.rb +0 -12
  670. data/db/migrate/20141012083513_create_spree_taxons_prototypes.rb +0 -8
  671. data/db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb +0 -8
  672. data/db/migrate/20141101231208_fix_adjustment_order_presence.rb +0 -13
  673. data/db/migrate/20141105213646_update_classifications_positions.rb +0 -9
  674. data/db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb +0 -5
  675. data/db/migrate/20141215235502_remove_extra_products_slug_index.rb +0 -5
  676. data/db/migrate/20141217215630_update_product_slug_index.rb +0 -8
  677. data/db/migrate/20141231151320_add_default_column_to_price.rb +0 -5
  678. data/db/migrate/20150112194216_add_position_to_stock_location.rb +0 -5
  679. data/db/migrate/20150113002122_create_spree_promotion_codes.rb +0 -13
  680. data/db/migrate/20150113002123_create_adjustment_promotion_code_association.rb +0 -6
  681. data/db/migrate/20150121022521_remove_environment_from_payment_method.rb +0 -6
  682. data/db/migrate/20150121202544_add_restock_inventory_to_stock_location.rb +0 -5
  683. data/db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb +0 -5
  684. data/db/migrate/20150127161843_create_order_stock_locations.rb +0 -12
  685. data/db/migrate/20150203151219_add_fulfillable_to_stock_location.rb +0 -5
  686. data/db/migrate/20150205210527_add_code_to_refund_reason.rb +0 -5
  687. data/db/migrate/20150213160148_add_promotion_code_id_to_orders_promotions.rb +0 -7
  688. data/db/migrate/20150213163612_add_approver_name_to_spree_orders.rb +0 -5
  689. data/db/migrate/20150225205344_move_promotion_code_to_promotion_code_value.rb +0 -64
  690. data/db/migrate/20150226195213_downcase_promotion_codes_values.rb +0 -11
  691. data/db/migrate/20150227161934_add_order_ids_to_adjustments_where_missing.rb +0 -9
  692. data/db/migrate/20150303212749_add_per_code_usage_limit_to_promotions.rb +0 -5
  693. data/db/migrate/20150303212826_remove_usage_limit_from_promotion_codes.rb +0 -5
  694. data/db/migrate/20150304211616_add_timestamps_to_order_promotions.rb +0 -6
  695. data/db/migrate/20150305043021_create_spree_cartons.rb +0 -24
  696. data/db/migrate/20150305210403_add_timestamps_to_spree_roles_users.rb +0 -7
  697. data/db/migrate/20150313140507_remove_considered_risky_from_spree_orders.rb +0 -5
  698. data/db/migrate/20150313192827_add_index_to_inventory_units_carton_id.rb +0 -5
  699. data/db/migrate/20150313201235_add_imported_from_shipment_id_to_cartons.rb +0 -8
  700. data/db/migrate/20150313201503_copy_shipped_shipments_to_cartons.rb +0 -12
  701. data/db/migrate/20150330144639_create_spree_user_stock_locations.rb +0 -10
  702. data/db/migrate/20150331134544_add_stock_location_code.rb +0 -5
  703. data/db/migrate/20150402210430_create_unit_cancels.rb +0 -10
  704. data/db/migrate/20150407173305_add_fields_to_stock_transfer.rb +0 -12
  705. data/db/migrate/20150407173531_create_transfer_items.rb +0 -14
  706. data/db/migrate/20150424143547_drop_stock_transfer_type.rb +0 -10
  707. data/db/migrate/20150424161102_add_stock_transfer_finalized_at.rb +0 -8
  708. data/db/migrate/20150429125822_rename_stock_transfer_reference.rb +0 -5
  709. data/db/migrate/20150430233803_create_line_item_actions.rb +0 -10
  710. data/db/migrate/20150506181159_create_spree_store_credit_categories.rb +0 -10
  711. data/db/migrate/20150506181244_create_spree_store_credits.rb +0 -19
  712. data/db/migrate/20150506181539_create_spree_store_credit_events.rb +0 -17
  713. data/db/migrate/20150506181611_create_spree_store_credit_payment_method.rb +0 -21
  714. data/db/migrate/20150506181715_create_store_credit_types.rb +0 -17
  715. data/db/migrate/20150506182045_create_store_credit_reimbursement_type.rb +0 -5
  716. data/db/migrate/20150508044622_add_resellable_to_return_items.rb +0 -5
  717. data/db/migrate/20150514185559_add_invalidated_at_to_spree_store_credits.rb +0 -5
  718. data/db/migrate/20150514201836_migrate_deleted_store_credits_to_invalidated.rb +0 -13
  719. data/db/migrate/20150515170322_add_check_stock_on_transfer.rb +0 -5
  720. data/db/migrate/20150515211137_fix_adjustment_order_id.rb +0 -79
  721. data/db/migrate/20150528125647_delete_inventory_units_without_shipment.rb +0 -25
  722. data/db/migrate/20150601191251_add_deleted_at_to_stock_transfers.rb +0 -5
  723. data/db/migrate/20150601204148_add_deleted_at_to_transfer_items.rb +0 -5
  724. data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb +0 -26
  725. data/db/migrate/20150609193231_add_preferences_to_promotion_actions.rb +0 -5
  726. data/db/migrate/20150610182638_add_id_to_spree_option_values_variants.rb +0 -5
  727. data/db/migrate/20150611200247_add_frontend_viewable_to_spree_orders.rb +0 -5
  728. data/db/migrate/20150612205731_remove_spree_configurations.rb +0 -15
  729. data/db/migrate/20150616204659_add_preference_source_to_spree_payment_methods.rb +0 -5
  730. data/db/migrate/20150618191713_remove_credit_card_address_id.rb +0 -7
  731. data/db/migrate/20150618212517_create_spree_store_credit_update_reasons.rb +0 -8
  732. data/db/migrate/20150619160613_create_adjustment_reason.rb +0 -18
  733. data/db/migrate/20150622144655_add_update_reason_to_store_credit_events.rb +0 -5
  734. data/db/migrate/20150623194316_add_return_authorization_reason_id_to_return_items.rb +0 -7
  735. data/db/migrate/20150623214058_seed_store_credit_update_reasons.rb +0 -9
  736. data/db/migrate/20150626200816_remove_shipping_method_id_from_spree_orders.rb +0 -9
  737. data/db/migrate/20150626214817_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb +0 -10
  738. data/db/migrate/20150629175931_add_address_id_to_credit_card.rb +0 -5
  739. data/db/migrate/20150630175644_copy_order_bill_address_to_credit_card.rb +0 -12
  740. data/db/migrate/20150723224133_remove_unnecessary_indexes.rb +0 -62
  741. data/db/migrate/20150724163716_remove_state_lock_version_from_order.rb +0 -11
  742. data/db/migrate/20150731201146_add_spree_user_addresses.rb +0 -15
  743. data/db/migrate/20150806190833_add_id_and_timestamp_to_promotion_rule_user.rb +0 -13
  744. data/db/migrate/20150811210350_remove_mandatory_from_adjustments.rb +0 -5
  745. data/db/migrate/20150811211025_add_finalized_to_spree_adjustments.rb +0 -11
  746. data/db/migrate/20150820160821_add_store_payment_methods.rb +0 -10
  747. data/db/migrate/20150824213633_convert_habtm_to_hmt_for_shipping_methods_zones.rb +0 -17
  748. data/db/migrate/20150824214129_convert_habtm_to_hmt_for_products_promotion_rules.rb +0 -17
  749. data/db/migrate/20150825204216_drop_spree_gateways.rb +0 -20
  750. data/db/migrate/20150826002555_convert_habtm_to_hmt_for_taxon_prototypes.rb +0 -15
  751. data/db/migrate/20150909123605_create_variant_properties_and_rules.rb +0 -28
  752. data/db/migrate/20151001121454_create_spree_shipping_method_stock_locations.rb +0 -13
  753. data/db/migrate/20151002023248_add_foreign_key_to_shipping_method_stock_location.rb +0 -6
  754. data/db/migrate/20151010003252_add_foreign_keys_for_taxons_prototypes.rb +0 -6
  755. data/db/migrate/20151013222921_remove_token_permissions_table.rb +0 -16
  756. data/db/migrate/20151014213349_rename_identifier_to_number_for_payment.rb +0 -7
  757. data/db/migrate/20151015203732_add_foreign_keys_for_product_promotion_rules.rb +0 -9
  758. data/db/migrate/20151021113730_add_sale_to_spree_promotions.rb +0 -6
  759. data/db/migrate/20151021163309_convert_sale_promotions.rb +0 -28
  760. data/db/migrate/20151026093607_change_return_item_pre_tax_amount_to_amount.rb +0 -29
  761. data/db/migrate/20151117063249_convert_habtm_to_hmt_for_properties_prototypes.rb +0 -17
  762. data/db/migrate/20151124062500_convert_habtm_to_hmt_for_option_type_prototypes.rb +0 -17
  763. data/db/migrate/20151126063028_convert_habtm_to_hmt_for_taxons_promotion_rules.rb +0 -15
  764. data/db/migrate/20151219020209_add_stock_item_unique_index.rb +0 -9
  765. data/db/migrate/20160111091912_add_column_available_to_all_on_spree_shipping_method.rb +0 -5
  766. data/db/migrate/20160116133604_add_position_to_spree_payment_methods.rb +0 -5
  767. data/db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb +0 -6
  768. data/db/migrate/20160224201413_create_spree_shipping_rate_taxes.rb +0 -11
  769. data/db/migrate/20160229133259_add_cart_tax_country_iso_to_spree_store.rb +0 -5
  770. data/db/migrate/20160301103333_remove_pre_tax_amount_on_line_item_and_shipment.rb +0 -6
  771. data/db/migrate/20160308000300_disallow_adjustment_finalized_nulls.rb +0 -19
  772. data/db/migrate/20160318145302_add_timestamps_to_prices.rb +0 -5
  773. data/db/migrate/20160330204846_add_missing_timestamp_columns.rb +0 -20
  774. data/db/migrate/20160420044191_create_spree_wallet_payment_sources.rb +0 -23
  775. data/db/migrate/20160420181916_migrate_credit_cards_to_wallet_payment_sources.rb +0 -27
  776. data/db/migrate/20160509181311_add_country_iso_to_prices.rb +0 -8
  777. data/db/migrate/20160527070401_rename_shipment_address_field.rb +0 -7
  778. data/db/migrate/20160608162651_ensure_default_store.rb +0 -13
  779. data/db/migrate/20160608180751_ensure_store_on_orders.rb +0 -12
  780. data/db/migrate/20160616232103_remove_user_id_from_promotion_rules.rb +0 -11
  781. data/db/migrate/20160718205341_add_payment_id_index_to_spree_refunds.rb +0 -5
  782. data/db/migrate/20160718205859_add_reimbursement_id_index_to_spree_refunds.rb +0 -5
  783. data/lib/spree/core/controller_helpers/respond_with.rb +0 -65
  784. data/lib/spree/core/price_migrator.rb +0 -30
  785. data/lib/spree/responder.rb +0 -44
  786. data/lib/spree/testing_support/factories/stock_packer_factory.rb +0 -13
  787. data/lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake +0 -172
  788. data/lib/tasks/migrations/create_vat_prices.rake +0 -15
  789. data/lib/tasks/upgrade.rake +0 -11
  790. data/spec/helpers/order_helper_spec.rb +0 -12
  791. data/spec/lib/spree/core/price_migrator_spec.rb +0 -358
  792. data/spec/lib/spree/core/testing_support/factories/stock_packer_factory_spec.rb +0 -16
  793. data/spec/lib/tasks/migrations/copy_shipped_shipments_to_cartons_spec.rb +0 -111
  794. data/spec/lib/tasks/migrations/create_vat_prices_spec.rb +0 -31
  795. data/spec/lib/tasks/order_capturing_spec.rb +0 -53
  796. data/spec/lib/tasks/upgrade_spec.rb +0 -20
  797. data/spec/models/spree/order/tax_spec.rb +0 -98
  798. data/spec/models/spree/stock/packer_spec.rb +0 -90
  799. data/spec/models/spree/stock/prioritizer_spec.rb +0 -125
@@ -1,7 +1,7 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
  require 'spree/testing_support/order_walkthrough'
3
3
 
4
- describe Spree::Order, type: :model do
4
+ RSpec.describe Spree::Order, type: :model do
5
5
  let!(:store) { create(:store) }
6
6
  let(:order) { Spree::Order.new(store: store) }
7
7
 
@@ -281,12 +281,12 @@ describe Spree::Order, type: :model do
281
281
  before do
282
282
  order.ship_address = ship_address
283
283
  order.state = 'delivery'
284
- allow(order).to receive(:apply_free_shipping_promotions)
284
+ allow(order).to receive(:apply_shipping_promotions)
285
285
  allow(order).to receive(:ensure_available_shipping_rates) { true }
286
286
  end
287
287
 
288
288
  it "attempts to apply free shipping promotions" do
289
- expect(order).to receive(:apply_free_shipping_promotions)
289
+ expect(order).to receive(:apply_shipping_promotions)
290
290
  order.next!
291
291
  end
292
292
 
@@ -328,7 +328,7 @@ describe Spree::Order, type: :model do
328
328
  context "with a shipment that has a price" do
329
329
  before do
330
330
  shipment.shipping_rates.first.update_column(:cost, 10)
331
- order.update!
331
+ order.recalculate
332
332
  end
333
333
 
334
334
  it "transitions to payment" do
@@ -595,7 +595,7 @@ describe Spree::Order, type: :model do
595
595
 
596
596
  it 'can complete the order' do
597
597
  create(:payment, state: 'completed', order: order, amount: order.total)
598
- order.update!
598
+ order.recalculate
599
599
  expect(order.complete).to eq(true)
600
600
  end
601
601
  end
@@ -1,6 +1,6 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
- describe Spree::Order, type: :model do
3
+ RSpec.describe Spree::Order, type: :model do
4
4
  let(:order) { stub_model("Spree::Order") }
5
5
 
6
6
  context "#finalize!" do
@@ -18,7 +18,7 @@ describe Spree::Order, type: :model do
18
18
 
19
19
  it "should sell inventory units" do
20
20
  order.shipments.each do |shipment|
21
- expect(shipment).to receive(:update!)
21
+ expect(shipment).to receive(:update_state)
22
22
  expect(shipment).to receive(:finalize!)
23
23
  end
24
24
  order.finalize!
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  RSpec.describe Spree::Order::NumberGenerator do
4
4
  subject { described_class.new.generate }
@@ -1,4 +1,4 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  # This method in particular has been difficult to get right.
4
4
  # Many things will affect this amount
@@ -18,7 +18,7 @@ RSpec.describe "Outstanding balance integration tests" do
18
18
 
19
19
  subject do
20
20
  order.reload
21
- order.update!
21
+ order.recalculate
22
22
  order.outstanding_balance
23
23
  end
24
24
 
@@ -63,7 +63,7 @@ RSpec.describe "Outstanding balance integration tests" do
63
63
 
64
64
  context 'with a removed item' do
65
65
  before do
66
- item_amount = item_1.final_amount
66
+ item_amount = item_1.total
67
67
  order.contents.remove(item_1.variant)
68
68
  create(:refund, payment: payment, amount: item_amount)
69
69
  end
@@ -1,57 +1,88 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  module Spree
4
- describe Spree::Order, type: :model do
4
+ RSpec.describe Spree::Order, type: :model do
5
5
  let(:order) { stub_model(Spree::Order) }
6
6
  let(:updater) { Spree::OrderUpdater.new(order) }
7
7
 
8
8
  context "processing payments" do
9
9
  let(:order) { create(:order_with_line_items, shipment_cost: 0, line_items_price: 100) }
10
+
10
11
  before do
11
12
  # So that Payment#purchase! is called during processing
12
13
  Spree::Config[:auto_capture] = true
13
14
  end
14
15
 
15
- it 'processes all checkout payments' do
16
- payment_1 = create(:payment, order: order, amount: 50)
17
- payment_2 = create(:payment, order: order, amount: 50)
16
+ let(:payment_method) { create(:credit_card_payment_method) }
17
+
18
+ let!(:payment_1) do
19
+ create(:payment, payment_method: payment_method, order: order, amount: 50)
20
+ end
18
21
 
19
- order.process_payments!
20
- updater.update_payment_state
22
+ context 'sharing the same payment method' do
23
+ let!(:payment_2) do
24
+ create(:payment, payment_method: payment_method, order: order, amount: 50)
25
+ end
21
26
 
22
- expect(order.payment_state).to eq('paid')
23
- expect(order.payment_total).to eq(100)
27
+ it 'processes only new payments' do
28
+ order.process_payments!
29
+ updater.update_payment_state
24
30
 
25
- expect(payment_1).to be_completed
26
- expect(payment_2).to be_completed
31
+ expect(order.payment_state).to eq('balance_due')
32
+ expect(order.payment_total).to eq(50)
33
+
34
+ expect(payment_1).to be_invalid
35
+ expect(payment_2).to be_completed
36
+ end
27
37
  end
28
38
 
29
- it 'does not go over total for order' do
30
- payment_1 = create(:payment, order: order, amount: 50)
31
- payment_2 = create(:payment, order: order, amount: 50)
32
- payment_3 = create(:payment, order: order, amount: 50)
39
+ context 'with different payment methods that are store credit' do
40
+ let!(:payment_2) { create(:store_credit_payment, order: order, amount: 50) }
41
+
42
+ it 'processes all checkout payments' do
43
+ order.process_payments!
44
+ updater.update_payment_state
33
45
 
34
- order.process_payments!
35
- updater.update_payment_state
46
+ expect(order.payment_state).to eq('paid')
47
+ expect(order.payment_total).to eq(100)
36
48
 
37
- expect(order.payment_state).to eq('paid')
38
- expect(order.payment_total).to eq(100)
49
+ expect(payment_1).to be_completed
50
+ expect(payment_2).to be_completed
51
+ end
52
+
53
+ context 'with over paid payments' do
54
+ let!(:payment_3) { create(:store_credit_payment, order: order, amount: 50) }
39
55
 
40
- expect(payment_1).to be_completed
41
- expect(payment_2).to be_completed
42
- expect(payment_3).to be_checkout
56
+ it 'does not go over total for order' do
57
+ order.process_payments!
58
+ updater.update_payment_state
59
+
60
+ expect(order.payment_state).to eq('paid')
61
+ expect(order.payment_total).to eq(100)
62
+ expect(payment_1).to be_completed
63
+ expect(payment_2).to be_completed
64
+ expect(payment_3).to be_checkout
65
+ end
66
+ end
43
67
  end
44
68
 
45
- it "does not use failed payments" do
46
- payment1 = create(:payment, order: order, amount: 50)
47
- payment2 = create(:payment, order: order, amount: 50, state: 'failed')
69
+ context 'with failed payments' do
70
+ let!(:payment_2) do
71
+ create(:payment,
72
+ payment_method: payment_method,
73
+ order: order,
74
+ amount: 50,
75
+ state: 'failed')
76
+ end
48
77
 
49
- expect(payment1).to receive(:process!).and_call_original
50
- expect(payment2).not_to receive(:process!)
78
+ it "does not use failed payments" do
79
+ expect(payment_1).to receive(:process!).and_call_original
80
+ expect(payment_2).not_to receive(:process!)
51
81
 
52
- order.process_payments!
82
+ order.process_payments!
53
83
 
54
- expect(order.payment_total).to eq(50)
84
+ expect(order.payment_total).to eq(50)
85
+ end
55
86
  end
56
87
  end
57
88
 
@@ -176,7 +207,7 @@ module Spree
176
207
  payment: reimbursement.order.payments.first,
177
208
  reimbursement: reimbursement
178
209
  # Update the order totals so payment_total goes to 0 reflecting the refund..
179
- order.update!
210
+ order.recalculate
180
211
  end
181
212
 
182
213
  context "for canceled orders" do
@@ -1,6 +1,6 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
- describe Spree::Order, type: :model do
3
+ RSpec.describe Spree::Order, type: :model do
4
4
  let(:order) { stub_model('Spree::Order') }
5
5
 
6
6
  describe ".is_risky?" do
@@ -1,6 +1,6 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
- describe Spree::Order, type: :model do
3
+ RSpec.describe Spree::Order, type: :model do
4
4
  let(:order) { create(:order_with_line_items) }
5
5
 
6
6
  context "#next!" do
@@ -1,7 +1,7 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  module Spree
4
- describe Order, type: :model do
4
+ RSpec.describe Order, type: :model do
5
5
  let(:order) { create(:order) }
6
6
  let(:shirt) { create(:variant) }
7
7
 
@@ -1,6 +1,6 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
- describe Spree::Order, type: :model do
3
+ RSpec.describe Spree::Order, type: :model do
4
4
  let(:order) { create(:order) }
5
5
 
6
6
  context "#update!" do
@@ -9,7 +9,7 @@ describe Spree::Order, type: :model do
9
9
  after { Spree::Order.update_hooks.clear }
10
10
  it "should call each of the update hooks" do
11
11
  expect(order).to receive :foo
12
- order.update!
12
+ order.recalculate
13
13
  end
14
14
  end
15
15
  end
@@ -1,7 +1,7 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
3
  module Spree
4
- describe Spree::Order, type: :model do
4
+ RSpec.describe Spree::Order, type: :model do
5
5
  context "validations" do
6
6
  # Regression test for https://github.com/spree/spree/issues/2214
7
7
  it "does not return two error messages when email is blank" do
@@ -1,6 +1,6 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
- describe Spree::OrderCancellations do
3
+ RSpec.describe Spree::OrderCancellations do
4
4
  describe "#cancel_unit" do
5
5
  subject { Spree::OrderCancellations.new(order).cancel_unit(inventory_unit) }
6
6
  let(:order) { create(:shipped_order, line_items_count: 1) }
@@ -148,7 +148,7 @@ describe Spree::OrderCancellations do
148
148
  source: promotion_action,
149
149
  finalized: true,
150
150
  )
151
- order.update!
151
+ order.recalculate
152
152
  end
153
153
 
154
154
  it "generates the correct total amount" do
@@ -1,150 +1,14 @@
1
- require 'spec_helper'
1
+ require 'rails_helper'
2
2
 
3
- describe Spree::OrderCapturing do
3
+ RSpec.describe Spree::OrderCapturing do
4
4
  describe '#capture_payments' do
5
- subject { Spree::OrderCapturing.new(order, payment_methods).capture_payments }
5
+ subject { Spree::OrderCapturing.new(order).capture_payments }
6
6
 
7
- # Regression for https://github.com/solidusio/solidus/pull/407
8
- # See also https://github.com/solidusio/solidus/pull/1406
9
- context "updating the order" do
10
- let(:order) { create :completed_order_with_totals }
11
- let(:payment_methods) { [] }
12
- let!(:payment) { create(:payment, order: order, amount: order.total) }
13
- let(:changes_spy) { spy('changes_spy') }
7
+ let(:order) { build(:completed_order_with_totals) }
14
8
 
15
- before do
16
- payment.pend!
17
-
18
- allow_any_instance_of(Spree::Order).to receive(:thingamajig) do |order|
19
- changes_spy.change_callback_occured if order.changes.any?
20
- end
21
-
22
- @update_hooks = Spree::Order.update_hooks.dup
23
- Spree::Order.register_update_hook :thingamajig
24
- end
25
-
26
- after do
27
- Spree::Order.update_hooks = @update_hooks
28
- end
29
-
30
- it "keeps the order up to date when updating and only changes it once" do
31
- subject
32
- expect(changes_spy).to have_received(:change_callback_occured).once
33
- end
34
- end
35
-
36
- context "payment methods specified" do
37
- let!(:order) { create(:order, ship_address: create(:address)) }
38
-
39
- let!(:product) { create(:product, price: 10.00) }
40
- let!(:variant) do
41
- create(:variant, price: 10, product: product, track_inventory: false, tax_category: tax_rate.tax_categories.first)
42
- end
43
- let!(:shipping_method) { create(:free_shipping_method) }
44
- let(:tax_rate) { create(:tax_rate, amount: 0.1, zone: create(:global_zone, name: "Some Tax Zone")) }
45
- let(:secondary_total) { 10.0 }
46
- let(:bogus_total) { order.total - secondary_total }
47
-
48
- before do
49
- order.contents.add(variant, 3)
50
- order.update!
51
- @secondary_bogus_payment = create(:payment, order: order, amount: secondary_total, payment_method: secondary_payment_method.create!(name: 'So bogus'))
52
- @bogus_payment = create(:payment, order: order, amount: bogus_total)
53
- order.contents.advance
54
- order.complete!
55
- order.reload
56
- end
57
-
58
- context "payment method ordering" do
59
- let(:secondary_payment_method) { SecondaryBogusPaymentMethod }
60
-
61
- class SecondaryBogusPaymentMethod < Spree::PaymentMethod::BogusCreditCard; end
62
-
63
- context "SecondaryBogusPaymentMethod payments are prioritized" do
64
- let(:payment_methods) { [SecondaryBogusPaymentMethod, Spree::PaymentMethod::BogusCreditCard] }
65
-
66
- it "captures SecondaryBogusPaymentMethod payments first" do
67
- @bogus_payment.update!(amount: bogus_total + 100)
68
- subject
69
- expect(@secondary_bogus_payment.reload.capture_events.sum(:amount)).to eq(10.0)
70
- expect(@bogus_payment.reload.capture_events.sum(:amount)).to eq(order.total - 10.0)
71
- end
72
- end
73
-
74
- context "Bogus payments are prioritized" do
75
- let(:payment_methods) { [Spree::PaymentMethod::BogusCreditCard, SecondaryBogusPaymentMethod] }
76
-
77
- it "captures Bogus payments first" do
78
- @secondary_bogus_payment.update!(amount: secondary_total + 100)
79
- subject
80
- expect(@bogus_payment.reload.capture_events.sum(:amount)).to eq(order.total - 10.0)
81
- expect(@secondary_bogus_payment.reload.capture_events.sum(:amount)).to eq(10.0)
82
- end
83
- end
84
-
85
- context "when the payment method ordering is configured" do
86
- subject { Spree::OrderCapturing.new(order, payment_methods).capture_payments }
87
-
88
- let(:payment_methods) { nil }
89
-
90
- before do
91
- allow(Spree::OrderCapturing).to receive(:sorted_payment_method_classes).and_return(
92
- [SecondaryBogusPaymentMethod, Spree::PaymentMethod::BogusCreditCard]
93
- )
94
- end
95
-
96
- it "captures in the order specified" do
97
- subject
98
- expect(@secondary_bogus_payment.reload.capture_events.sum(:amount)).to eq(10.0)
99
- expect(@bogus_payment.reload.capture_events.sum(:amount)).to eq(order.total - 10.0)
100
- end
101
- end
102
- end
103
-
104
- context "when a payment is not needed to capture the entire order" do
105
- let(:secondary_payment_method) { SecondaryBogusPaymentMethod }
106
- let(:payment_methods) { [Spree::PaymentMethod::BogusCreditCard, SecondaryBogusPaymentMethod] }
107
-
108
- before do
109
- @bogus_payment.update!(amount: order.total)
110
- end
111
-
112
- context "when void_unused_payments is true" do
113
- before { allow(Spree::OrderCapturing).to receive(:void_unused_payments).and_return(true) }
114
-
115
- it "captures for the order and voids the unused payment" do
116
- subject
117
- expect(order.reload.payment_state).to eq 'paid'
118
- expect(@secondary_bogus_payment.reload.state).to eq 'void'
119
- end
120
- end
121
-
122
- context "when void_unused_payments is false" do
123
- it "captures for the order and leaves the unused payment in a pending state" do
124
- subject
125
- expect(order.reload.payment_state).to eq 'paid'
126
- expect(@secondary_bogus_payment.reload.state).to eq 'pending'
127
- end
128
- end
129
- end
130
-
131
- context "when there is an error processing a payment" do
132
- let(:secondary_payment_method) { ExceptionallyBogusPaymentMethod }
133
- let(:bogus_total) { order.total - 1 }
134
- let(:secondary_total) { 1 }
135
- let(:payment_methods) { [Spree::PaymentMethod::BogusCreditCard, ExceptionallyBogusPaymentMethod] }
136
-
137
- class ExceptionallyBogusPaymentMethod < Spree::PaymentMethod::BogusCreditCard
138
- def capture(*_args)
139
- raise ActiveMerchant::ConnectionError.new("foo", nil)
140
- end
141
- end
142
-
143
- it "raises an error and leaves the order in a reasonable state" do
144
- expect { subject }.to raise_error(Spree::Core::GatewayError)
145
- expect(order.payments.to_a.sum(&:uncaptured_amount)).to eq 1.0
146
- end
147
- end
9
+ it 'is deprecated' do
10
+ expect(Spree::Deprecation).to(receive(:warn))
11
+ subject
148
12
  end
149
13
  end
150
14
  end