spree_core 3.2.9 → 3.3.0.rc1

data/config/locales/en.yml

@@ -96,10 +96,8 @@ en:
         path: Path
         starts_at: Starts At
         usage_limit: Usage Limit
-        promotion_category: Promotion Category
       spree/promotion_category:
         name: Name
-        code: Code
       spree/property:
         name: Name
         presentation: Presentation
@@ -478,8 +476,6 @@ en:
         taxonomies: Taxonomies
         taxons: Taxons
         users: Users
-        return_authorizations: Return Authorizations
-        customer_returns: Customer Returns
       order:
         events:
           approve: approve
@@ -563,6 +559,7 @@ en:
     cannot_create_customer_returns: Cannot create customer returns as this order has no shipped units.
     cannot_create_returns: Cannot create returns as this order has no shipped units.
     cannot_perform_operation: Cannot perform requested operation
+    cannot_return_more_than_bought_quantity: Cannot return more than bought quantity.
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
     capture: Capture
     capture_events: Capture events
@@ -725,6 +722,7 @@ en:
     errors_prohibited_this_record_from_being_saved:
       one: 1 error prohibited this record from being saved
       other: ! '%{count} errors prohibited this record from being saved'
+    error_user_destroy_with_orders: User associated with orders cannot be destroyed
     event: Event
     events:
       spree:
@@ -994,7 +992,7 @@ en:
     order_number: Order %{number}
     order_processed_successfully: Your order has been processed successfully
     order_resumed: Order resumed
-    order_state:
+    order_states:
       address: address
       awaiting_return: awaiting return
       canceled: canceled
@@ -1032,7 +1030,6 @@ en:
     payment_processor_choose_banner_text: If you need help choosing a payment processor, please visit
     payment_processor_choose_link: our payments page
     payment_state: Payment State
-    payment_identifier: Payment Identifier
     payment_states:
       balance_due: balance due
       checkout: checkout
@@ -1146,6 +1143,7 @@ en:
     prototypes: Prototypes
     provider: Provider
     provider_settings_warning: If you are changing the provider type, you must save first before you can edit the provider settings
+    purchased_quantity: Purchased Quantity
     qty: Qty
     quantity: Quantity
     quantity_returned: Quantity Returned
@@ -1160,6 +1158,7 @@ en:
     reference: Reference
     reference_contains: Reference Contains
     refund: Refund
+    refund_amount_must_be_greater_than_zero: Refund amount must be greater than zero
     refund_reasons: Refund Reasons
     refunded_amount: Refunded Amount
     refunds: Refunds
@@ -1214,6 +1213,7 @@ en:
         refund_summary: Refund Summary
         subject: Reimbursement Notification
         total_refunded: ! 'Total refunded: %{total}'
+        thanks: Thank you for your business.
     return_number: Return Number
     return_quantity: Return Quantity
     returned: Returned
@@ -1375,6 +1375,7 @@ en:
       captured: "Used"
       allocated: "Added"
       apply: Apply Store Credit
+      remove: Remove Store Credit
       applicable_amount: "%{amount} in store credit will be applied to this order."
       available_amount: "You have %{amount} in Store Credit available!"
       remaining_amount: "You have %{amount} remaining in your account's Store Credit."

data/db/migrate/20130807024301_upgrade_adjustments.rb

@@ -1,5 +1,8 @@
 class UpgradeAdjustments < ActiveRecord::Migration[4.2]
   def up
+    # Add Temporary index
+    add_index :spree_adjustments, :originator_type unless index_exists?(:spree_adjustments, :originator_type)
+
     # Temporarily make originator association available
     Spree::Adjustment.class_eval do
       belongs_to :originator, polymorphic: true
@@ -36,5 +39,8 @@ class UpgradeAdjustments < ActiveRecord::Migration[4.2]
 
       adjustment.save!
     end
+
+    # Remove Temporary index
+    remove_index :spree_adjustments, :originator_type if index_exists?(:spree_adjustments, :originator_type)
   end
 end

data/db/migrate/20130807024302_rename_adjustment_fields.rb

@@ -1,5 +1,8 @@
 class RenameAdjustmentFields < ActiveRecord::Migration[4.2]
   def up
+    # Add Temporary index
+    add_index :spree_adjustments, :adjustable_type unless index_exists?(:spree_adjustments, :adjustable_type)
+
     remove_column :spree_adjustments, :originator_id
     remove_column :spree_adjustments, :originator_type
 
@@ -10,5 +13,8 @@ class RenameAdjustmentFields < ActiveRecord::Migration[4.2]
     Spree::Adjustment.where(adjustable_type: "Spree::Order").find_each do |adjustment|
       adjustment.update_column(:order_id, adjustment.adjustable_id)
     end
+
+    # Remove Temporary index
+    remove_index :spree_adjustments, :adjustable_type if index_exists?(:spree_adjustments, :adjustable_type)
   end
 end

data/db/migrate/20161125065505_add_quantity_to_inventory_units.rb

@@ -0,0 +1,5 @@
+class AddQuantityToInventoryUnits < ActiveRecord::Migration[5.0]
+  def change
+    add_column :spree_inventory_units, :quantity, :integer, default: 1
+  end
+end

data/db/migrate/20170119122701_add_original_return_item_id_to_spree_inventory_units.rb

@@ -0,0 +1,29 @@
+class AddOriginalReturnItemIdToSpreeInventoryUnits < ActiveRecord::Migration[5.0]
+  def up
+    add_reference :spree_inventory_units, :original_return_item, references: :spree_return_items, index: true
+
+    Spree::InventoryUnit.reset_column_information
+
+    Spree::ReturnItem.where.not(exchange_inventory_unit_id: nil).find_each do |return_item|
+      if (inventory_unit = Spree::InventoryUnit.find_by(id: return_item.exchange_inventory_unit_id)).present?
+        inventory_unit.update_column(:original_return_item_id, return_item.id)
+      end
+    end
+
+    remove_column :spree_return_items, :exchange_inventory_unit_id
+  end
+
+  def down
+    add_reference :spree_return_items, :exchange_inventory_unit, references: :spree_inventory_units, index: true
+
+    Spree::InventoryUnit.reset_column_information
+
+    Spree::InventoryUnit.where.not(original_return_item_id: nil).find_each do |inventory_unit|
+      if (return_item = Spree::ReturnItem.find_by(id: inventory_unit.original_return_item_id)).present?
+        return_item.update_column(:exchange_inventory_unit_id, inventory_unit.id)
+      end
+    end
+
+    remove_reference :spree_inventory_units, :original_return_item
+  end
+end

data/db/migrate/20170315152755_add_unique_index_on_number_to_spree_orders.rb

@@ -0,0 +1,16 @@
+class AddUniqueIndexOnNumberToSpreeOrders < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_orders, :number, unique: true)
+      numbers = Spree::Order.group(:number).having('sum(1) > 1').pluck(:number)
+      orders = Spree::Order.where(number: numbers)
+
+      orders.find_each do |order|
+        order.number = order.class.number_generator.method(:generate_permalink).call(order.class)
+        order.save
+      end
+
+      remove_index :spree_orders, :number if index_exists?(:spree_orders, :number)
+      add_index :spree_orders, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170316154338_add_unique_index_on_number_to_spree_stock_transfer.rb

@@ -0,0 +1,16 @@
+class AddUniqueIndexOnNumberToSpreeStockTransfer < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_stock_transfers, :number, unique: true)
+      numbers = Spree::StockTransfer.group(:number).having('sum(1) > 1').pluck(:number)
+      transfers = Spree::StockTransfer.where(number: numbers)
+
+      transfers.find_each do |transfer|
+        transfer.number = transfer.class.number_generator.method(:generate_permalink).call(transfer.class)
+        transfer.save
+      end
+
+      remove_index :spree_stock_transfers, :number if index_exists?(:spree_stock_transfers, :number)
+      add_index :spree_stock_transfers, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170316205511_add_unique_index_on_number_to_spree_shipment.rb

@@ -0,0 +1,16 @@
+class AddUniqueIndexOnNumberToSpreeShipment < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_shipments, :number, unique: true)
+      numbers = Spree::Shipment.group(:number).having('sum(1) > 1').pluck(:number)
+      shipments = Spree::Shipment.where(number: numbers)
+
+      shipments.find_each do |shipment|
+        shipment.number = shipment.class.number_generator.method(:generate_permalink).call(shipment.class)
+        shipment.save
+      end
+
+      remove_index :spree_shipments, :number if index_exists?(:spree_shipments, :number)
+      add_index :spree_shipments, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170320134043_add_unique_index_on_number_to_spree_payments.rb

@@ -0,0 +1,17 @@
+class AddUniqueIndexOnNumberToSpreePayments < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_payments, :number, unique: true)
+      # default scope in Spree::Payment disturbs Postgres, hence `unscoped` is needed.
+      numbers = Spree::Payment.unscoped.group(:number).having('sum(1) > 1').pluck(:number)
+      payments = Spree::Payment.where(number: numbers)
+
+      payments.find_each do |payment|
+        payment.number = payment.class.number_generator.method(:generate_permalink).call(payment.class)
+        payment.save
+      end
+
+      remove_index :spree_payments, :number if index_exists?(:spree_payments, :number)
+      add_index :spree_payments, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170320142750_add_unique_index_on_number_to_spree_return_authorizations.rb

@@ -0,0 +1,16 @@
+class AddUniqueIndexOnNumberToSpreeReturnAuthorizations < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_return_authorizations, :number, unique: true)
+      numbers = Spree::ReturnAuthorization.group(:number).having('sum(1) > 1').pluck(:number)
+      authorizations = Spree::ReturnAuthorization.where(number: numbers)
+
+      authorizations.find_each do |authorization|
+        authorization.number = authorization.class.number_generator.method(:generate_permalink).call(authorization.class)
+        authorization.save
+      end
+
+      remove_index :spree_return_authorizations, :number if index_exists?(:spree_return_authorizations, :number)
+      add_index :spree_return_authorizations, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170320145040_add_unique_index_on_number_to_spree_customer_returns.rb

@@ -0,0 +1,16 @@
+class AddUniqueIndexOnNumberToSpreeCustomerReturns < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_customer_returns, :number, unique: true)
+      numbers = Spree::CustomerReturn.group(:number).having('sum(1) > 1').pluck(:number)
+      returns = Spree::CustomerReturn.where(number: numbers)
+
+      returns.find_each do |r|
+        r.number = r.class.number_generator.method(:generate_permalink).call(r.class)
+        r.save
+      end
+
+      remove_index :spree_customer_returns, :number if index_exists?(:spree_customer_returns, :number)
+      add_index :spree_customer_returns, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170320145518_add_unique_index_on_number_to_spree_reimbursements.rb

@@ -0,0 +1,16 @@
+class AddUniqueIndexOnNumberToSpreeReimbursements < ActiveRecord::Migration[5.0]
+  def change
+    unless index_exists?(:spree_reimbursements, :number, unique: true)
+      numbers = Spree::Reimbursement.group(:number).having('sum(1) > 1').pluck(:number)
+      reimbursements = Spree::Reimbursement.where(number: numbers)
+
+      reimbursements.find_each do |reimbursement|
+        reimbursement.number = reimbursement.class.number_generator.method(:generate_permalink).call(reimbursement.class)
+        reimbursement.save
+      end
+
+      remove_index :spree_reimbursements, :number if index_exists?(:spree_reimbursements, :number)
+      add_index :spree_reimbursements, :number, unique: true
+    end
+  end
+end

data/db/migrate/20170323151450_add_missing_unique_indexes_for_unique_attributes.rb

@@ -0,0 +1,37 @@
+class AddMissingUniqueIndexesForUniqueAttributes < ActiveRecord::Migration[5.0]
+  def change
+    tables = {
+      country: [:name, :iso_name],
+      refund_reason: [:name],
+      reimbursement_type: [:name],
+      return_authorization_reason: [:name],
+      role: [:name],
+      store: [:code]
+    }
+
+    tables.each do |table, columns|
+      table_class = "Spree::#{table.to_s.classify}".constantize
+      table_name = table_class.table_name
+
+      columns.each do |column|
+        unless index_exists?(table_name, column, unique: true)
+          attributes = table_class.unscoped.group(column).having('sum(1) > 1').pluck(column)
+          instances = table_class.where(column => [nil, attributes])
+
+          instances.find_each do |instance|
+            column_value = 'Unique String ' + SecureRandom.urlsafe_base64(8).upcase.delete('/+=_-')[0, 8]
+            instance.send("#{column}=", column_value)
+            instance.save
+          end
+
+          remove_index table_name, column if index_exists?(table_name, column)
+          if supports_expression_index?
+            add_index table_name, "lower(#{column})", unique: true
+          else
+            add_index table_name, column, unique: true
+          end
+        end
+      end
+    end
+  end
+end

data/db/migrate/20170329110859_add_index_on_stock_location_to_spree_customer_returns.rb

@@ -0,0 +1,5 @@
+class AddIndexOnStockLocationToSpreeCustomerReturns < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_customer_returns, :stock_location_id
+  end
+end

data/db/migrate/20170329113917_add_index_on_prototype_to_spree_option_type_prototype.rb

@@ -0,0 +1,19 @@
+class AddIndexOnPrototypeToSpreeOptionTypePrototype < ActiveRecord::Migration[5.0]
+  def change
+    duplicates = Spree::OptionTypePrototype.group(:prototype_id, :option_type_id).having('sum(1) > 1').size
+
+    duplicates.each do |f|
+      prototype_id, option_type_id = f.first
+      count = f.last - 1 # we want to leave one record
+      otp = Spree::OptionTypePrototype.where(prototype_id: prototype_id, option_type_id: option_type_id).last(count)
+      otp.map(&:destroy)
+    end
+
+    if index_exists? :spree_option_type_prototypes, [:prototype_id, :option_type_id]
+      remove_index :spree_option_type_prototypes, [:prototype_id, :option_type_id]
+      add_index :spree_option_type_prototypes, [:prototype_id, :option_type_id], unique: true, name: 'spree_option_type_prototypes_prototype_id_option_type_id'
+    end
+
+    add_index :spree_option_type_prototypes, :prototype_id
+  end
+end

data/db/migrate/20170330082155_add_indexes_to_spree_option_value_variant.rb

@@ -0,0 +1,19 @@
+class AddIndexesToSpreeOptionValueVariant < ActiveRecord::Migration[5.0]
+  def change
+    duplicates = Spree::OptionValueVariant.group(:variant_id, :option_value_id).having('sum(1) > 1').size
+
+    duplicates.each do |f|
+      variant_id, option_value_id = f.first
+      count = f.last - 1 # we want to leave one record
+      ov = Spree::OptionValueVariant.where(variant_id: variant_id, option_value_id: option_value_id).last(count)
+      ov.map(&:destroy)
+    end
+
+    if index_exists? :spree_option_value_variants, [:variant_id, :option_value_id], name: "index_option_values_variants_on_variant_id_and_option_value_id"
+      remove_index :spree_option_value_variants, [:variant_id, :option_value_id]
+      add_index :spree_option_value_variants, [:variant_id, :option_value_id], unique: true, name: "index_option_values_variants_on_variant_id_and_option_value_id"
+    end
+
+    add_index :spree_option_value_variants, :variant_id
+  end
+end

data/db/migrate/20170330132215_add_index_on_promotion_id_to_order_promotions.rb

@@ -0,0 +1,5 @@
+class AddIndexOnPromotionIdToOrderPromotions < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_order_promotions, :promotion_id
+  end
+end

data/db/migrate/20170331101758_add_indexes_for_property_prototype.rb

@@ -0,0 +1,20 @@
+class AddIndexesForPropertyPrototype < ActiveRecord::Migration[5.0]
+  def change
+    duplicates = Spree::PropertyPrototype.group(:prototype_id, :property_id).having('sum(1) > 1').size
+
+    duplicates.each do |f|
+      prototype_id, property_id = f.first
+      count = f.last - 1 # we want to leave one record
+      prototypes = Spree::PropertyPrototype.where(prototype_id: prototype_id, property_id: property_id).last(count)
+      prototypes.map(&:destroy)
+    end
+
+    if index_exists? :spree_property_prototypes, [:prototype_id, :property_id]
+      remove_index :spree_property_prototypes, [:prototype_id, :property_id]
+      add_index :spree_property_prototypes, [:prototype_id, :property_id], unique: true, name: 'index_property_prototypes_on_prototype_id_and_property_id'
+    end
+
+    add_index :spree_property_prototypes, :prototype_id
+    add_index :spree_property_prototypes, :property_id
+  end
+end

data/db/migrate/20170331103334_add_index_for_prototype_id_to_prototype_taxons.rb

@@ -0,0 +1,5 @@
+class AddIndexForPrototypeIdToPrototypeTaxons < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_prototype_taxons, :prototype_id
+  end
+end

data/db/migrate/20170331110454_add_indexes_to_refunds.rb

@@ -0,0 +1,6 @@
+class AddIndexesToRefunds < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_refunds, :payment_id
+    add_index :spree_refunds, :reimbursement_id
+  end
+end

data/db/migrate/20170331111757_add_indexes_to_reimbursement_credits.rb

@@ -0,0 +1,6 @@
+class AddIndexesToReimbursementCredits < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_reimbursement_credits, :reimbursement_id
+    add_index :spree_reimbursement_credits, [:creditable_id, :creditable_type], name: 'index_reimbursement_credits_on_creditable_id_and_type'
+  end
+end

data/db/migrate/20170331115246_add_indexes_to_return_authorizations.rb

@@ -0,0 +1,6 @@
+class AddIndexesToReturnAuthorizations < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_return_authorizations, :order_id
+    add_index :spree_return_authorizations, :stock_location_id
+  end
+end

data/db/migrate/20170331120125_add_indexes_to_return_items.rb

@@ -0,0 +1,11 @@
+class AddIndexesToReturnItems < ActiveRecord::Migration[5.0]
+  def change
+    add_index :spree_return_items, :return_authorization_id
+    add_index :spree_return_items, :inventory_unit_id
+    add_index :spree_return_items, :reimbursement_id
+    add_index :spree_return_items, :exchange_variant_id
+    add_index :spree_return_items, :preferred_reimbursement_type_id
+    add_index :spree_return_items, :override_reimbursement_type_id
+  end
+end
+