fix gadai

app/Http/Controllers/VaultController.php

@@ -6,6 +6,8 @@ use App\Cawangan;
 use App\Tunai;
 use App\AddTunai;
 use App\GlDetail;
+use App\imbangdugalama;
+use App\GlCode;
 
 use Illuminate\Http\Request;
 use Carbon\Carbon;
@@ -240,18 +242,64 @@ class VaultController extends Controller
    {
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-      $pendahuluan = Vault::on($cawangan['mysql'])
-      ->where('kodcaw','=',$kodcaw)
-      ->where('tarikh','<=', $request->tarikh)
-      ->sum('pendahuluan');
+      // $pendahuluan = Vault::on($cawangan['mysql'])
+      // ->where('kodcaw','=',$kodcaw)
+      // ->where('tarikh','<=', $request->tarikh)
+      // ->sum('pendahuluan');
 
-      $serahan = Vault::on($cawangan['mysql'])
-      ->where('kodcaw','=',$kodcaw)
-      ->where('tarikh','<=', $request->tarikh)
-      ->sum('serahan');
+      // $serahan = Vault::on($cawangan['mysql'])
+      // ->where('kodcaw','=',$kodcaw)
+      // ->where('tarikh','<=', $request->tarikh)
+      // ->sum('serahan');
 
+      $serahanpkb = '1000/020';
+      $serahanjmc = '1000/026';
+      $pendahuluanpkb = '7000/102';
+      $pendahuluanjmc = '7000/106';
+      $serahankoperasi = '1000/090';
 
-      $arraypend = ['pendahuluan' => $pendahuluan,'serahan' => $serahan];
+      $serahanpkb = GlDetail::on($cawangan['mysql'])
+         ->where('dtacct','=',$serahanpkb)
+         ->where('tarikh','<=', $request->tarikh)
+         ->where('tarikh','>','2014-12-31')
+         ->sum('amaun');
+
+      $serahanJMC = GlDetail::on($cawangan['mysql'])
+         ->where('dtacct','=',$serahanjmc)
+         ->where('tarikh','<=', $request->tarikh)
+         ->where('tarikh','>','2014-12-31')
+         ->sum('amaun');
+
+      $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
+         ->sum('serahan_pkb');
+
+      $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
+         ->sum('serahan_jmc');
+
+      $totaljmc = $serahanJMC + $serahanjmclama;
+      $totalpkb = $serahanpkb + $serahanpkblama;
+
+      $totalserahan = $totaljmc + $totalpkb;
+
+      $pendahuluan = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=',$pendahuluanpkb)
+         ->orWhere('ktacct','=',$pendahuluanjmc)
+         ->where('tarikh','<=', $request->tarikh)
+         ->sum('amaun');
+
+      $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
+         ->sum('pendahuluan_pkb');
+
+      $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
+         ->sum('pendahuluan_jmc');
+
+      $total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluan;
+
+      $pindahkekpkb = GlCode::on($cawangan['mysql'])
+      ->where('glcode','=',$serahankoperasi)
+      ->sum('amaun');
+
+      $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];
 
       return response()->json($arraypend);
    }