solidus_core 1.0.0.pre → 1.0.0.pre2

data/app/models/spree/store_credit.rb

@@ -7,11 +7,13 @@ class Spree::StoreCredit < ActiveRecord::Base
   ELIGIBLE_ACTION   = 'eligible'
   AUTHORIZE_ACTION  = 'authorize'
   ALLOCATION_ACTION = 'allocation'
+  ADJUSTMENT_ACTION = 'adjustment'
+  INVALIDATE_ACTION = 'invalidate'
 
   DEFAULT_CREATED_BY_EMAIL = "spree@example.com"
 
-  belongs_to :user, class_name: Spree.user_class.to_s
-  belongs_to :created_by, class_name: Spree.user_class.to_s
+  belongs_to :user, class_name: Spree::UserClassHandle.new
+  belongs_to :created_by, class_name: Spree::UserClassHandle.new
   belongs_to :category, class_name: "Spree::StoreCreditCategory"
   belongs_to :credit_type, class_name: 'Spree::StoreCreditType', :foreign_key => 'type_id'
   has_many :store_credit_events
@@ -27,11 +29,12 @@ class Spree::StoreCredit < ActiveRecord::Base
 
   scope :order_by_priority, -> { includes(:credit_type).order('spree_store_credit_types.priority ASC') }
 
-  before_validation :associate_credit_type
   after_save :store_event
+  before_validation :associate_credit_type
+  before_validation :validate_category_unchanged, on: :update
   before_destroy :validate_no_amount_used
 
-  attr_accessor :action, :action_amount, :action_originator, :action_authorization_code
+  attr_accessor :action, :action_amount, :action_originator, :action_authorization_code, :update_reason
 
   extend Spree::DisplayMoney
   money_methods :amount, :amount_used, :amount_authorized
@@ -174,9 +177,23 @@ class Spree::StoreCredit < ActiveRecord::Base
     !!invalidated_at
   end
 
-  def invalidate
+  def update_amount(amount, reason, user_performing_update)
+    previous_amount = self.amount
+    self.amount = amount
+    self.action_amount = self.amount - previous_amount
+    self.action = ADJUSTMENT_ACTION
+    self.update_reason = reason
+    self.action_originator = user_performing_update
+    save
+  end
+
+  def invalidate(reason, user_performing_invalidation)
     if invalidateable?
-      touch(:invalidated_at)
+      self.action = INVALIDATE_ACTION
+      self.update_reason = reason
+      self.action_originator = user_performing_invalidation
+      self.invalidated_at = Time.now
+      save
     else
       errors.add(:invalidated_at, Spree.t("store_credit.errors.cannot_invalidate_uncaptured_authorization"))
       return false
@@ -222,7 +239,7 @@ class Spree::StoreCredit < ActiveRecord::Base
   end
 
   def store_event
-    return unless amount_changed? || amount_used_changed? || amount_authorized_changed? || action == ELIGIBLE_ACTION
+    return unless amount_changed? || amount_used_changed? || amount_authorized_changed? || [ELIGIBLE_ACTION, INVALIDATE_ACTION].include?(action)
 
     event = if action
       store_credit_events.build(action: action)
@@ -235,6 +252,7 @@ class Spree::StoreCredit < ActiveRecord::Base
       authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
       user_total_amount: user.total_available_store_credit,
       originator: action_originator,
+      update_reason: update_reason,
     })
   end
 
@@ -252,6 +270,12 @@ class Spree::StoreCredit < ActiveRecord::Base
     end
   end
 
+  def validate_category_unchanged
+    if category_id_changed?
+      errors.add(:category, Spree.t('admin.store_credits.errors.cannot_be_modified'))
+    end
+  end
+
   def validate_no_amount_used
     if amount_used > 0
       errors.add(:amount_used, 'is greater than zero. Can not delete store credit')

data/app/models/spree/store_credit_event.rb

@@ -4,10 +4,16 @@ module Spree
 
     belongs_to :store_credit
     belongs_to :originator, polymorphic: true
+    belongs_to :update_reason, class_name: "Spree::StoreCreditUpdateReason"
+
+    validates_presence_of :update_reason, if: :action_requires_reason?
+
+    NON_EXPOSED_ACTIONS = [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]
 
     scope :exposed_events, -> { exposable_actions.not_invalidated }
-    scope :exposable_actions, -> { where.not(action: [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]) }
+    scope :exposable_actions, -> { where.not(action: NON_EXPOSED_ACTIONS) }
     scope :not_invalidated, -> { joins(:store_credit).where(spree_store_credits: { invalidated_at: nil }) }
+    scope :chronological, -> { order(:created_at) }
     scope :reverse_chronological, -> { order(created_at: :desc) }
 
     delegate :currency, to: :store_credit
@@ -20,6 +26,10 @@ module Spree
       action == Spree::StoreCredit::AUTHORIZE_ACTION
     end
 
+    def action_requires_reason?
+      [Spree::StoreCredit::ADJUSTMENT_ACTION, Spree::StoreCredit::INVALIDATE_ACTION].include?(action)
+    end
+
     def display_amount
       Spree::Money.new(amount, { currency: currency })
     end
@@ -33,16 +43,8 @@ module Spree
     end
 
     def display_action
-      case action
-      when Spree::StoreCredit::CAPTURE_ACTION
-        Spree.t('store_credit.captured')
-      when Spree::StoreCredit::AUTHORIZE_ACTION
-        Spree.t('store_credit.authorized')
-      when Spree::StoreCredit::ALLOCATION_ACTION
-        Spree.t('store_credit.allocated')
-      when Spree::StoreCredit::VOID_ACTION, Spree::StoreCredit::CREDIT_ACTION
-        Spree.t('store_credit.credit')
-      end
+      return if NON_EXPOSED_ACTIONS.include?(action)
+      Spree.t("store_credit.display_action.#{action}")
     end
 
     def order

data/app/models/spree/store_credit_update_reason.rb

@@ -0,0 +1,2 @@
+class Spree::StoreCreditUpdateReason < ActiveRecord::Base
+end

data/app/models/spree/user_class_handle.rb

@@ -0,0 +1,21 @@
+module Spree
+  # Placeholder for name of Spree.user_class to ensure later evaluation at
+  # runtime.
+  #
+  # Unfortunately, it is possible for classes to get loaded before
+  # Spree.user_class has been set in the initializer. As a result, they end up
+  # with class_name: "" in their association definitions. For obvious reasons,
+  # that doesn't work.
+  #
+  # For now, Rails does not call to_s on the instance passed in until runtime.
+  # So this little hack provides a wrapper around Spree.user_class so that we
+  # can basically lazy-evaluate it. Yay! Problem solved forever.
+  class UserClassHandle
+    # @return [String] the name of the user class as a string.
+    # @raise [RuntimeError] if Spree.user_class is nil
+    def to_s
+      fail "'Spree.user_class' has not been set yet." unless Spree.user_class
+      "::#{Spree.user_class}"
+    end
+  end
+end

data/app/models/spree/user_stock_location.rb

@@ -1,6 +1,6 @@
 module Spree
   class UserStockLocation < ActiveRecord::Base
-    belongs_to :user, class_name: Spree.user_class.to_s, inverse_of: :user_stock_locations
+    belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations
     belongs_to :stock_location, class_name: "Spree::StockLocation", inverse_of: :user_stock_locations
   end
 end

data/config/initializers/spree_user.rb

@@ -0,0 +1,10 @@
+# Ensure that Spree.user_class includes the UserMethods concern
+# Previously these methods were injected automatically onto the class, which we
+# are still doing for compatability, but with a warning.
+
+Spree::Core::Engine.config.to_prepare do
+  unless Spree.user_class.included_modules.include?(Spree::UserMethods)
+    ActiveSupport::Deprecation.warn "#{Spree.user_class} must include Spree::UserMethods"
+    Spree.user_class.include Spree::UserMethods
+  end
+end

data/config/locales/en.yml

@@ -150,6 +150,9 @@ en:
       spree/address:
         one: Address
         other: Addresses
+      spree/adjustment_reason:
+        one: Adjustment Reason
+        other: Adjustment Reasons
       spree/country:
         one: Country
         other: Countries
@@ -207,9 +210,9 @@ en:
       spree/return_authorization:
         one: Return Authorization
         other: Return Authorizations
-      spree/return_authorization_reason:
-        one: Return Authorization Reason
-        other: Return Authorization Reasons
+      spree/return_reason:
+        one: Return Reason
+        other: Return Reasons
       spree/role:
         one: Roles
         other: Roles
@@ -285,6 +288,12 @@ en:
             base:
               card_expired: "Card has expired"
               expiry_invalid: "Card expiration is invalid"
+        spree/inventory_unit:
+          attributes:
+            state:
+              cannot_destroy: "Cannot destroy a %{state} inventory unit"
+            base:
+              cannot_destroy_shipment_state: "Cannot destroy an inventory unit for a %{state} shipment"
         spree/line_item:
           attributes:
             currency:
@@ -303,12 +312,17 @@ en:
               cannot_be_associated_unless_accepted: cannot be associated to a return item that is not accepted.
             inventory_unit:
               other_completed_return_item_exists: "%{inventory_unit_id} has already been taken by return item %{return_item_id}"
+        spree/shipment:
+          attributes:
+            state:
+              cannot_destroy: "Cannot destroy a %{state} shipment"
+            base:
+              cannot_remove_items_shipment_state: "Cannot remove items from a %{state} shipment"
         spree/store:
           attributes:
             base:
               cannot_destroy_default_store: Cannot destroy the default Store.
 
-
   devise:
     confirmations:
       confirmed: Your account was successfully confirmed. You are now signed in.
@@ -404,6 +418,7 @@ en:
     adjustable: Adjustable
     adjustment: Adjustment
     adjustment_amount: Amount
+    adjustment_reasons: Adjustment Reasons
     adjustment_successfully_closed: Adjustment has been successfully closed!
     adjustment_successfully_opened: Adjustment has been successfully opened!
     adjustment_total: Adjustment Total
@@ -436,26 +451,42 @@ en:
         add: "Add store credit"
         new: "New store credit"
         edit: "Editing store credit"
+        edit_amount: "Editing store credit amount"
+        invalidate_store_credit: "Invalidating store credit"
+        back_to_edit: "Back to edit"
         back_to_user_list: "Back to user list"
-        back_to_store_credit_list: "Back to store credit list"
+        back_to_store_credit_list: "Store credit list"
+        change_amount: "Change amount"
+        credit_type: "Credit type"
         credited_html_header: "Amount Credited"
+        current_balance: "Current balance"
         used_html_header: "Amount Used"
         authed_html_header: "Amount Authorized"
         type_html_header: "Credit Type"
         created_by: "Created By"
+        history: "Store credit history"
         invalidated: "Invalidated"
         issued_on: "Issued On"
+        payment_originator: "Payment - Order #%{order_number}"
+        reason_for_updating: "Reason for updating"
+        refund_originator: "Refund - Order #%{order_number}"
+        user_originator: "User - %{email}"
         select_reason: "Select a reason for this store credit"
+        select_amount_update_reason: "Select a reason for updating the amount"
+        total_unused: "Total<br/>unused"
         unable_to_create: "Unable to create store credit"
         unable_to_update: "Unable to update store credit"
         unable_to_delete: "Unable to delete store credit"
+        unable_to_invalidate: "Unable to invalidate store credit"
         resource_name: "store credits"
         no_store_credit_selected: "No store credit was selected"
         errors:
           cannot_change_used_store_credit: "Store credit that has been claimed cannot be changed"
+          cannot_be_modified: "cannot be modified"
           amount_used_cannot_be_greater: "cannot be greater than the credited amount"
           amount_authorized_exceeds_total_credit: " exceeds the available credit"
           amount_used_not_zero: "is greater than zero. Can not delete store credit"
+          update_reason_required: "A reason for the change must be selected"
     administration: Administration
     agree_to_privacy_policy: Agree to Privacy Policy
     agree_to_terms_of_service: Agree to Terms of Service
@@ -495,6 +526,7 @@ en:
     back_end: Backend
     backordered: Backordered
     back_to_adjustments_list: Back To Adjustments List
+    back_to_adjustment_reason_list: Back To Adjustment Reason List
     back_to_customer_return: Back To Customer Return
     back_to_customer_return_list: Back To Customer Return List
     back_to_images_list: Back To Images List
@@ -547,6 +579,8 @@ en:
     cancellation: Cancellation
     cannot_create_payment_without_payment_methods: You cannot create a payment for an order without any payment methods defined.
     cannot_create_returns: Cannot create returns as this order has no shipped units.
+    cannot_rebuild_shipments_order_completed: Cannot rebuild shipments for a completed order.
+    cannot_rebuild_shipments_shipments_not_pending: Cannot rebuild shipments for an order with non-pending shipments.
     cannot_perform_operation: Cannot perform requested operation
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
     capture: Capture
@@ -674,12 +708,14 @@ en:
     destination: Destination
     destination_location: Destination location
     destroy: Destroy
+    details: Details
     discount_amount: Discount Amount
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
     download_promotion_code_list: Download Code List
     edit: Edit
     editing_country: Editing Country
+    editing_adjustment_reason: Editing Adjustment Reason
     editing_option_type: Editing Option Type
     editing_payment_method: Editing Payment Method
     editing_product: Editing Product
@@ -708,8 +744,6 @@ en:
         has_excluded_product: Your cart contains a product that prevents this coupon code from being applied.
         item_total_less_than: This coupon code can't be applied to orders less than %{amount}.
         item_total_less_than_or_equal: This coupon code can't be applied to orders less than or equal to %{amount}.
-        item_total_more_than: This coupon code can't be applied to orders higher than %{amount}.
-        item_total_more_than_or_equal: This coupon code can't be applied to orders higher than or equal to %{amount}.
         limit_once_per_user: This coupon code can only be used once per user.
         missing_product: This coupon code can't be applied because you don't have all of the necessary products in your cart.
         missing_taxon: You need to add a product from all applicable categories before applying this coupon code.
@@ -841,6 +875,7 @@ en:
     invalid_payment_provider: Invalid payment provider.
     invalid_promotion_action: Invalid promotion action.
     invalid_promotion_rule: Invalid promotion rule.
+    invalidate: Invalidate
     inventory: Inventory
     inventory_adjustment: Inventory Adjustment
     inventory_canceled: Inventory canceled
@@ -856,8 +891,6 @@ en:
       operators:
         gt: greater than
         gte: greater than or equal to
-        lt: less than
-        lte: less than or equal to
     items_cannot_be_shipped: We are unable to calculate shipping rates for the selected items.
     items_in_rmas: Items in Return Authorizations
     items_to_be_reimbursed: Items to be reimbursed
@@ -920,6 +953,7 @@ en:
     negative_movement_absent_item: Cannot create negative movement for absent stock item.
     new: New
     new_adjustment: New Adjustment
+    new_adjustment_reason: New Adjustment Reason
     new_customer: New Customer
     new_customer_return: New Customer Return
     new_country: New Country
@@ -1235,7 +1269,7 @@ en:
     resumed: Resumed
     return: return
     return_authorization: Return Authorization
-    return_authorization_reasons: Return Authorization Reasons
+    return_reasons: Return Reasons
     return_authorization_updated: Return authorization updated
     return_authorizations: Return Authorizations
     return_item_inventory_unit_ineligible: Return item's inventory unit must be shipped
@@ -1283,7 +1317,7 @@ en:
     security_settings: Security Settings
     select: Select
     select_from_prototype: Select From Prototype
-    select_a_return_authorization_reason: Select a reason for the return authorization
+    select_a_reason: Select a reason
     select_a_stock_location: Select a stock location
     select_stock: Select stock
     selected_quantity_not_available: ! 'selected of %{item} is not available.'
@@ -1382,19 +1416,27 @@ en:
     stop: Stop
     store: Store
     store_credit:
-      allocated: "Added"
-      authorized: "Authorized"
-      captured: "Used"
-      credit: "Credit"
+      actions:
+        invalidate: Invalidate
       credit_allocation_memo: "This is a credit from store credit ID %{id}"
       currency_mismatch: "Store credit currency does not match order currency"
+      display_action:
+        adjustment: Adjustment
+        allocation: Added
+        capture: Used
+        credit: Credit
+        invalidate: Invalidated
+        void: Credit
+        admin:
+          authorize: "Authorized"
+          eligible: "Eligibility Verified"
+          void: "Voided"
       errors:
         unable_to_fund: "Unable to pay for order using store credits"
         cannot_invalidate_uncaptured_authorization: "Cannot invalidate a store credit with an uncaptured authorization"
       expiring: Expiring
       insufficient_authorized_amount: "Unable to capture more than authorized amount"
       insufficient_funds: "Store credit amount remaining is not sufficient"
-      invalidate: "Invalidate"
       non_expiring: Non-expiring
       select_one_store_credit: "Select store credit to go towards remaining balance"
       store_credit: Store Credit

data/db/default/spree/return_reasons.rb

@@ -0,0 +1,9 @@
+Spree::ReturnReason.find_or_create_by(name: 'Better price available')
+Spree::ReturnReason.find_or_create_by(name: 'Missed estimated delivery date')
+Spree::ReturnReason.find_or_create_by(name: 'Missing parts or accessories')
+Spree::ReturnReason.find_or_create_by(name: 'Damaged/Defective')
+Spree::ReturnReason.find_or_create_by(name: 'Different from what was ordered')
+Spree::ReturnReason.find_or_create_by(name: 'Different from description')
+Spree::ReturnReason.find_or_create_by(name: 'No longer needed/wanted')
+Spree::ReturnReason.find_or_create_by(name: 'Accidental order')
+Spree::ReturnReason.find_or_create_by(name: 'Unauthorized purchase')

data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb

@@ -10,15 +10,17 @@ class CreateSpreeReturnAuthorizationReasons < ActiveRecord::Migration
 
     reversible do |direction|
       direction.up do
-        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')
+        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
       end
     end
 

data/db/migrate/20150618212517_create_spree_store_credit_update_reasons.rb

@@ -0,0 +1,8 @@
+class CreateSpreeStoreCreditUpdateReasons < ActiveRecord::Migration
+  def change
+    create_table :spree_store_credit_update_reasons do |t|
+      t.string :name
+      t.timestamps null: true
+    end
+  end
+end

data/db/migrate/20150619160613_create_adjustment_reason.rb

@@ -0,0 +1,18 @@
+class CreateAdjustmentReason < ActiveRecord::Migration
+  def change
+    create_table :spree_adjustment_reasons do |t|
+      t.string   "name"
+      t.string   "code"
+      t.boolean  "active",     default: true
+
+      t.timestamps null: true
+    end
+
+    add_index :spree_adjustment_reasons, :code
+    add_index :spree_adjustment_reasons, :active
+
+    change_table :spree_adjustments do |t|
+      t.references :adjustment_reason
+    end
+  end
+end