RubyGems - spree_core - Versions diffs - 1.3.2 → 1.3.3 - Mend

spree_core 1.3.2 → 1.3.3

Files changed (182) hide show

checksums.yaml +7 -0
data/app/assets/images/credit_cards/icons/diners_club.png +0 -0
data/app/assets/javascripts/admin/address_states.js +1 -1
data/app/assets/javascripts/admin/admin.js.erb +18 -13
data/app/assets/javascripts/admin/calculator.js +2 -2
data/app/assets/javascripts/admin/checkouts/edit.js +3 -1
data/app/assets/javascripts/admin/image_settings.js.erb +5 -5
data/app/assets/javascripts/admin/orders/edit.js +1 -1
data/app/assets/javascripts/admin/payments/new.js +9 -2
data/app/assets/javascripts/admin/spree_core.js +13 -1
data/app/assets/javascripts/admin/taxon_autocomplete.js.erb +2 -1
data/app/assets/javascripts/admin/variant_autocomplete.js.erb +23 -19
data/app/assets/javascripts/spree.js.coffee +37 -0
data/app/assets/javascripts/store/checkout.js.coffee +8 -0
data/app/assets/javascripts/store/product.js.coffee +1 -1
data/app/assets/javascripts/store/spree_core.js +1 -0
data/app/assets/stylesheets/admin/components/_sidebar.scss +7 -6
data/app/assets/stylesheets/admin/components/_states.scss +16 -12
data/app/assets/stylesheets/admin/globals/_variables.scss +102 -96
data/app/assets/stylesheets/admin/shared/_forms.scss +2 -1
data/app/assets/stylesheets/admin/shared/_icons.scss +2 -1
data/app/assets/stylesheets/admin/shared/_layout.scss +4 -1
data/app/assets/stylesheets/admin/shared/_tables.scss +8 -0
data/app/assets/stylesheets/store/screen.css.scss +28 -16
data/app/assets/stylesheets/store/variables.css.scss +4 -2
data/app/controllers/spree/admin/adjustments_controller.rb +7 -3
data/app/controllers/spree/admin/base_controller.rb +10 -5
data/app/controllers/spree/admin/line_items_controller.rb +3 -2
data/app/controllers/spree/admin/orders/customer_details_controller.rb +3 -2
data/app/controllers/spree/admin/orders_controller.rb +2 -2
data/app/controllers/spree/admin/payments_controller.rb +1 -1
data/app/controllers/spree/admin/resource_controller.rb +5 -5
data/app/controllers/spree/admin/shipments_controller.rb +1 -1
data/app/controllers/spree/admin/taxons_controller.rb +1 -1
data/app/controllers/spree/admin/users_controller.rb +96 -0
data/app/controllers/spree/checkout_controller.rb +18 -7
data/app/controllers/spree/locale_controller.rb +1 -1
data/app/controllers/spree/orders_controller.rb +20 -2
data/app/controllers/spree/taxons_controller.rb +8 -2
data/app/helpers/spree/admin/images_helper.rb +6 -2
data/app/helpers/spree/admin/navigation_helper.rb +23 -3
data/app/helpers/spree/base_helper.rb +9 -5
data/app/helpers/spree/orders_helper.rb +13 -0
data/app/helpers/spree/products_helper.rb +9 -4
data/app/mailers/spree/base_mailer.rb +16 -0
data/app/mailers/spree/order_mailer.rb +12 -11
data/app/mailers/spree/shipment_mailer.rb +4 -7
data/app/mailers/spree/test_mailer.rb +2 -3
data/app/models/spree/adjustment.rb +1 -1
data/app/models/spree/app_configuration.rb +9 -3
data/app/models/spree/calculator/default_tax.rb +5 -1
data/app/models/spree/calculator/per_item.rb +1 -1
data/app/models/spree/classification.rb +7 -0
data/app/models/spree/credit_card.rb +1 -5
data/app/models/spree/gateway.rb +10 -2
data/app/models/spree/gateway/bogus.rb +5 -5
data/app/models/spree/inventory_unit.rb +4 -4
data/app/models/spree/line_item.rb +1 -1
data/app/models/spree/order.rb +15 -35
data/app/models/spree/order/checkout.rb +52 -0
data/app/models/spree/order_populator.rb +11 -3
data/app/models/spree/order_updater.rb +3 -4
data/app/models/spree/payment.rb +23 -1
data/app/models/spree/payment/processing.rb +18 -5
data/app/models/spree/payment_method.rb +4 -0
data/app/models/spree/price.rb +2 -3
data/app/models/spree/product.rb +12 -4
data/app/models/spree/product/scopes.rb +29 -16
data/app/models/spree/return_authorization.rb +1 -1
data/app/models/spree/shipment.rb +1 -1
data/app/models/spree/taxon.rb +21 -6
data/app/models/spree/variant.rb +7 -2
data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +2 -2
data/app/views/spree/admin/countries/index.html.erb +1 -0
data/app/views/spree/admin/general_settings/edit.html.erb +10 -2
data/app/views/spree/admin/images/index.html.erb +7 -3
data/app/views/spree/admin/mail_methods/index.html.erb +2 -2
data/app/views/spree/admin/orders/_form.html.erb +3 -3
data/app/views/spree/admin/orders/_line_item.html.erb +1 -1
data/app/views/spree/admin/orders/customer_details/_form.html.erb +4 -4
data/app/views/spree/admin/orders/index.html.erb +60 -52
data/app/views/spree/admin/payment_methods/_form.html.erb +2 -2
data/app/views/spree/admin/payment_methods/index.html.erb +39 -35
data/app/views/spree/admin/payments/_list.html.erb +1 -1
data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +10 -10
data/app/views/spree/admin/products/_form.html.erb +7 -12
data/app/views/spree/admin/products/index.html.erb +13 -15
data/app/views/spree/admin/products/new.html.erb +3 -1
data/app/views/spree/admin/return_authorizations/_form.html.erb +7 -7
data/app/views/spree/admin/return_authorizations/edit.html.erb +17 -11
data/app/views/spree/admin/return_authorizations/index.html.erb +4 -4
data/app/views/spree/admin/return_authorizations/new.html.erb +13 -6
data/app/views/spree/admin/shared/_alert.html.erb +1 -1
data/app/views/spree/admin/shared/_configuration_menu.html.erb +6 -2
data/app/views/spree/admin/shared/_order_details.html.erb +6 -6
data/app/views/spree/admin/shared/_order_tabs.html.erb +20 -37
data/app/views/spree/admin/shared/_routes.html.erb +1 -1
data/app/views/spree/admin/shared/_tabs.html.erb +1 -2
data/app/views/spree/admin/shared/_update_order_state.js +1 -1
data/app/views/spree/admin/shipments/_form.html.erb +24 -24
data/app/views/spree/admin/shipments/edit.html.erb +13 -13
data/app/views/spree/admin/shipments/index.html.erb +35 -31
data/app/views/spree/admin/shipping_methods/index.html.erb +35 -32
data/app/views/spree/admin/tax_rates/_form.html.erb +2 -1
data/app/views/spree/admin/taxons/_form.html.erb +17 -0
data/app/views/spree/admin/taxons/edit.html.erb +3 -1
data/app/views/spree/admin/trackers/_form.html.erb +2 -2
data/app/views/spree/admin/trackers/index.html.erb +2 -2
data/app/views/spree/admin/users/_form.html.erb +37 -0
data/app/views/spree/admin/users/edit.html.erb +28 -0
data/app/views/spree/admin/users/index.html.erb +53 -0
data/app/views/spree/admin/users/new.html.erb +23 -0
data/app/views/spree/admin/users/show.html.erb +21 -0
data/app/views/spree/admin/variants/edit.html.erb +6 -4
data/app/views/spree/admin/variants/index.html.erb +1 -1
data/app/views/spree/admin/zones/_form.html.erb +4 -4
data/app/views/spree/admin/zones/index.html.erb +3 -1
data/app/views/spree/checkout/_delivery.html.erb +1 -1
data/app/views/spree/checkout/_payment.html.erb +1 -1
data/app/views/spree/checkout/_summary.html.erb +2 -2
data/app/views/spree/checkout/payment/_gateway.html.erb +6 -6
data/app/views/spree/layouts/spree_application.html.erb +0 -1
data/app/views/spree/order_mailer/cancel_email.text.erb +1 -1
data/app/views/spree/order_mailer/confirm_email.text.erb +1 -1
data/app/views/spree/orders/_adjustments.html.erb +1 -1
data/app/views/spree/orders/_line_item.html.erb +2 -2
data/app/views/spree/orders/edit.html.erb +1 -1
data/app/views/spree/payments/_payment.html.erb +16 -0
data/app/views/spree/products/_cart_form.html.erb +2 -2
data/app/views/spree/products/_thumbnails.html.erb +3 -3
data/app/views/spree/products/index.html.erb +1 -1
data/app/views/spree/shared/_google_analytics.html.erb +1 -1
data/app/views/spree/shared/_main_nav_bar.html.erb +1 -1
data/app/views/spree/shared/_order_details.html.erb +10 -24
data/app/views/spree/shared/_products.html.erb +1 -1
data/app/views/spree/shared/_search.html.erb +1 -1
data/app/views/spree/taxons/show.html.erb +1 -1
data/config/initializers/check_for_orphaned_preferences.rb +5 -2
data/config/locales/en.yml +24 -5
data/config/routes.rb +4 -3
data/db/default/spree/countries.rb +229 -0
data/db/default/spree/roles.rb +2 -0
data/db/default/spree/states.rb +57 -0
data/db/default/spree/zones.rb +17 -0
data/db/migrate/20130207155350_add_order_id_index_to_payments.rb +9 -0
data/db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb +5 -0
data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +5 -0
data/db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb +5 -0
data/db/migrate/20130226054936_add_variant_id_index_to_spree_prices.rb +5 -0
data/db/migrate/20130319062004_change_orders_total_precision.rb +8 -0
data/db/migrate/20130319063911_change_spree_payments_amount_precision.rb +7 -0
data/db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb +7 -0
data/db/migrate/20130319082943_change_adjustments_amount_precision.rb +7 -0
data/db/migrate/20130328195253_add_seo_metas_to_taxons.rb +9 -0
data/lib/generators/spree/dummy/templates/rails/database.yml +9 -6
data/lib/spree/core/calculated_adjustments.rb +1 -1
data/lib/spree/core/controller_helpers/auth.rb +3 -3
data/lib/spree/core/controller_helpers/common.rb +1 -11
data/lib/spree/core/controller_helpers/order.rb +15 -12
data/lib/spree/core/engine.rb +5 -1
data/lib/spree/core/mail_interceptor.rb +4 -6
data/lib/spree/core/mail_settings.rb +52 -23
data/lib/spree/core/permalinks.rb +1 -3
data/lib/spree/core/testing_support/authorization_helpers.rb +1 -1
data/lib/spree/core/testing_support/capybara_ext.rb +30 -0
data/lib/spree/core/testing_support/common_rake.rb +8 -0
data/lib/spree/core/testing_support/factories/payment_factory.rb +1 -1
data/lib/spree/core/testing_support/factories/product_factory.rb +7 -2
data/lib/spree/core/testing_support/factories/variant_factory.rb +4 -2
data/lib/spree/core/validators/email.rb +1 -1
data/lib/spree/core/version.rb +1 -1
data/lib/spree/money.rb +14 -3
data/lib/spree/product_filters.rb +1 -1
data/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js +3 -2
data/vendor/assets/javascripts/jsuri.js +2 -0
data/vendor/assets/javascripts/modernizr.js +3 -3
metadata +78 -69
data/db/default/spree/countries.yml +0 -1589
data/db/default/spree/roles.yml +0 -5
data/db/default/spree/states.yml +0 -256
data/db/default/spree/zone_members.yml +0 -169
data/db/default/spree/zones.yml +0 -13

data/db/default/spree/roles.yml DELETED Viewed

@@ -1,5 +0,0 @@
-admin_role:
-  name: admin
-user_role:
-  name: user

data/db/default/spree/states.yml DELETED Viewed

@@ -1,256 +0,0 @@
----
-states_043:
-  name: Michigan
-  country_id: "214"
-  id: "931624400"
-  abbr: MI
-states_032:
-  name: South Dakota
-  country_id: "214"
-  id: "615306087"
-  abbr: SD
-states_021:
-  name: Washington
-  country_id: "214"
-  id: "414569975"
-  abbr: WA
-states_010:
-  name: Wisconsin
-  country_id: "214"
-  id: "103680699"
-  abbr: WI
-states_044:
-  name: Arizona
-  country_id: "214"
-  id: "948208802"
-  abbr: AZ
-states_033:
-  name: Illinois
-  country_id: "214"
-  id: "625629523"
-  abbr: IL
-states_022:
-  name: New Hampshire
-  country_id: "214"
-  id: "426832442"
-  abbr: NH
-states_011:
-  name: North Carolina
-  country_id: "214"
-  id: "177087202"
-  abbr: NC
-states_045:
-  name: Kansas
-  country_id: "214"
-  id: "969722173"
-  abbr: KS
-states_034:
-  name: Missouri
-  country_id: "214"
-  id: "653576146"
-  abbr: MO
-states_023:
-  name: Arkansas
-  country_id: "214"
-  id: "471470972"
-  abbr: AR
-states_012:
-  name: Nevada
-  country_id: "214"
-  id: "179539703"
-  abbr: NV
-states_001:
-  name: District of Columbia
-  country_id: "214"
-  id: "6764998"
-  abbr: DC
-states_046:
-  name: Idaho
-  country_id: "214"
-  id: "982433740"
-  abbr: ID
-states_035:
-  name: Nebraska
-  country_id: "214"
-  id: "673350891"
-  abbr: NE
-states_024:
-  name: Pennsylvania
-  country_id: "214"
-  id: "471711976"
-  abbr: PA
-states_013:
-  name: Hawaii
-  country_id: "214"
-  id: "199950338"
-  abbr: HI
-states_002:
-  name: Utah
-  country_id: "214"
-  id: "17199670"
-  abbr: UT
-states_047:
-  name: Vermont
-  country_id: "214"
-  id: "989115415"
-  abbr: VT
-states_036:
-  name: Delaware
-  country_id: "214"
-  id: "721598219"
-  abbr: DE
-states_025:
-  name: Rhode Island
-  country_id: "214"
-  id: "474001862"
-  abbr: RI
-states_014:
-  name: Oklahoma
-  country_id: "214"
-  id: "248548169"
-  abbr: OK
-states_003:
-  name: Louisiana
-  country_id: "214"
-  id: "37199952"
-  abbr: LA
-states_048:
-  name: Montana
-  country_id: "214"
-  id: "999156632"
-  abbr: MT
-states_037:
-  name: Tennessee
-  country_id: "214"
-  id: "726305632"
-  abbr: TN
-states_026:
-  name: Maryland
-  country_id: "214"
-  id: "480368357"
-  abbr: MD
-states_015:
-  name: Florida
-  country_id: "214"
-  id: "267271847"
-  abbr: FL
-states_004:
-  name: Virginia
-  country_id: "214"
-  id: "41111624"
-  abbr: VA
-states_049:
-  name: Minnesota
-  country_id: "214"
-  id: "1032288924"
-  abbr: MN
-states_038:
-  name: New Jersey
-  country_id: "214"
-  id: "750950030"
-  abbr: NJ
-states_027:
-  name: Ohio
-  country_id: "214"
-  id: "485193526"
-  abbr: OH
-states_016:
-  name: California
-  country_id: "214"
-  id: "276110813"
-  abbr: CA
-states_005:
-  name: North Dakota
-  country_id: "214"
-  id: "51943165"
-  abbr: ND
-states_050:
-  name: Maine
-  country_id: "214"
-  id: "1055056709"
-  abbr: ME
-states_039:
-  name: Indiana
-  country_id: "214"
-  id: "769938586"
-  abbr: IN
-states_028:
-  name: Texas
-  country_id: "214"
-  id: "525212995"
-  abbr: TX
-states_017:
-  name: Oregon
-  country_id: "214"
-  id: "298914262"
-  abbr: OR
-states_006:
-  name: Wyoming
-  country_id: "214"
-  id: "66390489"
-  abbr: WY
-states_051:
-  name: Alabama
-  country_id: "214"
-  id: "1061493585"
-  abbr: AL
-states_040:
-  name: Iowa
-  country_id: "214"
-  id: "825306985"
-  abbr: IA
-states_029:
-  name: Mississippi
-  country_id: "214"
-  id: "532363768"
-  abbr: MS
-states_018:
-  name: Kentucky
-  country_id: "214"
-  id: "308473843"
-  abbr: KY
-states_007:
-  name: New Mexico
-  country_id: "214"
-  id: "69729944"
-  abbr: NM
-states_041:
-  name: Georgia
-  country_id: "214"
-  id: "876916760"
-  abbr: GA
-states_030:
-  name: Colorado
-  country_id: "214"
-  id: "536031023"
-  abbr: CO
-states_019:
-  name: Massachusetts
-  country_id: "214"
-  id: "385551075"
-  abbr: MA
-states_008:
-  name: Connecticut
-  country_id: "214"
-  id: "69870734"
-  abbr: CT
-states_042:
-  name: New York
-  country_id: "214"
-  id: "889445952"
-  abbr: NY
-states_031:
-  name: South Carolina
-  country_id: "214"
-  id: "597434151"
-  abbr: SC
-states_020:
-  name: Alaska
-  country_id: "214"
-  id: "403740659"
-  abbr: AK
-states_009:
-  name: West Virginia
-  country_id: "214"
-  id: "91367981"
-  abbr: WV

data/db/default/spree/zone_members.yml DELETED Viewed

@@ -1,169 +0,0 @@
----
-zone_members_019:
-  zoneable_id: "162"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_008:
-  zoneable_id: "67"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_020:
-  zoneable_id: "163"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_021:
-  zoneable_id: "167"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_010:
-  zoneable_id: "74"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_009:
-  zoneable_id: "68"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_022:
-  zoneable_id: "183"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_011:
-  zoneable_id: "90"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_023:
-  zoneable_id: "184"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_012:
-  zoneable_id: "96"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_001:
-  zoneable_id: "13"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_024:
-  zoneable_id: "188"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_013:
-  zoneable_id: "98"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_002:
-  zoneable_id: "20"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_025:
-  zoneable_id: "194"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_014:
-  zoneable_id: "110"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_003:
-  zoneable_id: "30"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_026:
-  zoneable_id: "213"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_015:
-  zoneable_id: "116"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_004:
-  zoneable_id: "51"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_016:
-  zoneable_id: "117"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_005:
-  zoneable_id: "52"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_028:
-  zoneable_id: "214"
-  created_at: 2009-06-04 17:22:41
-  updated_at: 2009-06-04 17:22:41
-  zone_id: "2"
-  zoneable_type: Spree::Country
-zone_members_017:
-  zoneable_id: "125"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_006:
-  zoneable_id: "53"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_029:
-  zoneable_id: "35"
-  created_at: 2009-06-04 17:22:41
-  updated_at: 2009-06-04 17:22:41
-  zone_id: "2"
-  zoneable_type: Spree::Country
-zone_members_018:
-  zoneable_id: "142"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country
-zone_members_007:
-  zoneable_id: "62"
-  created_at: 2009-06-04 13:22:26
-  updated_at: 2009-06-04 13:22:26
-  zone_id: "1"
-  zoneable_type: Spree::Country

data/db/default/spree/zones.yml DELETED Viewed

@@ -1,13 +0,0 @@
----
-zones_001:
-  name: EU_VAT
-  created_at: 2009-06-04 17:22:26
-  updated_at: 2009-06-04 17:22:26
-  id: "1"
-  description: Countries that make up the EU VAT zone.
-zones_002:
-  name: North America
-  created_at: 2009-06-04 17:22:41
-  updated_at: 2009-06-04 17:22:41
-  id: "2"
-  description: USA + Canada