spree_loyalty_points 1.0.2 → 1.0.3

data/README.md

@@ -10,7 +10,7 @@ Installation
 Add spree_loyalty_points to your Gemfile:
 
 ```ruby
-gem 'spree_loyalty_points', '~> 1.0.2'
+gem 'spree_loyalty_points', '~> 1.0.3'
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -18,7 +18,6 @@ Bundle your dependencies and run the installation generator:
 ```shell
 bundle
 bundle exec rails g spree_loyalty_points:install
-bundle exec rake db:migrate
 ```
 
 Usage

data/app/models/concerns/spree/order/loyalty_points.rb

@@ -1,7 +1,7 @@
 require 'active_support/concern'
 
 module Spree
-  class Order < ActiveRecord::Base
+  class Order
     module LoyaltyPoints
       extend ActiveSupport::Concern
 

data/app/models/concerns/spree/payment/loyalty_points.rb

@@ -1,7 +1,7 @@
 require 'active_support/concern'
 
 module Spree
-  class Payment < ActiveRecord::Base
+  class Payment
     module LoyaltyPoints
       extend ActiveSupport::Concern
 
@@ -19,10 +19,8 @@ module Spree
       private
 
         def redeem_loyalty_points
-          loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')
-          if by_loyalty_points? && redeemable_loyalty_points_balance?
-            order.create_debit_transaction(loyalty_points_redeemed)
-          end
+          loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')          
+          order.create_debit_transaction(loyalty_points_redeemed)
         end
 
         def return_loyalty_points
@@ -35,7 +33,14 @@ module Spree
         end
 
         def redeemable_loyalty_points_balance?
-          amount >= Spree::Config.loyalty_points_redeeming_balance
+          order.user.loyalty_points_balance >= Spree::Config.loyalty_points_redeeming_balance
+        end
+        
+        def redeemable_user_balance
+          unless redeemable_loyalty_points_balance?
+            min_balance = Spree::Config.loyalty_points_redeeming_balance
+            errors.add :loyalty_points_balance, "should be atleast #{ min_balance.to_s + " " + "point".pluralize(min_balance) } for redeeming Loyalty Points"
+          end
         end
 
     end

data/app/models/spree/payment_decorator.rb

@@ -4,6 +4,7 @@ Spree::Payment.class_eval do
   include Spree::Payment::LoyaltyPoints
 
   validates :amount, numericality: { greater_than: 0 }, :if => :by_loyalty_points?
+  validate :redeemable_user_balance, :if => :by_loyalty_points?
   scope :state_not, ->(s) { where('state != ?', s) }
 
   fsm = self.state_machines[:state]
@@ -12,14 +13,14 @@ Spree::Payment.class_eval do
   fsm.after_transition :from => fsm.states.map(&:name) - [:completed], :to => [:completed], :do => :redeem_loyalty_points, :if => :by_loyalty_points?
   fsm.after_transition :from => [:completed], :to => fsm.states.map(&:name) - [:completed] , :do => :return_loyalty_points, :if => :by_loyalty_points?
 
-  def invalidate_old_payments
-    order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
-      payment.invalidate!
-    end unless by_loyalty_points?
-  end
-
   private
 
+    def invalidate_old_payments
+      order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
+        payment.invalidate!
+      end unless by_loyalty_points?
+    end
+
     def notify_paid_order
       if all_payments_completed?
         order.touch :paid_at

data/db/migrate/20140207055836_add_lock_version_to_spree_user.rb

@@ -1,5 +1,5 @@
 class AddLockVersionToSpreeUser < ActiveRecord::Migration
   def change
-    add_column :spree_users, :lock_version, :integer, default: 0, null: false
+    add_column :spree_users, :lock_version, :integer, default: 0, null: false unless column_exists?(:spree_users, :lock_version)
   end
 end

metadata

@@ -1,47 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spree_loyalty_points
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.3
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
 platform: ruby
-authors: 
+authors:
 - Jatin Baweja
 - Sushant Mittal
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-03-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: spree_core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 description: To award loyalty points and add loyalty points payment method to spree
 email: info@vinsol.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
 - app/assets/javascripts/admin/spree_loyalty_points.js
@@ -105,39 +97,29 @@ files:
 - db/migrate/20140205111553_add_transaction_id_to_spree_loyalty_points_transactions.rb
 - db/migrate/20140207055836_add_lock_version_to_spree_user.rb
 homepage: http://vinsol.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 53
-      segments: 
-      - 1
-      - 9
-      - 3
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.3
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - none
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Add loyalty points to spree
 test_files: []
-