spree_wallet 2.1.1 → 2.2.0

data/README.md

@@ -7,13 +7,19 @@ Installation
 Add spree_wallet to your Gemfile:
 
 ```ruby
-gem 'spree_wallet', '2.1.1'
+gem 'spree_wallet'
 ```
 
-But if you are using 2.0.x version of spree
+But if you are using older version of spree
 
 ```ruby
-gem 'spree_wallet', '2.0.9'
+# Spree 2.1.x
+gem 'spree_wallet', '2.1.0'
+```
+
+```ruby
+# Spree 2.0.x
+gem 'spree_wallet', '2.0.6'
 ```
 
 Bundle your dependencies and run the installation generator:
@@ -36,28 +42,13 @@ 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/controllers/spree/checkout_controller_decorator.rb

@@ -1,32 +1,7 @@
 Spree::CheckoutController.class_eval do
   before_filter :validate_payments, :only => :update, :if => lambda { @order && @order.has_checkout_step?("payment") && @order.payment? && @order.available_wallet_payment_method }
-
+  
   private
-    def object_params
-      if @order.has_checkout_step?("payment") && @order.payment?
-        if params[:payment_source].present?
-          source_params = params.delete(:payment_source)[non_wallet_payment_method]
-
-          if source_params
-            non_wallet_payment_attributes(params[:order][:payments_attributes]).first[:source_attributes] = source_params
-          end
-        end
-
-        if (params[:order][:payments_attributes])
-          # This method is overrided because spree add all order total in first payment, now after wallet we can have multiple payments.
-          if spree_current_user && @order.available_wallet_payment_method
-            wallet_payments = wallet_payment_attributes(params[:order][:payments_attributes])
-            wallet_payments.first[:amount] = [@order.remaining_total, spree_current_user.store_credits_total].min if wallet_payments.present?
-            params[:order][:payments_attributes] = wallet_payments if remaining_order_total_after_wallet(@order, wallet_payments) <= 0
-            non_wallet_payment_attributes(params[:order][:payments_attributes]).first[:amount] = remaining_order_total_after_wallet(@order, wallet_payments) if non_wallet_payment_attributes(params[:order][:payments_attributes]).present?
-          else
-            params[:order][:payments_attributes].first[:amount] = @order.remaining_total
-          end
-        end
-      end
-      params[:order]
-    end
-
     def validate_payments
       payments_attributes = params[:order][:payments_attributes]
       wallet_payment = wallet_payment_attributes(payments_attributes)

data/app/models/spree/order_decorator.rb

@@ -46,6 +46,70 @@ Spree::Order.class_eval do
     Spree::Money.new(remaining_total_after_wallet)
   end
 
+  def process_payments!    
+    if pending_payments.empty? && wallet_payments.empty?
+      raise Spree::Core::GatewayError.new Spree.t(:no_pending_payments)
+    else
+      [pending_payments, wallet_payments].flatten.each do |payment|
+        break if payment_total >= total
+
+        payment.process!
+
+        if payment.completed?
+          self.payment_total += payment.amount
+        end
+      end
+    end
+  rescue Spree::Core::GatewayError => e
+    result = !!Spree::Config[:allow_checkout_on_gateway_error]
+    errors.add(:base, e.message) and return result
+  end
+
+
+  ### This methods are extensions of spree/order/checkout.rb
+
+  def update_params_payment_source
+    if has_checkout_step?("payment") && self.payment?
+      if @updating_params[:payment_source].present?
+        source_params = @updating_params.delete(:payment_source)[non_wallet_payment_method]
+
+        if source_params
+          non_wallet_payment_attributes(@updating_params[:order][:payments_attributes]).first[:source_attributes] = source_params
+        end
+      end
+
+      if (@updating_params[:order][:payments_attributes])
+        user = user_or_by_email
+        # This method is overrided because spree add all order total in first payment, now after wallet we can have multiple payments.
+        if user && available_wallet_payment_method
+          wallet_payments = wallet_payment_attributes(@updating_params[:order][:payments_attributes])
+          wallet_payments.first[:amount] = [remaining_total, user.store_credits_total].min if wallet_payments.present?
+          @updating_params[:order][:payments_attributes] = wallet_payments if remaining_order_total_after_wallet(wallet_payments) <= 0
+          non_wallet_payment_attributes(@updating_params[:order][:payments_attributes]).first[:amount] = remaining_order_total_after_wallet(wallet_payments) if non_wallet_payment_attributes(@updating_params[:order][:payments_attributes]).present?
+        else
+          @updating_params[:order][:payments_attributes].first[:amount] = remaining_total
+        end
+      end
+    end
+    @updating_params[:order]
+  end
+
+  def non_wallet_payment_method
+    non_wallet_payment_attributes(@updating_params[:order][:payments_attributes]).first[:payment_method_id] if non_wallet_payment_attributes(@updating_params[:order][:payments_attributes]).first
+  end
+
+  def remaining_order_total_after_wallet(wallet_payments)
+    wallet_payments.present? ? remaining_total - wallet_payments.first[:amount] : remaining_total
+  end
+
+  def wallet_payment_attributes(payment_attributes)
+    payment_attributes.select { |payment| payment["payment_method_id"] == Spree::PaymentMethod::Wallet.first.id.to_s }
+  end
+
+  def non_wallet_payment_attributes(payment_attributes)
+    @non_wallet_payment ||= payment_attributes - wallet_payment_attributes(payment_attributes)
+  end
+
   private
     def wallet_payments
       payments.where(:payment_method_id => Spree::PaymentMethod::Wallet.pluck(:id))

data/app/views/spree/admin/store_credits/new.html.erb

@@ -9,17 +9,17 @@
 
 <%= form_for [:admin, @user, @store_credit], :as => :store_credit do |f| %>
   <%= f.field_container :amount do %>
-    <%= f.label :amount %><br />
+    <%= f.label :amount %>*<br />
     <%= f.text_field :amount, :id => "debit_credit_amount" %>
   <% end %>
 
   <%= f.field_container :payment_mode do %>
-    <%= f.label :payment_mode, 'Payment Mode' %><br />
+    <%= f.label :payment_mode, 'Payment Mode' %>*<br />
     <%= f.select :payment_mode, store_credit_class::PAYMENT_MODE.select { |key, value| value >= 0 }, { :prompt => 'Select' } %>
   <% end %>
 
   <%= f.field_container :reason do %>
-    <%= f.label :reason %><br />
+    <%= f.label :reason %>*<br />
     <%= f.text_field :reason %>
   <% end %>
 

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

@@ -1,16 +1,51 @@
 <fieldset id="payment" data-hook>
   <legend align="center"><%= Spree.t(:payment_information) %></legend>
   <div data-hook="checkout_payment_step">
+
+    <% if @payment_sources.present? %>
+      <div class="card_options">
+        <%= radio_button_tag 'use_existing_card', 'yes', true %>
+        <label for="use_existing_card_yes">Use an existing card on file</label>
+        <br/>
+        <%= radio_button_tag 'use_existing_card', 'no' %>
+        <label for="use_existing_card_no">Use a new card / payment method</label>
+      </div>
+
+      <div id="existing_cards">
+        <p class="field" data-hook="existing_cards">
+          <table class="existing-credit-card-list">
+            <tbody>
+              <% @payment_sources.each do |card| %>
+                <tr id="<%= dom_id(card,'spree')%>" class="<%= cycle('even', 'odd') %>">
+                  <td><%= card.name %></td>
+                  <td><%= card.display_number %></td>
+                  <td><%= card.month %></td>
+                  <td><%= card.year %></td>
+                  <td>
+                    <%= radio_button_tag "existing_card", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" }  %>
+                  </td>
+                </tr>
+              <% end %>
+            </tbody>
+          </table>
+        </p>
+      </div>
+    <% 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? %>
+      <p>
+        <label>
         <%= 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 %> )
+        <%= Spree.t(@order.available_wallet_payment_method.name, :scope => :payment_methods, :default => @order.available_wallet_payment_method.name) %>( <%= number_to_currency spree_current_user.store_credits_total %> )
+         </label>
+      </p>
       <% end %>
-      
+
       <% @order.available_payment_methods_without_wallet.each do |method| %>
       <p>
         <label>
-          <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id %>
+          <%= radio_button_tag "order[payments_attributes][][payment_method_id]", method.id, method == @order.available_payment_methods_without_wallet.first %>
           <%= Spree.t(method.name, :scope => :payment_methods, :default => method.name) %>
         </label>
       </p>
@@ -19,8 +54,7 @@
 
     <ul id="payment-methods" data-hook>
       <% @order.available_payment_methods_without_wallet.each do |method| %>
-      <!-- hidden class is added to hide the partial initially -->
-        <li id="payment_method_<%= method.id %>" class="hidden <%= 'last' if method == @order.available_payment_methods_without_wallet.last %>" data-hook>
+        <li id="payment_method_<%= method.id %>" class="<%= 'last' if method == @order.available_payment_methods_without_wallet.last %>" data-hook>
           <fieldset>
             <%= render :partial => "spree/checkout/payment/#{method.method_type}", :locals => { :payment_method => method } %>
           </fieldset>
@@ -28,12 +62,10 @@
       <% end %>
     </ul>
     <br style="clear:both;" />
-    <% if Spree::Promotion.with_code.count > 0 %>
-      <p class='field' data-hook='coupon_code'>
-        <%= form.label :coupon_code %><br />
-        <%= form.text_field :coupon_code %>
-      </p>
-    <% end %>
+    <p class='field' data-hook='coupon_code'>
+      <%= form.label :coupon_code %><br />
+      <%= form.text_field :coupon_code %>
+    </p>
   </div>
 </fieldset>
 

data/db/migrate/20130729071647_add_lock_version_to_spree_users.rb

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

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

@@ -5,7 +5,7 @@ module SpreeWallet
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_wallet\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require store/spree_wallet\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_wallet
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.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-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
         - 2
-        - 1
+        - 2
         - 0
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   version_requirements: *id001
 description: Add wallet payment method functionality to spree