Skip to content

fix(jibit): Support additional Jibit purchase fields #360

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

Open
bardiaabasirad wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(jibit): Support additional Jibit purchase fields #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 24 additions & 8 deletions src/Drivers/Jibit/Jibit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,29 +36,45 @@ public function __construct(Invoice $invoice, array|object $settings)
/**
* Purchase invoice
*
* @return string
* @return int|string|null
* @throws PurchaseFailedException
*/
public function purchase() : string|int|null
{
public function purchase(): int|null|string
{
$amount = $this->invoice->getAmount() * ($this->settings->currency == 'T' ? 10 : 1); // Convert to Rial

$payerMobileNumber = $this->invoice->getDetail('payerMobileNumber')
?? $this->invoice->getDetail('mobile');

$payload = [
'wage' => $this->invoice->getDetail('wage'),
'payerMobileNumber' => $payerMobileNumber,
'checkPayerMobileNumber' => $this->invoice->getDetail('checkPayerMobileNumber'),
'payerCardNumber' => $this->invoice->getDetail('payerCardNumber'),
'payerCardNumbers' => $this->invoice->getDetail('payerCardNumbers'),
'payerNationalCode' => $this->invoice->getDetail('payerNationalCode'),
'description' => $this->invoice->getDetail('description'),
'switching' => $this->invoice->getDetail('switching'),
'additionalData' => $this->invoice->getDetail('additionalData'),
'userIdentifier' => $this->invoice->getDetail('userIdentifier'),
];

$requestResult = $this->jibit->paymentRequest(
$amount,
$this->invoice->getUuid(),
$this->invoice->getDetail('mobile'),
$this->settings->callbackUrl
$payerMobileNumber,
$this->settings->callbackUrl,
$this->settings->currency ?? 'IRR',
$payload
);


if (! empty($requestResult['pspSwitchingUrl'])) {
$this->paymentUrl = $requestResult['pspSwitchingUrl'];
}

if (! empty($requestResult['errors'])) {
$errMsgs = array_map(fn (array $err) => $err['code'], $requestResult['errors']);

throw new PurchaseFailedException(implode('\n', $errMsgs));
throw new PurchaseFailedException(implode("\n", $errMsgs));
}

$purchaseId = $requestResult['purchaseId'];
Expand Down
29 changes: 24 additions & 5 deletions src/Drivers/Jibit/JibitClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,22 +53,41 @@
* @param int $amount
* @param string $referenceNumber
* @param string $userIdentifier
* @param $callbackUrl
* @param string $currency
* @param array $payload
* @return bool|mixed|string
* @throws PurchaseFailedException
*/
public function paymentRequest(int|float $amount, string|int $referenceNumber, string|null $userIdentifier, string $callbackUrl, string $currency = 'IRR', string|null $description = null, mixed $additionalData = null) : mixed
public function paymentRequest(
int $amount,
string $referenceNumber,
string $userIdentifier,
$callbackUrl,
string $currency = 'IRR',
array $payload = []
): mixed
{
$this->generateToken();

$data = [
'additionalData' => $additionalData,
'amount' => $amount,
'callbackUrl' => $callbackUrl,
'clientReferenceNumber' => $referenceNumber,
'currency' => $currency,
'clientReferenceNumber' => (string) $referenceNumber,
'callbackUrl' => $callbackUrl,
'userIdentifier' => $userIdentifier,
'description' => $description,
];

if (is_array($payload)) {

Check failure on line 81 in src/Drivers/Jibit/JibitClient.php

View workflow job for this annotation

GitHub Actions / PHPStan 

Call to function is_array() with array will always evaluate to true.
$payload = array_filter($payload, static fn ($value) => $value !== null);

if (isset($payload['additionalData']) && is_array($payload['additionalData'])) {
$payload['additionalData'] = json_encode($payload['additionalData'], JSON_UNESCAPED_UNICODE);
}

$data = array_merge($data, $payload);
}

return $this->callCurl('/purchases', $data, true);
}

Expand Down
Loading