spree_loyalty_points 1.0.3 → 1.1.0

data/README.md

@@ -7,10 +7,16 @@ This extension adds Loyalty Points for users.
 Installation
 ------------
 
-Add spree_loyalty_points to your Gemfile:
+In your Gemfile, add:
 
 ```ruby
-gem 'spree_loyalty_points', '~> 1.0.3'
+gem 'spree_loyalty_points'
+```
+
+For Spree 2.1.x:
+
+```ruby
+gem 'spree_loyalty_points', '1.0.2'
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -18,6 +24,7 @@ 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/assets/javascripts/{admin → spree/backend}/spree_loyalty_points.js

@@ -1,5 +1,3 @@
-//= require admin/spree_backend
-
 function SelectOptionChange(selectBoxId, containerId, heading) {
     var that = this;
     this.selectBoxId = selectBoxId;

data/app/assets/stylesheets/{store → spree/frontend}/spree_loyalty_points.css

@@ -1,6 +1,3 @@
-/*
- *= require store/spree_frontend
-*/
 
 #loyalty-points-info {
   border: 1px solid #D9D9DB;

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

@@ -1,7 +1,7 @@
 require 'active_support/concern'
 
 module Spree
-  class Order
+  class Order < ActiveRecord::Base
     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
+  class Payment < ActiveRecord::Base
     module LoyaltyPoints
       extend ActiveSupport::Concern
 
@@ -19,8 +19,10 @@ module Spree
       private
 
         def redeem_loyalty_points
-          loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')          
-          order.create_debit_transaction(loyalty_points_redeemed)
+          loyalty_points_redeemed = loyalty_points_for(amount, 'redeem')
+          if by_loyalty_points? && redeemable_loyalty_points_balance?
+            order.create_debit_transaction(loyalty_points_redeemed)
+          end
         end
 
         def return_loyalty_points
@@ -33,14 +35,7 @@ module Spree
         end
 
         def redeemable_loyalty_points_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
+          amount >= Spree::Config.loyalty_points_redeeming_balance
         end
 
     end

data/app/models/spree/payment_decorator.rb

@@ -4,7 +4,6 @@ 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]
@@ -13,13 +12,13 @@ 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?
 
-  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 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 notify_paid_order
       if all_payments_completed?

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 unless column_exists?(:spree_users, :lock_version)
+    add_column :spree_users, :lock_version, :integer, default: 0, null: false
   end
 end

data/lib/generators/spree_loyalty_points/install/install_generator.rb

@@ -5,13 +5,13 @@ module SpreeLoyaltyPoints
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_loyalty_points\n"
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_loyalty_points\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_loyalty_points\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_loyalty_points\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_loyalty_points\n", :before => /\*\//, :verbose => true
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_loyalty_points\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_loyalty_points\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_loyalty_points\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

metadata

@@ -1,45 +1,53 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spree_loyalty_points
-version: !ruby/object:Gem::Version
-  version: 1.0.3
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Jatin Baweja
 - Sushant Mittal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-03-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: spree_core
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 2
+        version: "2.2"
+  type: :runtime
+  version_requirements: *id001
 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
-- app/assets/javascripts/store/spree_loyalty_points.js
-- app/assets/stylesheets/admin/spree_loyalty_points.css
-- app/assets/stylesheets/store/spree_loyalty_points.css
+- app/assets/javascripts/spree/backend/spree_loyalty_points.js
+- app/assets/javascripts/spree/frontend/spree_loyalty_points.js
+- app/assets/stylesheets/spree/backend/spree_loyalty_points.css
+- app/assets/stylesheets/spree/frontend/spree_loyalty_points.css
 - app/controllers/spree/admin/general_settings_controller_decorator.rb
 - app/controllers/spree/admin/loyalty_points_transactions_controller.rb
 - app/controllers/spree/admin/resource_controller_decorator.rb
@@ -97,29 +105,39 @@ 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
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 53
+      segments: 
+      - 1
+      - 9
+      - 3
       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
-      version: '0'
-requirements:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Add loyalty points to spree
 test_files: []
+

data/app/assets/javascripts/store/spree_loyalty_points.js

@@ -1 +0,0 @@
-//= require store/spree_frontend

data/app/assets/stylesheets/admin/spree_loyalty_points.css

@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_backend
-*/