spree_core 3.0.9 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (627) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/{spree.js.coffee.erb → spree.js.coffee} +13 -4
  3. data/app/helpers/spree/base_helper.rb +5 -2
  4. data/app/helpers/spree/products_helper.rb +37 -12
  5. data/app/mailers/spree/base_mailer.rb +11 -2
  6. data/app/mailers/spree/reimbursement_mailer.rb +6 -6
  7. data/app/models/concerns/spree/acts_as_taggable.rb +11 -0
  8. data/app/models/concerns/spree/adjustment_source.rb +3 -10
  9. data/app/models/concerns/spree/default_price.rb +7 -1
  10. data/app/models/concerns/spree/named_type.rb +1 -1
  11. data/app/models/concerns/spree/ransackable_attributes.rb +6 -1
  12. data/app/models/concerns/spree/user_api_authentication.rb +7 -1
  13. data/app/models/concerns/spree/user_methods.rb +57 -0
  14. data/app/models/concerns/spree/user_reporting.rb +2 -2
  15. data/app/models/concerns/spree/vat_price_calculation.rb +47 -0
  16. data/app/models/spree/ability.rb +9 -1
  17. data/app/models/spree/address.rb +75 -45
  18. data/app/models/spree/adjustable/adjuster/base.rb +25 -0
  19. data/app/models/spree/adjustable/adjuster/promotion.rb +41 -0
  20. data/app/models/spree/adjustable/adjuster/tax.rb +26 -0
  21. data/app/models/spree/adjustable/adjustments_updater.rb +22 -45
  22. data/app/models/spree/adjustment.rb +8 -10
  23. data/app/models/spree/app_configuration.rb +14 -8
  24. data/app/models/spree/base.rb +5 -1
  25. data/app/models/spree/calculator/default_tax.rb +2 -10
  26. data/app/models/spree/calculator/free_shipping.rb +6 -5
  27. data/app/models/spree/calculator.rb +1 -6
  28. data/app/models/spree/classification.rb +7 -3
  29. data/app/models/spree/country.rb +15 -3
  30. data/app/models/spree/credit_card.rb +37 -38
  31. data/app/models/spree/customer_return.rb +7 -15
  32. data/app/models/spree/gateway/bogus.rb +12 -12
  33. data/app/models/spree/gateway/bogus_simple.rb +4 -4
  34. data/app/models/spree/gateway.rb +8 -7
  35. data/app/models/spree/image.rb +3 -3
  36. data/app/models/spree/inventory_unit.rb +13 -14
  37. data/app/models/spree/legacy_user.rb +1 -14
  38. data/app/models/spree/line_item.rb +79 -67
  39. data/app/models/spree/log_entry.rb +1 -4
  40. data/app/models/spree/option_type.rb +15 -6
  41. data/app/models/spree/option_type_prototype.rb +9 -0
  42. data/app/models/spree/option_value.rb +11 -3
  43. data/app/models/spree/option_value_variant.rb +6 -0
  44. data/app/models/spree/order/checkout.rb +10 -13
  45. data/app/models/spree/order/currency_updater.rb +1 -1
  46. data/app/models/spree/order/store_credit.rb +96 -0
  47. data/app/models/spree/order.rb +105 -68
  48. data/app/models/spree/order_contents.rb +13 -7
  49. data/app/models/spree/order_inventory.rb +16 -9
  50. data/app/models/spree/order_promotion.rb +6 -0
  51. data/app/models/spree/order_updater.rb +4 -8
  52. data/app/models/spree/payment/gateway_options.rb +8 -4
  53. data/app/models/spree/payment/processing.rb +1 -1
  54. data/app/models/spree/payment.rb +55 -29
  55. data/app/models/spree/payment_method/store_credit.rb +130 -0
  56. data/app/models/spree/payment_method.rb +18 -13
  57. data/app/models/spree/preference.rb +1 -1
  58. data/app/models/spree/preferences/store.rb +2 -2
  59. data/app/models/spree/price.rb +16 -6
  60. data/app/models/spree/product/scopes.rb +22 -13
  61. data/app/models/spree/product.rb +83 -52
  62. data/app/models/spree/product_option_type.rb +7 -2
  63. data/app/models/spree/product_promotion_rule.rb +9 -0
  64. data/app/models/spree/product_property.rb +9 -10
  65. data/app/models/spree/promotion/actions/create_adjustment.rb +1 -1
  66. data/app/models/spree/promotion/actions/create_line_items.rb +21 -3
  67. data/app/models/spree/promotion/rules/country.rb +23 -0
  68. data/app/models/spree/promotion/rules/option_value.rb +13 -10
  69. data/app/models/spree/promotion/rules/product.rb +3 -1
  70. data/app/models/spree/promotion/rules/taxon.rb +3 -2
  71. data/app/models/spree/promotion/rules/user.rb +4 -4
  72. data/app/models/spree/promotion.rb +55 -19
  73. data/app/models/spree/promotion_action.rb +3 -3
  74. data/app/models/spree/promotion_category.rb +1 -1
  75. data/app/models/spree/promotion_handler/cart.rb +3 -17
  76. data/app/models/spree/promotion_handler/coupon.rb +22 -22
  77. data/app/models/spree/promotion_handler/page.rb +2 -2
  78. data/app/models/spree/promotion_rule_taxon.rb +9 -0
  79. data/app/models/spree/promotion_rule_user.rb +9 -0
  80. data/app/models/spree/property.rb +2 -1
  81. data/app/models/spree/property_prototype.rb +9 -0
  82. data/app/models/spree/prototype.rb +8 -3
  83. data/app/models/spree/prototype_taxon.rb +9 -0
  84. data/app/models/spree/refund.rb +10 -7
  85. data/app/models/spree/refund_reason.rb +2 -2
  86. data/app/models/spree/reimbursement.rb +12 -16
  87. data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +23 -6
  88. data/app/models/spree/reimbursement_type/store_credit.rb +28 -0
  89. data/app/models/spree/reimbursement_type.rb +5 -1
  90. data/app/models/spree/return_authorization.rb +8 -13
  91. data/app/models/spree/return_authorization_reason.rb +1 -1
  92. data/app/models/spree/return_item/eligibility_validator/time_since_purchase.rb +1 -1
  93. data/app/models/spree/return_item.rb +14 -13
  94. data/app/models/spree/role.rb +3 -2
  95. data/app/models/spree/role_user.rb +6 -0
  96. data/app/models/spree/shipment.rb +23 -30
  97. data/app/models/spree/shipment_handler.rb +2 -2
  98. data/app/models/spree/shipping_category.rb +6 -3
  99. data/app/models/spree/shipping_method.rb +12 -11
  100. data/app/models/spree/shipping_method_zone.rb +6 -0
  101. data/app/models/spree/shipping_rate.rb +16 -29
  102. data/app/models/spree/state.rb +3 -2
  103. data/app/models/spree/state_change.rb +1 -1
  104. data/app/models/spree/stock/adjuster.rb +9 -2
  105. data/app/models/spree/stock/content_item.rb +10 -12
  106. data/app/models/spree/stock/coordinator.rb +21 -15
  107. data/app/models/spree/stock/estimator.rb +28 -30
  108. data/app/models/spree/stock/inventory_unit_builder.rb +2 -10
  109. data/app/models/spree/stock/package.rb +11 -3
  110. data/app/models/spree/stock/packer.rb +16 -6
  111. data/app/models/spree/stock/prioritizer.rb +25 -15
  112. data/app/models/spree/stock/quantifier.rb +5 -5
  113. data/app/models/spree/stock/splitter/backordered.rb +2 -2
  114. data/app/models/spree/stock/splitter/shipping_category.rb +6 -1
  115. data/app/models/spree/stock_item.rb +15 -18
  116. data/app/models/spree/stock_location.rb +4 -7
  117. data/app/models/spree/stock_movement.rb +16 -9
  118. data/app/models/spree/stock_transfer.rb +11 -12
  119. data/app/models/spree/store.rb +15 -6
  120. data/app/models/spree/store_credit.rb +252 -0
  121. data/app/models/spree/store_credit_category.rb +22 -0
  122. data/app/models/spree/store_credit_event.rb +38 -0
  123. data/app/models/spree/store_credit_type.rb +6 -0
  124. data/app/models/spree/tag.rb +4 -0
  125. data/app/models/spree/tax_category.rb +3 -8
  126. data/app/models/spree/tax_rate.rb +61 -121
  127. data/app/models/spree/taxon.rb +12 -6
  128. data/app/models/spree/tracker.rb +12 -1
  129. data/app/models/spree/validations/db_maximum_length_validator.rb +2 -1
  130. data/app/models/spree/variant.rb +94 -49
  131. data/app/models/spree/zone.rb +23 -19
  132. data/app/models/spree/zone_member.rb +6 -0
  133. data/app/validators/db_maximum_length_validator.rb +11 -0
  134. data/app/views/layouts/spree/base_mailer.html.erb +38 -781
  135. data/app/views/spree/order_mailer/_adjustment.html.erb +8 -0
  136. data/app/views/spree/order_mailer/_subtotal.html.erb +8 -0
  137. data/app/views/spree/order_mailer/_total.html.erb +8 -0
  138. data/app/views/spree/order_mailer/cancel_email.html.erb +13 -28
  139. data/app/views/spree/order_mailer/cancel_email.text.erb +1 -1
  140. data/app/views/spree/order_mailer/confirm_email.html.erb +49 -63
  141. data/app/views/spree/order_mailer/confirm_email.text.erb +1 -1
  142. data/app/views/spree/shared/_base_mailer_header.html.erb +5 -7
  143. data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +777 -0
  144. data/app/views/spree/shared/_error_messages.html.erb +1 -1
  145. data/app/views/spree/shared/_mailer_line_item.html.erb +12 -0
  146. data/app/views/spree/shared/_paths.html.erb +8 -0
  147. data/app/views/spree/shipment_mailer/shipped_email.html.erb +21 -14
  148. data/app/views/spree/shipment_mailer/shipped_email.text.erb +3 -3
  149. data/config/initializers/acts_as_taggable_on.rb +9 -0
  150. data/config/initializers/friendly_id.rb +0 -81
  151. data/config/initializers/user_class_extensions.rb +7 -38
  152. data/config/locales/en.yml +137 -12
  153. data/config/routes.rb +7 -0
  154. data/db/default/spree/countries.rb +5 -1
  155. data/db/default/spree/default_reimbursement_type.rb +1 -1
  156. data/db/default/spree/roles.rb +2 -2
  157. data/db/default/spree/states.rb +1 -1
  158. data/db/default/spree/zones.rb +4 -5
  159. data/db/migrate/20120831092320_spree_one_two.rb +101 -101
  160. data/db/migrate/20120831092359_spree_promo_one_two.rb +14 -14
  161. data/db/migrate/20120905145253_add_tax_rate_label.rb +1 -1
  162. data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb +2 -2
  163. data/db/migrate/20120929093553_remove_unused_preference_columns.rb +4 -4
  164. data/db/migrate/20121009142519_add_lock_version_to_variant.rb +2 -2
  165. data/db/migrate/20121010142909_add_states_required_to_countries.rb +2 -2
  166. data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +3 -3
  167. data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +5 -5
  168. data/db/migrate/20121031162139_split_prices_from_variants.rb +10 -10
  169. data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +3 -3
  170. data/db/migrate/20121107184631_add_currency_to_line_items.rb +1 -1
  171. data/db/migrate/20121107194006_add_currency_to_orders.rb +1 -1
  172. data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +2 -2
  173. data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +1 -1
  174. data/db/migrate/20121124203911_add_position_to_taxonomies.rb +2 -2
  175. data/db/migrate/20121126040517_add_last_ip_to_spree_orders.rb +1 -1
  176. data/db/migrate/20121213162028_add_state_to_spree_adjustments.rb +1 -1
  177. data/db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb +1 -1
  178. data/db/migrate/20130120201805_add_position_to_product_properties.spree.rb +2 -2
  179. data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +1 -1
  180. data/db/migrate/20130207155350_add_order_id_index_to_payments.rb +1 -1
  181. data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb +1 -1
  182. data/db/migrate/20130211190146_create_spree_stock_items.rb +2 -2
  183. data/db/migrate/20130211191120_create_spree_stock_locations.rb +1 -1
  184. data/db/migrate/20130213191427_create_default_stock.rb +1 -2
  185. data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +1 -1
  186. data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb +2 -2
  187. data/db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb +1 -1
  188. data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb +3 -3
  189. data/db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb +1 -1
  190. data/db/migrate/20130228210442_create_shipping_method_zone.rb +3 -3
  191. data/db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb +1 -1
  192. data/db/migrate/20130301162924_create_shipping_method_categories.rb +3 -3
  193. data/db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb +1 -1
  194. data/db/migrate/20130304162240_create_spree_shipping_rates.rb +5 -5
  195. data/db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb +1 -1
  196. data/db/migrate/20130305143310_create_stock_movements.rb +1 -1
  197. data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb +3 -3
  198. data/db/migrate/20130306191917_add_active_field_to_stock_locations.rb +2 -2
  199. data/db/migrate/20130306195650_add_backorderable_to_stock_item.rb +2 -2
  200. data/db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb +2 -2
  201. data/db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb +1 -1
  202. data/db/migrate/20130319062004_change_orders_total_precision.rb +5 -5
  203. data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb +2 -2
  204. data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb +2 -2
  205. data/db/migrate/20130319082943_change_adjustments_amount_precision.rb +2 -2
  206. data/db/migrate/20130319183250_add_originator_to_stock_movement.rb +1 -1
  207. data/db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb +3 -3
  208. data/db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb +3 -3
  209. data/db/migrate/20130326175857_add_stock_location_to_rma.rb +1 -1
  210. data/db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb +1 -1
  211. data/db/migrate/20130328195253_add_seo_metas_to_taxons.rb +1 -1
  212. data/db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb +1 -1
  213. data/db/migrate/20130413230529_add_name_to_spree_credit_cards.rb +1 -1
  214. data/db/migrate/20130414000512_update_name_fields_on_spree_credit_cards.rb +2 -2
  215. data/db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb +1 -1
  216. data/db/migrate/20130417120035_update_adjustment_states.rb +3 -3
  217. data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb +4 -4
  218. data/db/migrate/20130418125341_create_spree_stock_transfers.rb +1 -1
  219. data/db/migrate/20130423110707_drop_products_count_on_hand.rb +1 -1
  220. data/db/migrate/20130423223847_set_default_shipping_rate_cost.rb +1 -1
  221. data/db/migrate/20130509115210_add_number_to_stock_transfer.rb +1 -1
  222. data/db/migrate/20130514151929_add_sku_index_to_spree_variants.rb +1 -1
  223. data/db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb +1 -1
  224. data/db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb +1 -1
  225. data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb +1 -1
  226. data/db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb +1 -1
  227. data/db/migrate/20130618041418_add_updated_at_to_spree_countries.rb +1 -1
  228. data/db/migrate/20130619012236_add_updated_at_to_spree_states.rb +1 -1
  229. data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb +1 -1
  230. data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +2 -2
  231. data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +4 -4
  232. data/db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb +1 -1
  233. data/db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb +1 -1
  234. data/db/migrate/20130718042445_add_cost_price_to_line_item.rb +2 -2
  235. data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb +3 -3
  236. data/db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb +1 -1
  237. data/db/migrate/20130729214043_index_completed_at_on_spree_orders.rb +1 -1
  238. data/db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb +1 -1
  239. data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +1 -1
  240. data/db/migrate/20130806022521_drop_spree_mail_methods.rb +1 -1
  241. data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb +1 -1
  242. data/db/migrate/20130807024301_upgrade_adjustments.rb +4 -4
  243. data/db/migrate/20130807024302_rename_adjustment_fields.rb +1 -1
  244. data/db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb +1 -1
  245. data/db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb +1 -1
  246. data/db/migrate/20130813004002_add_shipment_total_to_spree_orders.rb +2 -2
  247. data/db/migrate/20130813140619_expand_order_number_size.rb +3 -3
  248. data/db/migrate/20130813232134_rename_activators_to_promotions.rb +1 -1
  249. data/db/migrate/20130815000406_add_adjustment_total_to_line_items.rb +2 -2
  250. data/db/migrate/20130815024413_add_adjustment_total_to_shipments.rb +2 -2
  251. data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb +1 -1
  252. data/db/migrate/20130828234942_add_tax_total_to_line_items_shipments_and_orders.rb +2 -2
  253. data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb +2 -2
  254. data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb +1 -1
  255. data/db/migrate/20130903183026_add_code_to_spree_promotion_rules.rb +1 -1
  256. data/db/migrate/20130909115621_change_states_required_for_countries.rb +1 -1
  257. data/db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb +1 -1
  258. data/db/migrate/20130917024658_remove_promotions_event_name_field.rb +2 -2
  259. data/db/migrate/20130924040529_add_promo_total_to_line_items_and_shipments_and_orders.rb +1 -1
  260. data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb +2 -2
  261. data/db/migrate/20131026154747_add_track_inventory_to_variant.rb +2 -2
  262. data/db/migrate/20131107132123_add_tax_category_to_variants.rb +1 -1
  263. data/db/migrate/20131113035136_add_channel_to_spree_orders.rb +1 -1
  264. data/db/migrate/20131118043959_add_included_to_adjustments.rb +2 -2
  265. data/db/migrate/20131118050234_rename_tax_total_fields.rb +1 -1
  266. data/db/migrate/20131118183431_add_line_item_id_to_spree_inventory_units.rb +1 -1
  267. data/db/migrate/20131120234456_add_updated_at_to_variants.rb +1 -1
  268. data/db/migrate/20131127001002_add_position_to_classifications.rb +1 -1
  269. data/db/migrate/20131211112807_create_spree_orders_promotions.rb +2 -2
  270. data/db/migrate/20131211192741_unique_shipping_method_categories.rb +1 -1
  271. data/db/migrate/20131218054603_add_item_count_to_spree_orders.rb +2 -2
  272. data/db/migrate/20140106065820_remove_value_type_from_spree_preferences.rb +1 -1
  273. data/db/migrate/20140106224208_rename_permalink_to_slug_for_products.rb +1 -1
  274. data/db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb +1 -1
  275. data/db/migrate/20140124023232_rename_activator_id_in_rules_and_actions_to_promotion_id.rb +1 -1
  276. data/db/migrate/20140129024326_add_deleted_at_to_spree_prices.rb +1 -1
  277. data/db/migrate/20140203161722_add_approver_id_and_approved_at_to_orders.rb +1 -1
  278. data/db/migrate/20140204115338_add_confirmation_delivered_to_spree_orders.rb +1 -1
  279. data/db/migrate/20140204192230_add_auto_capture_to_payment_methods.rb +1 -1
  280. data/db/migrate/20140205120320_create_spree_payment_capture_events.rb +1 -1
  281. data/db/migrate/20140205144710_add_uncaptured_amount_to_payments.rb +1 -1
  282. data/db/migrate/20140205181631_default_variant_weight_to_zero.rb +1 -1
  283. data/db/migrate/20140207085910_add_tax_category_id_to_shipping_methods.rb +1 -1
  284. data/db/migrate/20140207093021_add_tax_rate_id_to_shipping_rates.rb +1 -1
  285. data/db/migrate/20140211040159_add_pre_tax_amount_to_line_items_and_shipments.rb +1 -1
  286. data/db/migrate/20140213184916_add_more_indexes.rb +1 -1
  287. data/db/migrate/20140219060952_add_considered_risky_to_orders.rb +2 -2
  288. data/db/migrate/20140227112348_add_preference_store_to_everything.rb +1 -1
  289. data/db/migrate/20140307235515_add_user_id_to_spree_credit_cards.rb +1 -1
  290. data/db/migrate/20140309023735_migrate_old_preferences.rb +1 -1
  291. data/db/migrate/20140309024355_create_spree_stores.rb +2 -2
  292. data/db/migrate/20140309033438_create_store_from_preferences.rb +2 -2
  293. data/db/migrate/20140315053743_add_timestamps_to_spree_assets.rb +1 -1
  294. data/db/migrate/20140318191500_create_spree_taxons_promotion_rules.rb +1 -1
  295. data/db/migrate/20140331100557_add_additional_store_fields.rb +1 -1
  296. data/db/migrate/20140410141842_add_many_missing_indexes.rb +1 -1
  297. data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb +1 -1
  298. data/db/migrate/20140415041315_add_user_id_created_by_id_index_to_order.rb +1 -1
  299. data/db/migrate/20140508151342_change_spree_price_amount_precision.rb +5 -5
  300. data/db/migrate/20140518174634_add_token_to_spree_orders.rb +1 -1
  301. data/db/migrate/20140530024945_move_order_token_from_tokenized_permission.rb +2 -2
  302. data/db/migrate/20140601011216_set_shipment_total_for_users_upgrading.rb +1 -1
  303. data/db/migrate/20140604135309_drop_credit_card_first_name_and_last_name.rb +1 -1
  304. data/db/migrate/20140609201656_add_deleted_at_to_spree_promotion_actions.rb +1 -1
  305. data/db/migrate/20140616202624_remove_uncaptured_amount_from_spree_payments.rb +1 -1
  306. data/db/migrate/20140625214618_create_spree_refunds.rb +1 -1
  307. data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb +1 -1
  308. data/db/migrate/20140707125621_rename_return_authorization_inventory_unit_to_return_items.rb +1 -1
  309. data/db/migrate/20140709160534_backfill_line_item_pre_tax_amount.rb +1 -1
  310. data/db/migrate/20140710041921_recreate_spree_return_authorizations.rb +2 -2
  311. data/db/migrate/20140710181204_add_amount_fields_to_return_items.rb +1 -1
  312. data/db/migrate/20140710190048_drop_return_authorization_amount.rb +1 -1
  313. data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb +1 -1
  314. data/db/migrate/20140713140527_create_spree_refund_reasons.rb +1 -1
  315. data/db/migrate/20140713142214_rename_return_authorization_reason.rb +1 -1
  316. data/db/migrate/20140715182625_create_spree_promotion_categories.rb +1 -1
  317. data/db/migrate/20140716204111_drop_received_at_on_return_items.rb +1 -1
  318. data/db/migrate/20140716212330_add_reception_and_acceptance_status_to_return_items.rb +1 -1
  319. data/db/migrate/20140717155155_create_default_refund_reason.rb +1 -1
  320. data/db/migrate/20140717185932_add_default_to_spree_stock_locations.rb +1 -1
  321. data/db/migrate/20140718133010_create_spree_customer_returns.rb +1 -1
  322. data/db/migrate/20140718133349_add_customer_return_id_to_return_item.rb +1 -1
  323. data/db/migrate/20140718195325_create_friendly_id_slugs.rb +5 -5
  324. data/db/migrate/20140723004419_rename_spree_refund_return_authorization_id.rb +1 -1
  325. data/db/migrate/20140723152808_increase_return_item_pre_tax_amount_precision.rb +1 -1
  326. data/db/migrate/20140723214541_copy_product_slugs_to_slug_history.rb +2 -2
  327. data/db/migrate/20140725131539_create_spree_reimbursements.rb +1 -1
  328. data/db/migrate/20140728225422_add_promotionable_to_spree_products.rb +1 -1
  329. data/db/migrate/20140729133613_add_exchange_inventory_unit_foreign_keys.rb +1 -1
  330. data/db/migrate/20140730155938_add_acceptance_status_errors_to_return_item.rb +1 -1
  331. data/db/migrate/20140731150017_create_spree_reimbursement_types.rb +1 -1
  332. data/db/migrate/20140804185157_add_default_to_shipment_cost.rb +1 -1
  333. data/db/migrate/20140805171035_add_default_to_spree_credit_cards.rb +1 -1
  334. data/db/migrate/20140805171219_make_existing_credit_cards_default.rb +1 -1
  335. data/db/migrate/20140806144901_add_type_to_reimbursement_type.rb +1 -1
  336. data/db/migrate/20140808184039_create_spree_reimbursement_credits.rb +1 -1
  337. data/db/migrate/20140827170513_add_meta_title_to_spree_products.rb +1 -1
  338. data/db/migrate/20140911173301_add_kind_to_zone.rb +1 -1
  339. data/db/migrate/20140924164824_add_code_to_spree_tax_categories.rb +1 -1
  340. data/db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb +1 -1
  341. data/db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb +1 -1
  342. data/db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb +1 -1
  343. data/db/migrate/20141009204607_add_store_id_to_orders.rb +1 -1
  344. data/db/migrate/20141012083513_create_spree_taxons_prototypes.rb +1 -1
  345. data/db/migrate/20141021194502_add_state_lock_version_to_order.rb +1 -1
  346. data/db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb +2 -7
  347. data/db/migrate/20141101231208_fix_adjustment_order_presence.rb +1 -1
  348. data/db/migrate/20141105213646_update_classifications_positions.rb +1 -1
  349. data/db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb +1 -1
  350. data/db/migrate/20141215232040_remove_token_permissions_table.rb +1 -1
  351. data/db/migrate/20141215235502_remove_extra_products_slug_index.rb +1 -1
  352. data/db/migrate/20141217215630_update_product_slug_index.rb +1 -1
  353. data/db/migrate/20141218025915_rename_identifier_to_number_for_payment.rb +1 -1
  354. data/db/migrate/20150118210639_create_spree_store_credits.rb +24 -0
  355. data/db/migrate/20150118211500_create_spree_store_credit_categories.rb +8 -0
  356. data/db/migrate/20150118212051_create_spree_store_credit_events.rb +17 -0
  357. data/db/migrate/20150118212101_create_spree_store_credit_types.rb +10 -0
  358. data/db/migrate/20150121022521_remove_environment_from_payment_method.rb +1 -1
  359. data/db/migrate/20150122145607_add_resellable_to_return_items.rb +1 -1
  360. data/db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb +1 -1
  361. data/db/migrate/20150128032538_remove_environment_from_tracker.rb +1 -1
  362. data/db/migrate/20150128060325_remove_spree_configurations.rb +1 -1
  363. data/db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb +1 -1
  364. data/db/migrate/20150309161154_ensure_payments_have_numbers.rb +1 -1
  365. data/db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb +67 -0
  366. data/db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb +18 -0
  367. data/db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb +14 -0
  368. data/db/migrate/20150515211137_fix_adjustment_order_id.rb +1 -1
  369. data/db/migrate/20150522071831_add_position_to_spree_payment_methods.rb +5 -0
  370. data/db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb +1 -1
  371. data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb +1 -1
  372. data/db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb +19 -0
  373. data/db/migrate/20150627090949_migrate_payment_methods_display.rb +12 -0
  374. data/db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb +1 -1
  375. data/db/migrate/20150714154102_spree_payment_method_store_credits.rb +12 -0
  376. data/db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb +18 -0
  377. data/db/migrate/20150727191614_spree_store_credit_types.rb +11 -0
  378. data/db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb +68 -0
  379. data/db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb +13 -0
  380. data/db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb +16 -0
  381. data/db/migrate/20160219165458_add_indexes.rb +14 -0
  382. data/db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb +10 -0
  383. data/db/migrate/20160511071954_acts_as_taggable_on_spree_migration.rb +40 -0
  384. data/db/migrate/20160511072249_change_collation_for_spree_tag_names.rb +9 -0
  385. data/db/migrate/20160511072335_add_missing_indexes_to_spree_taggings.rb +14 -0
  386. data/db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb +7 -0
  387. data/db/migrate/20161014145148_add_created_at_to_variant.rb +8 -0
  388. data/db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb +6 -0
  389. data/lib/generators/spree/custom_user/custom_user_generator.rb +1 -1
  390. data/lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt +3 -3
  391. data/lib/generators/spree/custom_user/templates/migration.rb.tt +2 -2
  392. data/lib/generators/spree/dummy/dummy_generator.rb +11 -11
  393. data/lib/generators/spree/dummy/templates/rails/application.rb +1 -1
  394. data/lib/generators/spree/dummy/templates/rails/database.yml +38 -28
  395. data/lib/generators/spree/dummy/templates/rails/test.rb +4 -3
  396. data/lib/generators/spree/install/install_generator.rb +37 -13
  397. data/lib/spree/core/controller_helpers/auth.rb +1 -1
  398. data/lib/spree/core/controller_helpers/common.rb +6 -6
  399. data/lib/spree/core/controller_helpers/order.rb +9 -10
  400. data/lib/spree/core/controller_helpers/respond_with.rb +1 -1
  401. data/lib/spree/core/controller_helpers/search.rb +1 -1
  402. data/lib/spree/core/controller_helpers/store.rb +29 -0
  403. data/lib/spree/core/delegate_belongs_to.rb +4 -4
  404. data/lib/spree/core/engine.rb +39 -20
  405. data/lib/spree/core/environment.rb +1 -1
  406. data/lib/spree/core/importer/order.rb +37 -40
  407. data/lib/spree/core/importer/product.rb +2 -2
  408. data/lib/spree/core/number_generator.rb +52 -0
  409. data/lib/spree/core/product_duplicator.rb +1 -1
  410. data/lib/spree/core/product_filters.rb +2 -2
  411. data/lib/spree/core/search/base.rb +4 -3
  412. data/lib/spree/core/version.rb +1 -1
  413. data/lib/spree/core.rb +16 -0
  414. data/lib/spree/i18n/initializer.rb +1 -1
  415. data/lib/spree/localized_number.rb +3 -1
  416. data/lib/spree/permitted_attributes.rb +6 -3
  417. data/lib/spree/testing_support/caching.rb +3 -3
  418. data/lib/spree/testing_support/common_rake.rb +3 -3
  419. data/lib/spree/testing_support/controller_requests.rb +4 -4
  420. data/lib/spree/testing_support/factories/address_factory.rb +1 -1
  421. data/lib/spree/testing_support/factories/country_factory.rb +2 -2
  422. data/lib/spree/testing_support/factories/line_item_factory.rb +0 -1
  423. data/lib/spree/testing_support/factories/order_factory.rb +3 -2
  424. data/lib/spree/testing_support/factories/payment_factory.rb +5 -0
  425. data/lib/spree/testing_support/factories/payment_method_factory.rb +8 -0
  426. data/lib/spree/testing_support/factories/promotion_rule_factory.rb +5 -0
  427. data/lib/spree/testing_support/factories/refund_factory.rb +9 -1
  428. data/lib/spree/testing_support/factories/return_authorization_factory.rb +2 -0
  429. data/lib/spree/testing_support/factories/state_factory.rb +2 -2
  430. data/lib/spree/testing_support/factories/store_credit_category_factory.rb +9 -0
  431. data/lib/spree/testing_support/factories/store_credit_event_factory.rb +8 -0
  432. data/lib/spree/testing_support/factories/store_credit_factory.rb +17 -0
  433. data/lib/spree/testing_support/factories/store_credit_type_factory.rb +11 -0
  434. data/lib/spree/testing_support/factories/tag_factory.rb +5 -0
  435. data/lib/spree/testing_support/factories/user_factory.rb +1 -1
  436. data/lib/spree/testing_support/factories/zone_member_factory.rb +6 -0
  437. data/lib/spree/testing_support/factories.rb +3 -3
  438. data/lib/spree/testing_support/kernel.rb +18 -0
  439. data/lib/spree/testing_support/microdata.rb +189 -0
  440. data/lib/spree/testing_support/order_walkthrough.rb +4 -4
  441. data/lib/tasks/core.rake +69 -1
  442. data/lib/tasks/exchanges.rake +2 -2
  443. data/spec/fixtures/microdata.html +22 -0
  444. data/spec/fixtures/microdata_itemref.html +15 -0
  445. data/spec/fixtures/microdata_no_itemscope.html +20 -0
  446. data/spec/helpers/base_helper_spec.rb +74 -11
  447. data/spec/helpers/products_helper_spec.rb +80 -15
  448. data/spec/lib/i18n_spec.rb +13 -13
  449. data/spec/lib/search/base_spec.rb +18 -18
  450. data/spec/lib/spree/core/controller_helpers/auth_spec.rb +6 -4
  451. data/spec/lib/spree/core/controller_helpers/order_spec.rb +15 -0
  452. data/spec/lib/spree/core/controller_helpers/store_spec.rb +56 -0
  453. data/spec/lib/spree/core/importer/order_spec.rb +227 -124
  454. data/spec/lib/spree/core/number_generator_spec.rb +175 -0
  455. data/spec/lib/spree/core_spec.rb +23 -0
  456. data/spec/lib/spree/localized_number_spec.rb +11 -1
  457. data/spec/lib/spree/money_spec.rb +6 -6
  458. data/spec/mailers/order_mailer_spec.rb +11 -13
  459. data/spec/mailers/reimbursement_mailer_spec.rb +2 -2
  460. data/spec/mailers/shipment_mailer_spec.rb +26 -8
  461. data/spec/mailers/test_mailer_spec.rb +16 -2
  462. data/spec/models/option_type_prototype_spec.rb +9 -0
  463. data/spec/models/spree/ability_spec.rb +20 -15
  464. data/spec/models/spree/address_spec.rb +144 -33
  465. data/spec/models/spree/adjustable/adjuster/base_spec.rb +10 -0
  466. data/spec/models/spree/adjustable/adjuster/promotion_spec.rb +211 -0
  467. data/spec/models/spree/adjustable/adjuster/tax_spec.rb +86 -0
  468. data/spec/models/spree/adjustable/adjustments_updater_spec.rb +2 -262
  469. data/spec/models/spree/adjustment_spec.rb +28 -2
  470. data/spec/models/spree/app_configuration_spec.rb +6 -3
  471. data/spec/models/spree/asset_spec.rb +9 -6
  472. data/spec/models/spree/calculator/default_tax_spec.rb +39 -14
  473. data/spec/models/spree/calculator/flat_percent_item_total_spec.rb +1 -1
  474. data/spec/models/spree/calculator/flexi_rate_spec.rb +6 -6
  475. data/spec/models/spree/calculator/percent_on_line_item_spec.rb +1 -1
  476. data/spec/models/spree/calculator/price_sack_spec.rb +2 -2
  477. data/spec/models/spree/calculator/refunds/default_refund_amount_spec.rb +4 -8
  478. data/spec/models/spree/calculator/shipping/flat_percent_item_total_spec.rb +4 -4
  479. data/spec/models/spree/calculator/shipping/flat_rate_spec.rb +2 -2
  480. data/spec/models/spree/calculator/shipping/flexi_rate_spec.rb +6 -6
  481. data/spec/models/spree/calculator/shipping/per_item_spec.rb +2 -2
  482. data/spec/models/spree/calculator/tiered_flat_rate_spec.rb +1 -1
  483. data/spec/models/spree/calculator/tiered_percent_spec.rb +1 -1
  484. data/spec/models/spree/calculator_spec.rb +3 -3
  485. data/spec/models/spree/classification_spec.rb +1 -1
  486. data/spec/models/spree/concerns/user_methods_spec.rb +82 -0
  487. data/spec/models/spree/concerns/vat_price_calculation_spec.rb +66 -0
  488. data/spec/models/spree/country_spec.rb +45 -8
  489. data/spec/models/spree/credit_card_spec.rb +13 -9
  490. data/spec/models/spree/customer_return_spec.rb +4 -26
  491. data/spec/models/spree/exchange_spec.rb +1 -1
  492. data/spec/models/spree/gateway/bogus_simple.rb +1 -1
  493. data/spec/models/spree/gateway/bogus_spec.rb +1 -1
  494. data/spec/models/spree/gateway_spec.rb +8 -1
  495. data/spec/models/spree/image_spec.rb +4 -1
  496. data/spec/models/spree/inventory_unit_spec.rb +35 -21
  497. data/spec/models/spree/line_item_spec.rb +100 -21
  498. data/spec/models/spree/option_type_spec.rb +3 -3
  499. data/spec/models/spree/option_value_spec.rb +8 -3
  500. data/spec/models/spree/order/address_spec.rb +1 -1
  501. data/spec/models/spree/order/adjustments_spec.rb +1 -1
  502. data/spec/models/spree/order/callbacks_spec.rb +3 -3
  503. data/spec/models/spree/order/checkout_spec.rb +99 -93
  504. data/spec/models/spree/order/currency_updater_spec.rb +4 -4
  505. data/spec/models/spree/order/finalizing_spec.rb +5 -8
  506. data/spec/models/spree/order/helpers_spec.rb +1 -1
  507. data/spec/models/spree/order/payment_spec.rb +21 -21
  508. data/spec/models/spree/order/risk_assessment_spec.rb +1 -1
  509. data/spec/models/spree/order/state_machine_spec.rb +4 -8
  510. data/spec/models/spree/order/store_credit_spec.rb +426 -0
  511. data/spec/models/spree/order/tax_spec.rb +13 -13
  512. data/spec/models/spree/order/totals_spec.rb +2 -2
  513. data/spec/models/spree/order/updating_spec.rb +4 -4
  514. data/spec/models/spree/order/validations_spec.rb +2 -2
  515. data/spec/models/spree/order_contents_spec.rb +45 -4
  516. data/spec/models/spree/order_inventory_spec.rb +28 -17
  517. data/spec/models/spree/order_merger_spec.rb +3 -1
  518. data/spec/models/spree/order_spec.rb +188 -96
  519. data/spec/models/spree/order_updater_spec.rb +43 -32
  520. data/spec/models/spree/payment/gateway_options_spec.rb +10 -2
  521. data/spec/models/spree/payment/store_credit_spec.rb +60 -0
  522. data/spec/models/spree/payment_method/store_credit_spec.rb +291 -0
  523. data/spec/models/spree/payment_method_spec.rb +22 -14
  524. data/spec/models/spree/payment_spec.rb +75 -82
  525. data/spec/models/spree/preference_spec.rb +1 -1
  526. data/spec/models/spree/preferences/configuration_spec.rb +2 -2
  527. data/spec/models/spree/preferences/preferable_spec.rb +15 -19
  528. data/spec/models/spree/preferences/scoped_store_spec.rb +1 -1
  529. data/spec/models/spree/preferences/store_spec.rb +3 -3
  530. data/spec/models/spree/price_spec.rb +87 -1
  531. data/spec/models/spree/product/scopes_spec.rb +39 -4
  532. data/spec/models/spree/product_duplicator_spec.rb +2 -2
  533. data/spec/models/spree/product_filter_spec.rb +2 -2
  534. data/spec/models/spree/product_option_type_spec.rb +6 -2
  535. data/spec/models/spree/product_promotion_rule_spec.rb +9 -0
  536. data/spec/models/spree/product_property_spec.rb +16 -1
  537. data/spec/models/spree/product_spec.rb +196 -41
  538. data/spec/models/spree/promotion/actions/create_adjustment_spec.rb +63 -0
  539. data/spec/models/spree/promotion/actions/create_item_adjustments_spec.rb +6 -6
  540. data/spec/models/spree/promotion/actions/free_shipping_spec.rb +1 -1
  541. data/spec/models/spree/promotion/rules/country_spec.rb +36 -0
  542. data/spec/models/spree/promotion/rules/first_order_spec.rb +11 -11
  543. data/spec/models/spree/promotion/rules/item_total_spec.rb +1 -1
  544. data/spec/models/spree/promotion/rules/one_use_per_user_spec.rb +1 -1
  545. data/spec/models/spree/promotion/rules/product_spec.rb +8 -8
  546. data/spec/models/spree/promotion/rules/taxon_spec.rb +1 -1
  547. data/spec/models/spree/promotion/rules/user_logged_in_spec.rb +3 -3
  548. data/spec/models/spree/promotion/rules/user_spec.rb +15 -7
  549. data/spec/models/spree/promotion_action_spec.rb +2 -2
  550. data/spec/models/spree/promotion_category_spec.rb +1 -1
  551. data/spec/models/spree/promotion_handler/cart_spec.rb +1 -1
  552. data/spec/models/spree/promotion_handler/coupon_spec.rb +28 -28
  553. data/spec/models/spree/promotion_handler/page_spec.rb +6 -6
  554. data/spec/models/spree/promotion_rule_spec.rb +2 -2
  555. data/spec/models/spree/promotion_rule_taxon_spec.rb +9 -0
  556. data/spec/models/spree/promotion_rule_user_spec.rb +9 -0
  557. data/spec/models/spree/promotion_spec.rb +141 -65
  558. data/spec/models/spree/property_prototype_spec.rb +9 -0
  559. data/spec/models/spree/property_spec.rb +1 -1
  560. data/spec/models/spree/prototype_spec.rb +1 -1
  561. data/spec/models/spree/prototype_taxon_spec.rb +9 -0
  562. data/spec/models/spree/refund_reason_spec.rb +20 -0
  563. data/spec/models/spree/refund_spec.rb +1 -1
  564. data/spec/models/spree/reimbursement/credit_spec.rb +1 -1
  565. data/spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb +1 -1
  566. data/spec/models/spree/reimbursement/reimbursement_type_validator_spec.rb +1 -1
  567. data/spec/models/spree/reimbursement_performer_spec.rb +1 -1
  568. data/spec/models/spree/reimbursement_spec.rb +3 -30
  569. data/spec/models/spree/reimbursement_tax_calculator_spec.rb +18 -6
  570. data/spec/models/spree/reimbursement_type/credit_spec.rb +1 -1
  571. data/spec/models/spree/reimbursement_type/exchange_spec.rb +1 -1
  572. data/spec/models/spree/reimbursement_type/original_payment_spec.rb +1 -1
  573. data/spec/models/spree/reimbursement_type/store_credit_spec.rb +101 -0
  574. data/spec/models/spree/return_authorization_reason_spec.rb +7 -0
  575. data/spec/models/spree/return_authorization_spec.rb +3 -23
  576. data/spec/models/spree/return_item/eligibility_validator/default_spec.rb +1 -1
  577. data/spec/models/spree/return_item/eligibility_validator/rma_required_spec.rb +1 -1
  578. data/spec/models/spree/return_item/eligibility_validator/time_since_purchase_spec.rb +1 -1
  579. data/spec/models/spree/return_item/exchange_variant_eligibility/same_option_value_spec.rb +1 -1
  580. data/spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb +1 -1
  581. data/spec/models/spree/return_item_spec.rb +51 -2
  582. data/spec/models/spree/returns_calculator_spec.rb +2 -2
  583. data/spec/models/spree/role_spec.rb +7 -0
  584. data/spec/models/spree/shipment_spec.rb +24 -22
  585. data/spec/models/spree/shipping_calculator_spec.rb +5 -5
  586. data/spec/models/spree/shipping_category_spec.rb +15 -1
  587. data/spec/models/spree/shipping_method_spec.rb +11 -4
  588. data/spec/models/spree/shipping_rate_spec.rb +40 -41
  589. data/spec/models/spree/state_spec.rb +13 -2
  590. data/spec/models/spree/stock/availability_validator_spec.rb +1 -1
  591. data/spec/models/spree/stock/content_item_spec.rb +9 -0
  592. data/spec/models/spree/stock/coordinator_spec.rb +13 -3
  593. data/spec/models/spree/stock/differentiator_spec.rb +1 -1
  594. data/spec/models/spree/stock/estimator_spec.rb +60 -12
  595. data/spec/models/spree/stock/inventory_unit_builder_spec.rb +1 -1
  596. data/spec/models/spree/stock/package_spec.rb +6 -18
  597. data/spec/models/spree/stock/packer_spec.rb +1 -1
  598. data/spec/models/spree/stock/prioritizer_spec.rb +7 -7
  599. data/spec/models/spree/stock/quantifier_spec.rb +61 -32
  600. data/spec/models/spree/stock/splitter/backordered_spec.rb +1 -1
  601. data/spec/models/spree/stock/splitter/base_spec.rb +1 -1
  602. data/spec/models/spree/stock/splitter/shipping_category_spec.rb +3 -3
  603. data/spec/models/spree/stock_item_spec.rb +30 -8
  604. data/spec/models/spree/stock_location_spec.rb +5 -5
  605. data/spec/models/spree/stock_movement_spec.rb +101 -37
  606. data/spec/models/spree/stock_transfer_spec.rb +1 -1
  607. data/spec/models/spree/store_credit_event_spec.rb +101 -0
  608. data/spec/models/spree/store_credit_spec.rb +786 -0
  609. data/spec/models/spree/store_spec.rb +40 -12
  610. data/spec/models/spree/tax_category_spec.rb +7 -2
  611. data/spec/models/spree/tax_rate_spec.rb +288 -109
  612. data/spec/models/spree/taxon_spec.rb +15 -4
  613. data/spec/models/spree/taxonomy_spec.rb +2 -2
  614. data/spec/models/spree/tracker_spec.rb +1 -1
  615. data/spec/models/spree/user_spec.rb +114 -41
  616. data/spec/models/spree/variant_spec.rb +310 -15
  617. data/spec/models/spree/zone_member_spec.rb +38 -0
  618. data/spec/models/spree/zone_spec.rb +38 -10
  619. data/spec/spec_helper.rb +5 -0
  620. data/spec/support/concerns/{adjustment_source_spec.rb → adjustment_source.rb} +0 -0
  621. data/spec/support/concerns/{default_price_spec.rb → default_price.rb} +9 -0
  622. data/spree_core.gemspec +12 -13
  623. data/vendor/assets/javascripts/jquery.payment.js +239 -84
  624. metadata +136 -65
  625. data/CHANGELOG.md +0 -4
  626. data/app/models/concerns/spree/number_generator.rb +0 -39
  627. data/spec/models/spree/validations/db_maximum_length_validator_spec.rb +0 -24
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.9
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-05-12 00:00:00.000000000 Z
11
+ date: 2017-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
@@ -16,42 +16,42 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.47.0
19
+ version: '1.59'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.47.0
26
+ version: '1.59'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: acts_as_list
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '='
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 0.7.2
33
+ version: '0.8'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '='
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 0.7.2
40
+ version: '0.8'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: awesome_nested_set
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 3.0.1
47
+ version: 3.1.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 3.0.1
54
+ version: 3.1.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: carmen
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.0.0
89
+ version: '1.0'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.0.0
96
+ version: '1.0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: ffaker
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: '1.16'
103
+ version: 2.2.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: '1.16'
110
+ version: 2.2.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: font-awesome-rails
113
113
  requirement: !ruby/object:Gem::Requirement
@@ -150,40 +150,20 @@ dependencies:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
152
  version: 1.6.18
153
- - !ruby/object:Gem::Dependency
154
- name: json
155
- requirement: !ruby/object:Gem::Requirement
156
- requirements:
157
- - - "~>"
158
- - !ruby/object:Gem::Version
159
- version: '1.7'
160
- type: :runtime
161
- prerelease: false
162
- version_requirements: !ruby/object:Gem::Requirement
163
- requirements:
164
- - - "~>"
165
- - !ruby/object:Gem::Version
166
- version: '1.7'
167
153
  - !ruby/object:Gem::Dependency
168
154
  name: kaminari
169
155
  requirement: !ruby/object:Gem::Requirement
170
156
  requirements:
171
157
  - - "~>"
172
158
  - !ruby/object:Gem::Version
173
- version: '0.15'
174
- - - ">="
175
- - !ruby/object:Gem::Version
176
- version: 0.15.1
159
+ version: '0.17'
177
160
  type: :runtime
178
161
  prerelease: false
179
162
  version_requirements: !ruby/object:Gem::Requirement
180
163
  requirements:
181
164
  - - "~>"
182
165
  - !ruby/object:Gem::Version
183
- version: '0.15'
184
- - - ">="
185
- - !ruby/object:Gem::Version
186
- version: 0.15.1
166
+ version: '0.17'
187
167
  - !ruby/object:Gem::Dependency
188
168
  name: monetize
189
169
  requirement: !ruby/object:Gem::Requirement
@@ -218,14 +198,14 @@ dependencies:
218
198
  requirements:
219
199
  - - "~>"
220
200
  - !ruby/object:Gem::Version
221
- version: 2.1.0
201
+ version: 2.2.0.pre
222
202
  type: :runtime
223
203
  prerelease: false
224
204
  version_requirements: !ruby/object:Gem::Requirement
225
205
  requirements:
226
206
  - - "~>"
227
207
  - !ruby/object:Gem::Version
228
- version: 2.1.0
208
+ version: 2.2.0.pre
229
209
  - !ruby/object:Gem::Dependency
230
210
  name: premailer-rails
231
211
  requirement: !ruby/object:Gem::Requirement
@@ -240,34 +220,48 @@ dependencies:
240
220
  - - ">="
241
221
  - !ruby/object:Gem::Version
242
222
  version: '0'
223
+ - !ruby/object:Gem::Dependency
224
+ name: acts-as-taggable-on
225
+ requirement: !ruby/object:Gem::Requirement
226
+ requirements:
227
+ - - "~>"
228
+ - !ruby/object:Gem::Version
229
+ version: '4.0'
230
+ type: :runtime
231
+ prerelease: false
232
+ version_requirements: !ruby/object:Gem::Requirement
233
+ requirements:
234
+ - - "~>"
235
+ - !ruby/object:Gem::Version
236
+ version: '4.0'
243
237
  - !ruby/object:Gem::Dependency
244
238
  name: rails
245
239
  requirement: !ruby/object:Gem::Requirement
246
240
  requirements:
247
241
  - - "~>"
248
242
  - !ruby/object:Gem::Version
249
- version: 4.2.2
243
+ version: 5.0.0
250
244
  type: :runtime
251
245
  prerelease: false
252
246
  version_requirements: !ruby/object:Gem::Requirement
253
247
  requirements:
254
248
  - - "~>"
255
249
  - !ruby/object:Gem::Version
256
- version: 4.2.2
250
+ version: 5.0.0
257
251
  - !ruby/object:Gem::Dependency
258
252
  name: ransack
259
253
  requirement: !ruby/object:Gem::Requirement
260
254
  requirements:
261
255
  - - "~>"
262
256
  - !ruby/object:Gem::Version
263
- version: 1.4.1
257
+ version: 1.8.0
264
258
  type: :runtime
265
259
  prerelease: false
266
260
  version_requirements: !ruby/object:Gem::Requirement
267
261
  requirements:
268
262
  - - "~>"
269
263
  - !ruby/object:Gem::Version
270
- version: 1.4.1
264
+ version: 1.8.0
271
265
  - !ruby/object:Gem::Dependency
272
266
  name: responders
273
267
  requirement: !ruby/object:Gem::Requirement
@@ -310,20 +304,6 @@ dependencies:
310
304
  - - ">="
311
305
  - !ruby/object:Gem::Version
312
306
  version: '0'
313
- - !ruby/object:Gem::Dependency
314
- name: truncate_html
315
- requirement: !ruby/object:Gem::Requirement
316
- requirements:
317
- - - '='
318
- - !ruby/object:Gem::Version
319
- version: 0.9.2
320
- type: :runtime
321
- prerelease: false
322
- version_requirements: !ruby/object:Gem::Requirement
323
- requirements:
324
- - - '='
325
- - !ruby/object:Gem::Version
326
- version: 0.9.2
327
307
  - !ruby/object:Gem::Dependency
328
308
  name: twitter_cldr
329
309
  requirement: !ruby/object:Gem::Requirement
@@ -372,7 +352,6 @@ executables: []
372
352
  extensions: []
373
353
  extra_rdoc_files: []
374
354
  files:
375
- - CHANGELOG.md
376
355
  - Gemfile
377
356
  - LICENSE
378
357
  - Rakefile
@@ -381,7 +360,7 @@ files:
381
360
  - app/assets/images/noimage/mini.png
382
361
  - app/assets/images/noimage/product.png
383
362
  - app/assets/images/noimage/small.png
384
- - app/assets/javascripts/spree.js.coffee.erb
363
+ - app/assets/javascripts/spree.js.coffee
385
364
  - app/controllers/spree/base_controller.rb
386
365
  - app/helpers/spree/base_helper.rb
387
366
  - app/helpers/spree/products_helper.rb
@@ -390,20 +369,25 @@ files:
390
369
  - app/mailers/spree/reimbursement_mailer.rb
391
370
  - app/mailers/spree/shipment_mailer.rb
392
371
  - app/mailers/spree/test_mailer.rb
372
+ - app/models/concerns/spree/acts_as_taggable.rb
393
373
  - app/models/concerns/spree/adjustment_source.rb
394
374
  - app/models/concerns/spree/calculated_adjustments.rb
395
375
  - app/models/concerns/spree/default_price.rb
396
376
  - app/models/concerns/spree/display_money.rb
397
377
  - app/models/concerns/spree/named_type.rb
398
- - app/models/concerns/spree/number_generator.rb
399
378
  - app/models/concerns/spree/ransackable_attributes.rb
400
379
  - app/models/concerns/spree/user_address.rb
401
380
  - app/models/concerns/spree/user_api_authentication.rb
381
+ - app/models/concerns/spree/user_methods.rb
402
382
  - app/models/concerns/spree/user_payment_source.rb
403
383
  - app/models/concerns/spree/user_reporting.rb
384
+ - app/models/concerns/spree/vat_price_calculation.rb
404
385
  - app/models/friendly_id/slug_decorator.rb
405
386
  - app/models/spree/ability.rb
406
387
  - app/models/spree/address.rb
388
+ - app/models/spree/adjustable/adjuster/base.rb
389
+ - app/models/spree/adjustable/adjuster/promotion.rb
390
+ - app/models/spree/adjustable/adjuster/tax.rb
407
391
  - app/models/spree/adjustable/adjustments_updater.rb
408
392
  - app/models/spree/adjustable/promotion_accumulator.rb
409
393
  - app/models/spree/adjustment.rb
@@ -441,14 +425,18 @@ files:
441
425
  - app/models/spree/line_item.rb
442
426
  - app/models/spree/log_entry.rb
443
427
  - app/models/spree/option_type.rb
428
+ - app/models/spree/option_type_prototype.rb
444
429
  - app/models/spree/option_value.rb
430
+ - app/models/spree/option_value_variant.rb
445
431
  - app/models/spree/order.rb
446
432
  - app/models/spree/order/checkout.rb
447
433
  - app/models/spree/order/currency_updater.rb
448
434
  - app/models/spree/order/payments.rb
435
+ - app/models/spree/order/store_credit.rb
449
436
  - app/models/spree/order_contents.rb
450
437
  - app/models/spree/order_inventory.rb
451
438
  - app/models/spree/order_merger.rb
439
+ - app/models/spree/order_promotion.rb
452
440
  - app/models/spree/order_updater.rb
453
441
  - app/models/spree/payment.rb
454
442
  - app/models/spree/payment/gateway_options.rb
@@ -456,6 +444,7 @@ files:
456
444
  - app/models/spree/payment_capture_event.rb
457
445
  - app/models/spree/payment_method.rb
458
446
  - app/models/spree/payment_method/check.rb
447
+ - app/models/spree/payment_method/store_credit.rb
459
448
  - app/models/spree/preference.rb
460
449
  - app/models/spree/preferences/configuration.rb
461
450
  - app/models/spree/preferences/preferable.rb
@@ -466,12 +455,14 @@ files:
466
455
  - app/models/spree/product.rb
467
456
  - app/models/spree/product/scopes.rb
468
457
  - app/models/spree/product_option_type.rb
458
+ - app/models/spree/product_promotion_rule.rb
469
459
  - app/models/spree/product_property.rb
470
460
  - app/models/spree/promotion.rb
471
461
  - app/models/spree/promotion/actions/create_adjustment.rb
472
462
  - app/models/spree/promotion/actions/create_item_adjustments.rb
473
463
  - app/models/spree/promotion/actions/create_line_items.rb
474
464
  - app/models/spree/promotion/actions/free_shipping.rb
465
+ - app/models/spree/promotion/rules/country.rb
475
466
  - app/models/spree/promotion/rules/first_order.rb
476
467
  - app/models/spree/promotion/rules/item_total.rb
477
468
  - app/models/spree/promotion/rules/one_use_per_user.rb
@@ -488,8 +479,12 @@ files:
488
479
  - app/models/spree/promotion_handler/free_shipping.rb
489
480
  - app/models/spree/promotion_handler/page.rb
490
481
  - app/models/spree/promotion_rule.rb
482
+ - app/models/spree/promotion_rule_taxon.rb
483
+ - app/models/spree/promotion_rule_user.rb
491
484
  - app/models/spree/property.rb
485
+ - app/models/spree/property_prototype.rb
492
486
  - app/models/spree/prototype.rb
487
+ - app/models/spree/prototype_taxon.rb
493
488
  - app/models/spree/refund.rb
494
489
  - app/models/spree/refund_reason.rb
495
490
  - app/models/spree/reimbursement.rb
@@ -503,6 +498,7 @@ files:
503
498
  - app/models/spree/reimbursement_type/exchange.rb
504
499
  - app/models/spree/reimbursement_type/original_payment.rb
505
500
  - app/models/spree/reimbursement_type/reimbursement_helpers.rb
501
+ - app/models/spree/reimbursement_type/store_credit.rb
506
502
  - app/models/spree/return_authorization.rb
507
503
  - app/models/spree/return_authorization_reason.rb
508
504
  - app/models/spree/return_item.rb
@@ -517,12 +513,14 @@ files:
517
513
  - app/models/spree/return_item/exchange_variant_eligibility/same_product.rb
518
514
  - app/models/spree/returns_calculator.rb
519
515
  - app/models/spree/role.rb
516
+ - app/models/spree/role_user.rb
520
517
  - app/models/spree/shipment.rb
521
518
  - app/models/spree/shipment_handler.rb
522
519
  - app/models/spree/shipping_calculator.rb
523
520
  - app/models/spree/shipping_category.rb
524
521
  - app/models/spree/shipping_method.rb
525
522
  - app/models/spree/shipping_method_category.rb
523
+ - app/models/spree/shipping_method_zone.rb
526
524
  - app/models/spree/shipping_rate.rb
527
525
  - app/models/spree/state.rb
528
526
  - app/models/spree/state_change.rb
@@ -546,6 +544,11 @@ files:
546
544
  - app/models/spree/stock_movement.rb
547
545
  - app/models/spree/stock_transfer.rb
548
546
  - app/models/spree/store.rb
547
+ - app/models/spree/store_credit.rb
548
+ - app/models/spree/store_credit_category.rb
549
+ - app/models/spree/store_credit_event.rb
550
+ - app/models/spree/store_credit_type.rb
551
+ - app/models/spree/tag.rb
549
552
  - app/models/spree/tax_category.rb
550
553
  - app/models/spree/tax_rate.rb
551
554
  - app/models/spree/taxon.rb
@@ -555,8 +558,12 @@ files:
555
558
  - app/models/spree/variant.rb
556
559
  - app/models/spree/zone.rb
557
560
  - app/models/spree/zone_member.rb
561
+ - app/validators/db_maximum_length_validator.rb
558
562
  - app/views/layouts/spree/base_mailer.html.erb
559
563
  - app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
564
+ - app/views/spree/order_mailer/_adjustment.html.erb
565
+ - app/views/spree/order_mailer/_subtotal.html.erb
566
+ - app/views/spree/order_mailer/_total.html.erb
560
567
  - app/views/spree/order_mailer/cancel_email.html.erb
561
568
  - app/views/spree/order_mailer/cancel_email.text.erb
562
569
  - app/views/spree/order_mailer/confirm_email.html.erb
@@ -564,11 +571,15 @@ files:
564
571
  - app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
565
572
  - app/views/spree/shared/_base_mailer_footer.html.erb
566
573
  - app/views/spree/shared/_base_mailer_header.html.erb
574
+ - app/views/spree/shared/_base_mailer_stylesheets.html.erb
567
575
  - app/views/spree/shared/_error_messages.html.erb
576
+ - app/views/spree/shared/_mailer_line_item.html.erb
577
+ - app/views/spree/shared/_paths.html.erb
568
578
  - app/views/spree/shipment_mailer/shipped_email.html.erb
569
579
  - app/views/spree/shipment_mailer/shipped_email.text.erb
570
580
  - app/views/spree/test_mailer/test_email.html.erb
571
581
  - app/views/spree/test_mailer/test_email.text.erb
582
+ - config/initializers/acts_as_taggable_on.rb
572
583
  - config/initializers/assets.rb
573
584
  - config/initializers/friendly_id.rb
574
585
  - config/initializers/premailer_assets.rb
@@ -776,6 +787,10 @@ files:
776
787
  - db/migrate/20141215235502_remove_extra_products_slug_index.rb
777
788
  - db/migrate/20141217215630_update_product_slug_index.rb
778
789
  - db/migrate/20141218025915_rename_identifier_to_number_for_payment.rb
790
+ - db/migrate/20150118210639_create_spree_store_credits.rb
791
+ - db/migrate/20150118211500_create_spree_store_credit_categories.rb
792
+ - db/migrate/20150118212051_create_spree_store_credit_events.rb
793
+ - db/migrate/20150118212101_create_spree_store_credit_types.rb
779
794
  - db/migrate/20150121022521_remove_environment_from_payment_method.rb
780
795
  - db/migrate/20150122145607_add_resellable_to_return_items.rb
781
796
  - db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb
@@ -783,10 +798,30 @@ files:
783
798
  - db/migrate/20150128060325_remove_spree_configurations.rb
784
799
  - db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb
785
800
  - db/migrate/20150309161154_ensure_payments_have_numbers.rb
801
+ - db/migrate/20150314013438_add_missing_indexes_on_spree_tables.rb
802
+ - db/migrate/20150317174308_remove_duplicated_indexes_from_multi_columns.rb
803
+ - db/migrate/20150324104002_remove_user_index_from_spree_state_changes.rb
786
804
  - db/migrate/20150515211137_fix_adjustment_order_id.rb
805
+ - db/migrate/20150522071831_add_position_to_spree_payment_methods.rb
787
806
  - db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb
788
807
  - db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb
808
+ - db/migrate/20150626181949_add_taxable_adjustment_total_to_line_item.rb
809
+ - db/migrate/20150627090949_migrate_payment_methods_display.rb
789
810
  - db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb
811
+ - db/migrate/20150714154102_spree_payment_method_store_credits.rb
812
+ - db/migrate/20150726141425_rename_has_and_belongs_to_associations_to_model_names.rb
813
+ - db/migrate/20150727191614_spree_store_credit_types.rb
814
+ - db/migrate/20150819154308_add_discontinued_to_products_and_variants.rb
815
+ - db/migrate/20151220072838_remove_shipping_method_id_from_spree_orders.rb
816
+ - db/migrate/20160207191757_add_id_column_to_earlier_habtm_tables.rb
817
+ - db/migrate/20160219165458_add_indexes.rb
818
+ - db/migrate/20160509064646_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb
819
+ - db/migrate/20160511071954_acts_as_taggable_on_spree_migration.rb
820
+ - db/migrate/20160511072249_change_collation_for_spree_tag_names.rb
821
+ - db/migrate/20160511072335_add_missing_indexes_to_spree_taggings.rb
822
+ - db/migrate/20160608090604_add_zipcode_required_to_spree_countries.rb
823
+ - db/migrate/20161014145148_add_created_at_to_variant.rb
824
+ - db/migrate/20161014152814_add_null_false_to_spree_variants_timestamps.rb
790
825
  - db/seeds.rb
791
826
  - lib/generators/spree/custom_user/custom_user_generator.rb
792
827
  - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -823,6 +858,7 @@ files:
823
858
  - lib/spree/core/importer.rb
824
859
  - lib/spree/core/importer/order.rb
825
860
  - lib/spree/core/importer/product.rb
861
+ - lib/spree/core/number_generator.rb
826
862
  - lib/spree/core/product_duplicator.rb
827
863
  - lib/spree/core/product_filters.rb
828
864
  - lib/spree/core/routes.rb
@@ -867,6 +903,7 @@ files:
867
903
  - lib/spree/testing_support/factories/product_property_factory.rb
868
904
  - lib/spree/testing_support/factories/promotion_category_factory.rb
869
905
  - lib/spree/testing_support/factories/promotion_factory.rb
906
+ - lib/spree/testing_support/factories/promotion_rule_factory.rb
870
907
  - lib/spree/testing_support/factories/property_factory.rb
871
908
  - lib/spree/testing_support/factories/prototype_factory.rb
872
909
  - lib/spree/testing_support/factories/refund_factory.rb
@@ -883,7 +920,12 @@ files:
883
920
  - lib/spree/testing_support/factories/stock_item_factory.rb
884
921
  - lib/spree/testing_support/factories/stock_location_factory.rb
885
922
  - lib/spree/testing_support/factories/stock_movement_factory.rb
923
+ - lib/spree/testing_support/factories/store_credit_category_factory.rb
924
+ - lib/spree/testing_support/factories/store_credit_event_factory.rb
925
+ - lib/spree/testing_support/factories/store_credit_factory.rb
926
+ - lib/spree/testing_support/factories/store_credit_type_factory.rb
886
927
  - lib/spree/testing_support/factories/store_factory.rb
928
+ - lib/spree/testing_support/factories/tag_factory.rb
887
929
  - lib/spree/testing_support/factories/tax_category_factory.rb
888
930
  - lib/spree/testing_support/factories/tax_rate_factory.rb
889
931
  - lib/spree/testing_support/factories/taxon_factory.rb
@@ -892,8 +934,11 @@ files:
892
934
  - lib/spree/testing_support/factories/user_factory.rb
893
935
  - lib/spree/testing_support/factories/variant_factory.rb
894
936
  - lib/spree/testing_support/factories/zone_factory.rb
937
+ - lib/spree/testing_support/factories/zone_member_factory.rb
895
938
  - lib/spree/testing_support/flash.rb
896
939
  - lib/spree/testing_support/i18n.rb
940
+ - lib/spree/testing_support/kernel.rb
941
+ - lib/spree/testing_support/microdata.rb
897
942
  - lib/spree/testing_support/order_walkthrough.rb
898
943
  - lib/spree/testing_support/preferences.rb
899
944
  - lib/spree/testing_support/shoulda_matcher_configuration.rb
@@ -903,6 +948,9 @@ files:
903
948
  - lib/tasks/email.rake
904
949
  - lib/tasks/exchanges.rake
905
950
  - script/rails
951
+ - spec/fixtures/microdata.html
952
+ - spec/fixtures/microdata_itemref.html
953
+ - spec/fixtures/microdata_no_itemscope.html
906
954
  - spec/fixtures/thinking-cat.jpg
907
955
  - spec/helpers/base_helper_spec.rb
908
956
  - spec/helpers/products_helper_spec.rb
@@ -916,8 +964,10 @@ files:
916
964
  - spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
917
965
  - spec/lib/spree/core/delegate_belongs_to_spec.rb
918
966
  - spec/lib/spree/core/importer/order_spec.rb
967
+ - spec/lib/spree/core/number_generator_spec.rb
919
968
  - spec/lib/spree/core/token_generator_spec.rb
920
969
  - spec/lib/spree/core/validators/email_spec.rb
970
+ - spec/lib/spree/core_spec.rb
921
971
  - spec/lib/spree/localized_number_spec.rb
922
972
  - spec/lib/spree/migrations_spec.rb
923
973
  - spec/lib/spree/money_spec.rb
@@ -926,8 +976,12 @@ files:
926
976
  - spec/mailers/reimbursement_mailer_spec.rb
927
977
  - spec/mailers/shipment_mailer_spec.rb
928
978
  - spec/mailers/test_mailer_spec.rb
979
+ - spec/models/option_type_prototype_spec.rb
929
980
  - spec/models/spree/ability_spec.rb
930
981
  - spec/models/spree/address_spec.rb
982
+ - spec/models/spree/adjustable/adjuster/base_spec.rb
983
+ - spec/models/spree/adjustable/adjuster/promotion_spec.rb
984
+ - spec/models/spree/adjustable/adjuster/tax_spec.rb
931
985
  - spec/models/spree/adjustable/adjustments_updater_spec.rb
932
986
  - spec/models/spree/adjustment_spec.rb
933
987
  - spec/models/spree/app_configuration_spec.rb
@@ -950,6 +1004,8 @@ files:
950
1004
  - spec/models/spree/calculator_spec.rb
951
1005
  - spec/models/spree/classification_spec.rb
952
1006
  - spec/models/spree/concerns/display_money_spec.rb
1007
+ - spec/models/spree/concerns/user_methods_spec.rb
1008
+ - spec/models/spree/concerns/vat_price_calculation_spec.rb
953
1009
  - spec/models/spree/country_spec.rb
954
1010
  - spec/models/spree/credit_card_spec.rb
955
1011
  - spec/models/spree/customer_return_spec.rb
@@ -973,6 +1029,7 @@ files:
973
1029
  - spec/models/spree/order/risk_assessment_spec.rb
974
1030
  - spec/models/spree/order/shipments_spec.rb
975
1031
  - spec/models/spree/order/state_machine_spec.rb
1032
+ - spec/models/spree/order/store_credit_spec.rb
976
1033
  - spec/models/spree/order/tax_spec.rb
977
1034
  - spec/models/spree/order/totals_spec.rb
978
1035
  - spec/models/spree/order/updating_spec.rb
@@ -983,6 +1040,8 @@ files:
983
1040
  - spec/models/spree/order_spec.rb
984
1041
  - spec/models/spree/order_updater_spec.rb
985
1042
  - spec/models/spree/payment/gateway_options_spec.rb
1043
+ - spec/models/spree/payment/store_credit_spec.rb
1044
+ - spec/models/spree/payment_method/store_credit_spec.rb
986
1045
  - spec/models/spree/payment_method_spec.rb
987
1046
  - spec/models/spree/payment_spec.rb
988
1047
  - spec/models/spree/preference_spec.rb
@@ -995,12 +1054,14 @@ files:
995
1054
  - spec/models/spree/product_duplicator_spec.rb
996
1055
  - spec/models/spree/product_filter_spec.rb
997
1056
  - spec/models/spree/product_option_type_spec.rb
1057
+ - spec/models/spree/product_promotion_rule_spec.rb
998
1058
  - spec/models/spree/product_property_spec.rb
999
1059
  - spec/models/spree/product_spec.rb
1000
1060
  - spec/models/spree/promotion/actions/create_adjustment_spec.rb
1001
1061
  - spec/models/spree/promotion/actions/create_item_adjustments_spec.rb
1002
1062
  - spec/models/spree/promotion/actions/create_line_items_spec.rb
1003
1063
  - spec/models/spree/promotion/actions/free_shipping_spec.rb
1064
+ - spec/models/spree/promotion/rules/country_spec.rb
1004
1065
  - spec/models/spree/promotion/rules/first_order_spec.rb
1005
1066
  - spec/models/spree/promotion/rules/item_total_spec.rb
1006
1067
  - spec/models/spree/promotion/rules/one_use_per_user_spec.rb
@@ -1016,9 +1077,14 @@ files:
1016
1077
  - spec/models/spree/promotion_handler/free_shipping_spec.rb
1017
1078
  - spec/models/spree/promotion_handler/page_spec.rb
1018
1079
  - spec/models/spree/promotion_rule_spec.rb
1080
+ - spec/models/spree/promotion_rule_taxon_spec.rb
1081
+ - spec/models/spree/promotion_rule_user_spec.rb
1019
1082
  - spec/models/spree/promotion_spec.rb
1083
+ - spec/models/spree/property_prototype_spec.rb
1020
1084
  - spec/models/spree/property_spec.rb
1021
1085
  - spec/models/spree/prototype_spec.rb
1086
+ - spec/models/spree/prototype_taxon_spec.rb
1087
+ - spec/models/spree/refund_reason_spec.rb
1022
1088
  - spec/models/spree/refund_spec.rb
1023
1089
  - spec/models/spree/reimbursement/credit_spec.rb
1024
1090
  - spec/models/spree/reimbursement/reimbursement_type_engine_spec.rb
@@ -1029,6 +1095,8 @@ files:
1029
1095
  - spec/models/spree/reimbursement_type/credit_spec.rb
1030
1096
  - spec/models/spree/reimbursement_type/exchange_spec.rb
1031
1097
  - spec/models/spree/reimbursement_type/original_payment_spec.rb
1098
+ - spec/models/spree/reimbursement_type/store_credit_spec.rb
1099
+ - spec/models/spree/return_authorization_reason_spec.rb
1032
1100
  - spec/models/spree/return_authorization_spec.rb
1033
1101
  - spec/models/spree/return_item/eligibility_validator/default_spec.rb
1034
1102
  - spec/models/spree/return_item/eligibility_validator/inventory_shipped_spec.rb
@@ -1040,6 +1108,7 @@ files:
1040
1108
  - spec/models/spree/return_item/exchange_variant_eligibility/same_product_spec.rb
1041
1109
  - spec/models/spree/return_item_spec.rb
1042
1110
  - spec/models/spree/returns_calculator_spec.rb
1111
+ - spec/models/spree/role_spec.rb
1043
1112
  - spec/models/spree/shipment_spec.rb
1044
1113
  - spec/models/spree/shipping_calculator_spec.rb
1045
1114
  - spec/models/spree/shipping_category_spec.rb
@@ -1064,6 +1133,8 @@ files:
1064
1133
  - spec/models/spree/stock_location_spec.rb
1065
1134
  - spec/models/spree/stock_movement_spec.rb
1066
1135
  - spec/models/spree/stock_transfer_spec.rb
1136
+ - spec/models/spree/store_credit_event_spec.rb
1137
+ - spec/models/spree/store_credit_spec.rb
1067
1138
  - spec/models/spree/store_spec.rb
1068
1139
  - spec/models/spree/tax_category_spec.rb
1069
1140
  - spec/models/spree/tax_rate_spec.rb
@@ -1071,13 +1142,13 @@ files:
1071
1142
  - spec/models/spree/taxonomy_spec.rb
1072
1143
  - spec/models/spree/tracker_spec.rb
1073
1144
  - spec/models/spree/user_spec.rb
1074
- - spec/models/spree/validations/db_maximum_length_validator_spec.rb
1075
1145
  - spec/models/spree/variant_spec.rb
1146
+ - spec/models/spree/zone_member_spec.rb
1076
1147
  - spec/models/spree/zone_spec.rb
1077
1148
  - spec/spec_helper.rb
1078
1149
  - spec/support/big_decimal.rb
1079
- - spec/support/concerns/adjustment_source_spec.rb
1080
- - spec/support/concerns/default_price_spec.rb
1150
+ - spec/support/concerns/adjustment_source.rb
1151
+ - spec/support/concerns/default_price.rb
1081
1152
  - spec/support/rake.rb
1082
1153
  - spec/support/test_gateway.rb
1083
1154
  - spree_core.gemspec
@@ -1088,7 +1159,7 @@ files:
1088
1159
  - vendor/assets/stylesheets/skeleton.css
1089
1160
  homepage: http://spreecommerce.com
1090
1161
  licenses:
1091
- - BSD-3
1162
+ - BSD-3-Clause
1092
1163
  metadata: {}
1093
1164
  post_install_message:
1094
1165
  rdoc_options: []
@@ -1098,7 +1169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
1098
1169
  requirements:
1099
1170
  - - ">="
1100
1171
  - !ruby/object:Gem::Version
1101
- version: 2.1.0
1172
+ version: 2.2.2
1102
1173
  required_rubygems_version: !ruby/object:Gem::Requirement
1103
1174
  requirements:
1104
1175
  - - ">="
@@ -1106,7 +1177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1106
1177
  version: 1.8.23
1107
1178
  requirements: []
1108
1179
  rubyforge_project:
1109
- rubygems_version: 2.4.8
1180
+ rubygems_version: 2.6.10
1110
1181
  signing_key:
1111
1182
  specification_version: 4
1112
1183
  summary: The bare bones necessary for Spree.
data/CHANGELOG.md DELETED
@@ -1,4 +0,0 @@
1
- ## Spree 3.0.0 (unreleased) ##
2
-
3
- * Renamed ItemAdjustments to Adjustable::AdjustmentsUpdater.
4
- * Removed allow_ssl_in_* preferences from spree
@@ -1,39 +0,0 @@
1
- module Spree
2
- module NumberGenerator
3
- extend ActiveSupport::Concern
4
-
5
- NUMBER_LENGTH = 9
6
- NUMBER_LETTERS = false
7
- NUMBER_PREFIX = 'N'
8
-
9
- included do
10
- before_validation :generate_number, on: :create # generate number before make_permalink
11
- validates :number, presence: true, uniqueness: true
12
- end
13
-
14
- def self.by_number(number)
15
- where(number: number)
16
- end
17
-
18
- def generate_number(options = {})
19
- options[:length] ||= NUMBER_LENGTH
20
- options[:letters] ||= NUMBER_LETTERS
21
- options[:prefix] ||= NUMBER_PREFIX
22
-
23
- possible = (0..9).to_a
24
- possible += ('A'..'Z').to_a if options[:letters]
25
-
26
- self.number ||= loop do
27
- # Make a random number.
28
- random = "#{options[:prefix]}#{(0...options[:length]).map { possible.shuffle.first }.join}"
29
- # Use the random number if no other order exists with it.
30
- if self.class.exists?(number: random)
31
- # If over half of all possible options are taken add another digit.
32
- options[:length] += 1 if self.class.count > (10 ** options[:length] / 2)
33
- else
34
- break random
35
- end
36
- end
37
- end
38
- end
39
- end