solidus_core 1.2.3 → 1.3.0.beta1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: '1.48'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.48.0
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: font-awesome-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.18
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -203,6 +175,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.4
   type: :runtime
@@ -210,6 +185,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.4
 - !ruby/object:Gem::Dependency
@@ -232,28 +210,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: responders
   requirement: !ruby/object:Gem::Requirement
@@ -525,8 +503,10 @@ files:
 - app/models/spree/shipping_manifest.rb
 - app/models/spree/shipping_method.rb
 - app/models/spree/shipping_method_category.rb
+- app/models/spree/shipping_method_stock_location.rb
 - app/models/spree/shipping_method_zone.rb
 - app/models/spree/shipping_rate.rb
+- app/models/spree/shipping_rate_tax.rb
 - app/models/spree/state.rb
 - app/models/spree/state_change.rb
 - app/models/spree/stock/adjuster.rb
@@ -558,6 +538,11 @@ files:
 - app/models/spree/store_credit_type.rb
 - app/models/spree/store_credit_update_reason.rb
 - app/models/spree/store_payment_method.rb
+- app/models/spree/tax/item_adjuster.rb
+- app/models/spree/tax/order_adjuster.rb
+- app/models/spree/tax/shipping_rate_taxer.rb
+- app/models/spree/tax/tax_helpers.rb
+- app/models/spree/tax/tax_location.rb
 - app/models/spree/tax_category.rb
 - app/models/spree/tax_rate.rb
 - app/models/spree/taxon.rb
@@ -570,6 +555,8 @@ files:
 - app/models/spree/user_stock_location.rb
 - app/models/spree/validations/db_maximum_length_validator.rb
 - app/models/spree/variant.rb
+- app/models/spree/variant/pricer.rb
+- app/models/spree/variant/pricing_options.rb
 - app/models/spree/variant/scopes.rb
 - app/models/spree/variant_property_rule.rb
 - app/models/spree/variant_property_rule_condition.rb
@@ -871,16 +858,28 @@ files:
 - db/migrate/20150825204216_drop_spree_gateways.rb
 - db/migrate/20150826002555_convert_habtm_to_hmt_for_taxon_prototypes.rb
 - db/migrate/20150909123605_create_variant_properties_and_rules.rb
+- db/migrate/20151001121454_create_spree_shipping_method_stock_locations.rb
+- db/migrate/20151002023248_add_foreign_key_to_shipping_method_stock_location.rb
 - db/migrate/20151010003252_add_foreign_keys_for_taxons_prototypes.rb
 - db/migrate/20151013222921_remove_token_permissions_table.rb
 - db/migrate/20151014213349_rename_identifier_to_number_for_payment.rb
 - db/migrate/20151015203732_add_foreign_keys_for_product_promotion_rules.rb
 - db/migrate/20151021113730_add_sale_to_spree_promotions.rb
 - db/migrate/20151021163309_convert_sale_promotions.rb
+- db/migrate/20151026093607_change_return_item_pre_tax_amount_to_amount.rb
 - db/migrate/20151117063249_convert_habtm_to_hmt_for_properties_prototypes.rb
 - db/migrate/20151124062500_convert_habtm_to_hmt_for_option_type_prototypes.rb
 - db/migrate/20151126063028_convert_habtm_to_hmt_for_taxons_promotion_rules.rb
 - db/migrate/20151219020209_add_stock_item_unique_index.rb
+- db/migrate/20160111091912_add_column_available_to_all_on_spree_shipping_method.rb
+- db/migrate/20160116133604_add_position_to_spree_payment_methods.rb
+- db/migrate/20160122182105_add_carrier_and_service_level_to_spree_shipping_methods.rb
+- db/migrate/20160224201413_create_spree_shipping_rate_taxes.rb
+- db/migrate/20160229133259_add_cart_tax_country_iso_to_spree_store.rb
+- db/migrate/20160301103333_remove_pre_tax_amount_on_line_item_and_shipment.rb
+- db/migrate/20160308000300_disallow_adjustment_finalized_nulls.rb
+- db/migrate/20160318145302_add_timestamps_to_prices.rb
+- db/migrate/20160330204846_add_missing_timestamp_columns.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -888,7 +887,6 @@ files:
 - lib/generators/spree/custom_user/templates/migration.rb.tt
 - lib/generators/spree/dummy/dummy_generator.rb
 - lib/generators/spree/dummy/templates/initializers/custom_user.rb
-- lib/generators/spree/dummy/templates/initializers/devise.rb
 - lib/generators/spree/dummy/templates/rails/application.rb
 - lib/generators/spree/dummy/templates/rails/boot.rb
 - lib/generators/spree/dummy/templates/rails/database.yml
@@ -907,6 +905,7 @@ files:
 - lib/spree/core/controller_helpers/common.rb
 - lib/spree/core/controller_helpers/order.rb
 - lib/spree/core/controller_helpers/payment_parameters.rb
+- lib/spree/core/controller_helpers/pricing.rb
 - lib/spree/core/controller_helpers/respond_with.rb
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
@@ -936,7 +935,6 @@ files:
 - lib/spree/localized_number.rb
 - lib/spree/mailer_previews/carton_preview.rb
 - lib/spree/mailer_previews/order_preview.rb
-- lib/spree/migration_helpers.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permission_sets.rb
@@ -1047,10 +1045,13 @@ files:
 - lib/tasks/core.rake
 - lib/tasks/email.rake
 - lib/tasks/exchanges.rake
+- lib/tasks/migrations/assure_store_on_orders.rake
 - lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
 - lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake
+- lib/tasks/migrations/migrate_shipping_rate_taxes.rake
 - lib/tasks/migrations/migrate_user_addresses.rake
 - lib/tasks/order_capturing.rake
+- lib/tasks/upgrade.rake
 - script/rails
 - solidus_core.gemspec
 - spec/fixtures/thinking-cat.jpg
@@ -1065,6 +1066,7 @@ files:
 - spec/lib/spree/core/controller_helpers/auth_spec.rb
 - spec/lib/spree/core/controller_helpers/order_spec.rb
 - spec/lib/spree/core/controller_helpers/payment_parameters_spec.rb
+- spec/lib/spree/core/controller_helpers/pricing_spec.rb
 - spec/lib/spree/core/controller_helpers/search_spec.rb
 - spec/lib/spree/core/controller_helpers/store_spec.rb
 - spec/lib/spree/core/controller_helpers/strong_parameters_spec.rb
@@ -1135,6 +1137,7 @@ files:
 - spec/lib/spree/core/testing_support/factories/variant_property_rule_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/variant_property_rule_value_factory_spec.rb
 - spec/lib/spree/core/testing_support/factories/zone_factory_spec.rb
+- spec/lib/spree/core/testing_support/preferences_spec.rb
 - spec/lib/spree/core/unreturned_item_charger_spec.rb
 - spec/lib/spree/core/validators/email_spec.rb
 - spec/lib/spree/core/version_spec.rb
@@ -1175,6 +1178,7 @@ files:
 - spec/models/spree/concerns/ordered_property_value_list_spec.rb
 - spec/models/spree/concerns/user_address_book_spec.rb
 - spec/models/spree/concerns/user_methods_spec.rb
+- spec/models/spree/country_spec.rb
 - spec/models/spree/credit_card_spec.rb
 - spec/models/spree/customer_return_spec.rb
 - spec/models/spree/exchange_spec.rb
@@ -1299,6 +1303,7 @@ files:
 - spec/models/spree/shipping_manifest_spec.rb
 - spec/models/spree/shipping_method_spec.rb
 - spec/models/spree/shipping_rate_spec.rb
+- spec/models/spree/shipping_rate_tax_spec.rb
 - spec/models/spree/state_spec.rb
 - spec/models/spree/stock/availability_validator_spec.rb
 - spec/models/spree/stock/coordinator_spec.rb
@@ -1323,6 +1328,11 @@ files:
 - spec/models/spree/store_credit_event_spec.rb
 - spec/models/spree/store_credit_spec.rb
 - spec/models/spree/store_spec.rb
+- spec/models/spree/tax/item_adjuster_spec.rb
+- spec/models/spree/tax/order_adjuster_spec.rb
+- spec/models/spree/tax/shipping_rate_taxer_spec.rb
+- spec/models/spree/tax/tax_location_spec.rb
+- spec/models/spree/tax/taxation_integration_spec.rb
 - spec/models/spree/tax_category_spec.rb
 - spec/models/spree/tax_rate_spec.rb
 - spec/models/spree/taxon_spec.rb
@@ -1332,6 +1342,8 @@ files:
 - spec/models/spree/unit_cancel_spec.rb
 - spec/models/spree/user_spec.rb
 - spec/models/spree/validations/db_maximum_length_validator_spec.rb
+- spec/models/spree/variant/pricer_spec.rb
+- spec/models/spree/variant/pricing_options_spec.rb
 - spec/models/spree/variant/scopes_spec.rb
 - spec/models/spree/variant_property_rule_condition_spec.rb
 - spec/models/spree/variant_property_rule_spec.rb
@@ -1347,7 +1359,6 @@ files:
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
 - vendor/assets/stylesheets/normalize.css
-- vendor/assets/stylesheets/skeleton.css
 homepage: http://solidus.io
 licenses:
 - BSD-3
@@ -1363,12 +1374,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.

data/lib/generators/spree/dummy/templates/initializers/devise.rb

@@ -1,3 +0,0 @@
-if Object.const_defined?("Devise")
-  Devise.secret_key = "<%= SecureRandom.hex(50) %>"
-end

data/lib/spree/migration_helpers.rb

@@ -1,19 +0,0 @@
-module Spree
-  module MigrationHelpers
-    def safe_remove_index(table, column)
-      remove_index(table, column) if index_exists?(table, column)
-    end
-
-    def safe_add_index(table, column, options = {})
-      if columns_exist?(table, column) && !index_exists?(table, column, options)
-        add_index(table, column, options)
-      end
-    end
-
-    private
-
-    def columns_exist?(table, columns)
-      Array.wrap(columns).all? { |column| column_exists?(table, column) }
-    end
-  end
-end

data/vendor/assets/stylesheets/skeleton.css

@@ -1,242 +0,0 @@
-/*
-* Skeleton V1.2
-* Copyright 2011, Dave Gamache
-* www.getskeleton.com
-* Free to use under the MIT license.
-* http://www.opensource.org/licenses/mit-license.php
-* 6/20/2012
-*/
-
-
-/* Table of Contents
-==================================================
-    #Base 960 Grid
-    #Tablet (Portrait)
-    #Mobile (Portrait)
-    #Mobile (Landscape)
-    #Clearing */
-
-
-
-/* #Base 960 Grid
-================================================== */
-
-    .container                                  { position: relative; width: 960px; margin: 0 auto; padding: 0; }
-    .container .column,
-    .container .columns                         { float: left; display: inline; margin-left: 10px; margin-right: 10px; }
-    .row                                        { margin-bottom: 20px; }
-
-    /* Nested Column Classes */
-    .column.alpha, .columns.alpha               { margin-left: 0; }
-    .column.omega, .columns.omega               { margin-right: 0; }
-
-    /* Base Grid */
-    .container .one.column,
-    .container .one.columns                     { width: 40px;  }
-    .container .two.columns                     { width: 100px; }
-    .container .three.columns                   { width: 160px; }
-    .container .four.columns                    { width: 220px; }
-    .container .five.columns                    { width: 280px; }
-    .container .six.columns                     { width: 340px; }
-    .container .seven.columns                   { width: 400px; }
-    .container .eight.columns                   { width: 460px; }
-    .container .nine.columns                    { width: 520px; }
-    .container .ten.columns                     { width: 580px; }
-    .container .eleven.columns                  { width: 640px; }
-    .container .twelve.columns                  { width: 700px; }
-    .container .thirteen.columns                { width: 760px; }
-    .container .fourteen.columns                { width: 820px; }
-    .container .fifteen.columns                 { width: 880px; }
-    .container .sixteen.columns                 { width: 940px; }
-
-    .container .one-third.column                { width: 300px; }
-    .container .two-thirds.column               { width: 620px; }
-
-    /* Offsets */
-    .container .offset-by-one                   { padding-left: 60px;  }
-    .container .offset-by-two                   { padding-left: 120px; }
-    .container .offset-by-three                 { padding-left: 180px; }
-    .container .offset-by-four                  { padding-left: 240px; }
-    .container .offset-by-five                  { padding-left: 300px; }
-    .container .offset-by-six                   { padding-left: 360px; }
-    .container .offset-by-seven                 { padding-left: 420px; }
-    .container .offset-by-eight                 { padding-left: 480px; }
-    .container .offset-by-nine                  { padding-left: 540px; }
-    .container .offset-by-ten                   { padding-left: 600px; }
-    .container .offset-by-eleven                { padding-left: 660px; }
-    .container .offset-by-twelve                { padding-left: 720px; }
-    .container .offset-by-thirteen              { padding-left: 780px; }
-    .container .offset-by-fourteen              { padding-left: 840px; }
-    .container .offset-by-fifteen               { padding-left: 900px; }
-
-
-
-/* #Tablet (Portrait)
-================================================== */
-
-    /* Note: Design for a width of 768px */
-
-    @media only screen and (min-width: 768px) and (max-width: 959px) {
-        .container                                  { width: 768px; }
-        .container .column,
-        .container .columns                         { margin-left: 10px; margin-right: 10px;  }
-        .column.alpha, .columns.alpha               { margin-left: 0; margin-right: 10px; }
-        .column.omega, .columns.omega               { margin-right: 0; margin-left: 10px; }
-        .alpha.omega                                { margin-left: 0; margin-right: 0; }
-
-        .container .one.column,
-        .container .one.columns                     { width: 28px; }
-        .container .two.columns                     { width: 76px; }
-        .container .three.columns                   { width: 124px; }
-        .container .four.columns                    { width: 172px; }
-        .container .five.columns                    { width: 220px; }
-        .container .six.columns                     { width: 268px; }
-        .container .seven.columns                   { width: 316px; }
-        .container .eight.columns                   { width: 364px; }
-        .container .nine.columns                    { width: 412px; }
-        .container .ten.columns                     { width: 460px; }
-        .container .eleven.columns                  { width: 508px; }
-        .container .twelve.columns                  { width: 556px; }
-        .container .thirteen.columns                { width: 604px; }
-        .container .fourteen.columns                { width: 652px; }
-        .container .fifteen.columns                 { width: 700px; }
-        .container .sixteen.columns                 { width: 748px; }
-
-        .container .one-third.column                { width: 236px; }
-        .container .two-thirds.column               { width: 492px; }
-
-        /* Offsets */
-        .container .offset-by-one                   { padding-left: 48px; }
-        .container .offset-by-two                   { padding-left: 96px; }
-        .container .offset-by-three                 { padding-left: 144px; }
-        .container .offset-by-four                  { padding-left: 192px; }
-        .container .offset-by-five                  { padding-left: 240px; }
-        .container .offset-by-six                   { padding-left: 288px; }
-        .container .offset-by-seven                 { padding-left: 336px; }
-        .container .offset-by-eight                 { padding-left: 384px; }
-        .container .offset-by-nine                  { padding-left: 432px; }
-        .container .offset-by-ten                   { padding-left: 480px; }
-        .container .offset-by-eleven                { padding-left: 528px; }
-        .container .offset-by-twelve                { padding-left: 576px; }
-        .container .offset-by-thirteen              { padding-left: 624px; }
-        .container .offset-by-fourteen              { padding-left: 672px; }
-        .container .offset-by-fifteen               { padding-left: 720px; }
-    }
-
-
-/*  #Mobile (Portrait)
-================================================== */
-
-    /* Note: Design for a width of 320px */
-
-    @media only screen and (max-width: 767px) {
-        .container { width: 300px; }
-        .container .columns,
-        .container .column { margin: 0; }
-
-        .container .one.column,
-        .container .one.columns,
-        .container .two.columns,
-        .container .three.columns,
-        .container .four.columns,
-        .container .five.columns,
-        .container .six.columns,
-        .container .seven.columns,
-        .container .eight.columns,
-        .container .nine.columns,
-        .container .ten.columns,
-        .container .eleven.columns,
-        .container .twelve.columns,
-        .container .thirteen.columns,
-        .container .fourteen.columns,
-        .container .fifteen.columns,
-        .container .sixteen.columns,
-        .container .one-third.column,
-        .container .two-thirds.column  { width: 300px; }
-
-        /* Offsets */
-        .container .offset-by-one,
-        .container .offset-by-two,
-        .container .offset-by-three,
-        .container .offset-by-four,
-        .container .offset-by-five,
-        .container .offset-by-six,
-        .container .offset-by-seven,
-        .container .offset-by-eight,
-        .container .offset-by-nine,
-        .container .offset-by-ten,
-        .container .offset-by-eleven,
-        .container .offset-by-twelve,
-        .container .offset-by-thirteen,
-        .container .offset-by-fourteen,
-        .container .offset-by-fifteen { padding-left: 0; }
-
-    }
-
-
-/* #Mobile (Landscape)
-================================================== */
-
-    /* Note: Design for a width of 480px */
-
-    @media only screen and (min-width: 480px) and (max-width: 767px) {
-        .container { width: 420px; }
-        .container .columns,
-        .container .column { margin: 0; }
-
-        .container .one.column,
-        .container .one.columns,
-        .container .two.columns,
-        .container .three.columns,
-        .container .four.columns,
-        .container .five.columns,
-        .container .six.columns,
-        .container .seven.columns,
-        .container .eight.columns,
-        .container .nine.columns,
-        .container .ten.columns,
-        .container .eleven.columns,
-        .container .twelve.columns,
-        .container .thirteen.columns,
-        .container .fourteen.columns,
-        .container .fifteen.columns,
-        .container .sixteen.columns,
-        .container .one-third.column,
-        .container .two-thirds.column { width: 420px; }
-    }
-
-
-/* #Clearing
-================================================== */
-
-    /* Self Clearing Goodness */
-    .container:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; }
-
-    /* Use clearfix class on parent to clear nested columns,
-    or wrap each row of columns in a <div class="row"> */
-    .clearfix:before,
-    .clearfix:after,
-    .row:before,
-    .row:after {
-      content: '\0020';
-      display: block;
-      overflow: hidden;
-      visibility: hidden;
-      width: 0;
-      height: 0; }
-    .row:after,
-    .clearfix:after {
-      clear: both; }
-    .row,
-    .clearfix {
-      zoom: 1; }
-
-    /* You can also use a <br class="clear" /> to clear columns */
-    .clear {
-      clear: both;
-      display: block;
-      overflow: hidden;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-    }