merged spree-contrib#180

app/models/spree/gateway/pay_pal_express.rb

@@ -29,15 +29,62 @@ def provider
     def auto_capture?
       true
     end
+
+    # https://github.com/spree-contrib/better_spree_paypal_express/pull/180/files
+    #
+    #this is essentially the refund method below except the creation of the refund transaction
+    #as that will count doubly towards the "credited" amount
+    def void(response_code, gateway_options={})
+      payment = Spree::Payment.find_by_response_code(response_code)
+      amount = payment.credit_allowed
 
-    def cancel(response)
-      #noop
+      #in case a partially refunded payment gets cancelled/voided, we don't want to act on the refunded payments
+      if amount.to_f > 0
+
+        # Process the refund
+        refund_type = payment.amount == amount.to_f ? "Full" : "Partial"
+
+        refund_transaction = provider.build_refund_transaction({
+          :TransactionID => payment.source.transaction_id,
+          :RefundType => refund_type,
+          :Amount => {
+            :currencyID => payment.currency,
+            :value => amount },
+            :RefundSource => "any" })
+
+        refund_transaction_response = provider.refund_transaction(refund_transaction)
+
+        if refund_transaction_response.success?
+          payment.source.update_attributes({
+            :refunded_at => Time.now,
+            :refund_transaction_id => refund_transaction_response.RefundTransactionID,
+            :state => "refunded",
+            :refund_type => refund_type
+          })
+          empty_success
+        else
+          class << refund_transaction_response
+            def to_s
+              errors.map(&:long_message).join(" ")
+            end
+          end
+          refund_transaction_response
+        end
+      end
+
+      empty_success
+    end
+
+    #cancellations also work for a partially refunded payment
+    def cancel(response_code)
+      void(response_code, {})
     end    
 
     def method_type
       'paypal'
     end
 
+    # https://github.com/spree-contrib/better_spree_paypal_express/pull/180/files
     def purchase(amount, express_checkout, gateway_options={})
       pp_details_request = provider.build_get_express_checkout_details({
         :Token => express_checkout.token
@@ -59,11 +106,12 @@ def purchase(amount, express_checkout, gateway_options={})
         # This is mainly so we can use it later on to refund the payment if the user wishes.
         transaction_id = pp_response.do_express_checkout_payment_response_details.payment_info.first.transaction_id
         express_checkout.update_column(:transaction_id, transaction_id)
-        # This is rather hackish, required for payment/processing handle_response code.
-        Class.new do
-          def success?; true; end
-          def authorization; nil; end
-        end.new
+
+        #"order_id: The Order’s number attribute, plus the identifier for each payment, generated when the payment is first created"
+        payment = Spree::Payment.find_by_number(gateway_options[:order_id].split('-').last)
+        payment.update_attribute(:response_code, transaction_id)
+
+        empty_success
       else
         class << pp_response
           def to_s
@@ -72,7 +120,43 @@ def to_s
         end
         pp_response
       end
-    end
+    end    
+
+    # def purchase(amount, express_checkout, gateway_options={})
+    #   pp_details_request = provider.build_get_express_checkout_details({
+    #     :Token => express_checkout.token
+    #   })
+    #   pp_details_response = provider.get_express_checkout_details(pp_details_request)
+
+    #   pp_request = provider.build_do_express_checkout_payment({
+    #     :DoExpressCheckoutPaymentRequestDetails => {
+    #       :PaymentAction => "Sale",
+    #       :Token => express_checkout.token,
+    #       :PayerID => express_checkout.payer_id,
+    #       :PaymentDetails => pp_details_response.get_express_checkout_details_response_details.PaymentDetails
+    #     }
+    #   })
+
+    #   pp_response = provider.do_express_checkout_payment(pp_request)
+    #   if pp_response.success?
+    #     # We need to store the transaction id for the future.
+    #     # This is mainly so we can use it later on to refund the payment if the user wishes.
+    #     transaction_id = pp_response.do_express_checkout_payment_response_details.payment_info.first.transaction_id
+    #     express_checkout.update_column(:transaction_id, transaction_id)
+    #     # This is rather hackish, required for payment/processing handle_response code.
+    #     Class.new do
+    #       def success?; true; end
+    #       def authorization; nil; end
+    #     end.new
+    #   else
+    #     class << pp_response
+    #       def to_s
+    #         errors.map(&:long_message).join(" ")
+    #       end
+    #     end
+    #     pp_response
+    #   end
+    # end
 
     def refund(payment, amount)
       refund_type = payment.amount == amount.to_f ? "Full" : "Partial"