fix panjar

2021-07-08 10:42:49 +08:00
parent 40d426b733
commit f5b8484cd1
3 changed files with 46 additions and 73 deletions
@@ -876,9 +876,10 @@ class KhazanahController extends Controller
        $api_url = config('api.url');
        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();

+        $denopanjar = Http::get( config('api.url') .'/api/getdenopanjar/'. $auth_user['cawangan'],['recno' => $request->recno])->json();
        
-        $denopanjar = Http::get( config('api.url') .'/api/requestdenopanjar/get/'. $auth_user['cawangan'],['recno' => $request->recno ])->json();
-
+        if(sizeof($denopanjar) > 0)
+            $denopanjar = $denopanjar[0];

        $denominasilist = Http::get( config('api.url') .'/api/DenominasiController/'. $auth_user['cawangan'])->json();
        
@@ -932,80 +933,24 @@ class KhazanahController extends Controller
            'jumlahkeping' => "0"
          ]);

-        $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil);
-        $tarikhbil = $myDateTime->format('dmY');
-
        $deletepanjar = Http::post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[
            'recno' => $request->recno    
        ])->json();

        $updateVault = Http::put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[
-            'totpanjar'=>$$denopanjar['serahan']
+            'totpanjar'=>$denopanjar['serahan']
        ]);

-        $rekodsen1 -= intval($request->ambilansen1);
-        $rekodsen5 -= intval($request->ambilansen5);
-        $rekodsen10 -= intval($request->ambilansen10);
-        $rekodsen20 -= intval($request->ambilansen20);
-        $rekodsen50 -= intval($request->ambilansen50);
-
-        $rekodring1 -= intval($request->ambilanring1);
-        $rekodring5 -= intval($request->ambilanring5); 
-        $rekodring10 -= intval($request->ambilanring10);
-        $rekodring20 -= intval($request->ambilanring20);
-        $rekodring50 -= intval($request->ambilanring50);
-        $rekodring100 -= intval($request->ambilanring100);
-        
-        $denopanjar = Http::post(config('api.url').'/api/requestdenopanjar/'.$auth_user['cawangan'],[
-            'kodlaluan' => $auth_user['name'],
-            'serahan' => $request->bayaran,
-            'bd1' => 0,
-            'bd5' => 0,
-            'bd10' => 0,
-            'bd20' => 0,
-            'bd50' => 0,
-            'bd100' => 0,
-            'txtring1' => $request->ambilanring1,
-            'txtring5' => $request->ambilanring5,
-            'txtring10' => $request->ambilanring10,
-            'txtring20' => $request->ambilanring20,
-            'txtring50' => $request->ambilanring50,
-            'txtring100' => $request->ambilanring100,
-            'txtring1000' => 0,
-            'txtsen1' => $request->ambilansen1,
-            'txtsen5' => $request->ambilansen5,
-            'txtsen10' => $request->ambilansen10,
-            'txtsen20' => $request->ambilansen20,
-            'txtsen50' => $request->ambilansen50,
-            'jenis' => $request->jenismodal,
-            'recno' => $recnopanjar 
-          ]);
-
        $upVault = $updateVault->getStatusCode();
        $upDeno = $denominasicreate->getStatusCode();
-        $updenopanjar = $denopanjar->getStatusCode();

-        if($upVault == 200 && empty($panjar) == false && $upDeno == 200 && $updenopanjar == 200)
+        if($upVault == 200 && $upDeno == 200)
        {
-            if($request->jenismodal === 'perubatan')
-            {
-                $listUser=User::where('name','=',$request->tuntutan)->get();
-
-                $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran);
-
-                $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
-                ->where('name','=',$request->tuntutan)
-                ->update(array(
-                    'perubatan' => $totalsebenar
-                ));
-            }
-
-            return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.');
+            return 'berjaya';
        }else{
-            return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.');
+            dd($upVault,$upDeno);
+            return 'gagal';
        }
-
-        return response($updateVault);
    }

    public function pendahuluan()
@@ -2778,10 +2723,10 @@ class KhazanahController extends Controller
        array_push($Debit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0.00]);
        array_push($Debit,['glcode' => '1000/241','descpt' => 'Rebet','amaun' => ($rebet)]);
        array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
-        array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
-        array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]);
-        array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]);
-        array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]);
+        if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
+        if($panjar['bds'] > 0) array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]);
+        if($panjar['perubatan'] > 0) array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]);
+        if($panjar['keraian'] > 0) array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]);

    //     // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
    //     //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
@@ -2811,7 +2756,7 @@ class KhazanahController extends Controller
        array_push($Kredit,['glcode' => '5000/211','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
        array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
        array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]);
-        array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
+        if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);


        $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'];
@@ -186,11 +186,38 @@
            confirmButtonText: 'Teruskan!'
            }).then((result) => {
            if (result.isConfirmed) {
-                Swal.fire(
-                'Deleted!',
-                'Your file has been deleted.',
-                'success'
-                )
+               
+                $.ajax({
+                method: 'post',
+                url: '{{ route("khazanah.deletepanjar") }}',
+                data: {
+                    "_token": "{{ csrf_token() }}",
+                    'recno' : rec_no
+                },
+                success:function(data){
+
+                    if(data === 'berjaya')
+                    {
+                        Swal.fire(
+                            'Deleted!',
+                            'Your file has been deleted.',
+                            'success'
+                        )
+                    }else{
+                        Swal.fire(
+                            'Tidak Berjaya!',
+                            'Data tidak berjaya dihapuskan.',
+                            'error'
+                        )
+                    }
+
+                }
+                });
+
+
+
+
+               
            }
        });
    }
@@ -161,6 +161,7 @@ Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'Khazana
 Route::get('/mintasemulakelulusan',['as'=>'khazanah.getmintasemulakelulusan','uses'=>'KhazanahController@mintakatalaluansemula'])->middleware('auth','khazanah');
 Route::get('/mintasemulakelulusan/operasi',['as'=>'operasi.getmintasemulakelulusan','uses'=>'OperasiController@mintakatalaluansemula'])->middleware('auth','operasi');
 Route::post('/createpanjar',['as'=>'khazanah.createpanjar','uses'=>'KhazanahController@createpanjar'])->middleware('auth','khazanah');
+Route::post('/deletepanjar',['as'=>'khazanah.deletepanjar','uses'=>'KhazanahController@deletepanjar'])->middleware('auth','khazanah');
 Route::get('/gadaian/edit/{norujukan}',['as'=>'gadaian.edit','uses'=>'GadaianController@edit'])->middleware('auth','teller');
 Route::post('/gadai/edit/store',['as'=>'gadai.editstore','uses'=>'GadaianController@editstore'])->middleware('auth','teller');
 Route::put('/gadai/edit/deletemarhun',['as'=>'gadai.editmarhun','uses'=>'GadaianController@editmarhun'])->middleware('auth','teller');