diff --git a/app/Models/BayarNonRegister.php b/app/Models/BayarNonRegister.php
new file mode 100644
index 0000000..8cdb353
--- /dev/null
+++ b/app/Models/BayarNonRegister.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class BayarNonRegister extends Model
+{
+    use HasFactory;
+    public $timestamps = false;
+}
diff --git a/app/Models/BayarRajal.php b/app/Models/BayarRajal.php
new file mode 100644
index 0000000..66c709a
--- /dev/null
+++ b/app/Models/BayarRajal.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class BayarRajal extends Model
+{
+    use HasFactory;
+    public $timestamps = false;
+    protected $table = 't_bayarranap';
+}
diff --git a/app/Models/BayarRanap.php b/app/Models/BayarRanap.php
new file mode 100644
index 0000000..929e83f
--- /dev/null
+++ b/app/Models/BayarRanap.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class BayarRanap extends Model
+{
+    use HasFactory;
+    public $timestamps = false;
+    protected $table = 't_bayarranap';
+}
diff --git a/app/Models/MaxNomerBayar.php b/app/Models/MaxNomerBayar.php
new file mode 100644
index 0000000..30d4d56
--- /dev/null
+++ b/app/Models/MaxNomerBayar.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class MaxNomerBayar extends Model
+{
+    use HasFactory;
+    public $timestamps = false;
+    protected $table = 'm_maxnobyr';
+}
diff --git a/app/Models/PelunasanPiutang.php b/app/Models/PelunasanPiutang.php
new file mode 100644
index 0000000..403d650
--- /dev/null
+++ b/app/Models/PelunasanPiutang.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class PelunasanPiutang extends Model
+{
+    use HasFactory;
+    protected $table = 't_pelunasan_piutang';
+}
diff --git a/app/Models/Piutang.php b/app/Models/Piutang.php
new file mode 100644
index 0000000..20ed042
--- /dev/null
+++ b/app/Models/Piutang.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Piutang extends Model
+{
+    use HasFactory;
+    public $timestamps = false;
+    protected $table = 't_piutang';
+}
diff --git a/app/Services/Va/v1/VirtualAccountJatimService.php b/app/Services/Va/v1/VirtualAccountJatimService.php
index 5207169..5f28ff2 100644
--- a/app/Services/Va/v1/VirtualAccountJatimService.php
+++ b/app/Services/Va/v1/VirtualAccountJatimService.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: USER
@@ -8,10 +9,13 @@
 
 namespace App\Services\Va\v1;
 
-
+use App\Models\BayarRanap;
+use App\Models\MaxNomerBayar;
 use App\Models\PaymentJatimLogs;
 use App\Models\PaymentVirtualAccount;
 use App\Models\PaymentVirtualAccountDetail;
+use App\Models\PelunasanPiutang;
+use App\Models\Piutang;
 use App\Models\Va\v1\VirtualAccountJatimRequest;
 use App\Models\Va\v1\VirtualAccountJatimResponse;
 use GuzzleHttp\Client;
@@ -48,7 +52,7 @@ class VirtualAccountJatimService
     public function updatePayment(VirtualAccountJatimRequest $data, VirtualAccountJatimResponse $result)
     {
         DB::beginTransaction();
-        try{
+        try {
             $pembayaran = PaymentVirtualAccount::where('virtual_account', $data->getVirtualAccount())->first();
             if (!$pembayaran) {
                 $result->setStatus(array(
@@ -65,6 +69,54 @@ class VirtualAccountJatimService
                     ));
                 } else {
                     if ($pembayaran->endpoint == "full") {
+                        if ($pembayaran->type == 'piutang') {
+                            $piutang = Piutang::where('nobilling', $pembayaran->billnumber)->get();
+
+                            if (count($piutang) > 0) {
+                                $date_now = date('Y-m-d');
+                                foreach ($piutang as $item) {
+                                    $no_kwitansi = $this->lastNoBayar($item->nip, $date_now, $item->shift);
+
+                                    $pelunasan['id_piutang'] = $item->id_piutang;
+                                    $pelunasan['tgl_pelunasan'] = $date_now;
+                                    $pelunasan['jumlah_piutang'] = $item->jumlah_bayar;
+                                    $pelunasan['jumlah_bayar'] = $item->jumlah_bayar;
+                                    $pelunasan['no_kwitansi'] = $no_kwitansi;
+                                    $pelunasan['tgl_entri'] = $date_now;
+                                    $pelunasan['petugas_entri'] = $item->nip;
+                                    $pelunasan['shift'] = $item->shift;
+                                    $save = PelunasanPiutang::insert($pelunasan);
+                                    //update status lunas di piutang
+                                    $lunas = Piutang::where('id_piutang', $item->id_piutang)->update(['st_piutang' => 'LUNAS']);
+
+                                    $data_piutang = Piutang::where('id_piutang', $item->id_piutang)->first();
+                                    if (!empty($data_piutang)) {
+                                        $payload['lunas'] = 1;
+                                        $payload['status'] = 'LUNAS';
+                                        $payload['jmbayar'] = $item->jumlah_bayar;
+                                        $payload['tglbayar'] = $date_now;
+                                        $payload['jambayar'] = date('H:i:s');
+                                        $payload['nobayar'] = $no_kwitansi;
+                                        $payload['nip'] = $item->nip;
+                                        $payload['shift'] = $item->shift;
+                                        if ($data_piutang['st_billing'] == 'IRNA') {
+                                            $update_bayar = BayarRanap::where('idxbill', $data_piutang->idxbill)->update($payload);
+                                        } else if ($data_piutang['st_billing'] == 'IRNA') {
+                                            $update_bayar = BayarRanap::where('idxbill', $data_piutang->idxbill)->update($payload);
+                                        } else {
+                                            $update_bayar = BayarRanap::where('idxbill', $data_piutang->idxbill)->update($payload);
+                                        }
+
+                                        $arr_max['nomor'] = $no_kwitansi;
+                                        $arr_max['type'] = 'kuitansi';
+                                        $arr_max['petugas'] = $item->nip;
+                                        $arr_max['tanggal'] = $date_now;
+                                        $arr_max['shift'] = $item->shift;
+                                        $update_max = MaxNomerBayar::where(['type' => 'kuitansi', 'petugas' => $item->nip, 'tanggal' => $date_now, 'shift' => $item->shift])->update($arr_max);
+                                    }
+                                }
+                            }
+                        }
                         $pembayaran->bayar = $data->getAmount();
                         $pembayaran->flags_lunas = "F";
                         $pembayaran->save();
@@ -89,9 +141,9 @@ class VirtualAccountJatimService
                                 $pembayaran->flags_lunas = ($pembayaran->bayar == $pembayaran->totalamount) ? "F" : "O";
                                 $pembayaran->save();
 
-                                if (empty($pembayaran->bayar)){
+                                if (empty($pembayaran->bayar)) {
                                     $detail_sisa = $pembayaran->totalamount - $data->getAmount();
-                                }else{
+                                } else {
                                     $detail_sisa = $pembayaran->totalamount - $pembayaran->bayar;
                                 }
 
@@ -107,14 +159,13 @@ class VirtualAccountJatimService
                         }
                     }
                 }
-
             }
             DB::commit();
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
+            dd($e);
             DB::rollback();
         }
         return $result;
-
     }
 
     public function log($type, $request, $response)
@@ -126,4 +177,25 @@ class VirtualAccountJatimService
         ]);
         return $log;
     }
-}
\ No newline at end of file
+
+    function lastNoBayar($petugas, $tanggal, $shift)
+    {
+        $kwitansi = MaxNomerBayar::where(['type' => 'kwitansi', 'petugas' => $petugas, 'tanggal' => $tanggal, 'shift' => $shift])->first();
+        $pre_no = $lastNoBayar = $xLastNoBayar = null;
+        $pre_no = date('Y');
+        if (isset($kwitansi)) {
+            $lastNoBayar = ((int)$kwitansi->nomor) + 1;
+            $xLastNoBayar = str_pad($lastNoBayar, 7, 0, STR_PAD_LEFT);
+            return $xLastNoBayar;
+        } else {
+            $new_nobayar = '0000001';
+            $payload['nomor'] = $new_nobayar;
+            $payload['type'] = 'kuitansi';
+            $payload['petugas'] = $petugas;
+            $payload['tanggal'] = $tanggal;
+            $payload['shift'] = $shift;
+            $nomor = MaxNomerBayar::insert($payload);
+            return $new_nobayar;
+        }
+    }
+}