From 521e52874f40f601540d52f5bff9bd94080390c2 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Sun, 16 Mar 2025 15:44:34 +0800
Subject: [PATCH] resolve conflict

---
 app/Http/Controllers/AutoSerahanController.php | 18 ++++++++++++------
 routes/web.php                                 |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php
index e2fdb32..e7e279c 100644
--- a/app/Http/Controllers/AutoSerahanController.php
+++ b/app/Http/Controllers/AutoSerahanController.php
@@ -36,8 +36,9 @@ class AutoSerahanController extends Controller
                 ->where('approval_status',"APPROVED")
                 ->where('action','create')
                 ->where('updated_serahan_v2',1)
-                ->where('updated_pendahuluan_v3',1)
-                ->get();
+                ->where('updated_pendahuluan_v3',1);
+
+                $listapproval = optional($listapproval)->first();
 
                 $approval = ApprovalWithdrawal::on('mysql7')->create([
                     'kodcaw' => ($request->version == 'v3') ? $this->interchangeCawangan($request->kodcaw,$request->version) : $request->kodcaw,
@@ -49,10 +50,10 @@ class AutoSerahanController extends Controller
                     'approval_timestamp' => null,
                     'gldetail_id_v3' => $listapproval['gldetail_id_v3'],
                     'gldetail_id_v2' => isset($request->recno) ? $request->recno : 0,
-                    'denopendser_id_v3' => 0,
-                    'denopendser_id_v2' => 0,
-                    'updated_serahan_v2' => 0,
-                    'updated_pendahuluan_v3' => 0,
+                    'denopendser_id_v3' => $listapproval['denopendser_id_v3'],
+                    'denopendser_id_v2' => $listapproval['denopendser_id_v2'],
+                    'updated_serahan_v2' => $listapproval['updated_serahan_v2'],
+                    'updated_pendahuluan_v3' => $listapproval['updated_pendahuluan_v3'],
                     'created_at' => $current,
                     'updated_at' => $current,
                 ]);
@@ -119,6 +120,7 @@ class AutoSerahanController extends Controller
                     'updated_serahan_v2' => 0,
                     'updated_pendahuluan_v3' => 0,
                     'created_at' => $current,
+                    'action' => 'create',
                     'updated_at' => $current,
                 ]);
                 DB::connection('mysql7')->commit();
@@ -253,6 +255,10 @@ class AutoSerahanController extends Controller
         try{
             $approval = ApprovalWithdrawal::on('mysql7')->where('id',$request->id)->first();
 
+            if($request->action == 'delete'){
+                
+            }
+
             if($approval->approval_status == 'PENDING' && $request->sendApproval == 'ACCEPTED'){
                 $approval->operasi_name = $request->operasi_name;
                 $approval->approval_status = 'APPROVED';
diff --git a/routes/web.php b/routes/web.php
index cf4ee3b..c9c9fd5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -681,6 +681,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     /* Endpoint for Auto Serahan */
     $router->get('autoserahan/list',['uses'=>'AutoSerahanController@getAutoSerahan']);
     $router->put('autoserahan/approve',['uses'=>'AutoSerahanController@autoSerahanApproval']);
+    $router->post('autoserahan/delete',['uses'=>'AutoSerahanController@deleteAutoSerahan']);
     $router->post('autoserahan/create',['uses'=>'AutoSerahanController@createAutoSerahan']);
     $router->post('autoserahan/delete',['uses'=>'AutoSerahanController@deleteAutoSerahan']);
     $router->put('autoserahan/pendahuluan',['uses'=>'AutoSerahanController@pendahuluanAutoSerahan']);