Merge branch 'apiaku' into 'master'

Apiaku

See merge request online-sistem1/api_arrahn!96

app/Http/Controllers/CustomerController.php

@@ -397,6 +397,37 @@ class CustomerController extends Controller
         return response()->json($customer_update, 200);
     }
 
+    public function customerUpdateKhazanah($nokp,Request $request){
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        foreach($cawangan_all as $index=>$cawangan){
+            $customer = Customer::on($cawangan['mysql'])
+            ->where('kplama','=',$nokp)
+            ->orWhere('kpbaru','=',$nokp)
+            ->first();
+            if($customer != null){
+                $poskod = Poskod::on('mysql7')->where('poskod','=',$request->poskod)->first();
+
+                $customer_update = Customer::on($cawangan['mysql'])
+                ->where('kplama','=',$nokp)
+                ->orWhere('kpbaru','=',$nokp)
+                ->update(array(
+                    'telefon' => $request->telefon1,
+                    'telefon2' => $request->telefon2,
+                    'kodbank' => $request->kodbank,
+                    'noakaun' => $request->noakaun,
+                    'nota' => $request->nota,
+                    'nama' => $request->nama,
+                    'alamat1' => $request->alamat,
+                    'poskod' => $request->poskod,
+                    'koddaerah' => $poskod['koddaerah'],
+                    'kodnegeri' => $poskod['kodnegeri']
+                ));
+            }
+        }
+        
+        return response()->json($customer_update, 200);
+    }
+
     public function listNorujukanMobile($nokp){
         $cawangan_all = Cawangan::on('mysql7')->get();
         $array_norujukan = [];

app/Http/Controllers/DaerahController.php

@@ -14,4 +14,13 @@ class DaerahController extends Controller
                     ->first();
         return response()->json($daerah);
     }
+
+    public function showOneNegeri($kodnegeri)
+    {
+        $daerah = Daerah::on('mysql7')
+                    ->where('kodnegeri','=',$kodnegeri)
+                    ->get();
+                    
+        return response()->json($daerah);
+    }
 }

app/Http/Controllers/GadaiController.php

@@ -925,11 +925,6 @@ class GadaiController extends Controller
 
         $array_kawalanstok = [];
 
-
-        $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
-                            ->get();
-
-
         ////////////
         ///GADAI////
         ///////////
@@ -1083,6 +1078,9 @@ class GadaiController extends Controller
 
         if($kodcaw == 'KB2')
         {
+            $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+                            ->get();
+                            
             foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
             {
                 //Gadai 
@@ -1150,6 +1148,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [1, 400.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1164,6 +1163,7 @@ class GadaiController extends Controller
                     // ->where('trans.created_at','=',$daterequest)
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [1, 400.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1177,6 +1177,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [401, 2000.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1190,6 +1191,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [401, 2000.99])
                     ->groupBy('trans.id')
                     ->get();
@@ -1203,6 +1205,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->where('trans.created_at','<',$daterequest)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [2001, 100000])
                     ->groupBy('trans.id')
                     ->get();
@@ -1216,6 +1219,7 @@ class GadaiController extends Controller
                     ->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
                     ->whereDate('trans.created_at','=',$tarikh)
                     ->where('trans.trans_type','=','A')
+                    ->where('db2.sttebus','=','')
                     ->whereBetween('nilaimarhun', [2001, 100000])
                     ->groupBy('trans.id')
                     ->get();
@@ -2181,6 +2185,9 @@ class GadaiController extends Controller
             case '1STOP':
                 $tarikhtawarruq = '2021-05-09';
             break;
+            case '020301';
+                $tarikhtawarruq = '2021-05-19';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
@@ -2277,10 +2284,8 @@ class GadaiController extends Controller
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    ->where('db2.sttebus','=','')
-                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('db2.hargajualan','<>','null')
-                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
                     ->sum('bayaran_pembiayaan');
 
         return response($transaksi);

app/Http/Controllers/LaporanController.php

@@ -16,6 +16,7 @@ use App\Advansur;
 use App\Vault;
 use App\Tunai;
 use App\Denominasi;
+use App\Hapuskira;
 
 use Carbon\Carbon;
 
@@ -119,8 +120,17 @@ class LaporanController extends Controller
                 ->sum('pinjaman');
             }
 
-        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq);
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
 
+        $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
+            ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->where('db2.sttebus','=','')
+            ->where('db2.hargajualan','<>','null')
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->sum('bayaran_pembiayaan');
+
+        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan);
    
         /* Stok Audit */
 
@@ -129,10 +139,19 @@ class LaporanController extends Controller
                     ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
                     ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 
-        $stokauditpembiayaan = $stokaudit->sum('pinjaman');
+        $stokauditget = $stokaudit->get();         
         $stokauditnilaimarhun = $stokaudit->sum('nilaimarhun'); 
         $stokauditcount = $stokaudit->count(); 
 
+        $totalstokaudit = 0;
+        foreach($stokauditget as $index1=>$stokA)
+        {
+            if($stokA['hargajualan'] == null)
+                $totalstokaudit += $stokA['pinjaman'];
+            else
+                $totalstokaudit += $stokA['bakipjm'];
+        }
+
 
         /* Kawalan Stok */
 
@@ -207,7 +226,7 @@ class LaporanController extends Controller
             'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
-            'stokauditpembiayaan'=>$stokauditpembiayaan,
+            'stokauditpembiayaan'=>$totalstokaudit,
             'stokauditnilaimarhun'=>$stokauditnilaimarhun,
             'stokauditcount'=>$stokauditcount,
             'petibesiimbangduga'=>$totalbakiakhirtunai,
@@ -217,4 +236,17 @@ class LaporanController extends Controller
             
         return response()->json($laporan_harian);
     }
+
+
+    public function CalcHapusKira($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $hapuskira = HapusKira::on($cawangan['mysql'])
+                        ->where('kodcaw','=',$kodcaw)
+                        ->where('tarikh','<',$request->tarikh)
+                        ->sum('amaun');
+
+        return response()->json($hapuskira);
+    }
 }

app/Http/Controllers/NegeriController.php

@@ -14,4 +14,14 @@ class NegeriController extends Controller
                     ->first();
         return response()->json($negeri);
     }
+
+    public function NegeriListAll()
+    {
+        $negeri = Negeri::on('mysql7')
+                    ->where('kodnegeri','<>','17')
+                    ->where('kodnegeri','<>','00')
+                    ->get();
+
+        return response()->json($negeri);
+    }
 }

app/Http/Controllers/PolisController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Polis;
+use App\Cawangan;
+use Illuminate\Http\Request;
+
+use Carbon\Carbon;
+
+class PolisController extends Controller
+{
+    public function getPolis(Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $polis = Polis::on($cawangan['mysql'])
+                 ->where('norujukan','=',$request->norujukan)
+                 ->get();
+        
+        return response()->json($polis);
+    }
+
+    public function PolischangeTebus(Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $polis = Polis::on($cawangan['mysql'])
+                 ->where('norujukan','=',$request->norujukan)
+                 ->update(['tebus' => $request->tebus]);
+        
+        return response()->json($polis);
+    }
+
+    public function createPolis(Request $request)
+    {
+        $harini = Carbon::now();
+        $harini = new Carbon;
+  
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+        
+        $polis = Polis::on($cawangan['mysql'])
+                 ->create([ 
+                    'tarikh' => $harini->toDateString(),
+                    'kodcaw' => $request->kodcaw,
+                    'norujukan' => $request->norujukan,
+                    'komen1' => $request->komen1,
+                    'komen2' => $request->komen2,
+                    'tebus' => 0,
+                    'teller' => $request->teller,
+                    'caj' => 0.00
+        ]);
+        
+        return response()->json($polis);
+
+    }
+}

app/Http/Controllers/VaultController.php

@@ -321,29 +321,50 @@ class VaultController extends Controller
 
 
       //Sebelum Tawarruq
+      if($kodcaw == 'KB2' || $kodcaw == 'WCY' || $kodcaw == '1STOP')
+      {
+         $serahanpkb = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanpkb)
+            ->where('tarikh','<=', $request->tarikh)
+            ->where('tarikh','>','2013-12-31')
+            ->sum('amaun');
 
-      $serahanpkb = GlDetail::on($cawangan['mysql'])
-         ->where('dtacct','=',$serahanpkb)
-         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2013-12-31')
-         ->sum('amaun');
+         $serahanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanjmc)
+            ->where('tarikh','<=', $request->tarikh)
+            ->where('tarikh','>','2013-12-31')
+            ->sum('amaun');
 
-      $serahanJMC = GlDetail::on($cawangan['mysql'])
-         ->where('dtacct','=',$serahanjmc)
-         ->where('tarikh','<=', $request->tarikh)
-         ->where('tarikh','>','2013-12-31')
-         ->sum('amaun');
+         $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('serahan_pkb');
 
-      $serahanpkblama = imbangdugalama::on($cawangan['mysql'])
-         ->sum('serahan_pkb');
+         $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
+            ->sum('serahan_jmc');
 
-      $serahanjmclama = imbangdugalama::on($cawangan['mysql'])
-         ->sum('serahan_jmc');
+         $totaljmc = $serahanJMC + $serahanjmclama;
+         $totalpkb = $serahanpkb + $serahanpkblama;
 
-      $totaljmc = $serahanJMC + $serahanjmclama;
-      $totalpkb = $serahanpkb + $serahanpkblama;
+         $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+      }else{
 
-      $totalserahan = $serahanpkbTawarruq + $totaljmc + $totalpkb;
+         if($kodcaw == '020301')
+            $serahanbaru = '1000/030';
+         else
+            $serahanbaru = '1000/026';
+
+         $serahanpkb = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanpkb)
+            ->where('tarikh','<=', $request->tarikh)
+            ->sum('amaun');
+
+         $serahanJMC = GlDetail::on($cawangan['mysql'])
+            ->where('dtacct','=',$serahanbaru)
+            ->where('tarikh','<=', $request->tarikh)
+            ->sum('amaun');
+
+         $totalserahan = $serahanpkbTawarruq + $serahanpkb + $serahanJMC;
+      }
+     
 
 
       //Selepas Tawarruq
@@ -375,6 +396,7 @@ class VaultController extends Controller
 
       $pindahkekpkb = GlCode::on($cawangan['mysql'])
       ->where('glcode','=',$serahankoperasi)
+      ->orWhere('glcode','=',)
       ->sum('amaun');
 
       $arraypend = ['pendahuluan' => $total,'serahan' => $totalserahan,'pindahkekpkb' => $pindahkekpkb];

app/Polis.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Polis extends Model
+{
+    protected $table = 'polis';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'tarikh',
+        'kodcaw',
+        'norujukan',
+        'komen1',
+        'komen2',
+        'tebus',
+        'recno',
+        'teller',
+        'caj'
+    ];
+
+    
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

routes/web.php

@@ -29,6 +29,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->delete('customers/{kodcaw}/{nokp}', ['uses' => 'CustomerController@delete']);
     $router->put('customers/update/{nokp}', ['uses' => 'CustomerController@customerUpdate']);
     $router->put('customers/update/kaunter/{nokp}', ['uses' => 'CustomerController@customerUpdateKaunter']);
+    $router->put('customers/update/khazanah/{nokp}', ['uses' => 'CustomerController@customerUpdateKhazanah']);
     $router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']);
     $router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']);
 
@@ -144,9 +145,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //Negeri API
     $router->get('negeri/{kodnegeri}',['uses'=>'NegeriController@showOneNegeri']);
+    $router->get('negeri/',['uses'=>'NegeriController@NegeriListAll']);
 
     //Daerah API
     $router->get('daerah/{koddaerah}',['uses'=>'DaerahController@showOneDaerah']);
+    $router->get('daerahkodnegeri/{kodnegeri}',['uses'=>'DaerahController@showOneNegeri']);
 
     //Bank API
     $router->get('bank',['uses'=>'BankController@showAllBank']);
@@ -192,6 +195,11 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
     $router->get('advansur/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansurUpah']);
 
+    //POLIS API
+    $router->get('polis/get/',['uses'=>'PolisController@getPolis']); 
+    $router->put('polis/put/',['uses'=>'PolisController@PolischangeTebus']); 
+    $router->post('polis/create/',['uses'=>'PolisController@createPolis']);
+
 
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
@@ -360,6 +368,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $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
+    $router->get('CalculationHapusKira/{kodcaw}',['uses'=>'LaporanController@CalcHapusKira']); //Hapus Kira
+
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar