diff --git a/app/Http/Controllers/CallCenterController.php b/app/Http/Controllers/CallCenterController.php
index 3f29f6f..6c31cd6 100644
--- a/app/Http/Controllers/CallCenterController.php
+++ b/app/Http/Controllers/CallCenterController.php
@@ -38,6 +38,11 @@ use App\CawanganDetail;
 use App\BlastSMS;
 use App\Jobs\ARCCWhatsappPelangganSAGLAMAbysag;
 use App\Jobs\ARCCSMSPelangganSAGLAMAbysag;
+use App\Services\MasterServices;
+use App\Daerah;
+use App\Poskod;
+use App\Negeri;
+use Log;
 
 use App\Services\OnePercentServices;
 
@@ -267,7 +272,7 @@ class CallCenterController extends Controller
     public function bycawnotisperingatan($kodcaw,$notisid)
     {
         $cawnotis_all = [];
-
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $notisbycaw = NotisPeringatan::on('mysql7')
         ->where('notisperingatan.notis_id',$notisid)->where('notisperingatan.kodcaw',$kodcaw)
         ->distinct()
@@ -280,7 +285,26 @@ class CallCenterController extends Controller
             ->orWhere('kplama','=',$cal['nokp'])
             ->first();
 
+            $datagadai =  Gadai::on($cawangan['mysql'])
+            ->where('norujukan','=',$cal['norujukan'])
+            ->first();
+            // dd( $datagadai);
+
+            if($datagadai->tagbaru == '0'){
+                $keuntungan = 'asal';
+                $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal';
+                $master = new MasterServices($kodcaw);
+                $response = $master->kiraUpahTawarruq($kodcaw,$cal['norujukan'],$jeniskeuntungan);
+            }elseif($datagadai->tagbaru == '1'){
+                $keuntungan = 'onepercent';
+                $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal';
+                $master = new MasterServices($kodcaw);
+                $response = $master->kiraupahUjrahOnePercent($kodcaw,$cal['norujukan']);
+            }
+            
             $notisbycawarray[$index]['namacust'] = $customer;
+            $notisbycawarray[$index]['datagadai'] = $datagadai;
+            $notisbycawarray[$index]['keuntungan'] = $response;
         }
 
         array_push($notisbycawarray);
@@ -368,5 +392,567 @@ class CallCenterController extends Controller
 
     }
 
+    public function cariannotispertama($kodcaw,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $today = $current->toDateString();
+        $time = strtotime($today);
+        $monthscoming = date("Y-m-d", strtotime("+1 month", $time));
+
+       
+        $fasa = $request->fasa;
+        // dd($fasa);
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        if($fasa == 1){
+           
+            $datagadai = Gadai::on($cawangan['mysql'])
+                ->where([['t_matang','<=',$monthscoming],['lelong_tawarruq','=',1],['tempoh','>=',5],['tempoh','<=',5.5],['tagpalsu','=',0],['sttebus','=',''],['taglel','=',0],['tagnotis','=',0]])
+                ->orderBy('t_gadai', 'ASC')
+                ->orderBy('sirig', 'ASC');
+                // ->get();      
+                // dd($datagadai);    
+
+            }elseif($fasa == 2){
+                $datagadai = Gadai::on($cawangan['mysql'])
+                ->where([['t_matang1','<=',$monthscoming],['lelong_tawarruq','=',0],['tempoh','>=',11],['tempoh','<=',11.5],['tagpalsu','=',0],['sttebus','=',''],['taglel','=',0]])
+                ->orderBy('t_gadai', 'ASC')
+                ->orderBy('sirig', 'ASC');
+                // ->get(); 
+            }
+            
+            $arraynorujukan = $datagadai->pluck('norujukan')->toArray();
+            $rekodgadai = $datagadai->get();
+            // dd($rekodgadai);
+       
+        $totalrekod = $datagadai->count('norujukan');
+        $totalberat = $datagadai->sum('berat');
+        $totalnilaimarhun = $datagadai->sum('nilaimarhun');
+        $totalpinjaman = $datagadai->sum('pinjaman');
+        $totalbakipjm = $datagadai->sum('bakipjm');
+        $totaltunggakan = $datagadai->sum('tunggakan');
+
+        $arrayrekod = ['rekod' => $rekodgadai, 'totalsag' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun,'totalpembiayaan'=>$totalpinjaman,'totalbakipjm'=>$totalbakipjm,'totaltunggakan'=>$totaltunggakan];
+        // dd($arrayrekod);
+        return response()->json($arrayrekod,200);
+    }
+
+    public function insertnotispertama($kodcaw,Request $request)
+    {
+        $fasa = $request->fasa;
+        $notisid = $request->notisid;
+        $current = Carbon::now();
+        $current = new Carbon();
+        $today = $current->toDateString();
+        $tarikh_notis = $current->toDateString();
+        $time = strtotime($today);
+        $monthscoming = date("Y-m-d", strtotime("+1 month", $time));
+
+        $sag_cawangans = [];
+        $bil_surat = 0;
+        // dd($kodcaw);
+        if($kodcaw){
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+            if($fasa == 1){
+                $datagadai = Gadai::on($cawangan['mysql'])
+                ->where([['t_matang','<=',$monthscoming],['lelong_tawarruq','=',1],['tempoh','>=',5],['tempoh','<=',5.5],['tagpalsu','=',0],['sttebus','=',''],['taglel','=',0],['tagnotis','=',0]])
+                ->orderBy('t_gadai', 'ASC')
+                ->orderBy('sirig', 'ASC');
+            }elseif($fasa == 2){
+                $datagadai = Gadai::on($cawangan['mysql'])
+                ->where([['t_matang1','<=',$monthscoming],['lelong_tawarruq','=',0],['tempoh','>=',11],['tempoh','<=',11.5],['tagpalsu','=',0],['sttebus','=',''],['taglel','=',0]])
+                ->orderBy('t_gadai', 'ASC')
+                ->orderBy('sirig', 'ASC');
+            }
+            array_push($sag_cawangans,['data'=>$datagadai->get()]);
+                // dd($sag_cawangans);
+
+                foreach($sag_cawangans as $index=>$cawnotis){
+
+                    if($fasa == 1){
+                        $caw_notis = new CawanganNotis;
+                        $caw_notis->notis_id = $notisid;
+                        $caw_notis->kodcaw = $kodcaw;
+                        $caw_notis->peringatan = 1;
+                        $caw_notis->daritempoh = 5;
+                        $caw_notis->hinggatempoh = 5;
+                        $caw_notis->status = 1;
+                        $caw_notis->save();
+
+                    }elseif($fasa == 2){
+                        $caw_notis = new CawanganNotis;
+                        $caw_notis->notis_id = $notisid;
+                        $caw_notis->kodcaw = $kodcaw;
+                        $caw_notis->peringatan = 1;
+                        $caw_notis->daritempoh = 11;
+                        $caw_notis->hinggatempoh = 11;
+                        $caw_notis->status = 1;
+                        $caw_notis->save();
+
+                    }
+                    
+                    
+
+                    $suratcaw = $cawnotis['data'];
+
+                    $notis_peringatan_arr = [];
+                    $now = Carbon::now();
+                    foreach($suratcaw as $surat)
+                    {
+                        $notis_to_be_inserted = new NotisPeringatan();
+                        $notis_to_be_inserted->notis_id = $notisid;
+                        $notis_to_be_inserted->tarikh_notis = $tarikh_notis;
+                        $notis_to_be_inserted->kodcaw = $kodcaw;
+                        $notis_to_be_inserted->norujukan = $surat->norujukan;
+                        $notis_to_be_inserted->nokp = $surat->nokp;
+                        $notis_to_be_inserted->jbg = $surat->tempoh;
+                        $notis_to_be_inserted->kadarupah = $surat->kadarupah;
+                        $notis_to_be_inserted->nilaimarhun = $surat->nilaimarhun;
+                        $notis_to_be_inserted->pinjaman = $surat->bakipjm;
+                        $notis_to_be_inserted->bakiupah = $surat->bakiupah;
+                        $notis_to_be_inserted->berat = $surat->berat;
+                        $notis_to_be_inserted->marhun = $surat->marhun;
+                        $notis_to_be_inserted->percent = $surat->percentpinj;
+                        $notis_to_be_inserted->peringatan = '1';
+                        $notis_to_be_inserted->tmatang = $surat->t_matang;
+                        $notis_to_be_inserted->tmatang1 = $surat->t_matang1;
+                        $notis_to_be_inserted->fasa = $fasa;
+                        $notis_peringatan_arr[] = $notis_to_be_inserted->attributesToArray();
+
+                        //updatetagnotisdlmgadai
+                        $updateTagNotis = Gadai::on($cawangan['mysql'])->where('norujukan',$surat->norujukan)->update([
+                            'tagnotis'=> 1
+                        ]);
+                    }
+
+                    $notis_peringatan_collection = collect($notis_peringatan_arr);
+
+                    NotisPeringatan::insert($notis_peringatan_arr);
+            }
+        }
+        return response()->json("success");
+    }
+
+    public function getbatchnotispertama(Request $request)
+    {
+
+        $currentDate = Carbon::now();
+        $tarikh_notis = $currentDate->toDateString();
+        $fasa = $request->fasa;
+        // $hinggatempoh = $request->hinggatempoh;
+        if($fasa == 1){
+            $notis = Notis::create([
+                'tarikh_notis' => $tarikh_notis,
+                'daritempoh' => 5,
+                'hinggatempoh' => 5,
+                'sts_notis' => 1,
+                'peringatan' => 1
+            ]);
+        }elseif($fasa == 2){
+            $notis = Notis::create([
+                'tarikh_notis' => $tarikh_notis,
+                'daritempoh' => 11,
+                'hinggatempoh' => 11,
+                'sts_notis' => 1,
+                'peringatan' => 1
+            ]);
+        }
+
+        $batchnotis = Notis::on('mysql7')->orderBy('id','desc')->first()->id;
+
+        return response()->json($batchnotis);
+
+    }
+    
+
+    public function kemaskininotisperingatan(Request $request)
+    {
+        $notisid = $request->notisid;
+        $current = Carbon::now();
+        $current = new Carbon();
+       
+        $kodcaw = $request->kodcaw;
+        $notisid = $request->notisid;
+
+        $cawnotis_all = [];
+
+        $notis = CawanganNotis::on('mysql7')
+            ->join('arrahn_master_db', 'arrahn_master_db.kodcaw', '=', 'cawangan_notis.kodcaw')
+            ->where('notis_id',$notisid)->get();
+        
+        foreach ($notis as $index => $cawangan){
+                $notisbycaw = NotisPeringatan::on('mysql7')
+                ->where('notisperingatan.notis_id',$notisid)
+                ->where('notisperingatan.kodcaw',$cawangan['kodcaw'])
+                ->distinct()
+                ->get();
+                foreach($notisbycaw as $index=> $notis){
+                    // dd($notis['tarikhnotis1']);
+                    $checkgadai = Gadai::on($cawangan['mysql'])
+                    ->where([['norujukan','=',$notis['norujukan']]])
+                    ->first();
+                    if($checkgadai->sttebus == 'T' || $checkgadai->sttebus == 'L'){
+                        $updatelistnotis=NotisPeringatan::on('mysql7')
+                        ->where('norujukan','=', $notis['norujukan'])
+                        ->where('notis_id','=', $notisid)
+                        ->where('kodcaw','=', $kodcaw)
+                        ->delete();
+
+                    }elseif($checkgadai->sttebus == ''){
+                        $updatedata = NotisPeringatan::on('mysql7')
+                        ->where('norujukan',$notis['norujukan'])
+                        ->where('notis_id','=', $notisid)
+                        ->where('kodcaw','=', $kodcaw)
+                        ->update([
+                            'jbg'=> $checkgadai->tempoh,
+                            'pinjaman'=> $checkgadai->bakipjm,
+                        ]);
+                    }
+                }
+            }
+            return response()->json("success");
+    }
+
+    public function cariannotiskedua(Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+        $today = $current->toDateString();
+        $fasa = $request->fasa;
+        // dd($fasa);
+        if($fasa == 1){
+            // dd(true);
+            $listnotis = NotisPeringatan::on('mysql7')
+                    ->where('peringatan', 1)
+                    ->where('tarikhnotis1','<>', NULL)
+                    ->get();
+                    // dd($listnotis,);
+            foreach($listnotis as $index=> $notis){
+                $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$notis['kodcaw'])->first();
+                $detail = Gadai::on($cawangan['mysql'])
+                ->where([['norujukan','=',$notis['norujukan']]])
+                ->first();
+                $tarikhmatang = Carbon::parse($detail['t_matang']);
+                
+                if($detail['lelong_tawarruq'] == 1){
+                    $t_perlunotis = ($tarikhmatang->subDays(14))->format('d-m-Y');
+                    if($t_perlunotis <= $today){
+                        $updatedata = NotisPeringatan::on('mysql7')
+                            ->where('norujukan',$notis['norujukan'])
+                            ->where('notis_id','=', $notis['notis_id'])
+                            ->where('kodcaw','=', $notis['kodcaw'])
+                            ->update([
+                                'peringatan'=> 2
+                            ]);}
+                }
+            }
+        }elseif($fasa == 2){ //sag tamat kontrak
+            $listnotis = NotisPeringatan::on('mysql7')
+            ->where('peringatan', 1)
+            ->where('tarikhnotis1','<>', NULL)
+            ->get();
+            // dd($listnotis);
+            foreach($listnotis as $index=> $notis){
+                // dd($notis['tmatang1']);
+                $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$notis['kodcaw'])->first();
+                $detail = Gadai::on($cawangan['mysql'])
+                ->where([['norujukan','=',$notis['norujukan']]])
+                ->first();
+                $tarikhmatang1 = Carbon::parse($notis['tmatang1']);
+                // dd($notis['tmatang1']);
+                if($detail['lelong_tawarruq'] == 0){
+                    $t_perlunotis = ($tarikhmatang1->subDays(14))->format('Y-m-d');
+                    // dd($t_perlunotis, $today);
+                    if($t_perlunotis <= $today){
+                        $updatedata = NotisPeringatan::on('mysql7')
+                            ->where('norujukan',$notis['norujukan'])
+                            ->where('notis_id','=', $notis['notis_id'])
+                            ->where('kodcaw','=', $notis['kodcaw'])
+                            ->update([
+                                'peringatan'=> 2
+                            ]);}
+                }
+            }
+        }
+
+        $arrayrekod = ['rekod' => $detail];
+        return response()->json($arrayrekod,200);
+    }
+
+    public function getcawnotiskeduabycaw(Request $request)
+    {
+        $notisid = $request->notisid;
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $arraybatch = [];
+        $batchnotis = Notis::on('mysql7')->where('id',$notisid)->get();
+        $cawangan_all = Cawangan::on('mysql7')->get();
+        $cawnotis_all = [];
+
+        $notis = CawanganNotis::on('mysql7')
+            ->join('arrahn_master_db', 'arrahn_master_db.kodcaw', '=', 'cawangan_notis.kodcaw')
+            ->where('notis_id',$notisid)->get();
+
+        foreach ($notis as $index => $cawangan){
+            // dd($cawangan['kodcaw']);
+                // dd($cawangan);
+                $notisbycaw = NotisPeringatan::on('mysql7')
+                ->where('notisperingatan.notis_id',$notisid)
+                ->where('notisperingatan.kodcaw',$cawangan['kodcaw'])
+                ->where('notisperingatan.peringatan','2')
+                ->distinct()
+                ->get();
+                // dd($notisbycaw);
+
+                $totalsag = $notisbycaw->count('norujukan');
+                $totalbakipjm = $notisbycaw->sum('pinjaman');
+
+            // if(sizeof($notis) != 0){
+                array_push($cawnotis_all,['namacaw' => $notis, 'detailbycaw' => $notisbycaw,'totalsag' =>$totalsag,'totalbakipjm' =>$totalbakipjm]);
+            // }
+        }
+        return response()->json($cawnotis_all);
+    }
+
+    public function bycawnotisperingatankedua($kodcaw,$notisid)
+    {
+        $cawnotis_all = [];
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $notisbycaw = NotisPeringatan::on('mysql7')
+        ->where('notisperingatan.notis_id',$notisid)
+        ->where('notisperingatan.kodcaw',$kodcaw)
+        ->where('notisperingatan.peringatan',2)
+        ->distinct()
+        ->get();
+
+        $notisbycawarray = $notisbycaw->toArray();
+
+        foreach($notisbycawarray as $index=>$cal){
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
+            ->orWhere('kplama','=',$cal['nokp'])
+            ->first();
+
+            $datagadai =  Gadai::on($cawangan['mysql'])
+            ->where('norujukan','=',$cal['norujukan'])
+            ->first();
+            // dd( $datagadai);
+
+            if($datagadai->tagbaru == '0'){
+                $keuntungan = 'asal';
+                $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal';
+                $master = new MasterServices($kodcaw);
+                $response = $master->kiraUpahTawarruq($kodcaw,$cal['norujukan'],$jeniskeuntungan);
+            }elseif($datagadai->tagbaru == '1'){
+                $keuntungan = 'onepercent';
+                $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal';
+                $master = new MasterServices($kodcaw);
+                $response = $master->kiraupahUjrahOnePercent($kodcaw,$cal['norujukan']);
+            }
+            
+            $notisbycawarray[$index]['namacust'] = $customer;
+            $notisbycawarray[$index]['datagadai'] = $datagadai;
+            $notisbycawarray[$index]['keuntungan'] = $response;
+        }
+
+        array_push($notisbycawarray);
+        return response()->json($notisbycawarray);
+    }
+
+    public function getfasa(Request $request){
+        
+        $fasa = NotisPeringatan::on('mysql7')
+        ->where('kodcaw','=',$request->kodcaw)
+        ->where('notis_id','=',$request->notisid)
+        ->where('peringatan','=',2)
+        ->first();
+
+        return response()->json($fasa);
+    }
+
+    public function getdatanotiskedua($kodcaw,$notisid,$fasa,Request $request){
+
+        $current = Carbon::now();
+        $current = new Carbon();
+        $arraynotiskedua = [];
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        if($fasa == 'fasa1')
+        {
+            $notisbycaw = NotisPeringatan::on('mysql7')
+            ->where('notisperingatan.notis_id',$notisid)
+            ->where('notisperingatan.kodcaw',$kodcaw)
+            ->where('notisperingatan.peringatan',2)
+            ->where('notisperingatan.fasa',1)
+            ->where('notisperingatan.tagsurat', NULL);
+        }else{
+            $notisbycaw = NotisPeringatan::on('mysql7')
+            ->where('notisperingatan.notis_id',$notisid)
+            ->where('notisperingatan.kodcaw',$kodcaw)
+            ->where('notisperingatan.peringatan',2)
+            ->where('notisperingatan.fasa',2)
+            ->where('notisperingatan.tagsurat', NULL);
+        }
+
+
+        $notislist = $notisbycaw->get();
+
+        foreach($notislist as $index=>$not)
+        {
+            $gadai = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=', $not['norujukan'])
+                    ->first();
+                    // dd($gadai);
+             if($gadai->tagbaru == '0'){
+                $keuntungan = 'asal';
+                $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal';
+                $master = new MasterServices($kodcaw);
+                $response = $master->kiraUpahTawarruq($kodcaw,$not['norujukan'],$jeniskeuntungan);
+            }elseif($gadai->tagbaru == '1'){
+                $keuntungan = 'onepercent';
+                $jeniskeuntungan = ($keuntungan == 'onepercent') ? 'onepercent' : 'asal';
+                $master = new MasterServices($kodcaw);
+                $response = $master->kiraupahUjrahOnePercent($kodcaw,$not['norujukan']);
+            }
+
+            $customer = Customer::on('mysql7')
+                    ->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah')
+                    ->where('kpbaru','=',$not['nokp'])
+                    ->orWhere('kplama','=',$not['nokp'])
+                    ->first();
+
+            $poskod = Poskod::on('mysql7')
+                    ->where('poskod','=',$customer['poskod'])
+                    ->first();
+
+                if($poskod)
+                        $daerah = Daerah::on('mysql7')
+                                ->where('koddaerah','=',$poskod['koddaerah'])
+                                ->first();
+                else
+                    Log::debug('poskod tiada' . $not['nokp']);
+
+                $negeri = Negeri::on('mysql7')
+                    ->where('kodnegeri','=',$poskod['kodnegeri'])
+                    ->first();
+
+                $updatetagsurat=NotisPeringatan::on('mysql7')
+                ->where('norujukan','=', $not['norujukan'])
+                ->update(
+                    array('tagsurat'=> 1));
+
+            array_push($arraynotiskedua,['poskod'=>$customer['poskod'],
+            'negeri' => $negeri['negeri'],
+            'daerah' => $daerah['namadaerah'],
+            'alamat' => $customer['alamat1'],
+            'alamat2' => $customer['alamat2'],
+            'nama' => $customer['nama'],
+            'telefon1' => $customer['telefon'], 
+            'telefon2' => $customer['telefon2'], 
+            'norujukan' => $gadai['norujukan'], 
+            'tempoh' => $gadai['tempoh'], 
+            'nokp' => $gadai['nokp'], 
+            'pinjaman' => $gadai['bakipjm'], 
+            'keuntungan' => $response,
+            'tmatang' => $gadai['t_matang'],
+            'tmatang1' => $gadai['t_matang1'],
+            'leltawarruq' => $gadai['lelong_tawarruq']]);
+        }
+
+       
+
+        return response()->json($arraynotiskedua);
+    }
+
+    public function blastwasapbysagkedua(Request $request)
+    {
+        // dd($request->all());
+        $current = Carbon::now();
+        $current = new Carbon();
+        $kodcaw = $request->kodcaw;
+        $notisid = $request->notisid;
+
+        $namapengguna = $request->namapengguna;
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+        $cawangan_detail = CawanganDetail::on($cawangan['mysql'])->first();
+        $caw_name = $cawangan->details_caw;
+        $nofoncaw = $cawangan_detail->notel;
+
+        $statusblast =  CawanganNotis::where('notis_id','=',$notisid)
+        ->where('kodcaw','=',$kodcaw)
+        ->first();
+        // dd($statusblast);
+        // if($statusblast->status == '2'){
+
+                $notisbycaw = NotisPeringatan::on('mysql7')
+                ->where('notisperingatan.notis_id',$notisid)
+                ->where('notisperingatan.kodcaw',$kodcaw)
+                ->where('notisperingatan.peringatan',2)
+                ->where('notisperingatan.tarikhnotis2','=', NULL)
+                ->distinct()
+                ->get();
+                // dd($notisbycaw);
+
+
+                    $arraynorujukan = $notisbycaw->pluck('norujukan')->toArray();
+                    
+                    $gadainokp = Gadai::on($cawangan['mysql'])->whereIn('norujukan', $arraynorujukan)
+                    ->get();
+                    $gadai_all_groupby_nokp = $notisbycaw->groupBy('nokp');
+
+                    foreach($gadainokp as $index1=>$cal){
+                        if($gadai_all_groupby_nokp[$cal->nokp]){
+                            $gadainokp[$index1]['gadai'] = $gadai_all_groupby_nokp[$cal->nokp];
+                        }
+                        $customer =  Customer::on('mysql7')->where('kpbaru','=',$cal['nokp'])
+                        ->orWhere('kplama','=',$cal['nokp'])
+                        ->first();
+                        $nokp=$cal['nokp'];
+                        // dd($customer);
+                                if($customer->telefon != 'null'){
+                                    $telefon=$customer->telefon;
+                                        //log auditrail
+                                        $audit = new Audit();
+                                        $audit->users = $namapengguna;
+                                        $audit->actions = 'ARCC Blast Whatsapp & SMS: Notis ID'.$notisid;
+                                        $audit->norujukan = $cal->norujukan;
+                                        $audit->new_data = $customer->telefon;
+                                        $audit->old_data = $nokp;
+                                        $audit->kodcaw = $kodcaw;
+                                        $audit->created_at = $current;
+                                        $audit->updated_at = $current;
+                                        $audit->save();
+
+                                        $today = $current->toDateString();  
+                                        $harini = date('Y-m-d',strtotime($today)); 
+
+                                        //update tarikh dlm table notisperingatan
+                                            $updatenotis=NotisPeringatan::on('mysql7')
+                                            ->where('norujukan','=', $cal->norujukan)
+                                            ->update(
+                                                array('tarikhnotis2'=> $harini));
+
+                                    dispatch(new ARCCWhatsappPelangganSAGLAMAbysag($nokp,$customer->telefon,$caw_name,$nofoncaw,$kodcaw,$cal->norujukan,$cal->tempoh,$cal->t_matang,$cal->t_matang1,$cal->lelong_tawarruq,$namapengguna));
+                                    dispatch(new ARCCSMSPelangganSAGLAMAbysag($nokp,$customer->telefon,$caw_name,$nofoncaw,$kodcaw,$cal->norujukan,$cal->tempoh,$cal->t_matang,$cal->t_matang1,$cal->lelong_tawarruq,$namapengguna));
+                                }
+                    }
+
+                    // $updatestatusnotis=CawanganNotis::on('mysql7')
+                    // ->where('notis_id','=', $notisid)
+                    // ->where('kodcaw','=', $kodcaw)
+                    // ->update(
+                    // array('status'=> 2));
+
+                    return response()->json('success');
+                }
+                
+            //}
+            // else{
+            //     return response()->json('failed');
+            // }
+
+   // }
+
 
 }
diff --git a/app/NotisPeringatan.php b/app/NotisPeringatan.php
index 4173469..9bf911b 100644
--- a/app/NotisPeringatan.php
+++ b/app/NotisPeringatan.php
@@ -15,7 +15,9 @@ class NotisPeringatan extends Model
      * @var array
      */
     protected $fillable = [
+      'id',
       'notis_id',
+      'tarikh_notis',
       'kodcaw',
       'norujukan',
       'nokp',
@@ -28,6 +30,12 @@ class NotisPeringatan extends Model
       'marhun',
       'percent',
       'peringatan',
+      'tarikhnotis1',
+      'tarikhnotis2',
+      'fasa',
+      'tmatang',
+      'tmatang1',
+      'tagsurat'
   ];
 
     /**
diff --git a/database/migrations/2023_12_28_103210_add_fasa_to_notis_peringatan_table.php b/database/migrations/2023_12_28_103210_add_fasa_to_notis_peringatan_table.php
new file mode 100644
index 0000000..2ec8ca5
--- /dev/null
+++ b/database/migrations/2023_12_28_103210_add_fasa_to_notis_peringatan_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddFasaToNotisPeringatanTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('notisperingatan', function (Blueprint $table) {
+            $table->tinyInteger('fasa')->default(0);
+            $table->string('tmatang')->nullable();
+            $table->string('tmatang1')->nullable();
+            $table->string('tagsurat')->nullable();
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('notisperingatan', function (Blueprint $table) {
+            $table->dropColumn(['fasa']);
+            $table->dropColumn(['tmatang']);
+            $table->dropColumn(['tmatang1']);
+            $table->dropColumn(['tagsurat']);
+
+        });
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index f32a539..012dc21 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -844,13 +844,26 @@ $router->group(['prefix'=>'kelantanpay'], function () use ($router){
 $router->group(['prefix'=>'arcc'], function () use ($router){
     //ARCC API
     $router->get('datagadai/aktif/{kodcaw}',['uses'=>'CallCenterController@datagadai']);
+    $router->get('cariannotispertama/{kodcaw}',['uses'=>'CallCenterController@cariannotispertama']);
     $router->get('cawangan',['uses'=>'CallCenterController@showAllCawangans']);
     $router->post('insertdatagadai/aktif/{kodcaw}',['uses'=>'CallCenterController@insertdatagadai']);
+    $router->post('insertnotispertama/{kodcaw}',['uses'=>'CallCenterController@insertnotispertama']);
+    $router->get('getbatchnotispertama',['uses'=>'CallCenterController@getbatchnotispertama']);
     $router->get('getbatchnotis',['uses'=>'CallCenterController@getbatchnotis']);
     $router->get('senarainotisperingatan',['uses'=>'CallCenterController@senarainotisperingatan']);
     $router->get('getcawnotis/{notisid}',['uses'=>'CallCenterController@getcawnotis']);
     $router->get('getcawnotisbycaw',['uses'=>'CallCenterController@getcawnotisbycaw']);
     $router->get('bycawnotisperingatan/{kodcaw}/{notisid}',['uses'=>'CallCenterController@bycawnotisperingatan']);
-    $router->post('blastwasapbysag',['uses'=>'CallCenterController@blastwasapbysag']);
+    $router->post('/notis/blastwasapbysag',['uses'=>'CallCenterController@blastwasapbysag']);
+    $router->post('kemaskininotisperingatan',['uses'=>'CallCenterController@kemaskininotisperingatan']);
+    $router->get('cariannotiskedua',['uses'=>'CallCenterController@cariannotiskedua']);
+    $router->get('getcawnotiskeduabycaw',['uses'=>'CallCenterController@getcawnotiskeduabycaw']);
+    $router->get('bycawnotisperingatankedua/{kodcaw}/{notisid}',['uses'=>'CallCenterController@bycawnotisperingatankedua']);
+    $router->get('notisperingatankedua/{kodcaw}/{notisid}',['uses'=>'CallCenterController@notisperingatankedua']);
+    $router->get('getfasa',['uses'=>'CallCenterController@getfasa']);
+    $router->get('getdatanotiskedua/{kodcaw}/{notisid}/{fasa}',['uses'=>'CallCenterController@getdatanotiskedua']);
+    $router->post('/notis/blastwasapbysagkedua',['uses'=>'CallCenterController@blastwasapbysagkedua']);
+
+
 
 });