spree_wallet 2.0.9 → 2.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 [name of plugin creator]
+Copyright (c) 2014 Vinsol
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/README.md

@@ -1,4 +1,4 @@
-SpreeWallet
+SpreeWallet  [![Code Climate](https://codeclimate.com/github/vinsol/spree_wallet.png)](https://codeclimate.com/github/vinsol/spree_wallet) [![Build Status](https://travis-ci.org/vinsol/spree_wallet.png?branch=master)](https://travis-ci.org/vinsol/spree_wallet)
 ===========
 
 Installation
@@ -7,7 +7,13 @@ Installation
 Add spree_wallet to your Gemfile:
 
 ```ruby
-gem 'spree_wallet', '2.0.9'
+gem 'spree_wallet', '~> 2.1.0'
+```
+
+But if you are using 2.0.x version of spree
+
+```ruby
+gem 'spree_wallet', '2.0.6'
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -25,29 +31,18 @@ From Admin end, create a payment method of Wallet type. From User end, user can
 
 While from admin end, Admin can select any amount from wallet, but it should be less than amount present in user's balance. 
 
-## Testing
+Testing
+-------
 
 You need to do a quick one-time creation of a test application and then you can use it to run the tests.
 
-```
-bundle exec rake test_app
-````
+    bundle exec rake test_app
+
 Then run the rspec tests with mysql.
 
-```
-bundle exec rspec .
-```
+    bundle exec rspec .
 
-Contributing
-------------
 
-1. Fork the repo.
-2. Clone your repo.
-3. Run `bundle install`.
-4. Run `bundle exec rake test_app` to create the test application in `spec/test_app`.
-5. Make your changes.
-6. Ensure specs pass by running `bundle exec rspec spec`.
-7. Submit your pull request.
 
 Credits
 -------

data/app/models/spree/payment_decorator.rb

@@ -8,8 +8,8 @@ Spree::Payment.class_eval do
   delegate :remaining_total, :user_or_by_email, :to => :order, :prefix => true, :allow_nil => true
 
   fsm = self.state_machines[:state]
-  fsm.after_transition :from => fsm.states.map(&:name) - ['completed'], :to => ['completed'], :do => :consume_user_credits, :if => :wallet?
-  fsm.after_transition :from => ['completed'], :to => fsm.states.map(&:name) - ['completed'] , :do => :release_user_credits, :if => :wallet?
+  fsm.after_transition :from => fsm.states.map(&:name) - [:completed], :to => :completed, :do => :consume_user_credits, :if => :wallet?
+  fsm.after_transition :from => :completed, :to => fsm.states.map(&:name) - [:completed] , :do => :release_user_credits, :if => :wallet?
 
   def wallet?
     payment_method.is_a? Spree::PaymentMethod::Wallet

data/app/models/spree/store_credit.rb

@@ -1,6 +1,5 @@
 module Spree
   class StoreCredit < ActiveRecord::Base
-    attr_accessible :amount, :reason, :payment_mode 
     attr_accessor :disable_negative_payment_mode
 
     belongs_to :transactioner, :class_name => Spree.user_class
@@ -14,7 +13,7 @@ module Spree
     before_validation :generate_transaction_id, :on => :create
     before_create :update_user_wallet   
 
-    scope :order_created_at_desc, order('created_at desc')
+    scope :order_created_at_desc, -> { order('created_at desc') }
 
     private
       def update_user_wallet

data/app/views/spree/checkout/_payment.html.erb

@@ -1,21 +1,21 @@
 <fieldset id="payment" data-hook>
   <legend align="center"><%= Spree.t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
-
-
-    <% if spree_current_user && @order.available_wallet_payment_method && !spree_current_user.store_credits_total.to_f.zero? %>
-      <%= check_box_tag "order[payments_attributes][][payment_method_id]", @order.available_wallet_payment_method.id %>
-      <%= Spree.t(@order.available_wallet_payment_method.name, :scope => :payment_methods, :default => @order.available_wallet_payment_method.name) %>( <%= spree_current_user.store_credits_total %> )
-    <% end %>
-    
-    <% @order.available_payment_methods_without_wallet.each do |method| %>
-    <p>
-      <label>
-        <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id %>
-        <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
-      </label>
-    </p>
-    <% end %>
+    <div id="payment-method-fields" data-hook>
+      <% if spree_current_user && @order.available_wallet_payment_method && !spree_current_user.store_credits_total.to_f.zero? %>
+        <%= check_box_tag "order[payments_attributes][][payment_method_id]", @order.available_wallet_payment_method.id %>
+        <%= Spree.t(@order.available_wallet_payment_method.name, :scope => :payment_methods, :default => @order.available_wallet_payment_method.name) %>( <%= spree_current_user.store_credits_total %> )
+      <% end %>
+      
+      <% @order.available_payment_methods_without_wallet.each do |method| %>
+      <p>
+        <label>
+          <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id %>
+          <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
+        </label>
+      </p>
+      <% end %>
+    </div>
 
     <ul id="payment-methods" data-hook>
       <% @order.available_payment_methods_without_wallet.each do |method| %>

data/db/migrate/20130729071647_add_lock_version_to_spree_users.rb

@@ -1,7 +1,5 @@
 class AddLockVersionToSpreeUsers < ActiveRecord::Migration
   def change
-    unless Spree::User.column_names.include? "lock_version"
-      add_column :spree_users, :lock_version, :integer, :default => 0
-    end
+    add_column :spree_users, :lock_version, :integer, :default => 0
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_wallet
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 11
   prerelease: 
   segments: 
   - 2
+  - 1
   - 0
-  - 9
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors: 
 - Nishant 'CyRo' Tuteja
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-27 00:00:00 Z
+date: 2014-03-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,11 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
         - 2
+        - 1
         - 0
-        version: "2.0"
+        version: 2.1.0
   type: :runtime
   version_requirements: *id001
 description: Add wallet payment method functionality to spree