Add duitnow requeries

Author: zarulizham

database/migrations/create_duitnow_qr_requeries.php.stub

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::create('duitnow_qr_requeries', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('transaction_id')->nullable()
+                ->constrained(
+                    table: 'duitnow_qr_transactions'
+                )->onUpdate('set null')->onDelete('set null');
+            $table->string('source_reference_number', 100)->nullable();
+            $table->date('transaction_date')->nullable();
+            $table->time('transaction_time_start')->nullable()->default(0);
+            $table->time('transaction_time_end')->nullable()->default(0);
+            $table->json('response_payload')->nullable();
+            $table->string('status_code', 5)->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('duitnow_qr_requeries');
+    }
+};

src/Data/Callback.php

@@ -66,7 +66,7 @@ private function storePayment()
         $this->duitnow_qr_transaction?->payments()->create($this->toArray());
     }
 
-    public function excludeProperties() : array
+    public function excludeProperties(): array
     {
         return [
             'payment_date',

src/Data/Requery.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace ZarulIzham\DuitNowQR\Data;
+
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Data;
+
+class Requery extends Data
+{
+    public function __construct(
+
+        #[MapInputName('EndID')]
+        public string $end_id,
+
+        #[MapInputName('BizID')]
+        public string $biz_id,
+
+        #[MapInputName('QRString')]
+        public ?string $qr_string,
+
+        #[MapInputName('TransactionStatus')]
+        public string $transaction_status,
+
+        #[MapInputName('Reason')]
+        public ?string $reason,
+
+        #[MapInputName('SenderName')]
+        public string $sender_name,
+
+        #[MapInputName('TrxAmount')]
+        public float $amount,
+
+        #[MapInputName('TrxCurrency')]
+        public string $currency,
+
+        #[MapInputName('AccNo')]
+        public string $account_number,
+
+        #[MapInputName('PaymentDt')]
+        public string $payment_date,
+
+        #[MapInputName('PaymentHrs')]
+        public string $payment_time,
+
+        #[MapInputName('SourceofFund')]
+        public string $source_of_fund,
+    ) {}
+}

src/DuitNowQR.php

@@ -2,6 +2,8 @@
 
 namespace ZarulIzham\DuitNowQR;
 
+use Carbon\Carbon;
+use Exception;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Http;
 use ZarulIzham\DuitNowQR\Exceptions\BadRequest;
@@ -146,6 +148,60 @@ public function getStatus($qrString, $transactionDate)
         return $response->json();
     }
 
+    public function getStatusByTransaction(DuitNowQRTransaction $duitNowQRTransaction, Carbon $transactionDate, $transactionTimeStart, $transactionTimeEnd)
+    {
+        $token = Cache::remember('duitnow_qr_token', config('duitnowqr.token_expiry'), fn () => $this->authenticate());
+
+        $sourceReferenceNumber = $this->getSrcRefNo();
+        $url = config('duitnowqr.url')."/api/MerchantQR/v1.0/GetQTNotification/$sourceReferenceNumber";
+
+        $ambankTimestamp = now()->format('dmYHis');
+
+        $headers = [
+            'Authorization' => 'Bearer '.$token,
+            'Authentication' => $token,
+            'AmBank-Timestamp' => $ambankTimestamp,
+            'Channel-Token' => config('duitnowqr.channel_token'),
+            'srcRefNo' => $sourceReferenceNumber,
+            'Content-Type' => 'application/json',
+            'Accept' => 'application/json',
+            'Channel-APIKey' => config('duitnowqr.api_key'),
+        ];
+
+        try {
+            $transactionTimeStart = $transactionDate->clone()->setTimeFromTimeString($transactionTimeStart);
+            $transactionTimeEnd = $transactionDate->clone()->setTimeFromTimeString($transactionTimeEnd);
+        } catch (\Throwable $th) {
+            throw new Exception('Failed to read transaction time. Please use format H:i (Eg: 23:00)');
+        }
+
+        $body = [
+            'QRString' => $duitNowQRTransaction->qr_string,
+            'TrxDate' => $transactionDate->format('d/m/Y'),
+            'TrxTimeStart' => $transactionTimeStart->format('H:i'),
+            'TrxTimeEnd' => $transactionTimeEnd->format('H:i'),
+        ];
+
+        $bodyEscaped = str_replace('\\', '', json_encode($body));
+
+        $headers['Ambank-Signature'] = $this->signature('/api/MerchantQR/v1.0/GetQTNotification/'.$sourceReferenceNumber, $ambankTimestamp, $body);
+
+        $response = null;
+        try {
+            $response = Http::withHeaders($headers)->withOptions([
+                'debug' => false,
+            ])
+                ->withBody($bodyEscaped, 'application/json')
+                ->post($url);
+        } catch (\Throwable $th) {
+            //throw $th;
+        }
+
+        $this->storeRequeryStatus($duitNowQRTransaction, $sourceReferenceNumber, $transactionTimeStart, $transactionTimeEnd, $response);
+
+        return $response->json();
+    }
+
     public function signature($uri, $ambankTimestamp, $body): string
     {
         $header = [
@@ -167,4 +223,16 @@ public function signature($uri, $ambankTimestamp, $body): string
 
         return $base64;
     }
+
+    public function storeRequeryStatus($duitNowQRTransaction, $sourceReferenceNumber, $transactionTimeStart, $transactionTimeEnd, $response)
+    {
+        $duitNowQRTransaction->requeries()->create([
+            'source_reference_number' => $sourceReferenceNumber,
+            'status_code' => $response?->status(),
+            'response_payload' => $response?->body(),
+            'transaction_date' => $transactionTimeStart->format('Y-m-d'),
+            'transaction_time_start' => $transactionTimeStart->format('H:i:s'),
+            'transaction_time_end' => $transactionTimeEnd->format('H:i:s'),
+        ]);
+    }
 }

src/DuitNowQRServiceProvider.php

@@ -19,6 +19,6 @@ public function configurePackage(Package $package): void
             ->hasCommand('ZarulIzham\DuitNowQR\Commands\DuitNowQRCommand')
             ->name('laravel-duitnow-qr')
             ->hasConfigFile('duitnowqr')
-            ->hasMigrations('create_duitnow_qr_transactions', 'create_duitnow_qr_payments');
+            ->hasMigrations('create_duitnow_qr_transactions', 'create_duitnow_qr_payments', 'create_duitnow_qr_requeries');
     }
 }

src/Models/DuitNowQRRequery.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace ZarulIzham\DuitNowQR\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+use ZarulIzham\DuitNowQR\Data\Requery;
+
+class DuitNowQRRequery extends Model
+{
+    protected $table = 'duitnow_qr_requeries';
+
+    protected $fillable = [
+        'transaction_id',
+        'source_reference_number',
+        'transaction_date',
+        'transaction_time_start',
+        'transaction_time_end',
+        'status_code',
+        'response_payload',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'transaction_date' => 'date',
+        'response_payload' => 'array',
+    ];
+
+    public function getResponseAttribute()
+    {
+        if ($this->status_code == '200') {
+            return Requery::collect($this->response_payload, Collection::class);
+        }
+
+        return $this->response_payload;
+    }
+}

src/Models/DuitNowQRTransaction.php

@@ -40,4 +40,12 @@ public function reference(): MorphTo
     {
         return $this->morphTo();
     }
+
+    /**
+     * Get all of the requeries for the DuitNowQRTransaction
+     */
+    public function requeries(): HasMany
+    {
+        return $this->hasMany(DuitNowQRRequery::class, 'transaction_id');
+    }
 }