solidus_paypal_commerce_platform 0.0.1 → 0.3.0

data/lib/views/frontend/solidus_paypal_commerce_platform/shared/_javascript_sdk_tag.html.erb

@@ -0,0 +1,6 @@
+<% currency = @order ? @order.currency : current_pricing_options.currency %>
+
+<script 
+  src="<%= payment_method.javascript_sdk_url(order: @order, currency: currency) %>" 
+  data-partner-attribution-id="<%= SolidusPaypalCommercePlatform.config.partner_code %>">
+</script>

data/lib/views/frontend/spree/checkout/payment/_paypal_commerce_platform.html.erb

@@ -1,10 +1,15 @@
-<script src="<%= payment_method.javascript_sdk_url(order: @order) %>"></script>
+<%= render partial: "solidus_paypal_commerce_platform/shared/javascript_sdk_tag", locals: {payment_method: payment_method} %>
 
 <div id="paypal-button-container"></div>
+
+<div data-pp-message data-pp-placement="payment" data-pp-amount="<%= @order.total %>"></div>
+
 <input type="hidden" name="payment_source[<%= payment_method.id %>][paypal_order_id]" id="payments_source_paypal_order_id">
 <input type="hidden" name="payment_source[<%= payment_method.id %>][paypal_email]" id="payments_source_paypal_email">
 
 <script>
+  Spree.current_order_id = "<%= @order.number %>"
+  Spree.current_order_token = "<%= @order.guest_token %>"
   $( document ).ready(function() {
     SolidusPaypalCommercePlatform.renderButton("<%= payment_method.id %>",<%= raw payment_method.button_style.to_json %>)
   })

data/lib/views/frontend/spree/orders/payment/_paypal_commerce_platform.html.erb

@@ -1,9 +1,10 @@
 <div style="margin-left:auto;margin-right:auto;width:50%;margin-top:20px;">
-  <script src="<%= payment_method.javascript_sdk_url(order: @order) %>">
-  </script>
+  <%= render partial: "solidus_paypal_commerce_platform/shared/javascript_sdk_tag", locals: {payment_method: payment_method} %>
 
   <div id="paypal-button-container"></div>
 
+  <div data-pp-message data-pp-placement="cart" data-pp-amount="<%= @order.total %>"></div>
+
   <script>
     Spree.current_order_id = "<%= @order.number %>"
     Spree.current_order_token = "<%= @order.guest_token %>"

data/lib/views/frontend/spree/products/payment/_paypal_commerce_platform.html.erb

@@ -1,9 +1,10 @@
 <div style="margin-top:20px;">
-  <script src="<%= payment_method.javascript_sdk_url %>">
-  </script>
+  <%= render partial: "solidus_paypal_commerce_platform/shared/javascript_sdk_tag", locals: {payment_method: payment_method} %>
 
   <div id="paypal-button-container"></div>
 
+  <div data-pp-message data-pp-placement="product" data-pp-amount="<%= @product.price %>"></div>
+
   <script>
     SolidusPaypalCommercePlatform.checkout_url = "<%= checkout_url %>"
     $( document ).ready(function() {

data/solidus_paypal_commerce_platform.gemspec

@@ -9,12 +9,12 @@ Gem::Specification.new do |spec|
   spec.email = 'contact@solidus.io'
 
   spec.summary = 'Integrate Solidus with Paypal Commerce Platform'
-  spec.homepage = 'https://github.com/nebulab/solidus_paypal_commerce_platform#readme'
+  spec.homepage = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform'
   spec.license = 'BSD-3-Clause'
 
   spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = 'https://github.com/nebulab/solidus_paypal_commerce_platform'
-  spec.metadata['changelog_uri'] = 'https://github.com/nebulab/solidus_paypal_commerce_platform/releases'
+  spec.metadata['source_code_uri'] = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform'
+  spec.metadata['changelog_uri'] = 'https://github.com/solidusio-contrib/solidus_paypal_commerce_platform/releases'
 
   spec.required_ruby_version = Gem::Requirement.new('~> 2.5')
 
@@ -30,10 +30,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'deface', '~> 1.5'
   spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 3']
-  spec.add_dependency 'solidus_support', '~> 0.5'
-  spec.add_dependency 'solidus_webhooks', '~> 0.2.0'
+  spec.add_dependency 'solidus_support', [">= 0.8.0", "< 1"]
+  spec.add_dependency 'solidus_webhooks', '~> 0.2'
 
   spec.add_dependency 'paypal-checkout-sdk'
 
-  spec.add_development_dependency 'solidus_dev_support'
+  spec.add_development_dependency 'cuprite'
+  spec.add_development_dependency 'solidus_dev_support', '~> 2.1'
 end

data/spec/features/frontend/cart_spec.rb

@@ -16,22 +16,30 @@ RSpec.describe "Cart page" do
       )
     end
 
-    def paypal_script_options
-      script_tag_url = URI(page.find('script[src*="sdk/js?"]', visible: false)[:src])
-      script_tag_url.query.split('&')
-    end
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit '/cart'
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
 
-    it "generate a js file with the correct credentials and intent attached" do
-      visit '/cart'
-      expect(paypal_script_options).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 '/cart'
+        expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
+      end
 
-    context "when auto-capture is set to true" do
-      it "generate a js file with intent capture" do
-        paypal_payment_method.update(auto_capture: true)
+      it "generates a URL with the correct currency" do
+        allow(order).to receive(:currency).and_return "EUR"
         visit '/cart'
-        expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-        expect(paypal_script_options).to include("intent=capture")
+        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 '/cart'
+          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
   end

data/spec/features/frontend/checkout_spec.rb

@@ -17,22 +17,30 @@ RSpec.describe "Checkout" do
       )
     end
 
-    def paypal_script_options
-      script_tag_url = URI(page.find('script[src*="sdk/js?"]', visible: false)[:src])
-      script_tag_url.query.split('&')
-    end
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit '/checkout/payment'
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
 
-    it "generates a js file with the correct credentials and intent attached" do
-      visit '/checkout/payment'
-      expect(paypal_script_options).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 '/checkout/payment'
+        expect(js_sdk_script_partner_id).to eq("Solidus_PCP_SP")
+      end
 
-    context "when auto-capture is set to true" do
-      it "generates a js file with intent capture" do
-        paypal_payment_method.update(auto_capture: true)
+      it "generates a URL with the correct currency" do
+        allow(order).to receive(:currency).and_return "EUR"
         visit '/checkout/payment'
-        expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-        expect(paypal_script_options).to include("intent=capture")
+        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 '/checkout/payment'
+          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
 

data/spec/features/frontend/product_spec.rb

@@ -12,29 +12,37 @@ RSpec.describe "Product page", js: true do
       paypal_payment_method
     end
 
-    def paypal_script_options
-      script_tag_url = URI(page.find('script[src*="sdk/js?"]', visible: false)[:src])
-      script_tag_url.query.split('&')
-    end
+    context "when generating a script tag" do
+      it "generates a url with the correct credentials attached" do
+        visit "/products/#{product.slug}"
+        expect(js_sdk_script_query).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
+      end
 
-    it "generates a js file with the correct credentials and intent attached" do
-      visit '/products/' + product.slug
-      expect(paypal_script_options).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/#{product.slug}"
+        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/#{product.slug}"
+        expect(js_sdk_script_query).to include("currency=EUR")
+      end
 
-    context "when auto-capture is set to true" do
-      it "generates a js file with intent capture" do
-        paypal_payment_method.update(auto_capture: true)
-        visit '/products/' + product.slug
-        expect(paypal_script_options).to include("client-id=#{paypal_payment_method.preferences[:client_id]}")
-        expect(paypal_script_options).to include("intent=capture")
+      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/#{product.slug}"
+          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
       before do
         allow_any_instance_of(Spree::Core::ControllerHelpers::Store).to receive(:current_store) { store }
-        visit '/products/' + product.slug
+        visit "/products/#{product.slug}"
 
         # Stubbing out paypal methods since their JS doesn't load in correctly on tests
         page.execute_script("paypal = {}")
@@ -48,12 +56,14 @@ RSpec.describe "Product page", js: true do
 
       it "creates an order successfully" do
         page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+        page.driver.wait_for_network_idle
 
         expect(Spree::Order.last).not_to be nil
       end
 
       it "sets the Spree number and token variables" do
         page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+        page.driver.wait_for_network_idle
 
         expect(page.evaluate_script("Spree.current_order_id")).to eq Spree::Order.last.number
         expect(page.evaluate_script("Spree.current_order_token")).to eq Spree::Order.last.guest_token
@@ -64,6 +74,7 @@ RSpec.describe "Product page", js: true do
         fill_in('quantity', with: quantity)
 
         page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+        page.driver.wait_for_network_idle
 
         expect(Spree::Order.last.line_items.first.quantity).to eq quantity
       end
@@ -71,6 +82,7 @@ RSpec.describe "Product page", js: true do
       it "uses the selected variant" do
         page.choose("variant_id_#{variant_two.id}")
         page.evaluate_script("SolidusPaypalCommercePlatform.createOrder()")
+        page.driver.wait_for_network_idle
 
         expect(Spree::Order.last.line_items.first.variant_id).to eq variant_two.id
       end

data/spec/lib/solidus_paypal_commerce_platform/client_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe SolidusPaypalCommercePlatform::Client do
     let(:status_code) { 201 }
 
     it 'forwards to the upstream client adding i18n response messages' do
-      expect_any_instance_of(PayPal::PayPalHttpClient)
+      allow_any_instance_of(PayPal::PayPalHttpClient)
         .to receive(:execute).with(paypal_request).and_return(paypal_response)
 
       response = subject.execute_with_response(paypal_request)

data/spec/lib/solidus_paypal_commerce_platform/configuration_spec.rb

@@ -12,16 +12,16 @@ RSpec.describe SolidusPaypalCommercePlatform::Configuration do
     it "falls back to Rails.env if ENV['PAYPAL_ENV'] is not set" do
       expect(ENV).to receive(:[]).with("PAYPAL_ENV").and_return(nil).at_least(:once)
 
-      expect(Rails).to receive(:env).and_return("development".inquiry)
+      allow(Rails).to receive(:env).and_return("development".inquiry)
       expect(subject.default_env).to eq("sandbox")
 
-      expect(Rails).to receive(:env).and_return("test".inquiry)
+      allow(Rails).to receive(:env).and_return("test".inquiry)
       expect(subject.default_env).to eq("sandbox")
 
-      expect(Rails).to receive(:env).and_return("production".inquiry)
+      allow(Rails).to receive(:env).and_return("production".inquiry)
       expect(subject.default_env).to eq("live")
 
-      expect(Rails).to receive(:env).and_return("staging".inquiry)
+      allow(Rails).to receive(:env).and_return("staging".inquiry)
       expect{ subject.default_env }.to raise_error(described_class::InvalidEnvironment)
     end
   end
@@ -64,4 +64,28 @@ RSpec.describe SolidusPaypalCommercePlatform::Configuration do
       expect(subject.env_domain).to eq("www.sandbox.paypal.com")
     end
   end
+
+  describe "#state_guesser_class" do
+    before do
+      stub_const('SolidusPaypalCommercePlatform::BetterStateGuesser', Class.new)
+    end
+
+    it "returns a class" do
+      expect(subject.state_guesser_class).to be_kind_of(Class)
+    end
+
+    it "is settable" do
+      expect(subject.state_guesser_class).to eq(SolidusPaypalCommercePlatform::StateGuesser)
+
+      subject.state_guesser_class = "SolidusPaypalCommercePlatform::BetterStateGuesser"
+
+      expect(subject.state_guesser_class).to eq(SolidusPaypalCommercePlatform::BetterStateGuesser)
+    end
+  end
+
+  describe "#partner_code" do
+    it "returns the correct code" do
+      expect(subject.partner_code).to eq("Solidus_PCP_SP")
+    end
+  end
 end

data/spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb

@@ -92,6 +92,25 @@ RSpec.describe SolidusPaypalCommercePlatform::PaymentMethod, type: :model do
         expect(url.query.split("&")).to include("commit=true")
       end
     end
+
+    context 'when messaging is turned on' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'includes messaging component' do
+        paypal_payment_method.preferences.update(display_credit_messaging: true)
+        expect(url.query.split("&")).to include("components=buttons%2Cmessages")
+      end
+    end
+
+    context 'when messaging is turned off' do
+      let(:order) { instance_double(Spree::Order, checkout_steps: { "foo" => "bar" }) }
+
+      it 'only includes buttons components' do
+        paypal_payment_method.preferences.update(display_credit_messaging: false)
+        expect(url.query.split("&")).not_to include("messages")
+        expect(url.query.split("&")).to include("components=buttons")
+      end
+    end
   end
 
   private

data/spec/models/solidus_paypal_commerce_platform/paypal_address_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
   let(:order) { create(:order) }
   let(:original_address) { create(:address) }
-  let(:address) { create(:address) }
+  let(:address) { create(:address, name_attributes) }
   let(:params) {
     {
       updated_address: {
@@ -16,8 +16,8 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       },
       recipient: {
         name: {
-          given_name: address.firstname,
-          surname: address.lastname
+          given_name: "Alexander",
+          surname: "Hamilton"
         }
       }
     }
@@ -37,8 +37,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       expect(subject.address2).to eq address.address2
       expect(subject.zipcode).to eq address.zipcode
       expect(subject.country).to eq address.country
-      expect(subject.firstname).to eq address.firstname
-      expect(subject.lastname).to eq address.lastname
+      if SolidusSupport.combined_first_and_last_name_in_address?
+        expect(subject.name).to eq address.name
+      else
+        expect(subject.firstname).to eq address.firstname
+        expect(subject.lastname).to eq address.lastname
+      end
       expect(subject.phone).to eq original_address.phone
     end
 
@@ -52,4 +56,12 @@ RSpec.describe SolidusPaypalCommercePlatform::PaypalAddress, type: :model do
       end
     end
   end
+
+  def name_attributes
+    if SolidusSupport.combined_first_and_last_name_in_address?
+      { name: "Alexander Hamilton" }
+    else
+      { firstname: "Alexander", lastname: "Hamilton" }
+    end
+  end
 end

data/spec/models/solidus_paypal_commerce_platform/state_guesser_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+RSpec.describe SolidusPaypalCommercePlatform::StateGuesser, type: :model do
+  let(:country) { create(:country, iso: "IT") }
+  let!(:state) { create(:state, country: country, name: "Abruzzo") }
+
+  describe "#guess" do
+    context "with a guessable state error" do
+      it "correctly guesses the state" do
+        expect(
+          described_class.new("Pescara", country).guess
+        ).to eq state
+      end
+
+      it "guesses the state using an abbreviation" do
+        expect(
+          described_class.new("PE", country).guess
+        ).to eq state
+      end
+    end
+
+    context "with an unsolvable state error" do
+      it "returns nil" do
+        expect(
+          described_class.new("Gondor", country).guess
+        ).to eq nil
+      end
+    end
+
+    context "with an already correct state" do
+      it "returns the correct state" do
+        expect(
+          described_class.new("Abruzzo", country).guess
+        ).to eq state
+      end
+    end
+  end
+end

data/spec/requests/solidus_paypal_commerce_platform/orders_controller_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_http_status(:ok)
       end
     end
 
@@ -29,7 +29,7 @@ RSpec.describe SolidusPaypalCommercePlatform::OrdersController, type: :request d
 
         get solidus_paypal_commerce_platform.verify_total_path, params: params
 
-        expect(response).to have_http_status(400)
+        expect(response).to have_http_status(:bad_request)
       end
     end
   end