Skip to content
This repository was archived by the owner on Sep 29, 2024. It is now read-only.

fix static and dynamic qr #5

Merged
merged 1 commit into from
Dec 19, 2023
Merged

fix static and dynamic qr #5

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
46 changes: 26 additions & 20 deletions src/GojekApi.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,24 +281,28 @@ public function validateQRCode($data) {
]);
}

public function payStaticQR($payee, $additionalData, $metaData, $orderSignature, $amount, $pin) {

$inquiry = $this->request('POST', EP_PAYMENTS_V1, [
'additional_data' => $additionalData,
public function paymentQR($validateQRCode, $amount) {
return $this->request('POST', EP_PAYMENTS_V1, [
'additional_data' => $validateQRCode->data->additional_data,
'amount' => [
'currency' => 'IDR',
'value' => $amount
],
'channel_type' => 'STATIC_QR',
'checksum' => json_decode($metaData->checksum),
'checksum' => json_decode($validateQRCode->data->metadata->checksum),
'fetch_promotion_details' => false,
'metadata' => $metaData,
'order_signature' => $orderSignature,
'payee' => $payee,
'payment_intent' => $metaData->payment_widget_intent
'metadata' => $validateQRCode->data->metadata,
'order_signature' => $validateQRCode->data->order_signature,
'payee' => $validateQRCode->data->payee,
'payment_intent' => $validateQRCode->data->metadata->payment_widget_intent
], [
'Idempotency-Key: ' . $this->uuid()
]);
}

public function payStaticQR($validateQRCode, $amount, $pin) {

$inquiry = $this->paymentQR($validateQRCode, $amount);

if (!$inquiry->success) {
return 'Error Inquiry';
Expand All @@ -318,13 +322,13 @@ public function payStaticQR($payee, $additionalData, $metaData, $orderSignature,
$paymentOptionsToken = $paymentOptions->data->payment_options[0]->token;

return $this->request('PATCH', str_replace('{{PAYMENT_ID}}', $inquiry->data->payment_id, EP_PAYMENTS_V3), [
'additional_data' => $additionalData,
'additional_data' => $validateQRCode->data->additional_data,
'applied_promo_code' => [
'NO_PROMO_APPLIED'
],
'checksum' => json_decode($metaData->checksum),
'metadata' => $metaData,
'order_signature' => $orderSignature,
'checksum' => json_decode($validateQRCode->data->metadata->checksum),
'metadata' => $validateQRCode->data->metadata,
'order_signature' => $validateQRCode->data->order_signature,
'payment_instructions' => [
[
'amount' => [
Expand All @@ -341,13 +345,15 @@ public function payStaticQR($payee, $additionalData, $metaData, $orderSignature,
]);
}

public function payDynamicQR($paymentId, $additionalData, $metaData, $orderSignature, $amount, $pin) {
public function payDynamicQR($validateQRCode, $amount, $pin) {

$payment = $this->paymentQR($validateQRCode, $amount);

$query = http_build_query([
'fetch_promotion_details' => false
]);

$inquiry = $this->request('GET', EP_PAYMENTS_V1 . '/' . $paymentId . '?' . $query);
$inquiry = $this->request('GET', EP_PAYMENTS_V1 . '/' . $payment->data->payment_id . '?' . $query);

if (!$inquiry->success) {
return 'Error Inquiry';
Expand All @@ -366,15 +372,15 @@ public function payDynamicQR($paymentId, $additionalData, $metaData, $orderSigna

$paymentOptionsToken = $paymentOptions->data->payment_options[0]->token;

return $this->request('PATCH', str_replace('{{PAYMENT_ID}}', $inquiry->data->payment_id, EP_PAYMENTS_V3), [
'additional_data' => $additionalData,
return $this->request('PATCH', str_replace('{{PAYMENT_ID}}', $payment->data->payment_id, EP_PAYMENTS_V3), [
'additional_data' => $validateQRCode->data->additional_data,
'applied_promo_code' => [
'NO_PROMO_APPLIED'
],
'channel_type' => 'DYNAMIC_QR',
'checksum' => json_decode($metaData->checksum),
'metadata' => $metaData,
'order_signature' => $orderSignature,
'checksum' => json_decode($validateQRCode->data->metadata->checksum),
'metadata' => $validateQRCode->data->metadata,
'order_signature' => $validateQRCode->data->order_signature,
'payment_instructions' => [
[
'amount' => [
Expand Down