From 8959f4af8ff3514da667b07c55406d19eb67bb76 Mon Sep 17 00:00:00 2001
From: fifi97 <46933637+fifi97@users.noreply.github.com>
Date: Wed, 2 Feb 2022 02:59:15 +0800
Subject: [PATCH] fix notis lelong

---
 app/Http/Controllers/AdminPageController.php | 14 +++++++++-
 app/Http/Controllers/LelongController.php    | 19 +++++++++++---
 app/Pelelong.php                             | 27 ++++++++++++++++++++
 routes/web.php                               |  2 ++
 4 files changed, 58 insertions(+), 4 deletions(-)
 create mode 100644 app/Pelelong.php

diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 69b05ff..3a7809b 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -20,6 +20,7 @@ use App\TransaksiKeuntungan;
 use App\Bajet;
 use App\BajetTahunan;
 use App\Blacklist;
+use App\Pelelong;
 
 
 use DB;
@@ -1490,7 +1491,18 @@ class AdminPageController extends Controller
         ));
 
         return response()->json($updatetunai, 200);
-    
 
     }
+
+    public function UpdateNotisLelong($kodcaw,Request $request){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $detailslelong = Pelelong::on($cawangan['mysql'])->
+        update(array(
+             'para2'=>$request->content
+        ));
+
+        return response()->json($detailslelong, 200);
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 9d40435..83aa687 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Customer;
 use App\BatchLel;
+use App\Pelelong;
 use App\Daerah;
 use App\Poskod;
 use App\Negeri;
@@ -642,11 +643,14 @@ class LelongController extends Controller
     }
 
     public function getSenaraiLelongAktif($kodcaw){
+        $current = Carbon::now();
+        $current = new Carbon();
+
         $cawangan = Cawangan::on('mysql7')->where('kodcaw',$kodcaw)->first();
 
         $lelong = Lelong::on($cawangan['mysql'])
             ->selectRaw('count(*) as total, batchno,t_lelong')
-            ->whereYear('t_lelong','>','2020')
+            ->where('t_lelong','>=',$current->toDateString())
             ->whereNull('t_jual')
             ->orderBy('t_lelong','desc')
             ->groupBy('batchno')
@@ -685,7 +689,7 @@ class LelongController extends Controller
                     ->sum('duit_masuk');
 
             $customer = Customer::on('mysql7')
-                    ->select('nama','telefon','telefon2','alamat1','poskod','koddaerah')
+                    ->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah')
                     ->where('kpbaru','=',$lel['nokp'])
                     ->orWhere('kplama','=',$lel['nokp'])
                     ->get()->toArray();
@@ -702,10 +706,19 @@ class LelongController extends Controller
                 ->where('kodnegeri','=',$poskod['kodnegeri'])
                 ->first();
 
-            array_push($arraylelong,['poskod'=>$customer[0]['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer[0]['alamat1'],'masa' => $batchlel[0]['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer[0]['nama'], 'telefon1' => $customer[0]['telefon'], 'telefon2' => $customer[0]['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
+            array_push($arraylelong,['poskod'=>$customer[0]['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer[0]['alamat1'],'alamat2' => $customer[0]['alamat2'],'masa' => $batchlel[0]['masadari'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer[0]['nama'], 'telefon1' => $customer[0]['telefon'], 'telefon2' => $customer[0]['telefon2'], 'norujukan' => $lel['norujukan'], 'JBG' => $lel['jbg'], 'IC' => $lel['nokp'], 'Pembiayaan' => $lel['pinjaman'], 'upah6' => $lel['bakiupah'], 'bayaran' => $ansuran]);
         }
 
         return response()->json($arraylelong);
     }
+    
+    public function DetailsNotisLelong($kodcaw){
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $detailslelong = Pelelong::on($cawangan['mysql'])->get();
+
+        return response()->json($detailslelong);
+    }
 
 }
diff --git a/app/Pelelong.php b/app/Pelelong.php
new file mode 100644
index 0000000..5ded022
--- /dev/null
+++ b/app/Pelelong.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Pelelong extends Model
+{
+    protected $table = 'pelelong';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+        
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 6f8bb87..2e25a70 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -261,6 +261,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     //LELONG API
     $router->get('senaraibatch/aktif/{kodcaw}',['uses'=>'LelongController@getSenaraiLelongAktif']); 
     $router->get('senaraibatch/laporan/{kodcaw}',['uses'=>'LelongController@getSenaraiBatchNoAktif']); 
+    $router->get('details/notislelong/{kodcaw}',['uses'=>'LelongController@DetailsNotisLelong']); 
 
 
     //API BARU
@@ -668,6 +669,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
     $router->get('SenaraiBlacklist/{kodcaw}',['uses'=>'AdminPageController@SenaraiBlacklist']);
     $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']);
     $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']);
+    $router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']);