solidus_core 1.1.0.pre1 → 1.1.0.pre2

data/db/default/spree/zones.rb

@@ -1,5 +1,5 @@
-eu_vat = Spree::Zone.create!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
-north_america = Spree::Zone.create!(name: "North America", description: "USA + Canada")
+eu_vat = Spree::Zone.find_or_create_by!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
+north_america = Spree::Zone.find_or_create_by!(name: "North America", description: "USA + Canada")
 
 ["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
  "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",

data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb

@@ -1,4 +1,8 @@
 class CreateSpreeReturnAuthorizationReasons < ActiveRecord::Migration
+  class ReturnAuthorizationReason < ActiveRecord::Base
+    self.table_name = 'spree_return_authorization_reasons'
+  end
+
   def change
     create_table :spree_return_authorization_reasons do |t|
       t.string :name
@@ -10,17 +14,15 @@ class CreateSpreeReturnAuthorizationReasons < ActiveRecord::Migration
 
     reversible do |direction|
       direction.up do
-        if defined?(Spree::ReturnAuthorizationReason)
-          Spree::ReturnAuthorizationReason.create!(name: 'Better price available')
-          Spree::ReturnAuthorizationReason.create!(name: 'Missed estimated delivery date')
-          Spree::ReturnAuthorizationReason.create!(name: 'Missing parts or accessories')
-          Spree::ReturnAuthorizationReason.create!(name: 'Damaged/Defective')
-          Spree::ReturnAuthorizationReason.create!(name: 'Different from what was ordered')
-          Spree::ReturnAuthorizationReason.create!(name: 'Different from description')
-          Spree::ReturnAuthorizationReason.create!(name: 'No longer needed/wanted')
-          Spree::ReturnAuthorizationReason.create!(name: 'Accidental order')
-          Spree::ReturnAuthorizationReason.create!(name: 'Unauthorized purchase')
-        end
+        ReturnAuthorizationReason.create!(name: 'Better price available')
+        ReturnAuthorizationReason.create!(name: 'Missed estimated delivery date')
+        ReturnAuthorizationReason.create!(name: 'Missing parts or accessories')
+        ReturnAuthorizationReason.create!(name: 'Damaged/Defective')
+        ReturnAuthorizationReason.create!(name: 'Different from what was ordered')
+        ReturnAuthorizationReason.create!(name: 'Different from description')
+        ReturnAuthorizationReason.create!(name: 'No longer needed/wanted')
+        ReturnAuthorizationReason.create!(name: 'Accidental order')
+        ReturnAuthorizationReason.create!(name: 'Unauthorized purchase')
       end
     end
 

data/db/migrate/20150128032538_remove_environment_from_tracker.rb

@@ -0,0 +1,6 @@
+class RemoveEnvironmentFromTracker < ActiveRecord::Migration
+  def up
+    Spree::Tracker.where('environment != ?', Rails.env).update_all(active: false)
+    remove_column :spree_trackers, :environment
+  end
+end

data/db/migrate/20150515211137_fix_adjustment_order_id.rb

@@ -0,0 +1,80 @@
+class FixAdjustmentOrderId < ActiveRecord::Migration
+  def change
+    say 'Populate order_id from adjustable_id where appropriate'
+
+    # 3 separate execute calls to workaround MySQL limitation
+    execute(<<-'SQL'.squish)
+      UPDATE
+        spree_adjustments
+      SET
+        order_id = adjustable_id
+      WHERE
+            adjustable_type = 'Spree::Order'
+        AND order_id IS NULL
+    SQL
+
+    execute(<<-'SQL'.squish)
+      UPDATE
+        spree_adjustments
+      SET
+        order_id =
+          (SELECT order_id FROM spree_line_items WHERE spree_line_items.id = spree_adjustments.adjustable_id)
+      WHERE
+            adjustable_type = 'Spree::LineItem'
+        AND order_id IS NULL
+      ;
+    SQL
+
+    execute(<<-'SQL'.squish)
+      UPDATE
+        spree_adjustments
+      SET
+        order_id =
+          (SELECT order_id FROM spree_shipments WHERE spree_shipments.id = spree_adjustments.adjustable_id)
+      WHERE
+            adjustable_type = 'Spree::Shipment'
+        AND order_id IS NULL
+    SQL
+
+    say 'Fix schema for spree_adjustments order_id column'
+    change_table :spree_adjustments do |t|
+      t.change :order_id,      :integer, null: false
+      t.change :adjustable_id, :integer, null: false
+
+      add_foreign_key :spree_adjustments,
+                      :spree_orders,
+                      name:      'fk_spree_adjustments_order_id', # default is indeterministic
+                      column:    :order_id,
+                      on_delete: :restrict, # handled by models
+                      on_update: :restrict  # handled by models
+    end
+
+
+    if connection.adapter_name.eql?('PostgreSQL')
+      # Negated Logical implication.
+      #
+      # When adjustable_type is 'Spree::Order' (p) the adjustable_id must be order_id (q).
+      #
+      # When adjustable_type is NOT 'Spree::Order' the adjustable id allowed to be any value (including of order_id in
+      # case foreign keys match). XOR does not work here.
+      #
+      # Postgresql does not have an operator for logical implication. So we need to build the following truth table
+      # via AND with OR:
+      #
+      #  p q | CHECK = !(p -> q)
+      #  -----------
+      #  t t | t
+      #  t f | f
+      #  f t | t
+      #  f f | t
+      #
+      # According to de-morgans law the logical implication q -> p is equivalent to !p || q
+      #
+      execute(<<-SQL.squish)
+        ALTER TABLE ONLY spree_adjustments
+          ADD CONSTRAINT check_spree_adjustments_order_id CHECK
+            (adjustable_type <> 'Spree::Order' OR order_id = adjustable_id);
+      SQL
+    end
+  end
+end

data/db/migrate/20150609093816_increase_scale_on_pre_tax_amounts.rb

@@ -0,0 +1,16 @@
+class IncreaseScaleOnPreTaxAmounts < ActiveRecord::Migration
+  def change
+    # set pre_tax_amount on shipments to discounted_amount - included_tax_total
+    # so that the null: false option on the shipment pre_tax_amount doesn't generate
+    # errors.
+    #
+    execute(<<-SQL)
+      UPDATE spree_shipments
+      SET pre_tax_amount = (cost + promo_total) - included_tax_total
+      WHERE pre_tax_amount IS NULL;
+    SQL
+
+    change_column :spree_line_items, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+    change_column :spree_shipments, :pre_tax_amount, :decimal, precision: 12, scale: 4, default: 0.0, null: false
+  end
+end

data/db/migrate/20150826002555_convert_habtm_to_hmt_for_taxon_prototypes.rb

@@ -0,0 +1,15 @@
+class ConvertHabtmToHmtForTaxonPrototypes < ActiveRecord::Migration
+  def up
+    add_column :spree_taxons_prototypes, :created_at, :datetime
+    add_column :spree_taxons_prototypes, :updated_at, :datetime
+
+    rename_table :spree_taxons_prototypes, :spree_prototype_taxons
+  end
+
+  def down
+    rename_table :spree_prototype_taxons, :spree_taxons_prototypes
+
+    remove_column :spree_taxons_prototypes, :created_at, :datetime
+    remove_column :spree_taxons_prototypes, :updated_at, :datetime
+  end
+end

data/db/migrate/20151010003252_add_foreign_keys_for_taxons_prototypes.rb

@@ -0,0 +1,6 @@
+class AddForeignKeysForTaxonsPrototypes < ActiveRecord::Migration
+  def change
+    add_foreign_key :spree_prototype_taxons, :spree_taxons, column: :taxon_id
+    add_foreign_key :spree_prototype_taxons, :spree_prototypes, column: :prototype_id
+  end
+end

data/db/migrate/20151013222921_remove_token_permissions_table.rb

@@ -0,0 +1,16 @@
+# This is named the same as the migration in spree 3.0 so it will not be copied
+# if that has already been run.
+class RemoveTokenPermissionsTable < ActiveRecord::Migration
+  def up
+    drop_table :spree_tokenized_permissions
+  end
+
+  def down
+    create_table "spree_tokenized_permissions" do |t|
+      t.integer  "permissable_id"
+      t.string   "permissable_type"
+      t.string   "token"
+      t.timestamps null: true
+    end
+  end
+end

data/db/migrate/20151014213349_rename_identifier_to_number_for_payment.rb

@@ -0,0 +1,7 @@
+# This file has the same name as the spree 3.0 migration to prevent it from
+# being run twice for those users.
+class RenameIdentifierToNumberForPayment < ActiveRecord::Migration
+  def change
+    rename_column :spree_payments, :identifier, :number
+  end
+end

data/db/migrate/20151015203732_add_foreign_keys_for_product_promotion_rules.rb

@@ -0,0 +1,9 @@
+class AddForeignKeysForProductPromotionRules < ActiveRecord::Migration
+  def change
+    add_foreign_key :spree_product_promotion_rules, :spree_products,
+                    column: :product_id
+
+    add_foreign_key :spree_product_promotion_rules, :spree_promotion_rules,
+                    column: :promotion_rule_id
+  end
+end

data/db/migrate/20151021113730_add_sale_to_spree_promotions.rb

@@ -0,0 +1,6 @@
+class AddSaleToSpreePromotions < ActiveRecord::Migration
+  def change
+    add_column :spree_promotions, :apply_automatically, :boolean, default: false
+    add_index :spree_promotions, :apply_automatically
+  end
+end

data/db/migrate/20151021163309_convert_sale_promotions.rb

@@ -0,0 +1,28 @@
+class ConvertSalePromotions < ActiveRecord::Migration
+  def up
+    sale_promotions.update_all(apply_automatically: true)
+  end
+
+  def down
+    # intentionally left blank
+  end
+
+  private
+
+  def sale_promotions
+    promo_table = Spree::Promotion.arel_table
+    code_table  = Spree::PromotionCode.arel_table
+
+    promotion_code_join = promo_table.join(code_table, Arel::Nodes::OuterJoin).on(
+      promo_table[:id].eq(code_table[:promotion_id])
+    ).join_sources
+
+    Spree::Promotion.includes(:promotion_rules).
+      joins(promotion_code_join).
+      where(
+        code_table[:value].eq(nil).and(
+          promo_table[:path].eq(nil)
+        )
+      ).distinct
+  end
+end

data/lib/spree/core.rb

@@ -92,6 +92,8 @@ require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/unreturned_item_charger'
 require 'spree/core/role_configuration'
+require 'spree/permission_sets'
+require 'spree/deprecation'
 
 require 'spree/mailer_previews/order_preview'
 require 'spree/mailer_previews/carton_preview'

data/lib/spree/core/controller_helpers/strong_parameters.rb

@@ -48,6 +48,13 @@ module Spree
             product_properties_attributes: permitted_product_properties_attributes
           ]
         end
+
+        def permitted_user_attributes
+          permitted_attributes.user_attributes + [
+            bill_address_attributes: permitted_address_attributes,
+            ship_address_attributes: permitted_address_attributes
+          ]
+        end
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -93,7 +93,8 @@ module Spree
           Spree::Promotion::Rules::OneUsePerUser,
           Spree::Promotion::Rules::Taxon,
           Spree::Promotion::Rules::NthOrder,
-          Spree::Promotion::Rules::OptionValue
+          Spree::Promotion::Rules::OptionValue,
+          Spree::Promotion::Rules::FirstRepeatPurchaseSince,
         ]
       end
 

data/lib/spree/deprecation.rb

@@ -0,0 +1,3 @@
+module Spree
+  Deprecation = ActiveSupport::Deprecation.new('2.0', 'Solidus')
+end

data/lib/spree/mailer_previews/carton_preview.rb

@@ -3,7 +3,7 @@ module Spree
     class CartonPreview < ActionMailer::Preview
       def shipped
         carton = Carton.first
-        CartonMailer.shipped_email(order: carton.orders.first, carton: carton)
+        Spree::Config.carton_shipped_email_class.shipped_email(order: carton.orders.first, carton: carton)
       end
     end
   end

data/lib/spree/permission_sets.rb

@@ -0,0 +1,23 @@
+require 'spree/permission_sets/base'
+require 'spree/permission_sets/configuration_display'
+require 'spree/permission_sets/configuration_management'
+require 'spree/permission_sets/dashboard_display'
+require 'spree/permission_sets/default_customer'
+require 'spree/permission_sets/order_display'
+require 'spree/permission_sets/order_management'
+require 'spree/permission_sets/product_display'
+require 'spree/permission_sets/product_management'
+require 'spree/permission_sets/promotion_display'
+require 'spree/permission_sets/promotion_management'
+require 'spree/permission_sets/report_display'
+require 'spree/permission_sets/restricted_stock_display'
+require 'spree/permission_sets/restricted_stock_management'
+require 'spree/permission_sets/restricted_stock_transfer_display'
+require 'spree/permission_sets/restricted_stock_transfer_management'
+require 'spree/permission_sets/stock_display'
+require 'spree/permission_sets/stock_management'
+require 'spree/permission_sets/stock_transfer_display'
+require 'spree/permission_sets/stock_transfer_management'
+require 'spree/permission_sets/super_user'
+require 'spree/permission_sets/user_display'
+require 'spree/permission_sets/user_management'

data/{app/models → lib}/spree/permission_sets/default_customer.rb

@@ -17,12 +17,13 @@ module Spree
         can :display, ProductProperty
         can :display, Property
         can :create, Spree.user_class
-        can [:read, :update], Spree.user_class, id: user.id
+        can [:read, :update, :update_email], Spree.user_class, id: user.id
         can :display, State
         can :display, StockItem, stock_location: { active: true }
         can :display, StockLocation, active: true
         can :display, Taxon
         can :display, Taxonomy
+        can [:save_in_address_book, :remove_from_address_book], Spree.user_class, id: user.id
         can [:display, :view_out_of_stock], Variant
         can :display, Zone
       end

data/{app/models → lib}/spree/permission_sets/restricted_stock_transfer_management.rb

@@ -19,32 +19,42 @@ module Spree
     class RestrictedStockTransferManagement < PermissionSets::Base
       def activate!
         if user.stock_locations.any?
-          can :display, Spree::StockLocation, id: location_ids
+          can :display, Spree::StockLocation, id: user_location_ids
           can [:admin, :create], Spree::StockTransfer
-          can :display, Spree::StockTransfer, source_location_id: location_ids
-          can :display, Spree::StockTransfer, destination_location_id: location_ids
+          can :display, Spree::StockTransfer, source_location_id: source_location_ids
+          can :display, Spree::StockTransfer, destination_location_id: destination_location_ids
           can :manage, Spree::StockTransfer,
-            source_location_id: location_ids,
-            destination_location_id: destination_location_ids
+            source_location_id: source_location_ids,
+            destination_location_id: destination_location_ids_with_undefined_destination
 
-          can :transfer, Spree::StockLocation, id: location_ids
+          can :transfer_from, Spree::StockLocation, id: source_location_ids
+          can :transfer_to, Spree::StockLocation, id: destination_location_ids
 
           can :manage, Spree::TransferItem, stock_transfer: {
-            source_location_id: location_ids,
-            destination_location_id: destination_location_ids
+            source_location_id: source_location_ids,
+            destination_location_id: destination_location_ids_with_undefined_destination
           }
         end
       end
 
       private
 
-      def location_ids
-        # either source_location_id or destination_location_id can be nil.
-        @ids ||= user.stock_locations.pluck(:id)
+      def user_location_ids
+        @user_location_ids ||= user.stock_locations.pluck(:id)
       end
 
+      # @note Meant to facilitate extension - override to define custom ids
+      def source_location_ids
+        user_location_ids
+      end
+
+      # @note Meant to facilitate extension - override to define custom ids
       def destination_location_ids
-        location_ids + [nil]
+        user_location_ids
+      end
+
+      def destination_location_ids_with_undefined_destination
+        destination_location_ids + [nil]
       end
     end
   end