Merged in feature/hapus-ansuran-v2 (pull request #340)

Feature/hapus ansuran v2

app/Services/Transaction/AnsuranServices.php

@@ -8,6 +8,8 @@ use App\Tunai;
 use App\Transaction;
 use App\TransaksiKeuntungan;
 use App\Cawangan;
+use App\Mohon;
+use App\Mohonid;
 use App\TransaksiGadai;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -39,7 +41,14 @@ class AnsuranServices
         $tarikh = Carbon::now();
         $harisemasa = $tarikh->toDateString();
 
+        $audit = new Audit();
+        $audit->users = $request->teller;
+        $audit->actions = 'Hapus Ansuran';
+        $audit->norujukan = $request->norujukan;
+        $audit->new_data = '';
+
         if($harisemasa !== $tarikh_request->toDateString()){
+            Log::debug('Date mismatch: ' . $harisemasa . ' vs ' . $tarikh_request->toDateString());
             return 'date not equal';
         }
         $transaction_gadai = TransaksiGadai::on('mysql7')->where('id',$request->tg_id)->first();
@@ -49,8 +58,11 @@ class AnsuranServices
             return 'wrong teller';
         }
 
+        $audit->old_data = $transaction_gadai;
+        
+
         try{
-            DB::connection('mysql7')->transaction(function () use($cawangan,$request,$harisemasa,$transaction,$transaction_gadai){
+            DB::connection('mysql7')->transaction(function () use($cawangan,$request,$harisemasa,$transaction,$transaction_gadai,$audit){
 
                 try{
                     DB::connection($cawangan['mysql'])->transaction(function () use($cawangan,$request,$transaction_gadai,$harisemasa,$transaction){
@@ -91,6 +103,17 @@ class AnsuranServices
                     'softDelete' => 1,
                 ));
 
+                $gadai_updated = Gadai::on($cawangan['mysql'])
+                                ->select('percentpinj','bakipjm','tempoh','t_update','bakihargajualan','tempohbayar','lelong_tawarruq','margin_semasa','tunggakanujrah','tunggakanonepercent')
+                                ->where('norujukan',$request->norujukan)->first();
+
+                $tarikh_audit = Carbon::now();
+                $audit->new_data = $gadai_updated;
+                $audit->kodcaw = $this->cawangan;
+                $audit->created_at = $tarikh_audit;
+                $audit->updated_at = $tarikh_audit;
+                $audit->save();
+
 
                 return 'success';
 
@@ -103,18 +126,6 @@ class AnsuranServices
         }
         
         return 'success';
-
-        // $audit = new Audit();
-        // $audit->users = $request->teller;
-        // $audit->actions = 'Hapus Ansuran';
-        // $audit->norujukan = $norujukan;
-        // $audit->new_data = $new_data;
-        // $audit->old_data = $old_data;
-        // $audit->kodcaw = $kodcaw;
-        // $audit->created_at = $current;
-        // $audit->updated_at = $current;
-        // $audit->save();
-        
     }
 
     public function getLatestAdvanceWithoutDelete(Request $request){
@@ -125,5 +136,21 @@ class AnsuranServices
         return $latest;
     }
 
+    public function getApprovalFromOperation(Request $request){
+        $tarikh = Carbon::now();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$this->cawangan)->first();
+
+        $latest = Mohon::on($cawangan['mysql'])
+            ->whereDate('tarikh',$tarikh->toDateString())
+            ->where('teller',$request->teller)
+            ->where('masalulus','=','')
+            ->where('operasi','=','')
+            ->where('status','Hapus Ansuran')
+            ->latest('tarikh')
+            ->first();
+
+        return $latest;
+    }
+
 
 }