spree_paypal_api_checkout 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d58fd2ed0b683b5f83542c81c695d25ba58e05807ea20db5a3391b5dc58b36
-  data.tar.gz: 5f315cada65b5b7fc6bd0b5d20dfeefbeddea0fc02883119faddbc5eb960cf52
+  metadata.gz: 53c335900fbbe782e6fc7cfa78b36f258b514a9d9b9400cef65f7fb8c7cf69c7
+  data.tar.gz: 946f4fa867ded14d6c7f494df8d8e21377721b682df09fe7cffd312540268540
 SHA512:
-  metadata.gz: 59b562c5c96d4ac8deacf23aa16671364ea01bbef64f467a626a04c047260f7e31d2832e340040bf6e588d8c6f9278d68e61e5c4113c05a133cde94aeb742d27
-  data.tar.gz: b4ee8db0480d09a7bf2dc2be5ede7af6166128a54eed82367a7d95e94327c7b30affe17b67120b95f3c22c701f7ecbbc5166f877b5c0fd73dc3a33e35551fbde
+  metadata.gz: 0d1754cdff574bb9bbe6b798663c02686228ec3a0e7fe30281b87dea2264245d2f296e849ad44145282305766678b5956834a8a44f0ed17c38e6a644abeb0719
+  data.tar.gz: aef76e65dae6694919ddc17f3c290de2a49be957ac913a9a0ba4863bfe0f1a576d7a10c7e7fcce1a658e087c1b48786514f21c329354094024a124b961986801

data/README.md

@@ -4,7 +4,7 @@
 
 1. Add this extension to your Gemfile with this line:
         
-        gem 'spree_paypal_api_checkout', '~> 0.0.7'
+        gem 'spree_paypal_api_checkout', '~> 0.1.0'
 
 2. Install the gem using Bundler:
 

data/app/controllers/spree/paypal_checkout_controller.rb

@@ -8,25 +8,26 @@ module Spree
       additional_adjustments = order.all_adjustments.additional
       tax_adjustments = additional_adjustments.tax
       shipping_adjustments = additional_adjustments.shipping
+      promotion_adjustments = additional_adjustments.promotion
 
       additional_adjustments.eligible.each do |adjustment|
         # Because PayPal doesn't accept $0 items at all. See #10
         # https://cms.paypal.com/uk/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_api_ECCustomizing
         # "It can be a positive or negative value but not zero."
         next if adjustment.amount.zero?
-        next if tax_adjustments.include?(adjustment) || shipping_adjustments.include?(adjustment)
+        next if tax_adjustments.include?(adjustment) || shipping_adjustments.include?(adjustment) || promotion_adjustments.include?(adjustment)
 
         items << {
           name: adjustment.label,
           quantity: 1,
-          amount: {
+          unit_amount: {
             currency_code: order.currency,
             value: adjustment.amount
           }
         }
       end
 
-      pp_response = provider.create_order(order, express_checkout_request_details(order, items))
+      pp_response = provider.create_order(order, express_checkout_request_details(order: order, items: items, tax_adjustments: tax_adjustments, promotion_adjustments: promotion_adjustments))
 
       render json: pp_response
     end
@@ -48,15 +49,16 @@ module Spree
     def proceed
       order = current_order || raise(ActiveRecord::RecordNotFound)
       order.payments.last.source.update(transaction_id: params[:transaction_id])
+      order.payments.last.update(response_code: params[:transaction_id])
       order.next
+      path = checkout_state_path(order.state)
       if order.complete?
         flash.notice = Spree.t(:order_processed_successfully)
         flash[:order_completed] = true
         session[:order_id] = nil
-        redirect_to completion_route(order)
-      else
-        redirect_to checkout_state_path(order.state)
+        path = completion_route(order)
       end
+      render json: { redirect_to: path }
     end
 
     def cancel
@@ -70,31 +72,68 @@ module Spree
     def line_item(item)
       {
           name: item.product.name,
-          number: item.variant.sku,
+          sku: item.variant.sku,
           quantity: item.quantity,
-          amount: {
+          description: item.product.meta_description,
+          unit_amount: {
             currency_code: item.order.currency,
             value: item.price
           },
-          ItemCategory: "Physical"
+          item_category: "Physical"
       }
     end
 
-    def express_checkout_request_details order, items
+    def express_checkout_request_details order:, items:, tax_adjustments:, promotion_adjustments:
       {
         intent: 'CAPTURE',
         purchase_units: [
           {
             amount: {
               currency_code: current_order.currency,
-              value: order.total
+              value: order.total,
+              breakdown: {
+                item_total: {
+                  currency_code: current_order.currency,
+                  value: items.sum{|r| (r[:unit_amount][:value] * r[:quantity]) }
+                },
+                shipping: {
+                  currency_code: current_order.currency,
+                  value: current_order.shipments.sum(:cost)
+                },
+                tax_total: {
+                  currency_code: current_order.currency,
+                  value: tax_adjustments.sum(:amount)
+                },
+                discount: {
+                  currency_code: current_order.currency,
+                  value: promotion_adjustments.sum(:amount).abs
+                }
+              }
             },
-            item: items
+            items: items,
+            shipping: address_options
           },
         ]
       }
     end
 
+    def address_options
+      address = current_order.ship_address
+      {
+        name: { full_name: address.try(:full_name) },
+        address: {
+          address_line_1: address.address1,
+          address_line_2: address.address2,
+          # phone: address.phone,
+          admin_area_1: address.state_text,
+          admin_area_2: address.city,
+          country_code: address.country.iso,
+          postal_code: address.zipcode
+        },
+        type: 'SHIPPING'
+      }
+    end
+
     def payment_method
       Spree::PaymentMethod.find(params[:payment_method_id])
     end

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

@@ -20,28 +20,14 @@ module Spree
       'paypal_checkout'
     end
 
-    def generate_client_token
-      uri = URI.parse("https://#{preferred_server}/v1/identity/generate-token")
-      request = Net::HTTP::Post.new(uri)
-      request['Authorization'] = "Bearer #{generate_access_token}"
-      request.content_type = "application/json"
-
-      req_options = { use_ssl: uri.scheme == "https" }
-
-      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
-        response = http.request(request)
-      end
-      return response
-    end
-
     def generate_access_token
       uri = URI.parse("https://#{preferred_server}/v1/oauth2/token")
       request = Net::HTTP::Post.new(uri)
       request.basic_auth("#{preferred_api_key}", "#{preferred_secret_key}")
-      request.content_type = "application/json"
-      request.body = "grant_type=client_credentials"
+      request.content_type = 'application/json'
+      request.body = 'grant_type=client_credentials'
 
-      req_options = { use_ssl: uri.scheme == "https" }
+      req_options = { use_ssl: uri.scheme == 'https' }
 
       response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
         response = http.request(request)
@@ -49,46 +35,24 @@ module Spree
       return JSON.parse(response.read_body)['access_token']
     end
 
+    def generate_client_token
+      uri = URI.parse("https://#{preferred_server}/v1/identity/generate-token")
+      return post_response(uri)
+    end
+
     def create_order order, body
       uri = URI.parse("https://#{preferred_server}/v2/checkout/orders")
-      request = Net::HTTP::Post.new(uri)
-      request['Authorization'] = "Bearer #{generate_access_token}"
-      request.content_type = "application/json"
-
-      request.body = body.to_json
-      req_options = { use_ssl: uri.scheme == "https" }
-
-      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
-        response = http.request(request)
-      end
-      return JSON.parse(response.read_body)
+      return post_response(uri, body)
     end
 
     def capture_payment order_id
       uri = URI.parse("https://#{preferred_server}/v2/checkout/orders/#{order_id}/capture")
-      request = Net::HTTP::Post.new(uri)
-      request['Authorization'] = "Bearer #{generate_access_token}"
-      request.content_type = "application/json"
-      req_options = { use_ssl: uri.scheme == "https" }
-
-      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
-        response = http.request(request)
-      end
-      return JSON.parse(response.read_body)
+      return post_response(uri)
     end
 
     def refund_payment id, body
       uri = URI.parse("https://#{preferred_server}/v2/payments/captures/#{id}/refund")
-      request = Net::HTTP::Post.new(uri)
-      request['Authorization'] = "Bearer #{generate_access_token}"
-      request.body = body.to_json
-      request.content_type = "application/json"
-      req_options = { use_ssl: uri.scheme == "https" }
-
-      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
-        response = http.request(request)
-      end
-      return JSON.parse(response.read_body)
+      return post_response(uri, body)
     end
 
     def purchase(amount, express_checkout, gateway_options={})
@@ -134,6 +98,19 @@ module Spree
       end
       refund_transaction_response
     end
+
+    def post_response uri, body={}
+      request = Net::HTTP::Post.new(uri)
+      request['Authorization'] = "Bearer #{generate_access_token}"
+      request.content_type = 'application/json'
+      req_options = { use_ssl: uri.scheme == 'https' }
+
+      request.body = body.to_json if body.present?
+      response = Net::HTTP.start(uri.hostname, uri.port, req_options) do |http|
+        response = http.request(request)
+      end
+      return JSON.parse(response.read_body)
+    end
   end
 end
 

data/lib/spree_paypal_api_checkout/version.rb

@@ -1,3 +1,3 @@
 module SpreePaypalApiCheckout
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'
 end

data/spree_paypal_api_checkout.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "spree_paypal_api_checkout".freeze
-  s.version = "0.0.7"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_paypal_api_checkout
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Spree Commerce