fix aliran tunai separuh

2021-03-24 16:18:31 +08:00
parent 0ce6f4495c
commit d86244657a
6 changed files with 137 additions and 53 deletions
@@ -643,6 +643,7 @@ class GadaiController extends Controller
        $gadai = Gadai::on($cawangan['mysql'])
        ->where('t_gadai','=',$request->tarikh)
        // ->where('sttebus','=','')
+        // ->where('teller','=',$request->teller)
        ->where('tagserah','=',1)
        ->orderBy('t_gadai')
        ->get();
@@ -650,6 +651,7 @@ class GadaiController extends Controller
        $tebus = Tebus::on($cawangan['mysql'])
        ->where('t_tebus','=',$request->tarikh)
        // ->where('jenistebus','!=','T')
+        // ->where('teller','=',$request->teller)
        ->where('tagterima','=',1)
        ->orderBy('t_tebus')
        ->get();
@@ -668,6 +670,43 @@ class GadaiController extends Controller

    }

+    public function GadaiTebusListTeller($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $arrayharian = [];
+
+        $gadai = Gadai::on($cawangan['mysql'])
+        ->where('t_gadai','=',$request->tarikh)
+        ->where('teller','=',$request->teller)
+        ->where('tagserah','=',1)
+        ->orderBy('t_gadai')
+        ->get();
+
+        $tebus = Tebus::on($cawangan['mysql'])
+        ->where('t_tebus','=',$request->tarikh)
+        ->where('teller','=',$request->teller)
+        ->where('tagterima','=',1)
+        ->orderBy('t_tebus')
+        ->get();
+
+        foreach($gadai as $index=>$g)
+        {
+            array_push($arrayharian,$g);
+        } 
+
+        foreach($tebus as $index1=>$t)
+        {
+            array_push($arrayharian,$t);
+        }
+
+        return response()->json($arrayharian,200);
+    }
+
    public function gadaiRingkasanTerkumpul($kodcaw,Request $request){

        $current = Carbon::now();
@@ -1412,12 +1451,13 @@ class GadaiController extends Controller
         
                }else{
         
-                     $totalmasuk = $masuk - $tebus['bakipjm'];
-                     $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+                     $totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
+                     $totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
+                     $bakiakhir = $bakiawal-$totalkeluar+$totalmasuk+$pendahuluan-$serahan;
         
                    $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                    update(array(
-                    'keluar' => $keluar,
+                    'keluar' => $totalkeluar,
                    'masuk' => $totalmasuk,
                    'baki' => $bakiakhir
                    ));
@@ -1440,7 +1480,7 @@ class GadaiController extends Controller

                }else{

-                    $bakiakhir = $bakiakhir - $tebus['bakipjm'];
+                    $bakiakhir = $bakiakhir - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);

                    $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
                    update(array(
@@ -1944,11 +1984,11 @@ class GadaiController extends Controller

        $keuntungan = Gadai::on($cawangan['mysql'])
        ->where('t_gadai','<=',$request->tarikh)
+        ->where('t_gadai','>=','2021-03-14')
        ->where('sttebus','=','')
        ->whereNotNull('upah12')
        ->sum('upah12');

-
        return response()->json($keuntungan,200);
    }

@@ -150,30 +150,27 @@ class LelongController extends Controller

        $bakilelong = Lelong::on($cawangan['mysql'])
        ->where('t_jual','<=',$request->tarikh)
-        ->where(function($query){
+        ->where(function($query) use ($tarikhbaru){
            $query->whereNull('trkhtuntut')
-                  ->orWhere('trkhtuntut','>','2021-01-02');
+                  ->orWhere('trkhtuntut','>',$tarikhbaru);
        })
        ->where('baki','>=',0)
        ->sum('baki');

-        // dd($bakilelong->toSql(), $bakilelong->getBindings());
-        // dd($bakilelong);
-
        $ansrugi = AnsRugi::on($cawangan['mysql'])
            ->sum('bayaran');
                
        $rugilelong = Lelong::on($cawangan['mysql'])
            ->where('t_jual','<=',$request->tarikh)
-            ->where(function($query)
+            ->where(function($query) use ($tarikhbaru)
            {
                $query->whereNull('trkhtuntut')
-                    ->orWhere('trkhtuntut','>','2021-01-02');
+                    ->orWhere('trkhtuntut','>',$tarikhbaru);
            })
            ->where('baki','<',0)
            ->sum('baki');

-        $rugitotal=$rugilelong + $ansrugi;
+        $rugitotal=$rugilelong + $ansrugi;        

        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];

@@ -310,6 +307,21 @@ class LelongController extends Controller
        return response()->json($tuntutbaki,200);
    }

+    public function showTuntutBakiTeller($kodcaw,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $tuntutbaki = TuntutBaki::on($cawangan['mysql'])
+            ->where('tarikh','=', $current->toDateString())
+            ->where('teller','=', $request->teller)
+            ->get();
+
+        return response()->json($tuntutbaki,200);
+    }
+
    public function resitLelong($kodcaw,$norujukan){

        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -16,6 +16,7 @@ use App\Customer;
 use App\Lelong;
 use App\HapusKira;
 use App\Parameter;
+use App\Panjar;

 use Illuminate\Http\Request;

@@ -548,22 +549,40 @@ class TebusController extends Controller
        $keuntunganselepastawarruq = 0;
        $keuntungansebelumtawarruq = 0;

-        if($request->tarikh >= '2021-03-15')
-        {
-            $keuntunganselepastawarruq = Tebus::on($cawangan['mysql'])
-                ->where('t_tebus','<=',$request->tarikh)
-                ->whereYear('t_tebus','=',$current->year)
-                ->whereNotNull('rebate')
-                ->sum('rebate');
-        }

-        $keuntungansebelumtawarruq = Tebus::on($cawangan['mysql'])
+        $keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
            ->where('t_tebus','<=',$request->tarikh)
-            ->where('t_tebus','>','2013-12-31')
+            ->where('t_tebus','>=','2021-03-14')
+            ->whereYear('t_tebus','=',$current->year)
+            ->whereNotNull('rebate')
+            ->sum('rebate');
+
+        $keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
+            ->where('t_tebus','<=',$request->tarikh)
+            ->where('t_tebus','>=','2021-03-14')
+            ->whereYear('t_tebus','=',$current->year)
+            ->whereNotNull('bakiupah')
+            ->sum('bakiupah');
+
+        $upahtebus = Tebus::on($cawangan['mysql'])
+            ->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
            ->whereYear('t_tebus','=',$current->year)
-            // ->whereNotNull('upahdibayar')
            ->sum('upahdibayar');
-        
+
+        $upahlelong = Lelong::on($cawangan['mysql'])
+            ->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31']])
+            ->whereYear('t_jual','=',$current->year)
+            ->sum('bakiupah');
+
+        $upahansur = Advansur::on($cawangan['mysql'])
+            ->where('tarikh','<=',$request->tarikh)
+            ->whereYear('tarikh','=',$current->year)
+            ->sum('upahdibayar');
+
+
+        $keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
+
+        $keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah; 

        $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;

@@ -578,9 +597,8 @@ class TebusController extends Controller

        $total = 0;

-
        //Untung Rugi Terkumpul Sebelum 01.12.2013
-        $utgrugilama = imbangdugalama::on($cawangan['mysql'])
+        $utgrugilama = imbangdugalama::on($cawangan['mysql']) //--masuk
            ->sum('untung_t');

        //Yuran Ahli
@@ -593,7 +611,7 @@ class TebusController extends Controller
            ->sum('yuranahli');

        //Caj Lelong
-        $lelong = Lelong::on($cawangan['mysql'])
+        $lelong = Lelong::on($cawangan['mysql']) //--masuk
            ->whereNotNull('t_jual')
            ->where('t_jual','>','2013-12-31')
            ->whereYear('t_jual','<',$current->year)
@@ -603,31 +621,28 @@ class TebusController extends Controller
            ->sum('cajlelong_t');


-            // dd($current->year);
        //Upah Simpan Tebus
-        $upahsimpantebus = Tebus::on($cawangan['mysql'])
+        $upahsimpantebus = Tebus::on($cawangan['mysql']) //--masuk
            ->where('t_tebus','>','2013-12-31')
            ->whereYear('t_tebus','<',$current->year)
            ->sum('upahdibayar');

        //Upah Simpan Lelong
-        $upahsimpanlelong = Lelong::on($cawangan['mysql'])
+        $upahsimpanlelong = Lelong::on($cawangan['mysql']) //--masuk
            ->where('t_jual','>','2013-12-31')
            ->whereYear('t_jual','<',$current->year)
            ->sum('bakiupah');
            
        //Upah Simpan Advansur
-        $upahsimpanansur = Advansur::on($cawangan['mysql'])
+        $upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk
            ->whereYear('tarikh','<',$current->year)
            ->sum('upahdibayar');

        $upahsimpanlama = imbangdugalama::on($cawangan['mysql'])
            ->sum('upah_t');

-        // dd($upahsimpanansur->toSql());
-
        //GST Caj Lelong
-        $gstcajlelong = Lelong::on($cawangan['mysql'])
+        $gstcajlelong = Lelong::on($cawangan['mysql']) //--masuk
            ->where('t_jual','<=',$request->tarikh)
            ->whereYear('t_jual','<',$current->year)
            ->sum('gst_cl');
@@ -638,20 +653,30 @@ class TebusController extends Controller
            ->whereYear('tarikh','<',$current->year)
            ->sum('bakiupah');

-        $parameter = Parameter::on($cawangan['mysql'])
-            ->sum('sumpanjarlama');
+        $panjar1 = Panjar::on($cawangan['mysql'])
+            ->whereYear('tarikh','<',$current->year)
+            ->where('tag','=','1')
+            ->sum('bayaran');

-        // dd($utgrugilama,$yuranTlama,$lelong,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahhapuskira,$parameter,$gstcajlelong);
+        $panjar2 = Panjar::on($cawangan['mysql'])
+            ->whereYear('tarikh','<',$current->year)
+            ->where('tag','=','2')
+            ->sum('bayaran');
+
+        $panjar3 = Panjar::on($cawangan['mysql'])
+            ->whereYear('tarikh','<',$current->year)
+            ->where('tag','=','3')
+            ->sum('bayaran');
+
+        $parameter = ($panjar1*-1) + ($panjar2*-1) + ($panjar3*-1);
+
+        // $parameter = Parameter::on($cawangan['mysql']) //--masuk
+        //     ->sum('sumpanjarlama');


        $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
-        // echo "UTGRUGI:" . $utgrugilama . " YuranTLama:" . $yuranTlama . " YuranBaru:" . $yuranbaru . " Lelong:" . $lelong . " Caj Lelong:" . $cajlelonglama . " Upah Tebus:" . $upahsimpantebus . " Upah Lelong:" . $upahsimpanlelong . " Upah Ansuran:". $upahsimpanansur;
-        // echo " UPah Hapus Kira : " . $upahhapuskira;
-
-        // var_dump($utgrugilama,$yuranTlama,$yuranbaru,$lelong,$cajlelonglama,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahsimpanlama,$gstcajlelong);
-        // + $cajlelonglama+ $upahsimpanlama+ $yuranbaru
-        // $total = ($yuranTlama  + $lelong  + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur  + $gstcajlelong + $utgrugilama ) - ($upahhapuskira);
-
+        
+  
        return response()->json($total,200);
    }

@@ -286,6 +286,7 @@ class TunaiController extends Controller
        $reqteller=RequestTeller::on('mysql7')->create([ 
              
             'tarikh' => $current->toDateString(),
+             'masa' => $current->toTimeString(),
             'kodcaw' => $kodcaw,
             'kodlaluan' => $request->kodlaluan,
             'modal' => $request->modal,
@@ -261,13 +261,13 @@ class VaultController extends Controller
      $serahanpkb = GlDetail::on($cawangan['mysql'])
         ->where('dtacct','=',$serahanpkb)
         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2014-12-31')
+         ->where('tarikh','>','2013-12-31')
         ->sum('amaun');

      $serahanJMC = GlDetail::on($cawangan['mysql'])
         ->where('dtacct','=',$serahanjmc)
         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2014-12-31')
+         ->where('tarikh','>','2013-12-31')
         ->sum('amaun');

      $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
@@ -281,10 +281,14 @@ class VaultController extends Controller

      $totalserahan = $totaljmc + $totalpkb;

-      $pendahuluan = GlDetail::on($cawangan['mysql'])
+      $pendahuluanPKB = GlDetail::on($cawangan['mysql'])
         ->where('ktacct','=',$pendahuluanpkb)
-         ->orWhere('ktacct','=',$pendahuluanjmc)
-         ->where('tarikh','<=', $request->tarikh)
+         ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
+         ->sum('amaun');
+
+      $pendahuluanJMC = GlDetail::on($cawangan['mysql'])
+         ->where('ktacct','=','7000/106')
+         ->where([['tarikh','<=', $request->tarikh],['tarikh','>','2013-12-31']])
         ->sum('amaun');

      $pendahuluanpkblama = imbangdugalama::on($cawangan['mysql'])
@@ -293,7 +297,7 @@ class VaultController extends Controller
      $pendahuluanjmclama = imbangdugalama::on($cawangan['mysql'])
         ->sum('pendahuluan_jmc');

-      $total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluan;
+      $total = $pendahuluanjmclama + $pendahuluanpkblama + $pendahuluanPKB + $pendahuluanJMC;

      $pindahkekpkb = GlCode::on($cawangan['mysql'])
      ->where('glcode','=',$serahankoperasi)