spree_paypal_rest 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1865d63b26deae7c342e7376af9a4e779544489
-  data.tar.gz: 26e6b21025c41397eea41594e3605e2607696488
+  metadata.gz: 27c526b59dbe7e1615d629527778f61edfd4209b
+  data.tar.gz: 03e3fa2fe2797fce9e5a3d5ede579539b5e73d83
 SHA512:
-  metadata.gz: 70a7191ac74db8576415841cf51c37c05239b77d14b292baaf0975c85e2c444f9176f4f3ec2f6850af253cebdf41437e0f83f6723e95dfff37319b4745e5d3e8
-  data.tar.gz: 14050002b7ce7d5930e619d4abbbc88e38639c0832dcdc98259e5bb56cb8a0d258257dd7fd0e8115ba40cbbd990615c2c8cc53806b368952f0ff05aa2d85427a
+  metadata.gz: 3eb54bd0178073a50b539c4f13a103d7550ed947731fde72535d4e3922ddd24ef84a3a72aee397a105fb2350dc1bd5c2e36c85512586a4e908d39e2af87d9b0a
+  data.tar.gz: f885102dd498bca45ac6699b6fb79fc41d5862c48bf011566c9b1d8f3ae85d98c62c5b7903b7cc508cecfa72752bbb0b41231c6ef82876436fd7be593d3ad608

data/README.md

@@ -1,13 +1,17 @@
 # Spree Paypal REST
+[![Gem Version](https://badge.fury.io/rb/spree_paypal_rest.svg)](https://badge.fury.io/rb/spree_paypal_rest)
+[![Build Status](https://travis-ci.org/hugomarquez/spree_paypal_rest.svg?branch=master)](https://travis-ci.org/hugomarquez/spree_paypal_rest)
+[![Coverage Status](https://coveralls.io/repos/github/hugomarquez/spree_paypal_rest/badge.svg?branch=master)](https://coveralls.io/github/hugomarquez/spree_paypal_rest?branch=master)
+
+
+This is a Paypal REST SDK extension for Spree.
 
-This is a Paypal REST SDK extension for Spree
 Behind the scenes, this extension uses [Paypal Ruby SDK](https://github.com/paypal/PayPal-Ruby-SDK).
 
 ### Why?
 * The Official [Spree Paypal Express](https://github.com/spree-contrib/better_spree_paypal_express) extension for Spree latest update was a year ago.
 * Braintree is not available in some countries.
-* Support for latest stable Spree release 3.1
-* 
+* Support for Spree latest stable release 3.1
 
 ## Features
 * Paypal Express Checkout/Payment Experience API integration.
@@ -19,7 +23,7 @@ Behind the scenes, this extension uses [Paypal Ruby SDK](https://github.com/payp
 Before installing this extension please follow Spree installation Guide.
     
     cd my_project
-    echo "gem 'spree_paypal_rest', '0.0.1'" >> Gemfile
+    echo "gem 'spree_paypal_rest', '1.0.0'" >> Gemfile
     bundle
     rails g spree_paypal_rest:install
     rails server
@@ -59,16 +63,15 @@ Then enter the following information for your paypal **Business** Account:
 * [Payments API](https://developer.paypal.com/docs/api/payments/)
 
 ## TO-DO
-* Refund action in Spree::Gateway::PaypalExpress.
-* Cancel action in Spree::Gateway::PaypalExpress.
 * Internationalization.
-* More testing and specs always welcome.
+* More testing.
 * Follow Spree versioning style.
+* Add store return and cancel url paths for PaypalPayment#payment_payload
 
 
 ## Contributing
 
-In the spirit of [free software](1), **everyone** is encouraged to help improve this project.
+In the spirit of free software, **everyone** is encouraged to help improve this project.
 
 Here are some ways *you* can contribute:
 
@@ -91,7 +94,6 @@ Starting point:
 * Ensure specs pass by running `bundle exec rspec spec`
 * Submit your pull request
 
-[1]: http://www.fsf.org/licensing/essays/free-sw.html
 [2]: https://github.com/spree/better_spree_paypal_express/issues
 
 ## License

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -20,14 +20,23 @@ module Spree
       paypal_checkout = Spree::PaypalRestCheckout.new(
         token: params[:token],
         payer_id: params[:PayerID],
-        transaction_id: params[:paymentId],
+        payment_id: params[:paymentId],
         state: params[:state]
       )
-      @order.payments.create!({
-        source: paypal_checkout,
-        amount: @order.total,
-        payment_method: @order.payments.last.payment_method
-      })
+
+      payment = @order.payments.last
+      
+      if payment.present?
+        if payment.payment_method.kind_of?(Spree::Gateway::PaypalExpress)
+          payment.update!({source: paypal_checkout})
+        end
+      else
+        @order.payments.create!({
+          source: paypal_checkout,
+          amount: @order.total,
+          payment_method: @order.payments.last.payment_method
+        })
+      end
 
       until @order.state == "complete"
         if @order.next!

data/app/models/spree/gateway/paypal_express.rb

@@ -13,6 +13,7 @@ module Spree
     preference :profile_name,       :string
     preference :logo_url,           :string, default: 'https://www.paypalobjects.com/webstatic/en_US/i/btn/png/blue-rect-paypal-60px.png'
 
+    # Force auto_capture
     alias_method :purchase, :authorize
 
     def source_required?
@@ -33,18 +34,45 @@ module Spree
     end
 
     def purchase(amount, source, options)
-      response = payment_source_class.find(source.transaction_id)
-      source.update(state: response.state)
-      case response.state
-      when 'created'
-        ActiveMerchant::Billing::Response.new(true, 'success', {}, {})
-      when 'failed'
-        ActiveMerchant::Billing::Response.new(true, 'failed', {}, {})
+      payment = payment_source_class.find(source.payment_id)
+      executed_payment = payment.execute(payer_id: source.payer_id)
+      source.update(state: payment.state)
+      if executed_payment
+        sale_id = payment.transactions.first.related_resources.first.sale.id
+        source.update(sale_id: sale_id)
+        ActiveMerchant::Billing::Response.new(true, 'Success', payment.to_hash, options)
+      else
+        ActiveMerchant::Billing::Response.new(false, payment.error.message, payment.to_hash, options)
       end
     end
 
-    def refund(order)
-      # TODO
+    def refund(amount, source, options)
+      provider
+      payment = payment_source_class.find(source.payment_id)
+      sale_id = payment.transactions.first.related_resources.first.sale.id
+      sale = PayPal::SDK::REST::Sale.find(sale_id)
+      paypal_refund = sale.refund_request({
+        amount:{
+          total: amount,
+          currency: options[:currency]
+        }
+      })
+      if paypal_refund.success?
+        refund_type = payment.amount == amount.to_f ? 'Full' : 'Partial'
+        source.update(
+          refund_id: paypal_refund.id,
+          refund_type: refund_type,
+          refunded_at: paypal_refund.create_time
+        )
+        ActiveMerchant::Billing::Response.new(true, 'Refund Successful', paypal_refund.to_hash, options)
+      else
+        ActiveMerchant::Billing::Response.new(false, paypal_refund.error.message, paypal_refund.to_hash, options)
+      end
+    end
+
+    def cancel(spree_payment_id)
+      spree_payment = Spree::Payment.find(spree_payment_id)
+      refund(spree_payment.amount, spree_payment.source, {currency: spree_payment.currency})
     end
 
     def profile_options
@@ -59,6 +87,5 @@ module Spree
         temporary: preferred_temporary
       }
     end
-
   end
 end

data/app/models/spree/gateway/paypal_payment.rb

@@ -14,9 +14,9 @@ module Spree
         payer:{
           payment_method: 'paypal',
           payer_info:{
-            first_name: order.user.billing_address.first_name,
-            last_name: order.user.billing_address.last_name,
-            email: order.user.email,
+            first_name: order.billing_address.first_name,
+            last_name: order.billing_address.last_name,
+            email: order.email,
             billing_address: billing_address(order)
           }
         },

data/app/models/spree/payment/processing_decorator.rb

@@ -0,0 +1,15 @@
+module Spree
+  Payment::Processing.module_eval do 
+    
+    def cancel!
+      if payment_method.kind_of?(Spree::Gateway::PaypalExpress)
+        response = payment_method.cancel(id)
+        handle_response(response, :void, :failure)
+      else
+        response = payment_method.cancel(response_code)
+        handle_response(response, :void, :failure)
+      end
+    end
+
+  end
+end

data/app/views/spree/admin/payments/source_views/_paypal_express.html.erb

@@ -1,33 +1,19 @@
 <fieldset>
-  <legend>Paypal Express Checkout </legend>
+  <h3><%= Spree.t(:paypal_express_checkout) %></h3>
 
-  <table class="index">
+  <table class="table table-condensed">
     <tr>
-      <th colspan="6">Transaction</th>
+      <th><label><%= Spree.t(:paypal_state) %></label></th>
+      <th><label><%= Spree.t(:token) %></label></th>
+      <th><label><%= Spree.t(:paypal_payer_id) %></label></th>
+      <th><label><%= Spree.t(:paypal_payment_id) %></label></th>
     </tr>
     <tr>
-      <td>State: </td>
-      <td>
-        <%= payment.source.state %>
-      </td>
-    </tr>
-    <tr>
-      <td><label>Token: </label></td>
-      <td>
-        <%= payment.source.token %>
-      </td>
-    </tr>
-    <tr>
-      <td><label>Payer Id: </label></td>
-      <td>
-        <%= payment.source.payer_id %>
-      </td>
-    </tr>
-    <tr>
-      <td><label>Transaction Id: </label></td>
-      <td>
-        <%= payment.source.transaction_id %>
-      </td>
+      <td><%= payment.source.state %></td>
+      <td><%= payment.source.token %></td>
+      <td><%= payment.source.payer_id %></td>
+      <td><%= payment.source.payment_id %></td>
     </tr>
   </table>
+
 </fieldset>

data/app/views/spree/checkout/payment/_paypal_express.html.erb

@@ -1,3 +1,4 @@
 <div class="well clearfix">
-  <p class="field">Paypal translation of instructions here...</p>
+  <p><%= Spree.t(:paypal_information) %></p>
+  <%= image_tag payment_method.preferred_logo_url %>
 </div>

data/config/locales/en.yml

@@ -0,0 +1,15 @@
+---
+en:
+  spree:
+    payment_has_been_cancelled: The payment has been cancelled.
+    complete_checkout: Please complete Paypal Express Checkout before continuing
+    paypal_express_checkout: Paypal Express Checkout
+    paypal_transaction: Transaction
+    paypal_state: Payment Status
+    paypal_token: Token
+    paypal_payer_id: Payer ID
+    paypal_payment_id: Transaction ID
+    paypal_refund_id: Refund ID
+    paypal_refund_type: Refund Type
+    paypal_refunded_at: Refunded At
+    paypal_information: PayPal is an easy and secure payment method that allows you to shop on websites and applications around the world without having to share your credit card details.

data/db/migrate/20161212151705_create_spree_paypal_rest_checkouts.rb

@@ -3,11 +3,12 @@ class CreateSpreePaypalRestCheckouts < ActiveRecord::Migration
     create_table :spree_paypal_rest_checkouts do |t|
       t.string    :token
       t.string    :payer_id 
-      t.string    :transaction_id,  index: true
+      t.string    :payment_id,      index: true
       t.string    :refund_id,       index: true
       t.string    :web_profile_id
       t.string    :refund_type
       t.string    :state
+      t.string    :sale_id,         index: true
       t.datetime  :refunded_at
       t.timestamps null: false
     end

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

@@ -0,0 +1,21 @@
+module SpreePaypalRest
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      class_option :auto_run_migrations, type: :boolean, default: false
+
+      def add_migrations
+        run 'bundle exec rake railties:install:migrations FROM=spree_paypal_rest'
+      end
+
+      def run_migrations
+        run_migrations = options[:auto_run_migrations] || ['', 'y', 'Y'].include?(ask('Would you like to run the migrations now? [Y/n]'))
+        if run_migrations
+          run 'bundle exec rake db:migrate'
+        else
+          puts 'Skipping rake db:migrate, don\'t forget to run it!'
+        end
+      end
+
+    end
+  end
+end

data/lib/spree_paypal_rest/version.rb

@@ -1,3 +1,3 @@
 module SpreePaypalRest
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_paypal_rest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - hugomarquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,12 +191,15 @@ files:
 - app/models/spree/gateway/paypal_payment.rb
 - app/models/spree/gateway/paypal_rest_base.rb
 - app/models/spree/gateway/paypal_web_profile.rb
+- app/models/spree/payment/processing_decorator.rb
 - app/models/spree/paypal_rest_checkout.rb
 - app/views/spree/admin/payments/source_forms/_paypal_express.html.erb
 - app/views/spree/admin/payments/source_views/_paypal_express.html.erb
 - app/views/spree/checkout/payment/_paypal_express.html.erb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20161212151705_create_spree_paypal_rest_checkouts.rb
+- lib/generators/spree_paypal_rest/install/install_generator.rb
 - lib/spree_paypal_rest.rb
 - lib/spree_paypal_rest/engine.rb
 - lib/spree_paypal_rest/version.rb