solidus_core 1.0.0.pre → 1.0.0.pre2

data/app/models/spree/payment_method.rb

@@ -16,14 +16,14 @@ module Spree
     end
 
     def provider_class
-      raise ::NotImplementedError, 'You must implement provider_class method for this gateway.'
+      raise ::NotImplementedError, "You must implement provider_class method for #{self.class}."
     end
 
     # The class that will process payments for this payment type, used for @payment.source
     # e.g. CreditCard in the case of a the Gateway payment type
     # nil means the payment method doesn't require a source e.g. check
     def payment_source_class
-      raise ::NotImplementedError, 'You must implement payment_source_class method for this gateway.'
+      raise ::NotImplementedError, "You must implement payment_source_class method for #{self.class}."
     end
 
     def self.available(display_on = 'both')

data/app/models/spree/permission_sets/base.rb

@@ -0,0 +1,17 @@
+module Spree
+  module PermissionSets
+    class Base
+      def initialize ability
+        @ability = ability
+      end
+
+      def activate!
+        raise NotImplementedError.new
+      end
+
+      private
+
+      delegate :can, :cannot, to: :@ability
+    end
+  end
+end

data/app/models/spree/permission_sets/configuration_display.rb

@@ -0,0 +1,24 @@
+module Spree
+  module PermissionSets
+    class ConfigurationDisplay < PermissionSets::Base
+      def activate!
+          can [:edit, :admin], :general_settings
+          can [:display, :admin], Spree::TaxCategory
+          can [:display, :admin], Spree::TaxRate
+          can [:display, :admin], Spree::Zone
+          can [:display, :admin], Spree::Country
+          can [:display, :admin], Spree::State
+          can [:display, :admin], Spree::PaymentMethod
+          can [:display, :admin], Spree::Taxonomy
+          can [:display, :admin], Spree::ShippingMethod
+          can [:display, :admin], Spree::ShippingCategory
+          can [:display, :admin], Spree::StockLocation
+          can [:display, :admin], Spree::StockMovement
+          can [:display, :admin], Spree::Tracker
+          can [:display, :admin], Spree::RefundReason
+          can [:display, :admin], Spree::ReimbursementType
+          can [:display, :admin], Spree::ReturnReason
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/configuration_management.rb

@@ -0,0 +1,24 @@
+module Spree
+  module PermissionSets
+    class ConfigurationManagement < PermissionSets::Base
+      def activate!
+        can :manage, :general_settings
+        can :manage, Spree::TaxCategory
+        can :manage, Spree::TaxRate
+        can :manage, Spree::Zone
+        can :manage, Spree::Country
+        can :manage, Spree::State
+        can :manage, Spree::PaymentMethod
+        can :manage, Spree::Taxonomy
+        can :manage, Spree::ShippingMethod
+        can :manage, Spree::ShippingCategory
+        can :manage, Spree::StockLocation
+        can :manage, Spree::StockMovement
+        can :manage, Spree::Tracker
+        can :manage, Spree::RefundReason
+        can :manage, Spree::ReimbursementType
+        can :manage, Spree::ReturnReason
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/dashboard_display.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PermissionSets
+    class DashboardDisplay < PermissionSets::Base
+      def activate!
+          can [:admin, :home], :dashboards
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/order_display.rb

@@ -0,0 +1,15 @@
+module Spree
+  module PermissionSets
+    class OrderDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin, :edit, :cart], Spree::Order
+        can [:display, :admin], Spree::Payment
+        can [:display, :admin], Spree::Shipment
+        can [:display, :admin], Spree::Adjustment
+        can [:display, :admin], Spree::LineItem
+        can [:display, :admin], Spree::ReturnAuthorization
+        can [:display, :admin], Spree::CustomerReturn
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/order_management.rb

@@ -0,0 +1,15 @@
+module Spree
+  module PermissionSets
+    class OrderManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::Order
+        can :manage, Spree::Payment
+        can :manage, Spree::Shipment
+        can :manage, Spree::Adjustment
+        can :manage, Spree::LineItem
+        can :manage, Spree::ReturnAuthorization
+        can :manage, Spree::CustomerReturn
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/product_display.rb

@@ -0,0 +1,18 @@
+module Spree
+  module PermissionSets
+    class ProductDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin, :edit], Spree::Product
+        can [:display, :admin], Spree::Image
+        can [:display, :admin], Spree::Variant
+        can [:display, :admin], Spree::OptionValue
+        can [:display, :admin], Spree::ProductProperty
+        can [:display, :admin], Spree::OptionType
+        can [:display, :admin], Spree::Property
+        can [:display, :admin], Spree::Prototype
+        can [:display, :admin], Spree::Taxonomy
+        can [:display, :admin], Spree::Taxon
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/product_management.rb

@@ -0,0 +1,19 @@
+module Spree
+  module PermissionSets
+    class ProductManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::Product
+        can :manage, Spree::Image
+        can :manage, Spree::Variant
+        can :manage, Spree::OptionValue
+        can :manage, Spree::ProductProperty
+        can :manage, Spree::OptionType
+        can :manage, Spree::Property
+        can :manage, Spree::Prototype
+        can :manage, Spree::Taxonomy
+        can :manage, Spree::Taxon
+        can :manage, Spree::Classification
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/promotion_display.rb

@@ -0,0 +1,12 @@
+module Spree
+  module PermissionSets
+    class PromotionDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::Promotion
+        can [:display, :admin], Spree::PromotionRule
+        can [:display, :admin], Spree::PromotionAction
+        can [:display, :admin], Spree::PromotionCategory
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/promotion_management.rb

@@ -0,0 +1,12 @@
+module Spree
+  module PermissionSets
+    class PromotionManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::Promotion
+        can :manage, Spree::PromotionRule
+        can :manage, Spree::PromotionAction
+        can :manage, Spree::PromotionCategory
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/report_display.rb

@@ -0,0 +1,9 @@
+module Spree
+  module PermissionSets
+    class ReportDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin, :sales_total], :reports
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/stock_display.rb

@@ -0,0 +1,10 @@
+module Spree
+  module PermissionSets
+    class StockDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::StockItem
+        can [:display, :admin], Spree::StockTransfer
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/stock_management.rb

@@ -0,0 +1,11 @@
+module Spree
+  module PermissionSets
+    class StockManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree::StockItem
+        can :manage, Spree::StockTransfer
+        can :manage, Spree::TransferItem
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/user_display.rb

@@ -0,0 +1,11 @@
+module Spree
+  module PermissionSets
+    class UserDisplay < PermissionSets::Base
+      def activate!
+        can [:display, :admin, :edit, :addresses, :orders, :items], Spree.user_class
+        can [:display, :admin], Spree::StoreCredit
+        can :display, Spree::Role
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/user_management.rb

@@ -0,0 +1,11 @@
+module Spree
+  module PermissionSets
+    class UserManagement < PermissionSets::Base
+      def activate!
+        can :manage, Spree.user_class
+        can :manage, Spree::StoreCredit
+        can :display, Spree::Role
+      end
+    end
+  end
+end

data/app/models/spree/promotion/rules/item_total.rb

@@ -4,14 +4,10 @@ module Spree
       # A rule to apply to an order greater than (or greater than or equal to)
       # a specific amount
       class ItemTotal < PromotionRule
-        preference :amount_min, :decimal, default: 100.00
-        preference :operator_min, :string, default: '>'
-        preference :amount_max, :decimal, default: 1000.00
-        preference :operator_max, :string, default: '<'
+        preference :amount, :decimal, default: 100.00
+        preference :operator, :string, default: '>'
 
-
-        OPERATORS_MIN = ['gt', 'gte']
-        OPERATORS_MAX = ['lt','lte']
+        OPERATORS = ['gt', 'gte']
 
         def applicable?(promotable)
           promotable.is_a?(Spree::Order)
@@ -19,42 +15,25 @@ module Spree
 
         def eligible?(order, options = {})
           item_total = order.item_total
-
-          lower_limit_condition = item_total.send(preferred_operator_min == 'gte' ? :>= : :>, BigDecimal.new(preferred_amount_min.to_s))
-          upper_limit_condition = item_total.send(preferred_operator_max == 'lte' ? :<= : :<, BigDecimal.new(preferred_amount_max.to_s))
-
-          eligibility_errors.add(:base, ineligible_message_max) unless upper_limit_condition
-          eligibility_errors.add(:base, ineligible_message_min) unless lower_limit_condition
+          unless item_total.send(preferred_operator == 'gte' ? :>= : :>, BigDecimal.new(preferred_amount.to_s))
+            eligibility_errors.add(:base, ineligible_message)
+          end
 
           eligibility_errors.empty?
         end
 
         private
-        def formatted_amount_min
-          Spree::Money.new(preferred_amount_min).to_s
-        end
-
-        def formatted_amount_max
-          Spree::Money.new(preferred_amount_max).to_s
+        def formatted_amount
+          Spree::Money.new(preferred_amount).to_s
         end
 
-
-        def ineligible_message_max
-          if preferred_operator_max == 'gte'
-            eligibility_error_message(:item_total_more_than_or_equal, amount: formatted_amount_max)
-          else
-            eligibility_error_message(:item_total_more_than, amount: formatted_amount_max)
-          end
-        end
-
-        def ineligible_message_min
-          if preferred_operator_min == 'gte'
-            eligibility_error_message(:item_total_less_than, amount: formatted_amount_min)
+        def ineligible_message
+          if preferred_operator == 'gte'
+            eligibility_error_message(:item_total_less_than, amount: formatted_amount)
           else
-            eligibility_error_message(:item_total_less_than_or_equal, amount: formatted_amount_min)
+            eligibility_error_message(:item_total_less_than_or_equal, amount: formatted_amount)
           end
         end
-
       end
     end
   end

data/app/models/spree/promotion/rules/user.rb

@@ -2,9 +2,9 @@ module Spree
   class Promotion
     module Rules
       class User < PromotionRule
-        belongs_to :user, class_name: "::#{Spree.user_class.to_s}"
+        belongs_to :user, class_name: Spree::UserClassHandle.new
 
-        has_and_belongs_to_many :users, class_name: "::#{Spree.user_class.to_s}",
+        has_and_belongs_to_many :users, class_name: Spree::UserClassHandle.new,
           join_table: 'spree_promotion_rules_users',
           foreign_key: 'promotion_rule_id',
           association_foreign_key: :user_id

data/app/models/spree/promotion_rule.rb

@@ -13,11 +13,11 @@ module Spree
     end
 
     def applicable?(promotable)
-      raise 'applicable? should be implemented in a sub-class of Spree::PromotionRule'
+      raise NotImplementedError, "applicable? should be implemented in a sub-class of Spree::PromotionRule"
     end
 
     def eligible?(promotable, options = {})
-      raise 'eligible? should be implemented in a sub-class of Spree::PromotionRule'
+      raise NotImplementedError, "eligible? should be implemented in a sub-class of Spree::PromotionRule"
     end
 
     # This states if a promotion can be applied to the specified line item

data/app/models/spree/reimbursement.rb

@@ -172,17 +172,5 @@ module Spree
                  end
       unpaid_amount.abs.between?(0, leniency)
     end
-
-
-    # If there are multiple different reimbursement types for a single reimbursement,
-    # We open ourselves to a one-cent rounding error for every type over the first one.
-    # This is due to how we round #unpaid_amount and how each reimbursement type will round as well.
-    # Since at this point, the payments and credits have already been processed, we should
-    # allow the reimbursement to show as 'reimbursed' and not 'errored'
-    def unpaid_amount_within_tolerance?
-      reimbursement_count = reimbursement_models.count { |model| model.total_amount_reimbursed_for(self) > 0 }
-      leniency = reimbursement_count > 0 ? (reimbursement_count - 1) * 0.01.to_d : 0
-      unpaid_amount.abs.between?(0, leniency)
-    end
   end
 end

data/app/models/spree/return_authorization.rb

@@ -7,7 +7,8 @@ module Spree
     has_many :customer_returns, through: :return_items
 
     belongs_to :stock_location
-    belongs_to :reason, class_name: 'Spree::ReturnAuthorizationReason', foreign_key: :return_authorization_reason_id
+    belongs_to :reason, class_name: 'Spree::ReturnReason', foreign_key: :return_reason_id
+
     before_create :generate_number
 
     after_save :generate_expedited_exchange_reimbursements
@@ -15,7 +16,6 @@ module Spree
     accepts_nested_attributes_for :return_items, allow_destroy: true
 
     validates :order, presence: true
-    validates :reason, presence: true
     validates :stock_location, presence: true
     validate :must_have_shipped_units, on: :create
     validate :no_previously_exchanged_inventory_units, on: :create

data/app/models/spree/return_item.rb

@@ -36,6 +36,7 @@ module Spree
     belongs_to :reimbursement, inverse_of: :return_items
     belongs_to :preferred_reimbursement_type, class_name: 'Spree::ReimbursementType'
     belongs_to :override_reimbursement_type, class_name: 'Spree::ReimbursementType'
+    belongs_to :return_reason, class_name: 'Spree::ReturnReason', foreign_key: :return_reason_id
 
     validate :eligible_exchange_variant
     validate :belongs_to_same_customer_order

data/app/models/spree/return_reason.rb

@@ -0,0 +1,18 @@
+module Spree
+  class ReturnReason < ActiveRecord::Base
+    include Spree::NamedType
+
+    has_many :return_authorizations
+
+    def self.reasons_for_return_items(return_items)
+      reasons = Spree::ReturnReason.active
+      # Only allow an inactive reason if it's already associated to a return item
+      return_items.each do |return_item|
+        if return_item.return_reason && !return_item.return_reason.active?
+          reasons << return_item.return_reason
+        end
+      end
+      reasons
+    end
+  end
+end

data/app/models/spree/role_user.rb

@@ -2,7 +2,7 @@ module Spree
   class RoleUser < ActiveRecord::Base
     self.table_name = "spree_roles_users"
     belongs_to :role, class_name: "Spree::Role"
-    belongs_to :user, class_name: Spree.user_class.to_s
+    belongs_to :user, class_name: Spree::UserClassHandle.new
 
     after_save :generate_admin_api_key
 

data/app/models/spree/shipment.rb

@@ -19,6 +19,8 @@ module Spree
 
     before_validation :set_cost_zero_when_nil
 
+    before_destroy :ensure_can_destroy
+
     # TODO remove the suppress_mailer temporary variable once we are calling 'ship'
     # from outside of the state machine and can actually pass variables through.
     attr_accessor :special_instructions, :suppress_mailer
@@ -152,32 +154,6 @@ module Spree
       inventory_units.includes(:line_item).map(&:line_item).uniq
     end
 
-    def process_order_payments
-      pending_payments =  order.pending_payments
-                            .sort_by(&:uncaptured_amount).reverse
-
-      shipment_to_pay = final_price_with_items
-      payments_amount = 0
-
-      payments_pool = pending_payments.each_with_object([]) do |payment, pool|
-        break if payments_amount >= shipment_to_pay
-        payments_amount += payment.uncaptured_amount
-        pool << payment
-      end
-
-      payments_pool.each do |payment|
-        capturable_amount = if payment.amount >= shipment_to_pay
-                              shipment_to_pay
-                            else
-                              payment.amount
-                            end
-
-        cents = (capturable_amount * 100).to_i
-        payment.capture!(cents)
-        shipment_to_pay -= capturable_amount
-      end
-    end
-
     def line_items
       inventory_units.includes(:line_item).map(&:line_item).uniq
     end
@@ -423,5 +399,12 @@ module Spree
         end
       end
 
+
+      def ensure_can_destroy
+        unless pending?
+          errors.add(:state, :cannot_destroy, state: self.state)
+          return false
+        end
+      end
   end
 end