Permalink
Browse files

stuff

  • Loading branch information...
1 parent 2c144e6 commit f27ac72fb19216534f9b234e532624c1e6f84646 @BDQ committed Feb 23, 2012
Showing with 160 additions and 86 deletions.
  1. +2 −2 Gemfile
  2. +11 −10 Gemfile.lock
  3. +2 −2 config/application.rb
  4. +0 −9 db/migrate/20111125110744_namespace_promo_tables.rb
  5. +0 −56 db/migrate/20111213160608_new_preferences.rb
  6. +0 −5 db/migrate/20111215101320_add_group_to_preferences.rb
  7. 0 db/migrate/{20111125110643_spree_zero_nine_zero.rb → 20120220172738_spree_zero_nine_zero.rb}
  8. 0 ...644_create_indexes_for_inventory_units.rb → 20120220172739_create_indexes_for_inventory_units.rb}
  9. 0 ..._hand_to_variants_and_products.rb → 20120220172740_add_count_on_hand_to_variants_and_products.rb}
  10. 0 ...e/{20111125110646_change_taxons_to_nested_set.rb → 20120220172741_change_taxons_to_nested_set.rb}
  11. 0 ...0111125110647_move_to_configurable_gateways.rb → 20120220172742_move_to_configurable_gateways.rb}
  12. 0 ...grate/{20111125110648_product_groups_and_scopes.rb → 20120220172743_product_groups_and_scopes.rb}
  13. 0 ...10649_add_open_id_authentication_tables.rb → 20120220172744_add_open_id_authentication_tables.rb}
  14. 0 ...grate/{20111125110650_add_openid_field_to_users.rb → 20120220172745_add_openid_field_to_users.rb}
  15. 0 ...{20111125110651_change_preference_value_type.rb → 20120220172746_change_preference_value_type.rb}
  16. 0 ...e/{20111125110652_create_billing_integrations.rb → 20120220172747_create_billing_integrations.rb}
  17. 0 db/migrate/{20111125110653_charge_refactoring.rb → 20120220172748_charge_refactoring.rb}
  18. 0 db/migrate/{20111125110654_add_some_indexes.rb → 20120220172749_add_some_indexes.rb}
  19. 0 db/migrate/{20111125110655_checkout_state_machine.rb → 20120220172750_checkout_state_machine.rb}
  20. 0 db/migrate/{20111125110656_state_for_shipments.rb → 20120220172751_state_for_shipments.rb}
  21. 0 ...0111125110657_make_state_events_polymorphic.rb → 20120220172752_make_state_events_polymorphic.rb}
  22. 0 ...0111125110658_ship_address_id_for_checkouts.rb → 20120220172753_ship_address_id_for_checkouts.rb}
  23. 0 ...5110659_shipping_method_id_for_checkouts.rb → 20120220172754_shipping_method_id_for_checkouts.rb}
  24. 0 ...e/{20111125110660_creditcard_last_four_digits.rb → 20120220172755_creditcard_last_four_digits.rb}
  25. 0 ...11125110661_populate_legacy_shipment_state.rb → 20120220172756_populate_legacy_shipment_state.rb}
  26. 0 db/migrate/{20111125110662_add_cost_price.rb → 20120220172757_add_cost_price.rb}
  27. 0 ...125110663_shipment_id_for_inventory_units.rb → 20120220172758_shipment_id_for_inventory_units.rb}
  28. 0 ...ate/{20111125110664_cim_fields_for_creditcards.rb → 20120220172759_cim_fields_for_creditcards.rb}
  29. 0 ...{20111125110665_create_return_authorizations.rb → 20120220172760_create_return_authorizations.rb}
  30. 0 ...horization_to_inventory_units.rb → 20120220172761_add_return_authorization_to_inventory_units.rb}
  31. 0 db/migrate/{20111125110667_create_trackers.rb → 20120220172762_create_trackers.rb}
  32. 0 ...10668_creditcard_id_for_creditcard_txns.rb → 20120220172763_creditcard_id_for_creditcard_txns.rb}
  33. 0 ...txn_id_for_creditcard_txns.rb → 20120220172764_original_creditcard_txn_id_for_creditcard_txns.rb}
  34. 0 ...add_test_mode_to_billing_integration.rb → 20120220172765_add_test_mode_to_billing_integration.rb}
  35. 0 ...11125110671_create_products_product_groups.rb → 20120220172766_create_products_product_groups.rb}
  36. 0 db/migrate/{20111125110672_create_payment_methods.rb → 20120220172767_create_payment_methods.rb}
  37. 0 db/migrate/{20111125110673_polymorphic_payments.rb → 20120220172768_polymorphic_payments.rb}
  38. 0 ...payment_method_to_belongs_to.rb → 20120220172769_change_payments_payment_method_to_belongs_to.rb}
  39. 0 ...10675_assign_creditcard_txns_to_payment.rb → 20120220172770_assign_creditcard_txns_to_payment.rb}
  40. 0 db/migrate/{20111125110676_sti_for_transactions.rb → 20120220172771_sti_for_transactions.rb}
  41. 0 ...grate/{20111125110677_drop_billing_integrations.rb → 20120220172772_drop_billing_integrations.rb}
  42. 0 ...11125110678_deleted_at_for_payment_methods.rb → 20120220172773_deleted_at_for_payment_methods.rb}
  43. 0 db/migrate/{20111125110679_add_adjustments_index.rb → 20120220172774_add_adjustments_index.rb}
  44. 0 db/migrate/{20111125110680_fix_by_popularity.rb → 20120220172775_fix_by_popularity.rb}
  45. 0 db/migrate/{20111125110681_add_alt_text_to_images.rb → 20120220172776_add_alt_text_to_images.rb}
  46. 0 ...e/{20111125110682_fix_existing_coupon_credits.rb → 20120220172777_fix_existing_coupon_credits.rb}
  47. 0 ...11125110683_add_display_to_payment_methods.rb → 20120220172778_add_display_to_payment_methods.rb}
  48. 0 ...125110684_add_addresses_checkouts_indexes.rb → 20120220172779_add_addresses_checkouts_indexes.rb}
  49. 0 db/migrate/{20111125110685_add_icon_to_taxons.rb → 20120220172780_add_icon_to_taxons.rb}
  50. 0 ...grate/{20111125110686_add_description_to_taxons.rb → 20120220172781_add_description_to_taxons.rb}
  51. 0 ...ate/{20111125110687_index_for_shipments_number.rb → 20120220172782_index_for_shipments_number.rb}
  52. 0 ...add_index_on_users_persistence_token.rb → 20120220172783_add_index_on_users_persistence_token.rb}
  53. 0 ...0111125110689_add_default_to_tax_categories.rb → 20120220172784_add_default_to_tax_categories.rb}
  54. 0 ...125110690_add_display_to_shipping_methods.rb → 20120220172785_add_display_to_shipping_methods.rb}
  55. 0 ...0111125110691_rename_payment_method_display.rb → 20120220172786_rename_payment_method_display.rb}
  56. 0 db/migrate/{20111125110692_rename_preferences_field.rb → 20120220172787_rename_preferences_field.rb}
  57. 0 db/migrate/{20111125110693_add_guest_flag.rb → 20120220172788_add_guest_flag.rb}
  58. 0 db/migrate/{20111125110694_drop_order_token.rb → 20120220172789_drop_order_token.rb}
  59. 0 ...tate_and_assigned_to_order_only.rb → 20120220172790_payments_state_and_assigned_to_order_only.rb}
  60. 0 ...0111125110696_create_address_keys_for_order.rb → 20120220172791_create_address_keys_for_order.rb}
  61. 0 db/migrate/{20111125110697_payment_total_for_orders.rb → 20120220172792_payment_total_for_orders.rb}
  62. 0 ...0111125110698_shipping_method_id_for_orders.rb → 20120220172793_shipping_method_id_for_orders.rb}
  63. 0 ...11125110699_add_shipment_and_payment_state.rb → 20120220172794_add_shipment_and_payment_state.rb}
  64. 0 db/migrate/{20111125110700_refactor_adjustments.rb → 20120220172795_refactor_adjustments.rb}
  65. 0 ...and_avs_response_for_payments.rb → 20120220172796_response_code_and_avs_response_for_payments.rb}
  66. 0 ...11125110702_change_guest_flag_to_anonymous.rb → 20120220172797_change_guest_flag_to_anonymous.rb}
  67. 0 db/migrate/{20111125110703_email_for_orders.rb → 20120220172798_email_for_orders.rb}
  68. 0 db/migrate/{20111125110704_create_mail_methods.rb → 20120220172799_create_mail_methods.rb}
  69. 0 db/migrate/{20111125110705_rename_frozen_to_locked.rb → 20120220172800_rename_frozen_to_locked.rb}
  70. 0 ...6_move_special_instructions_to_orders.rb → 20120220172801_move_special_instructions_to_orders.rb}
  71. 0 db/migrate/{20111125110707_create_log_entries.rb → 20120220172802_create_log_entries.rb}
  72. 0 ...grate_transactions_to_payment_state.rb → 20120220172803_migrate_transactions_to_payment_state.rb}
  73. 0 ...grate/{20111125110709_delete_in_progress_orders.rb → 20120220172804_delete_in_progress_orders.rb}
  74. 0 ...ate/{20111125110710_migrate_checkout_to_orders.rb → 20120220172805_migrate_checkout_to_orders.rb}
  75. 0 db/migrate/{20111125110711_remove_shipped_state.rb → 20120220172806_remove_shipped_state.rb}
  76. 0 ...grate/{20111125110712_prevent_nil_payment_total.rb → 20120220172807_prevent_nil_payment_total.rb}
  77. 0 db/migrate/{20111125110713_prevent_nil_email.rb → 20120220172808_prevent_nil_email.rb}
  78. 0 db/migrate/{20111125110714_generate_anonymous_users.rb → 20120220172809_generate_anonymous_users.rb}
  79. 0 db/migrate/{20111125110715_update_order_state.rb → 20120220172810_update_order_state.rb}
  80. 0 db/migrate/{20111125110716_cleanup_legacy_tables.rb → 20120220172811_cleanup_legacy_tables.rb}
  81. 0 ...remove_number_and_cvv_from_credicard.rb → 20120220172812_remove_number_and_cvv_from_credicard.rb}
  82. 0 ...0111125110718_drop_anonymous_field_for_user.rb → 20120220172813_drop_anonymous_field_for_user.rb}
  83. 0 ...e/{20111125110719_renamed_rma_cancelled_state.rb → 20120220172814_renamed_rma_cancelled_state.rb}
  84. 0 ...e/{20111125110720_fix_problematic_index_names.rb → 20120220172815_fix_problematic_index_names.rb}
  85. 0 db/migrate/{20111125110721_add_position_to_variants.rb → 20120220172816_add_position_to_variants.rb}
  86. 0 ...11125110722_add_next_state_to_state_events.rb → 20120220172817_add_next_state_to_state_events.rb}
  87. 0 ...{20111125110723_add_position_to_option_types.rb → 20120220172818_add_position_to_option_types.rb}
  88. 0 ...g_slashes_in_taxon_permalinks.rb → 20120220172819_remove_trailing_slashes_in_taxon_permalinks.rb}
  89. 0 db/migrate/{20111125110725_create_activators.rb → 20120220172820_create_activators.rb}
  90. 0 db/migrate/{20111125110726_eligible_for_adjustments.rb → 20120220172821_eligible_for_adjustments.rb}
  91. 0 ...ate/{20111125110727_namespace_top_level_models.rb → 20120220172822_namespace_top_level_models.rb}
  92. 0 ...grate_namespaced_polymorphic_models.rb → 20120220172823_migrate_namespaced_polymorphic_models.rb}
  93. 0 ...{20111223113234_make_adjustments_polymorphic.rb → 20120220172824_make_adjustments_polymorphic.rb}
  94. 0 db/migrate/{20111223113235_add_company_to_addresses.rb → 20120220172825_add_company_to_addresses.rb}
  95. 0 db/migrate/{20111223113236_add_inc_tax_to_tax_rates.rb → 20120220172826_add_inc_tax_to_tax_rates.rb}
  96. 0 ...ate/{20111223113237_rename_inc_price_attribute.rb → 20120220172827_rename_inc_price_attribute.rb}
  97. 0 db/migrate/{20111223113238_add_default_tax_zone.rb → 20120220172828_add_default_tax_zone.rb}
  98. 0 ...nd_shipping_categories.rb → 20120220172829_associate_shipping_methods_and_shipping_categories.rb}
  99. 0 ...3_add_match_rules_to_shipping_methods.rb → 20120220172830_add_match_rules_to_shipping_methods.rb}
  100. +48 −0 db/migrate/20120220172831_new_preferences.rb
  101. 0 ...20220121014_add_deleted_at_to_tax_category.rb → 20120220172832_add_deleted_at_to_tax_category.rb}
  102. 0 ...grate/{20111125110728_rename_columns_for_devise.rb → 20120220172833_rename_columns_for_devise.rb}
  103. 0 ...e/{20111125110729_convert_user_remember_field.rb → 20120220172834_convert_user_remember_field.rb}
  104. 0 ...{20111125110730_create_tokenized_permissions.rb → 20120220172835_create_tokenized_permissions.rb}
  105. +4 −0 db/migrate/{20111125110731_tokens_for_legacy_orders.rb → 20120220172836_tokens_for_legacy_orders.rb}
  106. 0 ...11125110732_namespace_tokenized_permission.rb → 20120220172837_namespace_tokenized_permission.rb}
  107. 0 ...0111213160609_migrate_tokenized_permissions.rb → 20120220172838_migrate_tokenized_permissions.rb}
  108. 0 db/migrate/{20111125110733_add_api_key_to_users.rb → 20120220172839_add_api_key_to_users.rb}
  109. 0 ...{20111125110734_rename_coupons_to_promotions.rb → 20120220172840_rename_coupons_to_promotions.rb}
  110. 0 db/migrate/{20111125110735_create_promotion_rules.rb → 20120220172841_create_promotion_rules.rb}
  111. 0 ...e/{20111125110736_match_policy_for_promotions.rb → 20120220172842_match_policy_for_promotions.rb}
  112. 0 ...{20111125110737_create_promotion_rules_users.rb → 20120220172843_create_promotion_rules_users.rb}
  113. 0 db/migrate/{20111125110738_name_for_promotions.rb → 20120220172844_name_for_promotions.rb}
  114. 0 ...date_calculable_type_for_promotions.rb → 20120220172845_update_calculable_type_for_promotions.rb}
  115. 0 db/migrate/{20111125110740_migrate_adjustments.rb → 20120220172846_migrate_adjustments.rb}
  116. 0 ...anges_to_subclass_of_activator.rb → 20120220172847_promotion_changes_to_subclass_of_activator.rb}
  117. 0 db/migrate/{20111125110742_create_promotion_actions.rb → 20120220172848_create_promotion_actions.rb}
  118. 0 ...743_create_promotion_action_line_items.rb → 20120220172849_create_promotion_action_line_items.rb}
  119. +85 −0 db/migrate/20120220172850_namespace_promo_tables.rb
  120. 0 ...220121015_create_spree_pending_promotions.rb → 20120220172851_create_spree_pending_promotions.rb}
  121. 0 db/migrate/{20120220121016_content_visited_event.rb → 20120220172852_content_visited_event.rb}
  122. 0 db/migrate/{20111125110745_create_themes.rb → 20120220172853_create_themes.rb}
  123. 0 db/migrate/{20111125110746_create_view_overrides.rb → 20120220172854_create_view_overrides.rb}
  124. 0 db/migrate/{20111125110747_create_stylesheets.rb → 20120220172855_create_stylesheets.rb}
  125. 0 db/migrate/{20111125110748_create_files.rb → 20120220172856_create_files.rb}
  126. 0 db/migrate/{20111125110749_add_sequence_to_override.rb → 20120220172857_add_sequence_to_override.rb}
  127. 0 db/migrate/{20111125110750_create_javascripts.rb → 20120220172858_create_javascripts.rb}
  128. 0 db/migrate/{20111125110751_add_import_from.rb → 20120220172859_add_import_from.rb}
  129. 0 db/migrate/{20111213160610_add_applies_to_theme.rb → 20120220172860_add_applies_to_theme.rb}
  130. 0 db/migrate/{20111215120733_create_palettes.rb → 20120220172861_create_palettes.rb}
  131. 0 db/migrate/{20111215143842_add_active_to_palette.rb → 20120220172862_add_active_to_palette.rb}
  132. +8 −2 db/schema.rb
  133. BIN public/spree/products/1004/large/apache_baseball.png
  134. BIN public/spree/products/1004/mini/apache_baseball.png
  135. BIN public/spree/products/1004/product/apache_baseball.png
  136. BIN public/spree/products/1004/small/apache_baseball.png
  137. BIN public/spree/products/1008/large/ruby_baseball.png
  138. BIN public/spree/products/1008/mini/ruby_baseball.png
  139. BIN public/spree/products/1008/product/ruby_baseball.png
  140. BIN public/spree/products/1008/small/ruby_baseball.png
  141. BIN public/spree/products/1009/large/ror_baseball_jersey_green.png
  142. BIN public/spree/products/1009/mini/ror_baseball_jersey_green.png
  143. BIN public/spree/products/1009/product/ror_baseball_jersey_green.png
  144. BIN public/spree/products/1009/small/ror_baseball_jersey_green.png
  145. BIN public/spree/products/1010/large/ror_baseball_jersey_back_green.png
  146. BIN public/spree/products/1010/mini/ror_baseball_jersey_back_green.png
  147. BIN public/spree/products/1010/product/ror_baseball_jersey_back_green.png
  148. BIN public/spree/products/1010/small/ror_baseball_jersey_back_green.png
  149. BIN public/spree/products/1011/large/ror_baseball_jersey_green.png
  150. BIN public/spree/products/1011/mini/ror_baseball_jersey_green.png
  151. BIN public/spree/products/1011/product/ror_baseball_jersey_green.png
  152. BIN public/spree/products/1011/small/ror_baseball_jersey_green.png
  153. BIN public/spree/products/1012/large/ror_baseball_jersey_back_green.png
  154. BIN public/spree/products/1012/mini/ror_baseball_jersey_back_green.png
  155. BIN public/spree/products/1012/product/ror_baseball_jersey_back_green.png
  156. BIN public/spree/products/1012/small/ror_baseball_jersey_back_green.png
  157. BIN public/spree/products/1013/large/ror_baseball_jersey_green.png
  158. BIN public/spree/products/1013/mini/ror_baseball_jersey_green.png
  159. BIN public/spree/products/1013/product/ror_baseball_jersey_green.png
  160. BIN public/spree/products/1013/small/ror_baseball_jersey_green.png
  161. BIN public/spree/products/1014/large/ror_baseball_jersey_back_green.png
  162. BIN public/spree/products/1014/mini/ror_baseball_jersey_back_green.png
  163. BIN public/spree/products/1014/product/ror_baseball_jersey_back_green.png
  164. BIN public/spree/products/1014/small/ror_baseball_jersey_back_green.png
  165. BIN public/spree/products/1015/large/ror_baseball_jersey_blue.png
  166. BIN public/spree/products/1015/mini/ror_baseball_jersey_blue.png
  167. BIN public/spree/products/1015/product/ror_baseball_jersey_blue.png
  168. BIN public/spree/products/1015/small/ror_baseball_jersey_blue.png
  169. BIN public/spree/products/1016/large/ror_baseball_jersey_back_blue.png
  170. BIN public/spree/products/1016/mini/ror_baseball_jersey_back_blue.png
  171. BIN public/spree/products/1016/product/ror_baseball_jersey_back_blue.png
  172. BIN public/spree/products/1016/small/ror_baseball_jersey_back_blue.png
  173. BIN public/spree/products/1017/large/ror_baseball_jersey_blue.png
  174. BIN public/spree/products/1017/mini/ror_baseball_jersey_blue.png
  175. BIN public/spree/products/1017/product/ror_baseball_jersey_blue.png
  176. BIN public/spree/products/1017/small/ror_baseball_jersey_blue.png
  177. BIN public/spree/products/1018/large/ror_baseball_jersey_back_blue.png
  178. BIN public/spree/products/1018/mini/ror_baseball_jersey_back_blue.png
  179. BIN public/spree/products/1018/product/ror_baseball_jersey_back_blue.png
  180. BIN public/spree/products/1018/small/ror_baseball_jersey_back_blue.png
  181. BIN public/spree/products/1019/large/ror_baseball_jersey_blue.png
  182. BIN public/spree/products/1019/mini/ror_baseball_jersey_blue.png
  183. BIN public/spree/products/1019/product/ror_baseball_jersey_blue.png
  184. BIN public/spree/products/1019/small/ror_baseball_jersey_blue.png
  185. BIN public/spree/products/1020/large/ror_baseball_jersey_back_blue.png
  186. BIN public/spree/products/1020/mini/ror_baseball_jersey_back_blue.png
  187. BIN public/spree/products/1020/product/ror_baseball_jersey_back_blue.png
  188. BIN public/spree/products/1020/small/ror_baseball_jersey_back_blue.png
  189. BIN public/spree/products/1021/large/ror_baseball_jersey_red.png
  190. BIN public/spree/products/1021/mini/ror_baseball_jersey_red.png
  191. BIN public/spree/products/1021/product/ror_baseball_jersey_red.png
  192. BIN public/spree/products/1021/small/ror_baseball_jersey_red.png
  193. BIN public/spree/products/1022/large/ror_baseball_jersey_back_red.png
  194. BIN public/spree/products/1022/mini/ror_baseball_jersey_back_red.png
  195. BIN public/spree/products/1022/product/ror_baseball_jersey_back_red.png
  196. BIN public/spree/products/1022/small/ror_baseball_jersey_back_red.png
  197. BIN public/spree/products/1023/large/ror_baseball_jersey_red.png
  198. BIN public/spree/products/1023/mini/ror_baseball_jersey_red.png
  199. BIN public/spree/products/1023/product/ror_baseball_jersey_red.png
  200. BIN public/spree/products/1023/small/ror_baseball_jersey_red.png
  201. BIN public/spree/products/1024/large/ror_baseball_jersey_back_red.png
  202. BIN public/spree/products/1024/mini/ror_baseball_jersey_back_red.png
  203. BIN public/spree/products/1024/product/ror_baseball_jersey_back_red.png
  204. BIN public/spree/products/1024/small/ror_baseball_jersey_back_red.png
  205. BIN public/spree/products/1025/large/ror_baseball_jersey_red.png
  206. BIN public/spree/products/1025/mini/ror_baseball_jersey_red.png
  207. BIN public/spree/products/1025/product/ror_baseball_jersey_red.png
  208. BIN public/spree/products/1025/small/ror_baseball_jersey_red.png
  209. BIN public/spree/products/1026/large/ror_baseball_jersey_back_red.png
  210. BIN public/spree/products/1026/mini/ror_baseball_jersey_back_red.png
  211. BIN public/spree/products/1026/product/ror_baseball_jersey_back_red.png
  212. BIN public/spree/products/1026/small/ror_baseball_jersey_back_red.png
View
@@ -16,8 +16,8 @@ gem 'jquery-rails'
gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-0-stable'
-# gem 'spree_spraycan', :path => '../spree_spraycan'
-gem 'spree_spraycan', :git => 'git://github.com/railsdog/spree_spraycan.git'
+gem 'spree_spraycan', :path => '../spree_spraycan'
+# gem 'spree_spraycan', :git => 'git://github.com/railsdog/spree_spraycan.git'
# gem 'spraycan', :path => '../spraycan'
gem 'spraycan', :git => 'git://github.com/railsdog/spraycan.git', :branch => 'tweaker'
View
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/railsdog/deface.git
- revision: 94f036e0e4d69c7b88d9bf894fc43f759341161c
+ revision: 04ada87494e3d436727329092f43f7a0b4946bf0
branch: haml
specs:
deface (0.7.2)
@@ -9,27 +9,22 @@ GIT
GIT
remote: git://github.com/railsdog/spraycan.git
- revision: fd38696309c4ca263e00de6a95b8f6ccb2f552f9
+ revision: 49acfc081b0a49a4c97460a51a729d8c2e7a0b21
branch: tweaker
specs:
spraycan (0.3.0)
acts_as_list (>= 0.1.2)
+ acts_as_list (>= 0.1.2)
carrierwave (= 0.5.4)
deface (>= 0.6.1)
ejs (= 1.0.0)
guid (= 0.1.1)
rabl (= 0.2.8)
-
-GIT
- remote: git://github.com/railsdog/spree_spraycan.git
- revision: 5aa1f19f9965aff70db4e06892402080dcd9f538
- specs:
- spree_spraycan (0.60.99)
- spraycan (>= 0.3.0)
+ sass (= 3.1.15)
GIT
remote: git://github.com/spree/spree.git
- revision: 3e8f9585f9003bfe60ee19461f7d0b0a6d8e1881
+ revision: 091062e16e76feea3dca9c55c30b806ef595636a
branch: 1-0-stable
specs:
spree (1.0.0)
@@ -71,6 +66,12 @@ GIT
spree_sample (1.0.0)
spree_core (= 1.0.0)
+PATH
+ remote: ../spree_spraycan
+ specs:
+ spree_spraycan (0.60.99)
+ spraycan (>= 0.3.0)
+
GEM
remote: http://rubygems.org/
specs:
View
@@ -4,9 +4,9 @@
if defined?(Bundler)
# If you precompile assets before deploying to production, use this line
- Bundler.require(*Rails.groups(:assets => %w(development test)))
+ # Bundler.require(*Rails.groups(:assets => %w(development test)))
# If you want your assets lazily compiled in production, use this line
- # Bundler.require(:default, :assets, Rails.env)
+ Bundler.require(:default, :assets, Rails.env)
end
module SprayTest
@@ -1,9 +0,0 @@
-class NamespacePromoTables < ActiveRecord::Migration
- def change
- rename_table :promotion_actions, :spree_promotion_actions
- rename_table :promotion_rules, :spree_promotion_rules
- rename_table :promotion_rules_users, :spree_promotion_rules_users
- rename_table :promotion_action_line_items, :spree_promotion_action_line_items
- rename_table :products_promotion_rules, :spree_products_promotion_rules
- end
-end
@@ -1,56 +0,0 @@
-class NewPreferences < ActiveRecord::Migration
-
- class OldPrefs < ActiveRecord::Base
- set_table_name "spree_preferences"
- belongs_to :owner, :polymorphic => true
- end
-
- def up
- add_column :spree_preferences, :key, :string
- add_column :spree_preferences, :value_type, :string
- add_index :spree_preferences, :key, :unique => true
-
- # remove old constraints for migration
- change_column :spree_preferences, :name, :string, :null => true
- change_column :spree_preferences, :owner_id, :integer, :null => true
- change_column :spree_preferences, :owner_type, :string, :null => true
- change_column :spree_preferences, :group_id, :integer, :null => true
- change_column :spree_preferences, :group_type, :string, :null => true
-
- OldPrefs.all.each do |old_pref|
- begin
- begin
- owner = old_pref.owner
- rescue => e1
- # case:
- # AppConfiguration is no longer an sti derivative of Configuration
- owner_class = old_pref.owner_type.constantize
- owner = OldPrefs.connection.select_value("SELECT #{owner_class.inheritance_column} FROM #{owner_class.table_name} WHERE id = #{old_pref.owner_id}").constantize.new
- end
- say "Migrating preference #{old_pref.name}..."
- owner.set_preference old_pref.name, old_pref.value
- rescue => e
- say "Skipping setting preference #{old_pref.owner_type}::#{old_pref.name}"
- end
- end
-
- remove_column :spree_preferences, :name
- remove_column :spree_preferences, :owner_id
- remove_column :spree_preferences, :owner_type
- remove_column :spree_preferences, :group_id
- remove_column :spree_preferences, :group_type
- end
-
- def down
- remove_column :spree_preferences, :key
- remove_column :spree_preferences, :value_type
-
- add_column :spree_preferences, :name, :string
- add_column :spree_preferences, :owner_id, :integer
- add_column :spree_preferences, :owner_type, :string
- add_column :spree_preferences, :group_id, :integer
- add_column :spree_preferences, :group_type, :string
- end
-
-end
-
@@ -1,5 +0,0 @@
-class AddGroupToPreferences < ActiveRecord::Migration
- def change
- add_column :spree_preferences, :group, :string
- end
-end
File renamed without changes.
@@ -0,0 +1,48 @@
+require 'spree/core/preference_rescue'
+
+class NewPreferences < ActiveRecord::Migration
+
+ def up
+ add_column :spree_preferences, :key, :string
+ add_column :spree_preferences, :value_type, :string
+ add_index :spree_preferences, :key, :unique => true
+
+ remove_index :spree_preferences, :name => 'ix_prefs_on_owner_attr_pref'
+
+ # remove old constraints for migration
+ change_column :spree_preferences, :name, :string, :null => true
+ change_column :spree_preferences, :owner_id, :integer, :null => true
+ change_column :spree_preferences, :owner_type, :string, :null => true
+ change_column :spree_preferences, :group_id, :integer, :null => true
+ change_column :spree_preferences, :group_type, :string, :null => true
+
+ cfgs = execute("select id, type from spree_configurations").to_a
+ execute("select id, owner_id, name from spree_preferences where owner_type = 'Spree::Configuration'").each do |pref|
+ configuration = cfgs.detect { |c| c[0].to_s == pref[1].to_s }
+
+ value_type = configuration[1].constantize.new.send "preferred_#{pref[2]}_type" rescue 'string'
+
+ execute "UPDATE spree_preferences set `key` = '#{configuration[1].underscore}/#{pref[2]}', `value_type` = '#{value_type}' where id = #{pref[0]}" rescue nil
+ end
+
+ # remove orphaned calculator preferences
+ Spree::Preference.where(:owner_type => 'Spree::Calculator').each do |preference|
+ preference.destroy unless Spree::Calculator.exists? preference.owner_id
+ end
+
+ Spree::PreferenceRescue.try
+
+ Spree::Preference.where(:value_type => nil).update_all(:value_type => 'string')
+ end
+
+ def down
+ remove_column :spree_preferences, :key
+ remove_column :spree_preferences, :value_type
+
+ add_column :spree_preferences, :name, :string
+ add_column :spree_preferences, :owner_id, :integer
+ add_column :spree_preferences, :owner_type, :string
+ add_column :spree_preferences, :group_id, :integer
+ add_column :spree_preferences, :group_type, :string
+ end
+end
@@ -1,10 +1,14 @@
class TokensForLegacyOrders < ActiveRecord::Migration
def up
+ Spree::TokenizedPermission.table_name = 'tokenized_permissions'
+
# add token permissions for legacy orders (stop relying on user persistence token)
Spree::Order.all.each do |order|
next unless order.user
order.create_tokenized_permission(:token => order.user.persistence_token)
end
+
+ Spree::TokenizedPermission.table_name = 'spree_tokenized_permissions'
end
def down
@@ -0,0 +1,85 @@
+require 'spree/core/preference_rescue'
+
+class NamespacePromoTables < ActiveRecord::Migration
+
+ def concat(str1, str2)
+ dbtype = Rails.configuration.database_configuration[Rails.env]['adapter'].to_sym
+
+ case dbtype
+ when :mysql, :mysql2
+ "CONCAT(#{str1}, #{str2})"
+ when :sqlserver
+ "(#{str1} + #{str2})"
+ else
+ "(#{str1} || #{str2})"
+ end
+ end
+
+ def update_column_data(table_names, column_name)
+ tables = Array.wrap(table_names)
+ tables.each do |table|
+ execute "UPDATE #{table} SET #{column_name} = #{concat("'Spree::'", column_name)}" +
+ " where #{column_name} NOT LIKE 'Spree::%' AND #{column_name} IS NOT NULL"
+ end
+ end
+
+ def replace_column_data(table_names, column_name)
+ tables = Array.wrap(table_names)
+ tables.each do |table|
+ execute "UPDATE #{table} SET #{column_name} = REPLACE(#{column_name}, 'Spree::', '') " +
+ " where #{column_name} LIKE 'Spree::%'"
+ end
+ end
+
+ def self.up
+ # namespace promo tables
+ rename_table :promotion_actions, :spree_promotion_actions
+ rename_table :promotion_rules, :spree_promotion_rules
+ rename_table :promotion_rules_users, :spree_promotion_rules_users
+ rename_table :promotion_action_line_items, :spree_promotion_action_line_items
+ rename_table :products_promotion_rules, :spree_products_promotion_rules
+
+ update_column_data('spree_promotion_actions', 'type')
+ update_column_data('spree_promotion_rules', 'type')
+
+ # add old promo preferences as columns
+ add_column :spree_activators, :usage_limit, :integer
+ add_column :spree_activators, :match_policy, :string, :default => 'all'
+ add_column :spree_activators, :code, :string
+ add_column :spree_activators, :advertise, :boolean, :default => false
+
+ Spree::Activator.reset_column_information
+
+ Spree::Preference.where(:owner_type => 'Spree::Activator').each do |preference|
+ unless Spree::Activator.exists? preference.owner_id
+ preference.destroy
+ next
+ end
+
+ @activator = Spree::Activator.find(preference.owner_id)
+ @activator.update_attribute(preference.name, preference.raw_value)
+ preference.destroy
+ end
+
+ Spree::PreferenceRescue.try
+
+ # This *should* be in the new_preferences migration inside of Core but...
+ # This is migration needs to have these keys around so that
+ # we can convert the promotions over correctly.
+ # So they hang around until we're *finally* done with them, since promo's
+ # migrations are copied over *after* core, and then we ditch them.
+ remove_column :spree_preferences, :group_id
+ remove_column :spree_preferences, :group_type
+ end
+
+ def self.down
+ replace_column_data('spree_promotion_actions', 'type')
+ replace_column_data('spree_promotion_rules', 'type')
+
+ rename_table :spree_promotion_actions, :promotion_actions
+ rename_table :spree_promotion_rules, :promotion_rules
+ rename_table :spree_promotion_rules_users, :promotion_rules_users
+ rename_table :spree_promotion_action_line_items, :promotion_action_line_items
+ rename_table :spree_products_promotion_rules, :products_promotion_rules
+ end
+end
View
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120220121016) do
+ActiveRecord::Schema.define(:version => 20120220172862) do
create_table "spraycan_files", :force => true do |t|
t.string "file"
@@ -80,6 +80,10 @@
t.string "name"
t.string "event_name"
t.string "type"
+ t.integer "usage_limit"
+ t.string "match_policy", :default => "all"
+ t.string "code"
+ t.boolean "advertise", :default => false
t.string "path"
end
@@ -321,12 +325,14 @@
add_index "spree_pending_promotions", ["user_id"], :name => "index_spree_pending_promotions_on_user_id"
create_table "spree_preferences", :force => true do |t|
+ t.string "name"
+ t.integer "owner_id"
+ t.string "owner_type"
t.text "value"
t.datetime "created_at"
t.datetime "updated_at"
t.string "key"
t.string "value_type"
- t.string "group"
end
add_index "spree_preferences", ["key"], :name => "index_spree_preferences_on_key", :unique => true
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f27ac72

Please sign in to comment.