fix bayaranpendahuluan

app/Services/Reports/ImbangDugaService.php

@@ -579,6 +579,36 @@ class ImbangDugaService
        return $arraypend;
     }
 
+    public function getBayaranPendahuluan()
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$this->kodcaw)->first();
+
+        $datetawarruq = new Carbon('2021-04-14');
+        $daterequest = new Carbon($this->tarikh);
+        $daterequest->addDays(1);
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $transaksi_data = TransaksiKeuntungan::on('mysql7')
+        ->where('tarikh_bayaran' ,'<=', $daterequest)
+        ->where('kodcaw',$this->kodcaw)
+        ->pluck('norujukan');
+
+        $gadaiData = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data)
+            ->where([['sttebus',''],['hargajualan','<>','null']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$this->tarikh],['hargajualan','<>','null']])
+            ->pluck('norujukan');
+
+
+        $transaksi = TransaksiKeuntungan::on('mysql7')
+            ->whereIn('norujukan',$gadaiData)
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->sum('bayaran_pembiayaan');
+
+        return $transaksi;
+    }
+
     public function setImbangDugaBackup()
     {
 
@@ -592,6 +622,7 @@ class ImbangDugaService
             $accrual = $this->getOnePercentUjrah();
             $tunaiditangan = $this->getTunaiDiTangan();
             $totalpendser = $this->getPendahuluanSerahan();
+            $bayaranpend = $this->getBayaranPendahuluan();
             $pendahuluan = $totalpendser['pendahuluan'];
             $serahan = $totalpendser['serahan'];
             $ujrah = $accrual['ujrah'];
@@ -599,8 +630,8 @@ class ImbangDugaService
 
             $totalharta = imbangdugabackup::on($cawangan['mysql'])->where('tarikh', $this->tarikh)
                 ->get()
-                ->map(function ($ig) use ($keuntungan_penggadai,$tunaiditangan,$serahan) {
-                    return floatval($tunaiditangan) + $ig['pembiayaantawarruq'] + $ig['bayaranpendahuluan'] + $ig['pinjamankoop'] + $ig['emaspalsu']
+                ->map(function ($ig) use ($keuntungan_penggadai,$tunaiditangan,$serahan,$bayaranpend) {
+                    return floatval($tunaiditangan) + $ig['pembiayaantawarruq'] + $bayaranpend + $ig['pinjamankoop'] + $ig['emaspalsu']
                         + $ig['pindahkekpkb'] + $ig['penghutangkaki'] + $ig['phapuskira'] + $ig['belian1stop'] + $keuntungan_penggadai + $serahan;
                 });