Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ typings/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/
__pycache__/

# Optional REPL history
.node_repl_history
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.9" />
<PackageReference Include="PayPalServerSDK" Version="0.6.0" />
<PackageReference Include="PayPalServerSDK" Version="1.0.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions advanced-integration/v2/server/dotnet/Server.cs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private async Task<dynamic> _CreateOrder(dynamic cart)
CheckoutPaymentIntent intent = (CheckoutPaymentIntent)
Enum.Parse(typeof(CheckoutPaymentIntent), "CAPTURE", true);

OrdersCreateInput ordersCreateInput = new OrdersCreateInput
CreateOrderInput createOrderInput = new CreateOrderInput
{
Body = new OrderRequest
{
Expand All @@ -131,7 +131,7 @@ private async Task<dynamic> _CreateOrder(dynamic cart)
},
};

ApiResponse<Order> result = await _ordersController.OrdersCreateAsync(ordersCreateInput);
ApiResponse<Order> result = await _ordersController.OrdersCreateAsync(createOrderInput);
return result;
}

Expand All @@ -152,7 +152,7 @@ public async Task<IActionResult> CaptureOrder(string orderID)

private async Task<dynamic> _CaptureOrder(string orderID)
{
OrdersCaptureInput ordersCaptureInput = new OrdersCaptureInput { Id = orderID, };
CaptureOrderInput ordersCaptureInput = new CaptureOrderInput { Id = orderID, };

ApiResponse<Order> result = await _ordersController.OrdersCaptureAsync(ordersCaptureInput);

Expand Down
2 changes: 1 addition & 1 deletion advanced-integration/v2/server/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
paypal-server-sdk
</artifactId>
<version>
0.6.0
1.0.0
</version>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import com.paypal.sdk.models.CheckoutPaymentIntent;
import com.paypal.sdk.models.Order;
import com.paypal.sdk.models.OrderRequest;
import com.paypal.sdk.models.OrdersCaptureInput;
import com.paypal.sdk.models.OrdersCreateInput;
import com.paypal.sdk.models.CaptureOrderInput;
import com.paypal.sdk.models.CreateOrderInput;
import com.paypal.sdk.models.PurchaseUnitRequest;
import java.util.Arrays;
import org.slf4j.event.Level;
Expand Down Expand Up @@ -107,7 +107,7 @@ public ResponseEntity<Order> captureOrder(@PathVariable String orderID) {

private Order createOrder(String cart) throws IOException, ApiException {

OrdersCreateInput ordersCreateInput = new OrdersCreateInput.Builder(
CreateOrderInput createOrderInput = new CreateOrderInput.Builder(
null,
new OrderRequest.Builder(
CheckoutPaymentIntent.CAPTURE,
Expand All @@ -123,18 +123,18 @@ private Order createOrder(String cart) throws IOException, ApiException {

OrdersController ordersController = client.getOrdersController();

ApiResponse<Order> apiResponse = ordersController.ordersCreate(ordersCreateInput);
ApiResponse<Order> apiResponse = ordersController.createOrder(createOrderInput);

return apiResponse.getResult();
}

private Order captureOrders(String orderID) throws IOException, ApiException {
OrdersCaptureInput ordersCaptureInput = new OrdersCaptureInput.Builder(
CaptureOrderInput ordersCaptureInput = new CaptureOrderInput.Builder(
orderID,
null)
.build();
OrdersController ordersController = client.getOrdersController();
ApiResponse<Order> apiResponse = ordersController.ordersCapture(ordersCaptureInput);
ApiResponse<Order> apiResponse = ordersController.captureOrder(ordersCaptureInput);
return apiResponse.getResult();
}
}
Expand Down
2 changes: 1 addition & 1 deletion advanced-integration/v2/server/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"type": "module",
"dependencies": {
"@paypal/paypal-server-sdk": "^0.6.0",
"@paypal/paypal-server-sdk": "^1.0.0",
"body-parser": "^1.20.3",
"dotenv": "^16.3.1",
"express": "^4.18.2"
Expand Down
4 changes: 2 additions & 2 deletions advanced-integration/v2/server/node/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const createOrder = async (cart) => {
};

try {
const { body, ...httpResponse } = await ordersController.ordersCreate(
const { body, ...httpResponse } = await ordersController.createOrder(
collect
);
// Get more response info...
Expand Down Expand Up @@ -84,7 +84,7 @@ const captureOrder = async (orderID) => {
};

try {
const { body, ...httpResponse } = await ordersController.ordersCapture(
const { body, ...httpResponse } = await ordersController.captureOrder(
collect
);
// Get more response info...
Expand Down
2 changes: 1 addition & 1 deletion advanced-integration/v2/server/php/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"require": {
"php": "^7.4 || ^8.0",
"ext-json": "*",
"paypal/paypal-server-sdk": "0.6.0"
"paypal/paypal-server-sdk": "1.0.0"
},
"require-dev": {
},
Expand Down
48 changes: 24 additions & 24 deletions advanced-integration/v2/server/php/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions advanced-integration/v2/server/php/src/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function createOrder($cart)
)->build()
];

$apiResponse = $client->getOrdersController()->ordersCreate($orderBody);
$apiResponse = $client->getOrdersController()->createOrder($orderBody);

return handleResponse($apiResponse);
}
Expand All @@ -61,7 +61,7 @@ function captureOrder($orderID)
'id' => $orderID
];

$apiResponse = $client->getOrdersController()->ordersCapture($captureBody);
$apiResponse = $client->getOrdersController()->captureOrder($captureBody);

return handleResponse($apiResponse);
}
Expand Down
Loading