solidus_paypal_commerce_platform 0.7.0 → 1.0.0.beta1

data/spec/system/frontend/product_spec.rb

@@ -0,0 +1,98 @@
+require 'solidus_paypal_commerce_platform_spec_helper'
+
+RSpec.describe "Product page", js: true do
+  describe "paypal button", :skip do
+    before { create(:store, default: true) }
+
+    let!(:paypal_payment_method) { create(:paypal_payment_method) }
+    let!(:variants) {
+      option_type = create(:option_type)
+      product = create(:product, option_types: [option_type], slug: 'foo-bar')
+      option_s = create(:option_value, option_type: option_type, presentation: 'S')
+      option_xs = create(:option_value, option_type: option_type, presentation: 'XS')
+
+      [
+        create(:variant, product: product, option_values: [option_s]),
+        create(:variant, product: product, option_values: [option_xs]),
+      ]
+    }
+
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit "/products/foo-bar"
+
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
+
+      it "generates a partner_id attribute with the correct partner code attached" do
+        visit "/products/foo-bar"
+
+        expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
+      end
+
+      it "generates a URL with the correct currency" do
+        allow_any_instance_of(SolidusPaypalCommercePlatform::PricingOptions).to receive(:currency).and_return "EUR"
+
+        visit "/products/foo-bar"
+
+        expect(js_sdk_script_query).to include("currency=EUR")
+      end
+
+      context "when auto-capture is set to true" do
+        it "generates a url with intent capture" do
+          paypal_payment_method.update(auto_capture: true)
+
+          visit "/products/foo-bar"
+
+          expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+          expect(js_sdk_script_query).to include("intent=capture")
+        end
+      end
+    end
+
+    describe "order creation" do
+      it "creates an order successfully" do
+        visit "/products/foo-bar"
+        page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+
+        expect(Spree::Order.last).to be_an_instance_of(Spree::Order)
+      end
+
+      it "sets the Spree number and token variables" do
+        visit "/products/foo-bar"
+        page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+
+        order = Spree::Order.last
+        expect(page.evaluate_script("SolidusPaypalCommercePlatform.current_order_id")).to eq order.number
+        expect(page.evaluate_script("SolidusPaypalCommercePlatform.current_order_token")).to eq order.guest_token
+      end
+
+      it "uses the specified quantity" do
+        visit "/products/foo-bar"
+        fill_in('quantity', with: 12)
+        page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+
+        expect(Spree::Order.last.line_items.first.quantity).to eq(12)
+      end
+
+      it "uses the selected variant" do
+        visit "/products/foo-bar"
+        find('label', text: 'XS').click
+        page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+
+        expect(Spree::Order.last.line_items.first.variant).to eq(variants.last)
+      end
+
+      it "assigns the order to the api token holder" do
+        user = create(:user)
+        user.generate_spree_api_key!
+
+        visit "/products/foo-bar"
+        page.evaluate_script("SolidusPaypalCommercePlatform.api_key = #{user.spree_api_key.to_json}")
+        page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+
+        expect(Spree::Order.last.user).to eq(user)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_paypal_commerce_platform
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Sean Denny
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -95,20 +95,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cuprite
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -144,17 +130,7 @@ files:
 - app/assets/javascripts/spree/backend/solidus_paypal_commerce_platform.js
 - app/assets/javascripts/spree/backend/solidus_paypal_commerce_platform/namespace.js
 - app/assets/javascripts/spree/backend/solidus_paypal_commerce_platform/wizard.js
-- app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform.js
-- app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/button_actions.js
-- app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/buttons.js
-- app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/namespace.js
 - app/assets/stylesheets/spree/backend/solidus_paypal_commerce_platform.css
-- app/assets/stylesheets/spree/frontend/solidus_paypal_commerce_platform.css
-- app/controllers/solidus_paypal_commerce_platform/orders_controller.rb
-- app/controllers/solidus_paypal_commerce_platform/payments_controller.rb
-- app/controllers/solidus_paypal_commerce_platform/paypal_orders_controller.rb
-- app/controllers/solidus_paypal_commerce_platform/shipping_rates_controller.rb
-- app/controllers/solidus_paypal_commerce_platform/wizard_controller.rb
 - app/decorators/models/solidus_paypal_commerce_platform/spree/address_decorator.rb
 - app/helpers/solidus_paypal_commerce_platform/button_options_helper.rb
 - app/jobs/solidus_paypal_commerce_platform/application_job.rb
@@ -178,10 +154,13 @@ files:
 - app/views/solidus_paypal_commerce_platform/admin/payment_methods/_setup_wizards.html.erb
 - app/views/solidus_paypal_commerce_platform/admin/payments/_log_entries.html.erb
 - bin/console
+- bin/dummy-app
 - bin/rails
+- bin/rails-dummy-app
 - bin/rails-engine
 - bin/rails-sandbox
 - bin/rake
+- bin/rspec
 - bin/sandbox
 - bin/setup
 - codecov.yml
@@ -190,7 +169,24 @@ files:
 - db/migrate/20200521190038_add_paypal_commerce_platform_sources.rb
 - db/migrate/20211220133406_add_paypal_funding_source_to_paypal_commerce_platform_sources.rb
 - lib/generators/solidus_paypal_commerce_platform/install/install_generator.rb
-- lib/generators/solidus_paypal_commerce_platform/install/templates/initializer.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform.js
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/button_actions.js
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/buttons.js
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/namespace.js
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/assets/stylesheets/spree/frontend/solidus_paypal_commerce_platform.css
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/controllers/solidus_paypal_commerce_platform/orders_controller.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/controllers/solidus_paypal_commerce_platform/payments_controller.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/controllers/solidus_paypal_commerce_platform/paypal_orders_controller.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/controllers/solidus_paypal_commerce_platform/shipping_rates_controller.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/controllers/solidus_paypal_commerce_platform/wizard_controller.rb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/checkouts/payment/_paypal_commerce_platform.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/orders/payment/_paypal_commerce_platform.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/products/payment/_paypal_commerce_platform.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/solidus_paypal_commerce_platform/cart/_cart_buttons.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/solidus_paypal_commerce_platform/payments/_payment.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/solidus_paypal_commerce_platform/product/_product_buttons.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/app/views/solidus_paypal_commerce_platform/shared/_javascript_sdk_tag.html.erb
+- lib/generators/solidus_paypal_commerce_platform/install/templates/config/initializers/solidus_paypal_commerce_platform.rb
 - lib/paypal/access_token.rb
 - lib/paypal/lib.rb
 - lib/paypal/paypal_checkout_sdk/orders/orders_authorize_request.rb
@@ -227,14 +223,34 @@ files:
 - lib/views/backend/spree/admin/payments/source_forms/_paypal_commerce_platform.html.erb
 - lib/views/backend/spree/admin/payments/source_views/_paypal_commerce_platform.html.erb
 - lib/views/backend/spree/admin/shared/preference_fields/_paypal_select.html.erb
-- lib/views/frontend/solidus_paypal_commerce_platform/cart/_cart_buttons.html.erb
-- lib/views/frontend/solidus_paypal_commerce_platform/payments/_payment.html.erb
-- lib/views/frontend/solidus_paypal_commerce_platform/product/_product_buttons.html.erb
-- lib/views/frontend/solidus_paypal_commerce_platform/shared/_javascript_sdk_tag.html.erb
-- lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb
-- lib/views/frontend/spree/orders/payment/_paypal_commerce_platform.html.erb
-- lib/views/frontend/spree/products/payment/_paypal_commerce_platform.html.erb
 - solidus_paypal_commerce_platform.gemspec
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/CHECKOUT.ORDER.COMPLETED.v2.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/CHECKOUT.ORDER.PROCESSED.v2.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/PAYMENT.CAPTURE.COMPLETED.v1.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/PAYMENT.CAPTURE.COMPLETED.v2.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/PAYMENT.CAPTURE.DENIED.v1.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/PAYMENT.CAPTURE.DENIED.v2.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/PAYMENT.CAPTURE.REFUNDED.v1.json
+- spec/jobs/solidus_paypal_commerce_platform/fixtures/PAYMENT.CAPTURE.REFUNDED.v2.json
+- spec/jobs/solidus_paypal_commerce_platform/webhook_job_spec.rb
+- spec/lib/solidus_paypal_commerce_platform/client_spec.rb
+- spec/lib/solidus_paypal_commerce_platform/configuration_spec.rb
+- spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb
+- spec/models/solidus_paypal_commerce_platform/payment_source_spec.rb
+- spec/models/solidus_paypal_commerce_platform/paypal_address_spec.rb
+- spec/models/solidus_paypal_commerce_platform/paypal_order_spec.rb
+- spec/models/solidus_paypal_commerce_platform/state_guesser_spec.rb
+- spec/models/solidus_paypal_commerce_platform/wizard_spec.rb
+- spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb
+- spec/requests/solidus_paypal_commerce_platform/shipping_rates_controller_spec.rb
+- spec/requests/solidus_paypal_commerce_platform/wizard_controller_spec.rb
+- spec/solidus_paypal_commerce_platform_spec_helper.rb
+- spec/support/solidus_paypal_commerce_platform/factories.rb
+- spec/support/solidus_paypal_commerce_platform/paypal_sdk_script_tag_helper.rb
+- spec/system/backend/new_payment_method_spec.rb
+- spec/system/frontend/cart_spec.rb
+- spec/system/frontend/checkout_spec.rb
+- spec/system/frontend/product_spec.rb
 homepage: https://github.com/solidusio/solidus_paypal_commerce_platform
 licenses:
 - BSD-3-Clause
@@ -254,11 +270,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: Integrate Solidus with Paypal Commerce Platform

data/app/assets/javascripts/spree/frontend/solidus_paypal_commerce_platform/button_actions.js

@@ -1,206 +0,0 @@
-SolidusPaypalCommercePlatform.showOverlay = function() {
-  document.getElementById("paypal_commerce_platform_overlay").style.display = "block";
-}
-
-SolidusPaypalCommercePlatform.hideOverlay = function() {
-  document.getElementById("paypal_commerce_platform_overlay").style.display = "none";
-}
-
-SolidusPaypalCommercePlatform.handleError = function(error) {
-  console.error(error);
-  alert("There was a problem connecting with PayPal.")
-  throw error
-}
-
-SolidusPaypalCommercePlatform.sendOrder = function(payment_method_id) {
-  return Spree.ajax({
-    url: '/solidus_paypal_commerce_platform/paypal_orders/' + Spree.current_order_id,
-    method: 'GET',
-    data: {
-      payment_method_id: payment_method_id,
-      order_token: Spree.current_order_token
-    }
-  }).then(function(success_response) {
-    return success_response.table.result.table.id
-  }, function(failure_response) {
-    return failure_response.responseJSON.table.error.table
-  })
-}
-
-SolidusPaypalCommercePlatform.createAndSendOrder = function(payment_method_id) {
-  return SolidusPaypalCommercePlatform.createOrder().then(function(){
-    return SolidusPaypalCommercePlatform.sendOrder(payment_method_id)
-  })
-}
-
-SolidusPaypalCommercePlatform.createOrder = function() {
-  var data = {
-    order: {
-      line_items_attributes: [{
-        variant_id: SolidusPaypalCommercePlatform.getVariantId(),
-        quantity: SolidusPaypalCommercePlatform.getQuantity()
-      }]
-    }
-  }
-
-  return Spree.ajax({
-    url: "/solidus_paypal_commerce_platform/orders",
-    method: 'POST',
-    data: data,
-    error: function(response) {
-      message = response.responseJSON
-      alert('A problem has occurred while creating your order - ' + message);
-    }
-  }).then(function(response) {
-    Spree.current_order_id = response.number
-    Spree.current_order_token = response.guest_token
-  });
-}
-
-SolidusPaypalCommercePlatform.getVariantId = function() {
-  var variants = document.getElementsByName("variant_id")
-  var variant_id;
-  if(variants.length == 1){
-    variant_id = variants[0].value
-  }else{
-    var i;
-    for (i = 0; i < variants.length; i++) {
-      if (variants[i].checked) {
-        variant_id = variants[i].value
-      }
-    }
-  }
-  return variant_id
-}
-
-SolidusPaypalCommercePlatform.getQuantity = function() {
-  return document.getElementById("quantity").value
-}
-
-SolidusPaypalCommercePlatform.approveOrder = function(data, actions) {
-  SolidusPaypalCommercePlatform.showOverlay()
-  actions.order.get().then(function(response){
-    SolidusPaypalCommercePlatform.updateAddress(response).then(function() {
-      SolidusPaypalCommercePlatform.verifyTotal(response.purchase_units[0].amount.value).then(function(){
-        $("#payments_source_paypal_order_id").val(data.orderID)
-        $("#payments_source_paypal_email").val(response.payer.email_address)
-        $("#payments_source_paypal_funding_source").val(SolidusPaypalCommercePlatform.fundingSource)
-        $("#checkout_form_payment").submit()
-      })
-    })
-  })
-}
-
-SolidusPaypalCommercePlatform.shippingChange = function(data, actions) {
-  Spree.ajax({
-    url: '/solidus_paypal_commerce_platform/shipping_rates',
-    method: 'GET',
-    data: {
-      order_id: Spree.current_order_id,
-      order_token: Spree.current_order_token,
-      address: data.shipping_address
-    },
-    error: function(response) {
-      message = response.responseJSON;
-      console.log('There were some problems with your payment address - ' + message);
-      actions.reject()
-    }
-  }).then(function(response) {
-    actions.order.patch([response]).catch(function() {
-      actions.reject()
-    })
-  })
-}
-
-SolidusPaypalCommercePlatform.verifyTotal = function(paypal_total) {
-  return Spree.ajax({
-    url: '/solidus_paypal_commerce_platform/verify_total',
-    method: 'GET',
-    data: {
-      order_id: Spree.current_order_id,
-      order_token: Spree.current_order_token,
-      paypal_total: paypal_total
-    },
-    error: function(response) {
-      SolidusPaypalCommercePlatform.hideOverlay()
-      alert('There were some problems with your payment - ' + response.responseJSON.errors.expected_total);
-    }
-  })
-}
-
-SolidusPaypalCommercePlatform.finalizeOrder = function(payment_method_id, data, actions) {
-  SolidusPaypalCommercePlatform.showOverlay()
-  actions.order.get().then(function(response){
-    SolidusPaypalCommercePlatform.updateAddress(response).then(function() {
-      var paypal_amount = response.purchase_units[0].amount.value
-      SolidusPaypalCommercePlatform.advanceOrder().then(function() {
-        SolidusPaypalCommercePlatform.verifyTotal(paypal_amount).then(function(){
-          SolidusPaypalCommercePlatform.addPayment(paypal_amount, payment_method_id, data, response.payer.email_address).then(function() {
-            window.location.href = SolidusPaypalCommercePlatform.checkout_url
-          })
-        })
-      })
-    })
-  })
-}
-
-SolidusPaypalCommercePlatform.advanceOrder = function() {
-  return Spree.ajax({
-    url: '/api/checkouts/' + Spree.current_order_id + '/advance',
-    method: 'PUT',
-    data: {
-      order_token: Spree.current_order_token
-    },
-    error: function(response) {
-      SolidusPaypalCommercePlatform.hideOverlay()
-      alert('There were some problems with your order');
-    }
-  })
-}
-
-SolidusPaypalCommercePlatform.addPayment = function(paypal_amount, payment_method_id, data, email) {
-  return Spree.ajax({
-    url: '/api/checkouts/' + Spree.current_order_id + '/payments',
-    method: 'POST',
-    data: {
-      order_token: Spree.current_order_token,
-      payment: {
-        amount: paypal_amount,
-        payment_method_id: payment_method_id,
-        source_attributes: {
-          paypal_order_id: data.orderID,
-          paypal_email: email,
-          paypal_funding_source: SolidusPaypalCommercePlatform.fundingSource
-        }
-      }
-    },
-    error: function(response) {
-      SolidusPaypalCommercePlatform.hideOverlay()
-      alert('There were some problems with your payment');
-    }
-  })
-}
-
-SolidusPaypalCommercePlatform.updateAddress = function(response) {
-  var shipping = response.purchase_units[0].shipping;
-  if (!shipping) return Promise.resolve({});
-
-  var updated_address = shipping.address;
-  return Spree.ajax({
-    url: '/solidus_paypal_commerce_platform/update_address',
-    method: 'POST',
-    data: {
-      address: {
-        updated_address: updated_address,
-        recipient: response.payer
-      },
-      order_id: Spree.current_order_id,
-      order_token: Spree.current_order_token
-    },
-    error: function(response) {
-      SolidusPaypalCommercePlatform.hideOverlay()
-      message = response.responseJSON;
-      alert('There were some problems with your payment address - ' + message);
-    }
-  })
-}