spree_core 1.0.0.rc2 → 1.0.0.rc3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-14 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70152003681720 !ruby/object:Gem::Requirement
+  requirement: &70287232483420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70152003681720
+  version_requirements: *70287232483420
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70152003680940 !ruby/object:Gem::Requirement
+  requirement: &70287232498240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70152003680940
+  version_requirements: *70287232498240
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70152003680160 !ruby/object:Gem::Requirement
+  requirement: &70287232494200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70152003680160
+  version_requirements: *70287232494200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70152003678860 !ruby/object:Gem::Requirement
+  requirement: &70287232491820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70152003678860
+  version_requirements: *70287232491820
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70152003678180 !ruby/object:Gem::Requirement
+  requirement: &70287232517320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70152003678180
+  version_requirements: *70287232517320
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70152003677480 !ruby/object:Gem::Requirement
+  requirement: &70287232512680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,21 +79,21 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152003677480
+  version_requirements: *70287232512680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70152003676860 !ruby/object:Gem::Requirement
+  requirement: &70287232529780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152003676860
+  version_requirements: *70287232529780
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70152003676300 !ruby/object:Gem::Requirement
+  requirement: &70287232525620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70152003676300
+  version_requirements: *70287232525620
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70152003675740 !ruby/object:Gem::Requirement
+  requirement: &70287232544300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70152003675740
+  version_requirements: *70287232544300
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70152003675120 !ruby/object:Gem::Requirement
+  requirement: &70287232541980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70152003675120
+  version_requirements: *70287232541980
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70152003673840 !ruby/object:Gem::Requirement
+  requirement: &70287232563100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152003673840
+  version_requirements: *70287232563100
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70152003673080 !ruby/object:Gem::Requirement
+  requirement: &70287232560620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70152003673080
+  version_requirements: *70287232560620
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70152003672340 !ruby/object:Gem::Requirement
+  requirement: &70287232556600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70152003672340
+  version_requirements: *70287232556600
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -249,6 +249,23 @@ files:
 - app/assets/images/creditcards/amex_cid.gif
 - app/assets/images/creditcards/creditcard.gif
 - app/assets/images/creditcards/discover_cid.gif
+- app/assets/images/creditcards/icons/american_express.png
+- app/assets/images/creditcards/icons/cirrus.png
+- app/assets/images/creditcards/icons/delta.png
+- app/assets/images/creditcards/icons/dinersclub.png
+- app/assets/images/creditcards/icons/directdebit.png
+- app/assets/images/creditcards/icons/discover.png
+- app/assets/images/creditcards/icons/egold.png
+- app/assets/images/creditcards/icons/maestro.png
+- app/assets/images/creditcards/icons/master.png
+- app/assets/images/creditcards/icons/paypal.png
+- app/assets/images/creditcards/icons/solo.png
+- app/assets/images/creditcards/icons/switch.png
+- app/assets/images/creditcards/icons/visa.png
+- app/assets/images/creditcards/icons/visaelectron.png
+- app/assets/images/creditcards/icons/westernunion.png
+- app/assets/images/creditcards/icons/wirecard.png
+- app/assets/images/creditcards/icons/worldpay.png
 - app/assets/images/creditcards/master_cid.jpg
 - app/assets/images/creditcards/visa_cid.gif
 - app/assets/images/favicon.ico
@@ -260,6 +277,8 @@ files:
 - app/assets/images/noimage/product.png
 - app/assets/images/noimage/small.png
 - app/assets/images/spinner.gif
+- app/assets/images/store/cart.png
+- app/assets/images/store/select_arrow.gif
 - app/assets/javascripts/admin/address_states.js
 - app/assets/javascripts/admin/admin.js.erb
 - app/assets/javascripts/admin/calculator.js
@@ -279,6 +298,7 @@ files:
 - app/assets/javascripts/admin/zone.js
 - app/assets/javascripts/store/cart.js
 - app/assets/javascripts/store/checkout.js
+- app/assets/javascripts/store/helpers.js.erb
 - app/assets/javascripts/store/product.js
 - app/assets/javascripts/store/spree_core.js
 - app/assets/stylesheets/admin/admin-form.css.erb
@@ -289,8 +309,8 @@ files:
 - app/assets/stylesheets/admin/edit_checkouts.css
 - app/assets/stylesheets/admin/spree_core.css
 - app/assets/stylesheets/admin/token-input.css
-- app/assets/stylesheets/store/reset.css
-- app/assets/stylesheets/store/screen.css
+- app/assets/stylesheets/store/base.css
+- app/assets/stylesheets/store/screen.css.scss
 - app/assets/stylesheets/store/spree_core.css
 - app/controllers/spree/admin/adjustments_controller.rb
 - app/controllers/spree/admin/base_controller.rb
@@ -841,7 +861,6 @@ files:
 - db/migrate/20110418151136_eligible_for_adjustments.rb
 - db/migrate/20111007143030_namespace_top_level_models.rb
 - db/migrate/20111107143030_migrate_namespaced_polymorphic_models.rb
-- db/migrate/20111128153359_new_preferences.rb
 - db/migrate/20111201024007_make_adjustments_polymorphic.rb
 - db/migrate/20111215032408_add_company_to_addresses.rb
 - db/migrate/20111216154844_add_inc_tax_to_tax_rates.rb
@@ -849,6 +868,7 @@ files:
 - db/migrate/20111219205902_add_default_tax_zone.rb
 - db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb
 - db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb
+- db/migrate/20120119024710_new_preferences.rb
 - db/sample/users.rb
 - db/seeds.rb
 - vendor/assets/images/datepicker/cal.gif
@@ -875,6 +895,7 @@ files:
 - vendor/assets/javascripts/jquery.alerts/jquery.alerts.spree.css
 - vendor/assets/javascripts/jquery.cookie.js
 - vendor/assets/javascripts/jquery.delayedobserver.js
+- vendor/assets/javascripts/jquery.formalize.min.js
 - vendor/assets/javascripts/jquery.jstree/jquery.jstree.js
 - vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg
 - vendor/assets/javascripts/jquery.jstree/themes/apple/d.png
@@ -924,6 +945,7 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_pt.js
 - vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
+- vendor/assets/stylesheets/jquery.formalize.css
 homepage: http://spreecommerce.com
 licenses: []
 post_install_message: 

data/app/assets/stylesheets/store/reset.css

@@ -1,175 +0,0 @@
-html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  outline: 0;
-  font-weight: inherit;
-  font-style: inherit;
-  font-size: 100%;
-  font-family: inherit;
-  vertical-align: baseline;
-}
-*:focus { outline: 0; }
-body {
-  line-height: 1em;
-  color: black;
-  background: #ffffff;
-}
-ol, ul { list-style: none; }
-table {
-  border-collapse: separate;
-  border-spacing: 0;
-  vertical-align: middle;
-}
-caption, th, td {
-  text-align: left;
-  font-weight: normal;
-  vertical-align: middle;
-}
-q, blockquote { quotes: "" ""; }
-q:before { content: ""; }
-q:after { content: ""; }
-blockquote:before { content: ""; }
-blockquote:after { content: ""; }
-img a { border: none; }
-hr {
-  background: #dddddd;
-  color: #dddddd;
-  clear: both;
-  float: none;
-  width: 100%;
-  height: 0.1em;
-  margin: 0 0 1.45em;
-  border: none;
-}
-hr.space {
-  background: #dddddd;
-  color: #dddddd;
-  clear: both;
-  float: none;
-  width: 100%;
-  height: 0.1em;
-  margin: 0 0 1.45em;
-  border: none;
-  background: #ffffff;
-  color: #ffffff;
-}
-body {
-  line-height: 1.5;
-  font-family: Helvetica Neue, Arial, Helvetica, sans-serif;
-  color: #333333;
-  font-size: 90%;
-}
-h1 {
-  font-weight: normal;
-  color: #222222;
-  font-size: 3em;
-  line-height: 1;
-  margin-bottom: 0.5em;
-}
-h1 img { margin: 0; }
-h2 {
-  font-weight: normal;
-  color: #222222;
-  font-size: 2em;
-  margin-bottom: 0.75em;
-}
-h3 {
-  font-weight: normal;
-  color: #222222;
-  font-size: 1.5em;
-  line-height: 1;
-  margin-bottom: 1em;
-}
-h4 {
-  font-weight: normal;
-  color: #222222;
-  font-size: 1.2em;
-  line-height: 1.25;
-  margin-bottom: 1.25em;
-}
-h5 {
-  font-weight: normal;
-  color: #222222;
-  font-size: 1em;
-  font-weight: bold;
-  margin-bottom: 1.5em;
-}
-h6 {
-  font-weight: normal;
-  color: #222222;
-  font-size: 1em;
-  font-weight: bold;
-}
-h2 img { margin: 0; }
-h3 img { margin: 0; }
-h4 img { margin: 0; }
-h5 img { margin: 0; }
-h6 img { margin: 0; }
-p { margin: 0 0 1.5em; }
-p img.left {
-  display: inline;
-  float: left;
-  margin: 1.5em 1.5em 1.5em 0;
-  padding: 0;
-}
-p img.right {
-  display: inline;
-  float: right;
-  margin: 1.5em 0 1.5em 1.5em;
-  padding: 0;
-}
-a {
-  text-decoration: underline;
-  color: #2e6ab1;
-}
-blockquote {
-  margin: 1.5em;
-  color: #666666;
-  font-style: italic;
-}
-strong { font-weight: bold; }
-em { font-style: italic; }
-dfn {
-  font-style: italic;
-  font-weight: bold;
-}
-sup, sub { line-height: 0; }
-abbr, acronym { border-bottom: 1px dotted #666666; }
-address {
-  margin: 0 0 1.5em;
-  font-style: italic;
-}
-del { color: #666666; }
-pre {
-  margin: 1.5em 0;
-  white-space: pre;
-}
-pre, code, tt {
-  font: 1em 'andale mono', 'lucida console', monospace;
-  line-height: 1.5;
-}
-li ul { margin: 0 1.5em; }
-li ol { margin: 0 1.5em; }
-ul {
-  margin: 0 1.5em 1.5em 1.5em;
-  list-style-type: disc;
-}
-ol {
-  margin: 0 1.5em 1.5em 1.5em;
-  list-style-type: decimal;
-}
-dl { margin: 0 0 1.5em 0; }
-dl dt { font-weight: bold; }
-dd { margin-left: 1.5em; }
-table {
-  margin-bottom: 1.4em;
-  width: 100%;
-}
-th { font-weight: bold; }
-thead th { background: #c3d9ff; }
-th, td, caption { padding: 4px 10px 4px 5px; }
-tr.even td { background: #e5ecf9; }
-tfoot { font-style: italic; }
-caption { background: #eeeeee; }
-input[type="number"] { width: 42px; }

data/app/assets/stylesheets/store/screen.css

@@ -1,127 +0,0 @@
-body {
-  padding: 0 1em;
-}
-
-/* Header */
-
-div#header {
-  margin-bottom: 1em;
-}
-
-div#header ul#nav-bar {
-  line-height: 50px;
-  float: right;
-  clear: both;
-  font-size: 1.2em;
-  list-style: none;
-  margin: 0;
-}
-
-div#header ul#nav-bar li {
-  padding: 0 0 0 1em;
-  display: table-cell;
-  vertical-align: middle;
-  height: 82px;
-}
-
-
-/* Sidebar */
-
-div#sidebar {
-  float: left;
-  height: 100%;
-  max-width: 25%;
-}
-
-/* Content */
-
-div#content {
-  float: left;
-}
-
-body.two-col div#content {
-  float: left;
-  max-width: 75%;
-}
-
-div#footer {
-  clear: both;
-}
-
-ul#products {
-  list-style: none;
-  margin: 0 auto;
-}
-
-ul#products li {
-  float: left;
-  text-align: center;
-  width: 200px;
-  height: 150px;
-  padding: 0 10px 20px 10px;
-}
-
-ul#products li img {
-  display: block;
-  margin: auto;
-}
-
-button, a.button, input.button {
-  display: inline-block;
-  width: auto;
-  height: auto;
-  cursor: pointer;
-  margin: 0px;
-  padding: 3px;
-  text-decoration: none;
-  font-size: 1em;
-  color: inherit;
-}
-
-button img, a.button img, input.button img {
-  vertical-align: middle;
-  margin-right: 5px;
-}
-
-div#subtotal { float: right; }
-
-div#product-variants ul li label { cursor: pointer; }
-div#product-images { width: 50%; }
-div#product-images, div#main-image, div#cart-form { float: left; }
-div#product-description { float: none; clear: both; }
-
-ul.filter_choices {
-  list-style-type:none;
-  padding-left:0px;
-}
-
-ul.thumbnails, #breadcrumbs ul {
-  margin: 0;
-  padding: 0;
-  list-style: none;
-}
-ul.thumbnails li {
-  width: 48px;
-  height: 48px;
-  margin-right: 4px;
-  margin-bottom: 4px;
-  min-height: 48px;
-  padding: 0;
-  float: none;
-  display: inline-block;
-  position: relative;
-  border: 1px solid silver;
-}
-#breadcrumbs ul li { display: inline-block; }
-
-dl.table-display dt { float: left; min-width: 200px; padding: 3px 5px; }
-dl.table-display dd { padding: 3px; }
-dl#product-price dt { float: left; padding: 0 10px 0 0; font-size: 14pt; }
-dl#product-price dd { font-size: 14pt; }
-
-.even { background: #EEE;}
-.odd { background: #DDD;}
-.hidden { display: none; }
-
-div.inner input[type=text], div.inner select { width: 90%; }
-span.req { color: red; padding-left: 0.25em; }