fix gadai

app/Http/Controllers/GadaiController.php

@@ -190,8 +190,8 @@ class GadaiController extends Controller
 
     public function daftarGadaiMarhun($norujukan,Request $request)
     {
-        $router->get('CalculationPendahuluanSerahan/{kodcaw}',['uses'=>'VaultController@CalculationPendahuluanSerahan']); //panjar
+        $current = Carbon::now();
-
+        $current = new Carbon();
 
         $t_matang = Carbon::now();
         $t_matang = new Carbon();
@@ -1922,18 +1922,17 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
-            ->where('t_gadai','<=',$request->tarikh)
-            ->where('sttebus','=','')
             ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
-            ->where('t_gadai','<=',$request->tarikh)
-            ->where('sttebus','=','')
             ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
         return response()->json($array_rekodemas);
@@ -1952,4 +1951,5 @@ class GadaiController extends Controller
 
         return response()->json($keuntungan,200);
     }
+
 }

app/Http/Controllers/GlDetailsController.php

@@ -91,12 +91,11 @@ public function JumlahSerahanHQ($kodcaw)
 
  public function data_imbangduga($kodcaw, $tarikh)
  {
-
     $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
     $db=$cawangan['mysql'];
-     $imbangduga=DB::connection($db)->select("select glcode.glcode, glcode.descpt, glcode.acttype, glcode.tarikh, glcode.amaun, glcode.kodcaw, glcode.jenisakaun, jenisakaun.keterangan,jenisakaun.kod from glcode, jenisakaun where glcode.tarikh='".$tarikh."' and glcode.amaun<>0 and jenisakaun.kod=glcode.acttype order by jenisakaun.kod,  glcode.glcode ");
+     $imbangduga=DB::connection($db)->select("select glcode.glcode, glcode.descpt, glcode.acttype, glcode.tarikh, glcode.amaun, glcode.kodcaw, glcode.jenisakaun, jenisakaun.keterangan,jenisakaun.kod from glcode, jenisakaun where glcode.tarikh='".$tarikh."' and glcode.amaun<>0 and jenisakaun.kod=glcode.acttype order by jenisakaun.kod,  glcode.glcode");
-    return response()->json($imbangduga);
+   
-
+     return response()->json($imbangduga);
  }
 
 }

app/Http/Controllers/LelongController.php

@@ -7,8 +7,12 @@ use App\Cawangan;
 use App\Gadai;
 use App\TuntutBaki;
 use App\WTD;
+use App\GlCode;
+use App\imbangdugalama;
+use App\AnsRugi;
 use Illuminate\Http\Request;
 
+
     use Carbon\Carbon;
 
 class LelongController extends Controller
@@ -134,22 +138,44 @@ class LelongController extends Controller
     public function BakiLelongCalculation($kodcaw,Request $request)
     {
 
+        $tarikhbaru = $request->tarikh;
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $bakilelong = Gadai::on($cawangan['mysql'])
-        ->where([['gadai.sttebus','=', 'L'],['lelong.t_jual','<=',$request->tarikh],['lelong.baki','>=', 0]])
-        ->whereNull('lelong.trkhtuntut')
-        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
-                ->sum('baki');
 
+        $bakilelonglama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('baki_lelong');
+
+        $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('rugi_lelong');
+
+        $bakilelong = Lelong::on($cawangan['mysql'])
+        ->where('t_jual','<=',$request->tarikh)
+        ->where(function($query){
+            $query->whereNull('trkhtuntut')
+                  ->orWhere('trkhtuntut','>','2021-01-02');
+        })
+        ->where('baki','>=',0)
+        ->sum('baki');
+
+        // dd($bakilelong->toSql(), $bakilelong->getBindings());
+        // dd($bakilelong);
+
+        $ansrugi = AnsRugi::on($cawangan['mysql'])
+            ->sum('bayaran');
                 
-        $rugilelong = Gadai::on($cawangan['mysql'])
+        $rugilelong = Lelong::on($cawangan['mysql'])
-        ->where([['gadai.sttebus','=', 'L'],['lelong.t_jual','<=',$request->tarikh],['lelong.baki','<=', 0]])
+            ->where('t_jual','<=',$request->tarikh)
-        ->whereNull('lelong.trkhtuntut')
+            ->where(function($query)
-        ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
+            {
-                ->sum('baki');
+                $query->whereNull('trkhtuntut')
+                    ->orWhere('trkhtuntut','>','2021-01-02');
+            })
+            ->where('baki','<',0)
+            ->sum('baki');
 
-        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugilelong];
+        $rugitotal=$rugilelong + $ansrugi;
+
+        $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
 
         return response()->json($arraylelong,200);
     }
@@ -313,19 +339,33 @@ class LelongController extends Controller
         return response()->json($wtd,200);
     }
 
-    public function cajlelongcalculation($kodcaw)
+    public function cajlelongcalculation($kodcaw,Request $request)
     {
         $current = Carbon::now();
-        $current = new Carbon();
+
+        $current = new Carbon($request->tarikh);
+
 
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $cajlelong = Lelong::on($cawangan['mysql'])
+        ->whereNotNull('t_jual')
+        ->where([['t_jual','<=', $request->tarikh],['t_jual','>','2014-12-31']])
         ->whereYear('t_jual','=',$current->year)
         ->sum('cajlelong');
 
         return response()->json($cajlelong,200);
     }
 
+    public function cajperkhidmatancalculation($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $cajperkhidmatan = GlCode::on($cawangan['mysql'])
+        ->where('glcode','=','7000/500')
+        ->sum('amaun');
+  
+        return response()->json($cajperkhidmatan,200);
+    }
 
 }

app/Http/Controllers/PanjarController.php

@@ -104,25 +104,25 @@ class PanjarController extends Controller
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
       $current = Carbon::now();
-      $current = new Carbon();
+      $current = new Carbon($request->tarikh);
 
       $baikidanselenggara = Panjar::on($cawangan['mysql'])
       // ->where('tarikh','>=', $request->mula)
-      // ->where('tarikh','<=', $request->akhir)
+      ->where('tarikh','<=', $request->tarikh)
       ->where('tag', '=', 2)
       ->whereYear('tarikh','=',$current->year)
       ->sum('bayaran');
 
       $perubatan = Panjar::on($cawangan['mysql'])
       // ->where('tarikh','>=', $request->mula)
-      // ->where('tarikh','<=', $request->akhir)
+      ->where('tarikh','<=', $request->tarikh)
       ->where('tag', '=', 1)
       ->whereYear('tarikh','=',$current->year)
       ->sum('bayaran'); 
 
       $keraian = Panjar::on($cawangan['mysql'])
       // ->where('tarikh','>=', $request->mula)
-      // ->where('tarikh','<=', $request->akhir)
+      ->where('tarikh','<=', $request->tarikh)
       ->where('tag', '=', 3)
       ->whereYear('tarikh','=',$current->year)
       ->sum('bayaran');

app/Http/Controllers/TebusController.php

@@ -11,6 +11,11 @@ use App\Advansur;
 use App\Tebus;
 use App\InOutMar;
 use App\Wakil;
+use App\imbangdugalama;
+use App\Customer;
+use App\Lelong;
+use App\HapusKira;
+use App\Parameter;
 
 use Illuminate\Http\Request;
 
@@ -537,12 +542,128 @@ class TebusController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        $keuntungan = Tebus::on($cawangan['mysql'])
+        $current = new Carbon($request->tarikh);
-        ->where('t_tebus','<=',$request->tarikh)
-        // ->where('sttebus','=','')
-        ->whereNotNull('rebate')
-        ->sum('rebate');
 
-        return response()->json($keuntungan,200);
+        $total = 0;
+        $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'])
+            ->where('t_tebus','<=',$request->tarikh)
+            ->where('t_tebus','>','2013-12-31')
+            ->whereYear('t_tebus','=',$current->year)
+            // ->whereNotNull('upahdibayar')
+            ->sum('upahdibayar');
+        
+
+        $total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
+
+        return response()->json($total,200);
     }
+
+    public function calculationUntungRugiTerkumpul($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $current = new Carbon($request->tarikh);
+
+        $total = 0;
+
+
+        //Untung Rugi Terkumpul Sebelum 01.12.2013
+        $utgrugilama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('untung_t');
+
+        //Yuran Ahli
+        $yuranTlama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('yuran_t');
+
+        $yuranbaru = Customer::on($cawangan['mysql'])
+            ->where('tarikhdaftar','>','2013-12-31')
+            ->whereYear('tarikhdaftar','<',$current->year)
+            ->sum('yuranahli');
+
+        //Caj Lelong
+        $lelong = Lelong::on($cawangan['mysql'])
+            ->whereNotNull('t_jual')
+            ->where('t_jual','>','2013-12-31')
+            ->whereYear('t_jual','<',$current->year)
+            ->sum('cajlelong');
+
+        $cajlelonglama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('cajlelong_t');
+
+
+            // dd($current->year);
+        //Upah Simpan Tebus
+        $upahsimpantebus = Tebus::on($cawangan['mysql'])
+            ->where('t_tebus','>','2013-12-31')
+            ->whereYear('t_tebus','<',$current->year)
+            ->sum('upahdibayar');
+
+        //Upah Simpan Lelong
+        $upahsimpanlelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','>','2013-12-31')
+            ->whereYear('t_jual','<',$current->year)
+            ->sum('bakiupah');
+            
+        //Upah Simpan Advansur
+        $upahsimpanansur = Advansur::on($cawangan['mysql'])
+            ->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'])
+            ->where('t_jual','<=',$request->tarikh)
+            ->whereYear('t_jual','<',$current->year)
+            ->sum('gst_cl');
+
+        //Upah Hapus Kira
+        $upahhapuskira = HapusKira::on($cawangan['mysql'])
+            ->where('tarikh','>','2013-12-31')
+            ->whereYear('tarikh','<',$current->year)
+            ->sum('bakiupah');
+
+        $parameter = Parameter::on($cawangan['mysql'])
+            ->sum('sumpanjarlama');
+
+        // dd($utgrugilama,$yuranTlama,$lelong,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahhapuskira,$parameter,$gstcajlelong);
+
+
+        $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);
+    }
+
+    public function PenghutangKakitangan($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $penghutangkaki = imbangdugalama::on($cawangan['mysql'])
+        ->sum('penghutang');
+
+
+        return response()->json($penghutangkaki,200);
+    }
+
 }

app/Http/Controllers/TunaiController.php

@@ -270,6 +270,13 @@ class TunaiController extends Controller
          ) );
     }
 
+    public function batalRequestTeller($kodcaw,Request $request)
+    {
+        $requestteller = RequestTeller::on('mysql7')->where([['no','=',$request->no],['kodcaw','=',$kodcaw],['kodlaluan','=',$request->kodlaluan],['update','=',0]])->update(array(
+            'update' => 2
+         ));   
+    }
+
     public function createRequestTeller($kodcaw,Request $request)
     {
     

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'])
+      // $pendahuluan = Vault::on($cawangan['mysql'])
-      ->where('kodcaw','=',$kodcaw)
+      // ->where('kodcaw','=',$kodcaw)
-      ->where('tarikh','<=', $request->tarikh)
+      // ->where('tarikh','<=', $request->tarikh)
-      ->sum('pendahuluan');
+      // ->sum('pendahuluan');
 
-      $serahan = Vault::on($cawangan['mysql'])
+      // $serahan = Vault::on($cawangan['mysql'])
-      ->where('kodcaw','=',$kodcaw)
+      // ->where('kodcaw','=',$kodcaw)
-      ->where('tarikh','<=', $request->tarikh)
+      // ->where('tarikh','<=', $request->tarikh)
-      ->sum('serahan');
+      // ->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);
    }

app/Parameter.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Parameter extends Model
+{
+    protected $table = 'parameter';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+        
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

routes/web.php

@@ -247,7 +247,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('requestTeller/{kodcaw}',['uses' => 'TunaiController@createRequestTeller']);
     $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']);
     $router->put('requestTeller/update/{kodcaw}',['uses' => 'TunaiController@updateRequestTeller']);
-    
+    $router->put('requestTeller/batal/{kodcaw}',['uses' => 'TunaiController@batalRequestTeller']);
+
     //API WAKIL
     $router->get('getwakil/{kodcaw}',['uses' => 'TebusController@AllWakil']);
     $router->get('getwakil/{kodcaw}/{icno}',['uses' => 'TebusController@getWakil']);
@@ -292,6 +293,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gldetailkira_pendahuluanJMC_2015/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2015']);
     $router->get('gldetailkira_pendahuluanJMC_2014/data/{kodcaw}', ['uses' =>'GlDetailsController@sumJMC_2014']);
     $router->get('gldetailKira_SerahanHQ/data/{kodcaw}', ['uses'=>'GlDetailsController@JumlahSerahanHQ']);
+    $router->get('paparanImbangduga/data/{kodcaw}/{tarikh}',['uses'=>'GlDetailsController@data_imbangduga']);
 
     //API GLEJER
     $router->get('getGlejer/{kodcaw}',['uses'=>'GlejerController@getGlejer']);
@@ -324,16 +326,17 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
     $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
-    
+    $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //pinjaman diberi
+
     //-- Tanggungan Semasa --//
     $router->get('CalculationPanjar/{kodcaw}',['uses'=>'PanjarController@calculationpanjar']); //panjar
     $router->get('BakiLelongCalculation/{kodcaw}',['uses'=>'LelongController@BakiLelongCalculation']); //baki lelong & Rugi lelong
     $router->get('WTD/{kodcaw}',['uses'=>'LelongController@calculationwtd']); //wang tak dituntut
     $router->get('cajlelong/{kodcaw}',['uses'=>'LelongController@cajlelongcalculation']); //caj lelong by tahun
     $router->get('KeuntunganSebenar/{kodcaw}',['uses'=>'TebusController@calculationKeuntunganSebenar']); //Keuntungan Sebenar
+    $router->get('UntungRugiTerkumpul/{kodcaw}',['uses'=>'TebusController@calculationUntungRugiTerkumpul']); //caj lelong by tahun
+    $router->get('cajperkhidmatanterkumpul/{kodcaw}',['uses'=>'LelongController@cajperkhidmatancalculation']); //caj lelong by tahun
     
-
-
     //END IMBANG DUGA//
 
     //Komuditi Pukal