KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix new-pipi

Browse Source
This commit is contained in:
fifi97
2021-08-12 23:46:24 +08:00
parent 29b18c19cf
commit 50895f580b
5 changed files with 395 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AliranTunaiController.php
+2 -1
View File
@@ -446,7 +446,8 @@ class AliranTunaiController extends Controller
$gadaian = floatval($totalgadai);
if(strtoupper(Auth::user()->name) === 'LELONG'){
$bakisemasa = $lelongan;
$penebusanbarcodescanned = floatval($lelongan);
$bakisemasa = floatval($lelongan) - floatval($totalserahan);
}else{
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
}
app/Http/Controllers/LelongController.php
-263
View File
@@ -145,279 +145,16 @@ class LelongController extends Controller
$serahan = $getTunai2['kurang'];
$bakiakhir = $baki;
$jumlah_byr=$request->jumlah;
if($request->jenis == 'T')
{
$bakiakhir -= $request->jumlah;
$KOD_TUNAI='1000/010';
$BAKI_LELONG='7000/090';
$get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json();
$hariIni_Tunai=$get_lejerTunai[0]['hariini'];
$kelmarin_Tunai=$get_lejerTunai[0]['kelmarin'];
$jumlah_Tunai=$get_lejerTunai[0]['jumlah'];
$kredit_Tunai=$get_lejerTunai[0]['kredit'];
$debit_Tunai=$get_lejerTunai[0]['debit'];
$recno_Tunai=$get_lejerTunai[0]['recno'];
$kredit_Tunai=$kredit_Tunai+$jumlah_byr;
$hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
$kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
$updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_Tunai,
'debit'=>$debit_Tunai,
'kredit'=>$kredit_Tunai,
'hariini'=>$hariIni_Tunai,
'kelmarin' =>$kelmarin_Tunai,
]);
$get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
$gl_cdetails_bl= $get_KOD_BL[0];
$keterangan_bl= $get_KOD_BL[0]['descpt']; //keterangan glcode
$actype_bl= $get_KOD_BL[0]['acttype'];
$get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
if(sizeof($get_current_GLejer_Baki_Lelong)==0)
{
$jumlah_bl=0.0;
$getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
if(sizeof($getGLedjer_bl_Semalam)==0)
{
$jumlah_bl=0.0;
}
else
{
$jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah'];
$hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini'];
$jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl;
}
$jumlahBulan_ini_bl=0.0;
$get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
if( sizeof($get_GlejerBulan_Tahun_bl)==0)
{
$jumlahBulan_ini_bl=0.0;
}
else
{
$jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah'];
$jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl;
}
$Jumlah_TahunIni_bl=0.0;
$get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
if(sizeof($get_Glejer_Tahun_bl)==0)
{
$Jumlah_TahunIni_bl=0.0;
}
else
{
$JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah'];
$Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl;
}
$HariIni_bl=0.0;
$kelmarin_bl=$jumlah_bl-$HariIni_bl;
$daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
'kodcaw'=>$auth_user['cawangan'],
'glcode'=>$BAKI_LELONG,
'descpt'=>$keterangan_bl,
'debit'=>$jumlah_byr,
'kredit'=>0.0,
'hariini'=>$HariIni_bl,
'kelmarin'=>$kelmarin_bl,
'jumlah'=>$jumlah_bl,
'bulanini'=>$jumlahBulan_ini_bl,
'tahunini'=>$Jumlah_TahunIni_bl,
'acttype'=> $actype_bl
]);
}
else
{
$hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini'];
$kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin'];
$jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah'];
$kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit'];
$debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit'];
$recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno'];
$debit_BL=$debit_BL+$jumlah_byr;
$hariIni_Tunai=$debit_BL-$kredit_BL;
$kelmarin_BL=$jumlah_BL-$hariIni_BL;
$updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_BL,
'debit'=>$debit_BL,
'kredit'=>$kredit_BL,
'hariini'=>$hariIni_BL,
'kelmarin' =>$kelmarin_BL,
]);
}
}
else
{
$bakiakhir += -($request->jumlah);
$KOD_TUNAI='1000/010';
$get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json();
$hariIni_Tunai=$get_lejerTunai[0]['hariini'];
$kelmarin_Tunai=$get_lejerTunai[0]['kelmarin'];
$jumlah_Tunai=$get_lejerTunai[0]['jumlah'];
$kredit_Tunai=$get_lejerTunai[0]['kredit'];
$debit_Tunai=$get_lejerTunai[0]['debit'];
$recno_Tunai=$get_lejerTunai[0]['recno'];
$debit_Tunai=$debit_Tunai+$jumlah_byr;
$hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
$kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
$updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_Tunai,
'debit'=>$debit_Tunai,
'kredit'=>$kredit_Tunai,
'hariini'=>$hariIni_Tunai,
'kelmarin' =>$kelmarin_Tunai,
]);
$RUGI_LELONG='3000/020';
$get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
$gl_cdetails_rl= $get_KOD_RL[0];
$keterangan_rl= $get_KOD_RL[0]['descpt']; //keterangan glcode
$actype_rl= $get_KOD_RL[0]['acttype'];
$get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
if(sizeof($get_current_GLejer_Rugi_Lelong)==0)
{
$jumlah_rl=0.0;
$getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
if(sizeof($getGLedjer_rl_Semalam)==0)
{
$jumlah_rl=0.0;
}
else
{
$jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah'];
$hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini'];
$jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl;
}
$jumlahBulan_ini_rl=0.0;
$get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
if( sizeof($get_GlejerBulan_Tahun_rl)==0)
{
$jumlahBulan_ini_rl=0.0;
}
else
{
$jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah'];
$jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl;
}
$Jumlah_TahunIni_rl=0.0;
$get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
if(sizeof($get_Glejer_Tahun_rl)==0)
{
$Jumlah_TahunIni_rl=0.0;
}
else
{
$JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah'];
$Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl;
}
$HariIni_rl=0.0;
$kelmarin_rl=$jumlah_rl-$HariIni_rl;
$daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
'kodcaw'=>$auth_user['cawangan'],
'glcode'=>$RUGI_LELONG,
'descpt'=>$keterangan_rl,
'debit'=>0.0,
'kredit'=>$jumlah_byr,
'hariini'=>$HariIni_rl,
'kelmarin'=>$kelmarin_rl,
'jumlah'=>$jumlah_rl,
'bulanini'=>$jumlahBulan_ini_rl,
'tahunini'=>$Jumlah_TahunIni_rl,
'acttype'=> $actype_rl
]);
}
else
{
$hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini'];
$kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin'];
$jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah'];
$kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit'];
$debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit'];
$recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno'];
$kredit_RL=$kredit_RL+$jumlah_byr;
$hariIni_Tunai=$debit_RL-$kredit_RL;
$kelmarin_BL=$jumlah_RL-$hariIni_RL;
$updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
'recno'=>$recno_RL,
'debit'=>$debit_RL,
'kredit'=>$kredit_RL,
'hariini'=>$hariIni_RL,
'kelmarin' =>$kelmarin_RL,
]);
}
}
//masuk dalam tunai aliran
$updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
public/img/loader.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 54 KiB

resources/views/lelongan/index.blade.php
+2
View File
@@ -252,6 +252,8 @@
alert(xhr.responseText);
}
});
return false;
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
resources/views/print/laporan_imbanduga.blade.php
+36 -50
View File
@@ -1,3 +1,7 @@
<html>
<head>
<script src="{{ asset('js/jquery.min.js') }}"></script>
<style>
#header {
@@ -23,12 +27,27 @@
padding:4px;
color:black;
}
</style>
#loading {
position: fixed;
display: block;
width: 100%;
height: 100%;
top: 0;
left: 0;
text-align: center;
opacity: 0.7;
background-color: #fff;
z-index: 99;
}
#loading-image {
position: absolute;
top: 100px;
left: 240px;
z-index: 100;
}
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
@@ -53,10 +72,7 @@
padding:4px;
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
@@ -82,11 +98,7 @@
padding:4px;
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -111,9 +123,7 @@
padding:4px;
color:black;
}
</style>
<style>
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -138,11 +148,7 @@
padding:4px;
color:black;
}
</style>
<style>
#title {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -168,9 +174,7 @@
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -197,11 +201,7 @@
color:black;
}
</style>
<style>
#tarikh_cetak {
font-family: Arial, Helvetica, sans-serif;
@@ -229,10 +229,7 @@
color:black;
}
</style>
<style>
#data {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -262,13 +259,7 @@
}
</style>
<style>
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -292,11 +283,7 @@
padding:4px;
color:black;
}
</style>
<style>
#GL {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -321,12 +308,7 @@
padding:4px;
color:black;
}
</style>
<style>
#GL_dtl {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -351,10 +333,7 @@
padding:4px;
color:black;
}
</style>
<style>
#dtl_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -379,10 +358,7 @@
padding:4px;
color:black;
}
</style>
<style>
#total_harta {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
@@ -408,9 +384,11 @@
color:black;
}
</style>
</head>
<body>
<div id="loading">
<img id="loading-image" src="{{ asset('img/loader.gif') }}" alt="Loading..." />
</div>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
@@ -528,5 +506,13 @@
</table>
<br>
<br>
<script>
$(window).load(function() {
$('#loading').hide();
});
</script>
</body>
</html>