Move 'shipping_preference' preference under PaypalOrder#to_json

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

@@ -181,8 +181,11 @@ SolidusPaypalCommercePlatform.addPayment = function(paypal_amount, payment_metho
   })
 }
 
-SolidusPaypalCommercePlatform.updateAddress = function(response) { 
-  var updated_address = response.purchase_units[0].shipping.address
+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',

app/models/solidus_paypal_commerce_platform/payment_method.rb

@@ -87,7 +87,6 @@ def javascript_sdk_url(order: nil, currency: nil)
         currency: currency
       }
 
-      parameters[:shipping_preference] = 'NO_SHIPPING' if step_names.exclude? 'delivery'
       parameters['enable-funding'] = 'venmo' if venmo_standalone_enabled?
 
       if !Rails.env.production? && options[:force_buyer_country].present?

app/models/solidus_paypal_commerce_platform/paypal_order.rb

@@ -10,7 +10,8 @@ def to_json(intent)
       {
         intent: intent,
         purchase_units: purchase_units,
-        payer: (payer if @order.bill_address)
+        payer: (payer if @order.bill_address),
+        application_context: application_context
       }
     end
 
@@ -109,5 +110,19 @@ def price(amount)
         value: amount
       }
     end
+
+    def application_context
+      {
+        shipping_preference: require_shipping? ? 'SET_PROVIDED_ADDRESS' : 'NO_SHIPPING'
+      }
+    end
+
+    def require_shipping?
+      step_names.include? :delivery
+    end
+
+    def step_names
+      @order ? @order.checkout_steps.map(&:to_sym) : ::Spree::Order.checkout_steps.keys
+    end
   end
 end

spec/models/solidus_paypal_commerce_platform/payment_method_spec.rb

@@ -127,13 +127,6 @@ def Struct(data) # rubocop:disable Naming/MethodName
       end
     end
 
-    context 'when checkout_steps does not include "delivery"' do
-      it 'disables autocommit' do
-        allow(order).to receive(:checkout_steps).and_return([:address, :confirm, :payment])
-        expect(url.query.split("&")).to include("shipping_preference=NO_SHIPPING")
-      end
-    end
-
     context 'when messaging is turned on' do
       it 'includes messaging component' do
         paypal_payment_method.preferences.update(display_credit_messaging: true)

spec/models/solidus_paypal_commerce_platform/paypal_order_spec.rb

@@ -20,6 +20,28 @@
         payer: hash_including(name: { given_name: 'Johnny', surname: 'Vonny Doey' })
       )
     end
+
+    context 'when checkout_steps does not include "delivery"' do
+      let(:old_checkout_flow) { Spree::Order.checkout_flow }
+
+      before do
+        old_checkout_flow
+
+        Spree::Order.class_eval do
+          remove_checkout_step :delivery
+        end
+      end
+
+      after do
+        Spree::Order.checkout_flow(&old_checkout_flow)
+      end
+
+      it 'disable shipping requirements' do
+        expect(to_json).to match hash_including(
+          application_context: hash_including(shipping_preference: 'NO_SHIPPING')
+        )
+      end
+    end
   end
 
   private