spree_unified_payment 1.1.0 → 1.1.1

data/Gemfile

@@ -11,7 +11,7 @@ gem 'spree_auth_devise', github: 'spree/spree_auth_devise', :branch => '2-1-stab
 
 gem 'spree_wallet', :git => 'git://github.com/vinsol/spree_wallet.git', tag: '2.1.0'
 
-gem 'unified_payment', github: 'vinsol/Unified-Payments', branch: 'upgrade_rails4'
+gem 'unified_payment', github: 'vinsol/Unified-Payments', tag: '1.1.0'
 
 gem 'delayed_job_active_record', :tag => 'v4.0.0'
 

data/README.md

@@ -23,7 +23,7 @@ Set Up
 
 Add To Gemfile:
 ```ruby
-gem 'spree_unified_payment', '1.1.0'
+gem 'spree_unified_payment', '1.1.1'
 ```
 For Spree 2.0:
 ```ruby

data/Versionfile

@@ -10,4 +10,4 @@
 # '0.40.x' => { :tag => 'v1.0.0', :version => '1.0.0' }
 
 "2.0.x" => { :tag => '1.0.2' }
-"2.1.x" => { :tag => '1.1.0' }
+"2.1.x" => { :tag => '1.1.1' }

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

@@ -1,3 +1,4 @@
+//= require jquery.ui.dialog.js
 $(document).ready(function() {
   click_on_overlay = function(pop_up_div) {
     $('div.ui-widget-overlay').on('click', function(){
@@ -13,7 +14,7 @@ $(document).ready(function() {
           autoOpen: false,
           modal: true,
           width:700,
-          closeText: "X",
+          closeText: "",
           dialogClass:"quick_view_container",
           close: function(event, ui) {
             pop_up_div.remove();

data/app/controllers/spree/admin/unified_payments_controller.rb

@@ -5,6 +5,10 @@ module Spree
       
       before_filter :load_transactions, :only => [:query_gateway, :receipt]
 
+      def model_class
+        UnifiedPayment::Transaction
+      end
+      
       def index
         params[:q] ||= {}
         @search = UnifiedPayment::Transaction.order('updated_at desc').ransack(params[:q])
@@ -13,8 +17,11 @@ module Spree
 
       def receipt
         @order = @card_transaction.order
-        doc = Nokogiri::XML(@card_transaction.xml_response)
-        @message = Hash.from_xml(doc.to_xml)['Message']
+        @xml_response = @card_transaction.xml_response
+        if @xml_response.include?('<Message')
+          doc = Nokogiri::XML(@card_transaction.xml_response)
+          @message = Hash.from_xml(doc.to_xml)['Message']
+        end
         render :layout => false
       end
 

data/app/overrides/add_unified_tabs_to_admin_menu.rb

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

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

@@ -1,20 +1,24 @@
 <div class="logo-container">
     <%= image_tag(Spree::Config[:admin_interface_logo], :id => 'logo') %>
-</div>  
-<h1>Receipt:</h1>
-<table border="0" cellpadding="5" cellspacing="0">
-  <% mail_content_hash_for_unified(@message, @card_transaction).each_pair do |key, value| %>
-  <tr>
-    <td><%= key.to_s.split('_').inject([]) { |r,s| r += [s.capitalize] }.join(' ') %></td>
-    <td><%= value.to_s %></td>
-  </tr>
-  <% end %>
-  <tr>
-    <td>Order Description</td>
-    <% if @order.line_items.count == 1 %>
-      <td>Payment for <%= @order.line_items.first.product.name + " at #{Spree::Config[:site_name]}"%></td>
-    <% else %>
-      <td>Payment for <%= @order.line_items.count.to_s + " products at #{Spree::Config[:site_name]}"%></td>
+</div>
+<% if @message %>
+  <h1>Receipt:</h1>
+  <table border="0" cellpadding="5" cellspacing="0">
+    <% mail_content_hash_for_unified(@message, @card_transaction).each_pair do |key, value| %>
+    <tr>
+      <td><%= key.to_s.split('_').inject([]) { |r,s| r += [s.capitalize] }.join(' ') %></td>
+      <td><%= value.to_s %></td>
+    </tr>
     <% end %>
-  </tr>
-</table>
+    <tr>
+      <td>Order Description</td>
+      <% if @order.line_items.count == 1 %>
+        <td>Payment for <%= @order.line_items.first.product.name + " at #{Spree::Config[:site_name]}"%></td>
+      <% else %>
+        <td>Payment for <%= @order.line_items.count.to_s + " products at #{Spree::Config[:site_name]}"%></td>
+      <% end %>
+    </tr>
+  </table>
+<% else %>
+  <p>No Receipt for this transaction</p>
+<% end %>

data/config/routes.rb

@@ -3,18 +3,12 @@ Spree::Core::Engine.routes.draw do
   get '/unified_payments/new' => "unified_payments#new", as: :new_unified_transaction
   post '/unified_payments/create' => "unified_payments#create", as: :create_unified_transaction
   post '/unified_payments/canceled' => "unified_payments#canceled", as: :canceled_unified_payments
-  get '/unified_payments/declined' => "unified_payments#declined", as: :declined_unified_payments
+  post '/unified_payments/declined' => "unified_payments#declined", as: :declined_unified_payments
   post '/unified_payments/approved' => "unified_payments#approved", as: :approved_unified_payments
   
   get 'admin/unified_payments' => "admin/unified_payments#index"
-  get 'admin/unified_payments/receipt/:transaction_id' => "admin/unified_payments#receipt", as: :unified_payments_receipt
-  post 'admin/unified_payments/query_gateway' => "admin/unified_payments#query_gateway", as: :unified_payments_query_gateway
+  get 'admin/unified_payments/receipt/:transaction_id' => "admin/unified_payments#receipt", as: :admin_unified_payments_receipt
+  post 'admin/unified_payments/query_gateway' => "admin/unified_payments#query_gateway", as: :admin_unified_payments_query_gateway
   
-  #for test
-  #[TODO]:uncomment this later 
-  # get '/unified_payments/declined', :to => redirect{ |p, request| '/' }
-  
-  #[TODO]:remove this later
-  # get '/unified_payments/approved', :to => "unified_payments#approved"
-  # get '/unified_payments/canceled', :to => "unified_payments#canceled"
+  get '/unified_payments/declined', :to => redirect{ |p, request| '/' }  
 end

data/spec/controllers/spree/admin/unified_payments_controller_spec.rb

@@ -18,6 +18,8 @@ describe Spree::Admin::UnifiedPaymentsController do
     card_transaction.stub(:order).and_return(order)
   end
 
+  it { controller.model_class.should eq(UnifiedPayment::Transaction) }
+
   describe '#index' do
     def send_request(params = {})
       get :index, params.merge!(:use_route => 'spree', :page => 0)

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.1.0"
+  s.version   = "1.1.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.1.0')
-  s.add_dependency 'unified_payment', '1.0.2'
+  s.add_dependency 'unified_payment', '1.1.0'
   s.add_dependency 'spree_wallet', '~> 2.1.0'
   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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Manish Kangia
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-28 00:00:00 Z
+date: 2014-03-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
@@ -45,9 +45,9 @@ dependencies:
         hash: 19
         segments: 
         - 1
+        - 1
         - 0
-        - 2
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - 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/payments/source_views/_unifiedpaymentmethod.html.erb
 - 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