nimbleshop_paypalwp 0.0.10 → 0.0.11

data/app/controllers/nimbleshop_paypalwp/paypalwps_controller.rb

@@ -1,6 +1,6 @@
 module NimbleshopPaypalwp
 
-  # this line makes it possible to use this gem without nimbleshop_core
+  # Following line makes it possible to use this gem without nimbleshop_core
   klass = defined?(::Admin::PaymentMethodsController) ? ::Admin::PaymentMethodsController : ActionController::Base
 
   class PaypalwpsController < klass
@@ -13,40 +13,23 @@ module NimbleshopPaypalwp
       processor = NimbleshopPaypalwp::Processor.new(raw_post: request.raw_post)
       order = processor.order
 
-      # Since IPN can send notification multiple times check if the order has already been set to purchased status
-      unless order.purchased?
-        processor.order.update_attributes(payment_method: NimbleshopPaypalwp::Paypalwp.first)
-        processor.purchase
-      end
+      # order is already in purchased state. Seems like IPN is sending duplicate notification
+      processor.purchase unless order.purchased?
 
       render nothing: true
     end
 
     def update
-      respond_to do |format|
-        if @payment_method.update_attributes(post_params[:paypalwp])
-          format.js  {
-            flash[:notice] = 'Paypal record was successfully updated'
-            render js: "window.location = '/admin/payment_methods'"
-          }
-        else
-          msg =  @payment_method.errors.full_messages.first
-          error =  %Q[alert("#{msg}")]
-          format.js { render js: error }
-        end
-      end
-    end
+      alert_msg = if @payment_method.update_attributes(post_params[:paypalwp])
+                    msg = "Record has been updated"
+                    %Q[alert("#{msg}")]
+                  else
+                    msg =  @payment_method.errors.full_messages.first
+                    %Q[alert("#{msg}")]
+                  end
 
-    def destroy
       respond_to do |format|
-        if @payment_method.destroy
-          format.js {
-            flash[:notice] = 'Paypal record was successfully deleted'
-            render js: "window.location = '/admin/payment_methods'"
-          }
-        else
-          format.js { render js: 'Paypal record could not be deleted. Please try again later.' }
-        end
+        format.js { render js: alert_msg }
       end
     end
 

data/app/helpers/nimbleshop_paypalwp/exposed_helper.rb

@@ -39,6 +39,8 @@ module NimbleshopPaypalwp
       service.notify_url         nimbleshop_paypalwp_notify_url
       service.return_url         nimbleshop_paypalwp_return_url(order)
       service.cancel_return_url  nimbleshop_paypalwp_cancel_url(order)
+
+      Rails.logger.debug "service attributes: #{service.inspect}"
     end
 
     def nimbleshop_paypalwp_crud_form
@@ -65,6 +67,7 @@ module NimbleshopPaypalwp
     end
 
     def nimbleshop_paypalwp_protocol
+      # TODO do not hardcode decision based on env
       NimbleshopPaypalwp::Paypalwp.first.mode == 'production' ? 'https' : 'http'
     end
 

data/app/models/nimbleshop_paypalwp/paypalwp.rb

@@ -9,6 +9,10 @@ module NimbleshopPaypalwp
 
     before_validation :strip_attributes
 
+    def test_mode?
+      self.mode == 'test'
+    end
+
     private
 
     def set_mode

data/app/views/nimbleshop_paypalwp/paypalwps/_edit.html.erb

@@ -1,32 +1,41 @@
-<div class='payment-method-engine-well'>
+<% payment_method = NimbleshopPaypalwp::Paypalwp.first %>
 
-   <div>
-    <h2>Paypal websites payment standard</h2>
-    <div class="edit_link">
-      <%= link_to 'Edit', '#', class: 'nimbleshop-payment-method-edit', id: 'nimbleshop-paypalwp-payment-method-edit' %>
+<%= content_tag :div, style: 'display:none', data: { behavior: "payment-method-form-#{payment_method.permalink}" } do %>
 
-      <%= link_to nimbleshop_paypalwp.paypalwp_path, class: 'nimbleshop-payment-method-delete',
-                                                      confirm: 'Do you really want to delete Paypal payment method', method: :delete, remote: true do %>
-          <i class='icon-remove icon-white'></i>
-      <% end %>
-    </div>
+  <div style="width:100px;margin-left:50px;"> <%= nimbleshop_paypalwp_picture_on_admin_payment_methods %> </div>
+  <br />
+
+  <%= form_for payment_method,  url: '/nimbleshop_paypalwp/paypalwp',
+                                                      remote: true,
+                                                      html: { method: 'put',
+                                                              id: 'nimbleshop-paypalwp-form',
+                                                              class: 'nimbleshop-payment-method-form form-horizontal'} do |f| %>
 
-    <%= nimbleshop_paypalwp_picture_on_admin_payment_methods %>
 
-    <div class='clear'></div>
-   </div>
+    <fieldset>
 
-  <%= render partial: '/nimbleshop_paypalwp/paypalwps/form' %>
-</div>
+      <div class="control-group">
+        <%= f.label :merchant_email, nil, class: 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :merchant_email, class: 'span6' %>
+        </div>
+      </div>
 
-<script>
-  $(function(){
+      <div class="control-group">
+        <div class="controls">
+          <label class='checkbox'>
+            <%= f.check_box :mode, {}, 'test', 'production' %> Enable sandbox mode
+          </label>
+        </div>
+      </div>
 
-    $('#nimbleshop-paypalwp-payment-method-edit').toggle(function(){
-      $('#nimbleshop-paypalwp-form-well').show();
-    }, function(){
-      $('#nimbleshop-paypalwp-form-well').hide();
-    });
+    </fieldset>
+
+    <div class="form-actions">
+      <%= f.submit('Submit', class: 'btn btn-primary') %>
+      &nbsp;
+      <%= link_to 'Disable', main_app.disable_admin_payment_method_path(payment_method), class: 'disable-payment-method-link', method: :put %>
+    </div>
+  <% end %>
 
-  })
-</script>
+<% end %>

data/lib/nimbleshop_paypalwp/processor.rb

@@ -1,29 +1,23 @@
 module NimbleshopPaypalwp
   class Processor < Processor::Base
 
-    attr_reader :order, :payment_method
+    attr_reader :order, :payment_method, :notify
 
     def initialize(options = {})
-      @paypal_ipn = paypal_ipn(options[:raw_post])
-      @order = Order.find_by_number!(@paypal_ipn.invoice)
+      options.symbolize_keys!
+      options.assert_valid_keys :raw_post
+      raw_post = options.fetch :raw_post
+
+      @notify = ActiveMerchant::Billing::Integrations::Paypal::Notification.new raw_post
+      @order = Order.find_by_number! notify.invoice
       @payment_method = NimbleshopPaypalwp::Paypalwp.first
     end
 
     private
 
-    def paypal_ipn(raw_post)
-      # ActiveMerchant::Billing::Integrations::Paypal::Notification is a subclass of
-      # ActiveMerchant::Billing::Integrations::Notification
-      #
-      # And ActiveMerchant::Billing::Integrations::Notification dependds on money gem
-      ActiveMerchant::Billing::Integrations::Paypal::Notification.new(raw_post)
-    end
-
     def do_capture(options = {})
-      success = amount_match?
-      record_transaction('captured', success: success)
-
-      if success
+      if success = ipn_from_paypal?
+        record_transaction 'captured'
         order.update_attributes(purchased_at: purchased_at, payment_method: payment_method)
         order.kapture
       end
@@ -32,10 +26,8 @@ module NimbleshopPaypalwp
     end
 
     def do_authorize(options = {})
-      success = amount_match?
-      record_transaction('authorized', success: success)
-
-      if success
+      if success = ipn_from_paypal?
+        record_transaction 'authorized'
         order.update_attributes(purchased_at: purchased_at, payment_method: payment_method)
         order.authorize
       end
@@ -47,32 +39,59 @@ module NimbleshopPaypalwp
     end
 
     def do_purchase(options = {})
-      success = amount_match?
-      record_transaction('purchased', success: success)
-
-      if success
-        order.update_attributes(purchased_at: @paypal_ipn.received_at, payment_method: payment_method)
+      if success = ipn_from_paypal?
+        record_transaction 'purchased'
+        order.update_attributes(purchased_at: notify.received_at, payment_method: payment_method)
         order.purchase
       end
 
       success
     end
 
-
     def record_transaction(operation, options = {})
-      order.payment_transactions.create(options.merge(amount: @paypal_ipn.amount.cents,
-                                                      params: { ipn: @paypal_ipn.raw },
-                                                      transaction_gid: @paypal_ipn.transaction_id,
+      order.payment_transactions.create(options.merge(amount: notify.amount.cents,
+                                                      params: { ipn: notify.raw },
+                                                      transaction_gid: notify.transaction_id,
                                                       operation: operation))
+    end
+
+    def ipn_from_paypal?
+      # this is needed because the intergration mode was being reset in development
+      ActiveMerchant::Billing::Base.integration_mode = payment_method.mode.intern
+
+      result = amount_match? && notify_complete && business_email_match? && notify_acknowledge
+      Rails.logger.debug "ipn_from_paypal? : #{result}"
+      result
+    end
+
+    def notify_complete
+      result = notify.complete?
+      Rails.logger.debug "notify.complete? : #{result}"
+      result
+    end
+
+    def notify_acknowledge
+      result = Rails.env.test? ? true : notify.acknowledge
+      Rails.logger.debug "notify_acknowledge : #{result}"
+      result
+    end
+
+    def business_email_match?
+      return true if Rails.env.test?
 
+      result = notify.account ==  payment_method.merchant_email
+      Rails.logger.debug "business_email_match? : #{result}"
+      result
     end
 
     def amount_match?
-      @paypal_ipn.amount.cents == order.total_amount_in_cents
+      result = notify.amount.cents == order.total_amount_in_cents
+      Rails.logger.debug "amount_match? : #{result}"
+      result
     end
 
     def purchased_at
-      Time.strptime(@paypal_ipn.params['payment_date'], "%H:%M:%S %b %d, %Y %z")
+      Time.strptime(notify.params['payment_date'], "%H:%M:%S %b %d, %Y %z")
     end
   end
 end

data/test/functional/paypalwps_controller_test.rb

@@ -0,0 +1,67 @@
+require 'test_helper'
+
+class PaypalwpsControllerTest < ActionController::TestCase
+
+  setup do
+    @controller = NimbleshopPaypalwp::PaypalwpsController.new
+    NimbleshopPaypalwp::Paypalwp.create!(name: 'Paypalwp', merchant_email: 'seller_1323037155_biz@bigbinary.com', description: 'this is description')
+    @order = create :order_paid_using_paypalwp
+  end
+
+  test "should accept notification request" do
+
+   hash = { "mc_gross" => "2.99",
+     "invoice"=> @order.number,
+     "item_mpn1"=>"",
+     "protection_eligibility"=>"Ineligible",
+     "item_count_unit1"=>"0",
+     "item_number1"=>"",
+     "tax"=>"0.04",
+     "payer_id"=>"8NMFURHRJBP94",
+     "payment_date"=>"05:50:35 Sep 27, 2012 PDT",
+     "item_tax_rate1"=>"0",
+     "payment_status"=>"Completed",
+     "charset"=>"windows-1252",
+     "mc_shipping"=>"0.00",
+     "item_tax_rate_double1"=>"0.00",
+     "mc_handling"=>"10.00",
+     "first_name"=>"Rashmi",
+     "mc_fee"=>"0.68",
+     "notify_version"=>"3.7",
+     "custom"=>"4",
+     "payer_status"=>"unverified",
+     "business"=>"seller_1323037155_biz@bigbinary.com",
+     "num_cart_items"=>"1",
+     "mc_handling1"=>"0.00",
+     "verify_sign"=>"A52WYOWQ5f6.ZWIwRWkmVwieCw2gAWuLNstA178r02lkMvIe5mnmEib8",
+     "payer_email"=>"hello@bigbinary.com",
+     "mc_shipping1"=>"0.00",
+     "item_style_number1"=>"",
+     "tax1"=>"0.00",
+     "item_plu1"=>"",
+     "txn_id"=>"90U719813N3473230",
+     "payment_type"=>"instant",
+     "last_name"=>"Singh",
+     "item_name1"=>"Hard wood case for iphone",
+     "receiver_email"=>"neeraj@bigbinary.com",
+     "item_isbn1"=>"",
+     "payment_fee"=>"0.68",
+     "quantity1"=>"1",
+     "receiver_id"=>"DS94AKELVSP6U",
+     "txn_type"=>"cart",
+     "item_model_number1"=>"",
+     "mc_gross_1"=>"3.00",
+     "mc_currency"=>"USD",
+     "item_taxable1"=>"N",
+     "residence_country"=>"US",
+     "transaction_subject"=>"4",
+     "payment_gross"=>"13.04",
+     "ipn_track_id"=>"841618d367692"}
+
+    post :notify, { use_route: :nimbleshop_paypalwp }.merge(hash)
+    @order.reload
+    assert @order.purchased?, "payment status is #{@order.payment_status}"
+  end
+
+end
+

data/test/unit/processor_test.rb

@@ -14,26 +14,23 @@ module Processor
       @order = create(:order)
     end
 
-    test "when authorization succeeds" do
+    test "when purchase succeeds" do
       processor = NimbleshopPaypalwp::Processor.new(raw_post: raw_post(@order.number, @order.total_amount))
-      playcasette('paypal/authorize-success') do
-        assert_equal true, processor.authorize
-      end
+      assert_equal true, processor.purchase
 
       @order.reload
 
       transaction = @order.payment_transactions.last
-      assert_equal 'authorized', transaction.operation
-      assert_equal true, transaction.success
-      assert_equal true, @order.authorized?
-      assert_equal "April 01, 2012 at 08:46 pm", @order.purchased_at.to_s(:long)
+      assert_equal 'purchased', transaction.operation
+      assert_equal true, @order.purchased?
+      assert_match /April 01, 2012/, @order.purchased_at.to_s(:long)
       assert_equal NimbleshopPaypalwp::Paypalwp.first, @order.payment_method
       assert_equal transaction.amount, @order.total_amount_in_cents
     end
 
-    test "when authorization fails" do
+    test "when purchase fails" do
       processor = NimbleshopPaypalwp::Processor.new(raw_post: raw_post(@order.number, 10.48))
-      assert_equal false, processor.authorize
+      assert_equal false, processor.purchase
       assert_nil @order.payment_method
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbleshop_paypalwp
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -75,7 +75,6 @@ files:
 - app/views/nimbleshop_paypalwp/payments/_new.html.erb
 - app/views/nimbleshop_paypalwp/payments/_order_show_extra_info.html.erb
 - app/views/nimbleshop_paypalwp/paypalwps/_edit.html.erb
-- app/views/nimbleshop_paypalwp/paypalwps/_form.html.erb
 - config/routes.rb
 - lib/nimbleshop_paypalwp/active_merchant/billing/integrations/paypal/helper.rb
 - lib/nimbleshop_paypalwp/engine.rb
@@ -84,6 +83,7 @@ files:
 - lib/tasks/nimbleshop_paypalwp_mock_ipn_callback.rake
 - lib/tasks/nimbleshop_paypalwp_tasks.rake
 - README.md
+- test/functional/paypalwps_controller_test.rb
 - test/test_helper.rb
 - test/unit/payment_method_test.rb
 - test/unit/processor_test.rb
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4510410604428150121
+      hash: -3466410436082107566
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4510410604428150121
+      hash: -3466410436082107566
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -118,6 +118,7 @@ signing_key:
 specification_version: 3
 summary: Paypal WPS extension for nimbleshop
 test_files:
+- test/functional/paypalwps_controller_test.rb
 - test/test_helper.rb
 - test/unit/payment_method_test.rb
 - test/unit/processor_test.rb

data/app/views/nimbleshop_paypalwp/paypalwps/_form.html.erb

@@ -1,36 +0,0 @@
-<div class='well nimbleshop-payment-method-form-well' id='nimbleshop-paypalwp-form-well',  style='display:none;'>
-
-  <%= form_for NimbleshopPaypalwp::Paypalwp.first,  url: '/nimbleshop_paypalwp/paypalwp',
-                                                      remote: true,
-                                                      html: { method: 'put',
-                                                              id: 'nimbleshop-paypalwp-form',
-                                                              class: 'nimbleshop-payment-method-form form-horizontal'} do |f| %>
-
-
-    <fieldset>
-
-      <div class="control-group">
-        <%= f.label :merchant_email, nil, class: 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :merchant_email, class: 'span6' %>
-        </div>
-      </div>
-
-      <div class="control-group">
-        <div class="controls">
-          <label class='checkbox'>
-            <%= f.check_box :mode, {}, 'test', 'production' %> Enable sandbox mode
-          </label>
-        </div>
-      </div>
-
-    </fieldset>
-
-    <div class="form-actions">
-      <%= f.submit('Submit', class: 'btn btn-primary') %>
-      &nbsp;
-      <%= link_to t(:cancel), nimbleshop_paypalwp.paypalwp_path, class: 'cancel btn' %>
-    </div>
-  <% end %>
-
-</div>