Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use wc order number metadata #435

Merged
merged 2 commits into from
Mar 4, 2024
Merged

Use wc order number metadata #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e3bf5
Order ID sent in charge is replaced with order number
Mar 1, 2024
ffe3870
Add missing mock function
Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions includes/gateway/abstract-omise-payment-base-card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,14 @@ private function getOmiseCustomerId($user) {
private function prepareChargeData($order_id, $order, $omise_customer_id, $card_id, $token)
{
$currency = $order->get_currency();
$order_number = $order->get_order_number();
$data = [
'amount' => Omise_Money::to_subunit($order->get_total(), $currency),
'currency' => $currency,
'description' => 'WooCommerce Order id ' . $order_id,
'description' => 'WooCommerce Order id ' . $order_number,
'return_uri' => $this->get_redirect_url('omise_callback', $order_id, $order),
'metadata' => $this->get_metadata(
$order_id,
$order_number,
[ 'secure_form_enabled' => $this->getSecureFormState()]
),
];
Expand Down
11 changes: 6 additions & 5 deletions includes/gateway/traits/charge-request-builder-trait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ public function build_charge_request(
)
{
$currency = $order->get_currency();
$description = 'WooCommerce Order id ' . $order_id;
$order_number = $order->get_order_number();
$description = 'WooCommerce Order id ' . $order_number;

$request = [
'amount' => Omise_Money::to_subunit($order->get_total(), $currency),
'currency' => $currency,
'description' => $description,
'metadata' => $this->get_metadata($order_id),
'metadata' => $this->get_metadata($order_number),
'source' => [ 'type' => $source_type ]
];

Expand All @@ -40,13 +41,13 @@ public function build_charge_request(
}

/**
* @param string $order_id
* @param string $order_number
* @param array $additionalData
*/
public function get_metadata($order_id, $additionalData = [])
public function get_metadata($order_number, $additionalData = [])
{
// override order_id as a reference for webhook handlers.
$orderId = [ 'order_id' => $order_id ];
$orderId = [ 'order_id' => $order_number ];
return array_merge($orderId, $additionalData);
}

Expand Down
2 changes: 2 additions & 0 deletions tests/unit/includes/gateway/abstract-omise-payment-base-card-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public function getOrderMock($expectedAmount, $expectedCurrency)
->andReturn($expectedAmount); // in units
$orderMock->shouldReceive('add_meta_data')
->andReturn(['order_id' => 'order_123']);
$orderMock->shouldReceive('get_order_number')
->andReturn(1234);
$orderMock->shouldReceive('get_user')
->andReturn((object)[
'ID' => 'user_123',
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/includes/gateway/traits/charge-request-builder-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ public function getOrderMock($expectedAmount, $expectedCurrency)
$orderMock->shouldReceive('get_total')
->andReturn($expectedAmount); // in units
$orderMock->shouldReceive('add_meta_data');
$orderMock->shouldReceive('get_order_number')
->andReturn(1234);
return $orderMock;
}

Expand Down