spree_unified_payment 1.0.0 → 1.0.1

data/Gemfile

@@ -1,13 +1,14 @@
 source "https://rubygems.org"
 gem 'rails', '3.2.16'
 gem 'mysql2'
+gem 'sqlite3'
 
 
 gem 'spree', :git => 'git://github.com/spree/spree.git', :tag => 'v2.0.3'
 gem 'spree_wallet', :git => 'git://github.com/vinsol/spree_wallet.git'
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
 
-gem 'unified_payment', :git => "git@github.com:vinsol/Unified-Payments.git", :branch => 'master', :ref => '4ced91335fec2cf186c30b593d9a1f6083028748'
+gem 'unified_payment', :tag => 'v1.0.1'
 gem 'delayed_job_active_record', :tag => 'v4.0.0'
 
 group :test do

data/Rakefile

@@ -0,0 +1,15 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+require 'spree/testing_support/extension_rake'
+
+RSpec::Core::RakeTask.new
+
+task :default => [:spec]
+
+desc 'Generates a dummy app for testing'
+task :test_app do
+  ENV['LIB_NAME'] = 'spree_unified_payment'
+  Rake::Task['extension:test_app'].invoke
+end

data/app/assets/javascripts/admin/spree_unified_payment.js

@@ -30,7 +30,7 @@ $(document).ready(function() {
     return self;
   }  
   
-  $('#reveal_xml').click(function() {
+  $('.reveal_xml').click(function() {
     ct_id = $(this).attr('data-ct-id');
     var quick_view = new ModalPopUp($("<div></div>").attr('id', 'quick_view_popup').html($("#xml_response_" + ct_id).clone()));
     $('#quick_view_popup .xml_response').removeClass('hidden');

data/app/controllers/spree/unified_payments_controller.rb

@@ -49,7 +49,7 @@ module Spree
  
       @payment_made = @gateway_message_hash['PurchaseAmountScr'].to_f
       if @card_transaction.approved_at_gateway?
-        if @card_transaction.amount != @payment_made
+        if @card_transaction.amount.to_f != @payment_made
           process_unsuccessful_transaction
         else
           process_successful_transaction
@@ -129,9 +129,7 @@ module Spree
 
     def tasks_on_gateway_create_response(response, transaction_id)
       response_order = response['Order']
-
-      #[TODO_CR] Make required attributes protected and save them with without protection in the place where protection is not necessary.
-      #[MK] Please look into this change. Could not find a good way to implement it without much hastle.
+      
       gateway_transaction = UnifiedPayment::Transaction.where(:gateway_session_id => response_order['SessionID'], :gateway_order_id => response_order['OrderID'], :url => response_order['URL']).first
       gateway_transaction.assign_attributes({:user_id => @order.user.try(:id), :payment_transaction_id => transaction_id, :order_id => @order.id, :gateway_order_status => 'CREATED', :amount => @order.total, :currency => Spree::Config[:currency], :response_status => response["Status"], :status => 'pending'}, :without_protection => true)
       gateway_transaction.save!

data/app/overrides/add_unified_tabs_to_admin_menu.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(:virtual_path => "spree/layouts/admin",
                      :name => "Add Unified tab to menu",
                      :insert_bottom => "[data-hook='admin_tabs'], #admin_tabs[data-hook]",
-                     :text => " <%= tab( :Unified , :url => admin_unified_payments_path) %>",
+                     :text => " <%= tab( :UnifiedPayments , :url => admin_unified_payments_path) %>",
                      :sequence => {:after => "promo_admin_tabs"},
                      :disabled => false)

data/app/overrides/add_user_view_link_for_transactions.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
+                     :name => "User link to view UnifiedPayment Transactions",
+                     :insert_before => "li#search-bar",
+                     :partial => "spree/shared/unified_payments_link",
+                     :disabled => false, 
+                     :original => 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac')

data/app/views/spree/admin/unified_payments/index.html.erb

@@ -2,7 +2,7 @@
 
 <% content_for :table_filter do %>
   <div data-hook="admin_orders_index_search">
-    <%= form_for [:admin, @search], :url => unified_payments_path, :method => :get do |f| %>
+    <%= form_for [:admin, @search], :url => admin_unified_payments_path, :method => :get do |f| %>
       <div class="field-block alpha four columns">
         <div class="date-range-filter field">
           <%= label_tag nil, Spree.t(:date_range) %>
@@ -79,10 +79,10 @@
         <td><%= card_transaction.created_at.strftime("%d %b %Y, %I:%M%p") %></td>
         <td class="action">
           <% unless card_transaction.status == 'pending' %>
-            <a href="javascript:void(0)" id="reveal_xml" data-ct-id=<%= card_transaction.id%>>View XML</a>
+            <a href="javascript:void(0)" class="reveal_xml" data-ct-id=<%= card_transaction.id%>>View XML</a>
             <div class="hidden xml_response" id="xml_response_<%= card_transaction.id %>"><%= card_transaction.xml_response %></div>
             <% unless card_transaction.store_credit.present? %>
-              |<%= link_to "Receipt", unified_payments_receipt_path(:transaction_id => card_transaction.payment_transaction_id) %>
+              |<%= link_to "Receipt", admin_unified_payments_receipt_path(:transaction_id => card_transaction.payment_transaction_id) %>
             <% end %>
           <% else %>
             <%= link_to("QueryAndWallet", admin_unified_payments_query_gateway_path(:transaction_id => card_transaction.payment_transaction_id), :remote => true, confirm: "#{card_transaction.amount} will be walleted to #{card_transaction.user.try(:email) }. Are You Sure?", :method => 'post', :class => 'wallet_link') unless card_transaction.store_credit.present? %>

data/app/views/spree/admin/unified_payments/query_gateway.js.erb

@@ -6,5 +6,5 @@
   $('#<%= @card_transaction.payment_transaction_id %> .gateway_order_status').text('<%= @card_transaction.gateway_order_status %>')
 <% else %>
   alert('Could not wallet the money. Got order status <%= @card_transaction.gateway_order_status %>');
-  $('#<%= @card_transaction.payment_transaction_id %> .gateway_order_status').text('<%= @@card_transaction.gateway_order_status %>')
+  $('#<%= @card_transaction.payment_transaction_id %> .gateway_order_status').text('<%= @card_transaction.gateway_order_status %>')
 <% end %>

data/app/views/spree/shared/_unified_payments_link.html.erb

@@ -0,0 +1 @@
+<li><%= link_to 'UnifiedPayment Transactions', unified_payments_path %></li>

data/db/migrate/20131101092408_add_unified_payment_transactions.rb

@@ -0,0 +1,25 @@
+class AddUnifiedPaymentTransactions < ActiveRecord::Migration
+  def change
+    unless UnifiedPayment::Transaction.table_exists?
+      create_table :unified_payment_transactions do |t|
+        t.integer :gateway_order_id
+        t.string :gateway_order_status
+        t.string :amount
+        t.string :gateway_session_id
+        t.string :url
+        t.string :merchant_id
+        t.string :currency
+        t.string :order_description
+        t.string :response_status
+        t.string :response_description
+        t.string :pan
+        t.string :approval_code
+        t.text :xml_response
+        t.timestamps
+      end
+
+      add_index :unified_payment_transactions, [:gateway_order_id, :gateway_session_id], name: :order_session_index
+      add_index :unified_payment_transactions, :response_status
+    end
+  end
+end

data/spec/controllers/spree/unified_payments_controller_spec.rb

@@ -9,7 +9,6 @@ describe Spree::UnifiedPaymentsController do
   before(:each) do
     user.stub(:generate_spree_api_key!).and_return(true)
     user.stub(:last_incomplete_spree_order).and_return(order)
-    Spree::Config[:site_name] = "MyTestSite"
     controller.stub(:spree_current_user).and_return(user)
     controller.stub(:current_order).and_return(order)
   end
@@ -142,8 +141,8 @@ describe Spree::UnifiedPaymentsController do
       before do
         session[:transaction_id] = '12345678910121'
         @gateway_response = Object.new
-        UnifiedPayment::Transaction.stub(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from MyTestSite"}).and_return(@gateway_response)
-        UnifiedPayment::Transaction.stub(:extract_url_for_unified_payment).with(@gateway_response).and_return('www.MyTestSite.com')
+        UnifiedPayment::Transaction.stub(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from #{Spree::Config[:site_name]}"}).and_return(@gateway_response)
+        UnifiedPayment::Transaction.stub(:extract_url_for_unified_payment).with(@gateway_response).and_return("www.#{Spree::Config[:site_name]}.com")
         controller.stub(:tasks_on_gateway_create_response).with(@gateway_response, '12345678910121').and_return(true)
       end
 
@@ -175,8 +174,8 @@ describe Spree::UnifiedPaymentsController do
       context 'when an order is successfully created at gateway' do
         
         describe 'method calls' do
-          it { UnifiedPayment::Transaction.should_receive(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from MyTestSite"}).and_return(@gateway_response) }
-          it { UnifiedPayment::Transaction.should_receive(:extract_url_for_unified_payment).with(@gateway_response).and_return('www.MyTestSite.com') }
+          it { UnifiedPayment::Transaction.should_receive(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from #{Spree::Config[:site_name]}"}).and_return(@gateway_response) }
+          it { UnifiedPayment::Transaction.should_receive(:extract_url_for_unified_payment).with(@gateway_response).and_return("www.#{Spree::Config[:site_name]}.com") }
           it { controller.should_receive(:tasks_on_gateway_create_response).with(@gateway_response, '12345678910121').and_return(true) }
           
           after { send_request }
@@ -185,17 +184,17 @@ describe Spree::UnifiedPaymentsController do
         describe 'assigns' do
           it 'payment_url' do
             send_request
-            assigns(:payment_url).should eq("www.MyTestSite.com")
+            assigns(:payment_url).should eq("www.#{Spree::Config[:site_name]}.com")
           end
         end
       end
 
       context 'when order not created at gateway' do
         
-        before { UnifiedPayment::Transaction.stub(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from MyTestSite"}).and_return(false) }
+        before { UnifiedPayment::Transaction.stub(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from #{Spree::Config[:site_name]}"}).and_return(false) }
         
         describe 'method calls' do
-          it { UnifiedPayment::Transaction.should_receive(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from MyTestSite"}).and_return(false) }
+          it { UnifiedPayment::Transaction.should_receive(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from #{Spree::Config[:site_name]}"}).and_return(false) }
           it { UnifiedPayment::Transaction.should_not_receive(:extract_url_for_unified_payment) }
           it { controller.should_not_receive(:tasks_on_gateway_create_response) }
           
@@ -219,7 +218,7 @@ describe Spree::UnifiedPaymentsController do
             before { send_request }
 
             it { flash[:error].should be_nil }
-            it { response.body.should eq("$('#confirm_payment').hide();top.location.href = 'www.MyTestSite.com'") }
+            it { response.body.should eq("$('#confirm_payment').hide();top.location.href = 'www.#{Spree::Config[:site_name]}.com'") }
           end
         end
       end
@@ -236,8 +235,8 @@ describe Spree::UnifiedPaymentsController do
         order.stub(:next).and_return(true)
         @gateway_response = {'Status' => 'status', 'Order' => { 'SessionID' => '12312', 'OrderID' => '123121', 'URL' => 'MyResponse'}}
         @transaction = UnifiedPayment::Transaction.new
-        UnifiedPayment::Transaction.stub(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from MyTestSite"}).and_return(@gateway_response)
-        UnifiedPayment::Transaction.stub(:extract_url_for_unified_payment).with(@gateway_response).and_return('www.MyTestSite.com')
+        UnifiedPayment::Transaction.stub(:create_order_at_unified).with(order.total, {:approve_url=>"http://test.host/unified_payments/approved", :cancel_url=>"http://test.host/unified_payments/canceled", :decline_url=>"http://test.host/unified_payments/declined", :description=>"Purchasing items from #{Spree::Config[:site_name]}"}).and_return(@gateway_response)
+        UnifiedPayment::Transaction.stub(:extract_url_for_unified_payment).with(@gateway_response).and_return("www.#{Spree::Config[:site_name]}.com")
         UnifiedPayment::Transaction.stub(:where).with(:gateway_session_id => '12312', :gateway_order_id => '123121', :url => 'MyResponse').and_return([@transaction])
         @transaction.stub(:save!).and_return(true)
       end

data/spec/models/unified_payment/transaction_decorator_spec.rb

@@ -320,8 +320,8 @@ describe UnifiedPayment::Transaction do
 
   describe 'abort!' do
     before do
-      @time_now = Time.now
-      Time.stub(:now).and_return(@time_now)
+      @time_now = DateTime.strptime('2012-03-03', '%Y-%m-%d')
+      Time.stub(:current).and_return(@time_now)
       @card_transaction = UnifiedPayment::Transaction.new(:status => 'somestatus', :payment_transaction_id => '1234')
       @card_transaction.stub(:release_order_inventory).and_return(true)
     end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 # require 'rspec/autorun'
 
@@ -17,6 +17,11 @@ require 'database_cleaner'
 # If you are not using ActiveRecord, you can remove this line.
 # ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
+#Allow attr_access for test environment
+UnifiedPayment::Transaction.class_eval do
+  attr_accessible :payment_transaction_id
+end
+
 RSpec.configure do |config|
   # ## Mock Framework
   #

data/spree_unified_payment.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform  = Gem::Platform::RUBY
   s.name      = "spree_unified_payment"
-  s.version   = "1.0.0"
+  s.version   = "1.0.1"
   s.author    = ["Manish Kangia", "Sushant Mittal"]
   s.email     = 'info@vinsol.com'
   s.homepage  = 'http://vinsol.com'
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.requirements << 'none'
 
   s.add_dependency('spree_core', '~> 2.0.0')
-  s.add_dependency 'unified_payment', '1.0.0'
+  s.add_dependency 'unified_payment', '1.0.1'
   s.add_dependency 'spree_wallet', '~> 2.0.3'
   s.add_dependency 'delayed_job_active_record', '~> 4.0.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_unified_payment
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Manish Kangia
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-27 00:00:00 Z
+date: 2014-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
 - Gemfile
 - LICENSE
 - README.md
+- Rakefile
 - Versionfile
 - app/assets/javascripts/admin/spree_unified_payment.js
 - app/assets/stylesheets/store/spree_unified_payment.css
@@ -112,10 +113,12 @@ files:
 - app/models/spree/user_decorator.rb
 - app/models/unified_payment/transaction_decorator.rb
 - app/overrides/add_unified_tabs_to_admin_menu.rb
+- app/overrides/add_user_view_link_for_transactions.rb
 - app/views/spree/admin/unified_payments/index.html.erb
 - app/views/spree/admin/unified_payments/query_gateway.js.erb
 - app/views/spree/admin/unified_payments/receipt.html.erb
 - app/views/spree/checkout/payment/_unifiedpaymentmethod.html.erb
+- app/views/spree/shared/_unified_payments_link.html.erb
 - app/views/spree/transaction_notification_mailer/send_mail.html.erb
 - app/views/spree/unified_payments/approved.html.erb
 - app/views/spree/unified_payments/canceled.html.erb
@@ -127,6 +130,7 @@ files:
 - app/views/spree/unified_payments/new.js.erb
 - config/initializers/constants.rb
 - config/routes.rb
+- db/migrate/20131101092408_add_unified_payment_transactions.rb
 - db/migrate/20140120075553_add_transaction_fields_to_unified_payment_transactions.rb
 - db/migrate/20140120081453_add_unified_transaction_id_to_spree_store_credits.rb
 - lib/generators/spree_unified_payment/install/install_generator.rb