Improve PPL Order request

Replace application_context with experience_context, because the application_context is deprecated. Set user_action to 'PAY_NOW' because we want to immediately capture the payment and know the amount.
wmde · Aug 9, 2023 · 4c9114c · 4c9114c
1 parent 5e52d03
commit 4c9114c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/src/Services/PayPal/Model/Order.php b/src/Services/PayPal/Model/Order.php
@@ -39,7 +39,7 @@ public static function from( array $apiResponse ): self {
 	 */
 	private static function getUrlFromLinks( array $links ): string {
 		foreach ( $links as $link ) {
-			if ( $link['rel'] === 'approve' ) {
+			if ( $link['rel'] === 'payer-action' ) {
 				return $link['href'];
 			}
 		}

diff --git a/src/Services/PayPal/Model/OrderParameters.php b/src/Services/PayPal/Model/OrderParameters.php
@@ -50,14 +50,17 @@ public function toJSON(): string {
 						],
 					],
 				'intent' => 'CAPTURE',
-				'application_context' =>
-					[
-						'brand_name' => 'Wikimedia Deutschland',
-						'landing_page' => 'LOGIN',
-						'user_action' => 'CONTINUE',
-						'return_url' => $this->returnUrl,
-						'cancel_url' => $this->cancelUrl,
-					],
+				'payment_source' => [
+					'paypal' => [
+						'experience_context' => [
+							'brand_name' => 'Wikimedia Deutschland',
+							'user_action' => 'PAY_NOW',
+							"shipping_preference" => 'NO_SHIPPING',
+							'return_url' => $this->returnUrl,
+							'cancel_url' => $this->cancelUrl,
+						]
+					]
+				]
 			],
 		 JSON_THROW_ON_ERROR );
 	}

diff --git a/tests/Data/PaypalAPI/create_order_request.json b/tests/Data/PaypalAPI/create_order_request.json
@@ -27,11 +27,15 @@
     }
   ],
   "intent": "CAPTURE",
-  "application_context": {
-    "brand_name": "Wikimedia Deutschland",
-    "landing_page": "LOGIN",
-    "user_action": "CONTINUE",
-    "return_url": "https://example.com/returnUrl",
-    "cancel_url": "https://example.com/cancelUrl"
+  "payment_source": {
+    "paypal": {
+      "experience_context": {
+        "brand_name": "Wikimedia Deutschland",
+        "user_action": "PAY_NOW",
+        "shipping_preference": "NO_SHIPPING",
+        "return_url": "https:\/\/example.com\/returnUrl",
+        "cancel_url": "https:\/\/example.com\/cancelUrl"
+      }
+    }
   }
 }
diff --git a/tests/Unit/Services/PayPal/GuzzlePaypalAPITest.php b/tests/Unit/Services/PayPal/GuzzlePaypalAPITest.php
@@ -687,7 +687,7 @@ private function createCreateOrderResponse(): Response {
 					{
 					
 					    "href": "https://www.paypal.com/checkoutnow?token=5O190127TN364715T",
-					    "rel": "approve",
+					    "rel": "payer-action",
 					    "method": "GET"
 					}
 				]

diff --git a/tests/Unit/Services/PayPal/Model/OrderTest.php b/tests/Unit/Services/PayPal/Model/OrderTest.php
@@ -23,7 +23,7 @@ public function testCreateFromApiResponse(): void {
 				],
 				[
 					"href" => "https://www.paypal.com/checkoutnow?token=5O190127TN364715T",
-					"rel" => "approve",
+					"rel" => "payer-action",
 					"method" => "GET"
 				]
 			]