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

Merge branch 'pipi' into 'master'

Browse Source 
fix bugging je

See merge request online-sistem1/kaunter!94
This commit is contained in:
hafifie rahman
2021-04-06 00:36:31 +00:00
parent d7e5d8bd70 5a4496b741
commit aa247640e7
6 changed files with 22 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/PendahuluanSerahan.php
+1 -1
View File
@@ -15,7 +15,7 @@ class PendahuluanSerahan implements ShouldBroadcast
public function __construct($pengesahan)
{
$this->cawangan = $pengesahan;
$this->pengesahan = $pengesahan;
}
public function broadcastOn()
app/Http/Controllers/KhazanahController.php
+3 -140
View File
@@ -1960,144 +1960,7 @@ class KhazanahController extends Controller
$tarikh_imbangan2 = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
}
// //DAPATKAN DATA JUMLAH DARI IMBANGDUGA LAMA...
// $getData_ImbangdugaLama= Http::get(config('api.url') . '/api/imbangduga_lama/'. $auth_user['cawangan'])->json();
// $tunai_ditangan=$getData_ImbangdugaLama[0]['tunai_tangan'];
// $untung_t=$getData_ImbangdugaLama[0]['untung_t'];
// $pendahuluan_pkb_lama=$getData_ImbangdugaLama[0]['pendahuluan_pkb'];
// $serahan_pkb=$getData_ImbangdugaLama[0]['serahan_pkb'];
// $pendahuluan_jmc=$getData_ImbangdugaLama[0]['pendahuluan_jmc'];
// $penghutang_kaki_tangan=$getData_ImbangdugaLama[0]['penghutang'];
// //kira jumlah amaount PENDAHULUAN DARI PKB 2013
// $amt_2013=Http::get(config('api.url').'/api/gldetailkira_pendahuluan_2013/data/'.$auth_user['cawangan'])->json();
// $jumlah1=0.0;
// // dd($amt_2013);
// if(sizeof($amt_2013)!=0)
// {
// $jumlah1=$amt_2013[0]['amaun'];
// }
// else
// {
// $jumlah1=0.0;
// }
// $jumlah2=0.0; //pendahuluan pkb 2014
// $amt_2014=Http::get(config('api.url').'/api/gldetailkira_pendahuluan_2014/data/'.$auth_user['cawangan'])->json();
// if(sizeof($amt_2014)!=0)
// {
// $jumlah2=$amt_2014[0]['amaun'];
// }
// else
// {
// $jumlah2=0.0;
// }
// $jumlah_PendahuluanPKB=$jumlah1-$jumlah2+$pendahuluan_pkb_lama;
// //PENDAHULUAN DARI JMC/PKB
// $jumlah_jmc_2015=0.0;
// $get_Adv_JMC_2015=Http::get(config('api.url').'/gldetailkira_pendahuluanJMC_2015/data/'.$auth_user['cawangan'])->json();
// //dd($get_Adv_JMC_2015);
// //dd(sizeof($get_Adv_JMC_2015));
// if($get_Adv_JMC_2015!=null)
// {
// $jumlah_jmc_2015=$get_Adv_JMC_2015[0]['amaun'];
// }
// else
// {
// $jumlah_jmc_2015=0.0;
// }
// //PENDAHULUAN DARI JMC/PKB
// $jumlah_jmc_2014=0.0;
// $get_Adv_JMC_2014=Http::get(config('api.url').'/gldetailkira_pendahuluanJMC_2014/data/'.$auth_user['cawangan'])->json();
// if($get_Adv_JMC_2014!=null)
// {
// $jumlah_jmc_2014=$get_Adv_JMC_2014[0]['amaun'];
// }
// else
// {
// $jumlah_jmc_2014=0.0;
// }
// //////// //////////////////KIRAAN WANG MASUK KESELURUHAN /////////////////////////////////////
// //KIRA JUMLAH UPAH DIBAYAR:-
// $getUpahBayar=Http::get(config('api.url').'/api/jumlah_UpahDibayarAll/'.$auth_user['cawangan'])->json();
// $totalUpahBayar=0.0;
// if($getUpahBayar!=null)
// {
// $totalUpahBayar=$getUpahBayar[0]['upah'];
// }
// else
// {
// $totalUpahBayar=0.0;
// }
// //jumlah Bayaran Online
// //$total_JumlahBayaranOnline=
// $total_byrn_online=0.0;
// $jumlahBayaranOnlineAll=Http::get(config('api.url').'/api/jumlahBayaranOnlineAll/data/'.$auth_user['cawangan'])->json();
// if($jumlahBayaranOnlineAll!=null)
// {
// $total_byrn_online=$jumlahBayaranOnlineAll[0]['cash_in'];
// }
// else
// {
// $total_byrn_online=0.0;
// }
// $total_pendahuluan_JMC=$jumlah_jmc_2014+$pendahuluan_jmc;
// //Kira jumlah wang masuk keseluruhan
// $tunai_masuk=$jumlah_PendahuluanPKB+$totalUpahBayar+$total_pendahuluan_JMC+$total_byrn_online;
// //kira jumlah wang keluar // START DISINI
// /////////////////////KIRA JUMLAH WANG KELUAR ( GADAI)//////////
// $total_jumlahGadaian=0.0;
// $jumlahGadaianAll=Http::get(config('api.url').'/api/jumlahPinjaman_TerkumpulAll/'.$auth_user['cawangan'])->json();
// if($jumlahGadaianAll!=null)
// {
// $total_jumlahGadaian=$jumlahGadaianAll[0]['totalGadai'];
// }
// else
// {
// $total_jumlahGadaian=0.0;
// }
// //serahan kepada PKB
// $jumlah_serahHQ_PKB=0.0;
// $jumlah_SerahanPKB=Http::get(config('api.url').'/api/gldetailKira_SerahanHQ/data/'.$auth_user['cawangan'])->json();
// if($jumlah_SerahanPKB!=null)
// {
// $jumlah_serahHQ_PKB=$jumlah_SerahanPKB[0]['amaun'];
// }
// else
// {
// $jumlah_serahHQ_PKB=0.0;
// }
// $jumlah_SerahHQ=$jumlah_serahHQ_PKB+$serahan_pkb;
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
@@ -2133,7 +1996,7 @@ class KhazanahController extends Controller
array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]);
array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Penghutang Ar-Rahn', 'amaun' => $keuntungan]);
// array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Penghutang Ar-Rahn', 'amaun' => $keuntungan]);
array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
@@ -2150,7 +2013,7 @@ class KhazanahController extends Controller
// $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Terakru', 'amaun' => $keuntungan]);
// array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Terakru', 'amaun' => $keuntungan]);
array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Keuntungan Sebenar','amaun' => $keuntungansebenar]);
array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
public/js/main.js
Vendored
+5 -5
View File
@@ -333,7 +333,7 @@ async function openuptambahdanserah(e)
allowEnterKey: false
})
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
var pusher = new Pusher(pusherenv, {
cluster: 'ap1',
encrypted: true
});
@@ -341,7 +341,7 @@ async function openuptambahdanserah(e)
var channel = pusher.subscribe('pendahuluanserahan-notice');
channel.bind('penserahan-event', function(data) {
if(data == 'Lulus')
if(data.pengesahan === 'Lulus')
{
Swal.fire({
icon: 'success',
@@ -497,7 +497,7 @@ function tambahdanserahanfunc(e)
allowEnterKey: false
})
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
var pusher = new Pusher(pusherenv, {
cluster: 'ap1',
encrypted: true
});
@@ -505,8 +505,8 @@ function tambahdanserahanfunc(e)
var channel = pusher.subscribe('pendahuluanserahan-notice');
channel.bind('penserahan-event', function(data) {
// let message = JSON.stringify(data);
if(data == 'Lulus')
if(data.pengesahan === 'Lulus')
{
Swal.fire({
icon: 'success',
resources/views/aliran_tunai/index.blade.php
+2 -1
View File
@@ -131,7 +131,7 @@
<thead>
<tr>
<th>Bil</th>
<th>Masa</th>
<th>Tarikh</th>
<th>Debit (RM)</th>
<th>Kredit (RM)</th>
<th>Nota</th>
@@ -276,6 +276,7 @@
});
}
let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
</script>
<script src="{{ asset('js/main.js') }}"></script>
@endsection
resources/views/khazanah/khazanahserahan.blade.php
+1 -2
View File
@@ -21,7 +21,7 @@
<div class="col-3"><input type="text" class="form-control" name="teller" id="teller" value="{{ $array_reqteller['kodlaluan'] }}" readonly/></div>
</div>
<input type="hidden" name="no" value="{{ $array_reqteller['no'] }}"/>
<input type="hidden" id="no" name="no" value="{{ $array_reqteller['no'] }}"/>
<div class="row">
<div class="col-2">Amaun (RM)</div>
@@ -348,7 +348,6 @@
let teller = $('#teller').val();
let kodcaw = "{{ Auth::user()->cawangan }}";
$.ajax({
method: 'get',
url: "{{ route('request.pembatalan') }}",
resources/views/modal/denominasimodal.blade.php
+10 -10
View File
@@ -6,10 +6,10 @@
<ul class="nav nav-pills">
<li class="nav-item">
<a class="nav-link active" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a>
<a class="nav-link" data-toggle="pill" href="#home" role="tab" aria-controls="pills-flamingo" aria-selected="true">Bundle</a>
</li>
<li class="nav-item">
<a class="nav-link" data-toggle="pill" href="#profile" role="tab" aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
<a class="nav-link active" data-toggle="pill" href="#profile" role="tab" aria-controls="pills-cuckoo" aria-selected="false">Keping</a>
</li>
</ul>
@@ -24,7 +24,7 @@
<div class="modal-body">
<div class="tab-content">
<div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<div class="tab-pane fade" id="home" role="tabpanel" aria-labelledby="flamingo-tab">
<table class="table">
<tr>
@@ -37,32 +37,32 @@
</tr>
<tr>
<td>RM1</td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="ambilanb1" class="form-control" id="bundle1" onkeyup="kiraan(this)" readonly/> </td>
<td><input type="text" name="totalb1" class="form-control" id="totalb1" value="0.00" readonly/> </td>
<td> RM20</td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="ambilanb20" class="form-control" id="bundle20" onkeyup="kiraan(this)" readonly/> </td>
<td><input type="text" name="totalb20" class="form-control" id="totalb20" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM5</td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="ambilanb5" class="form-control" id="bundle5" onkeyup="kiraan(this)" readonly/> </td>
<td><input type="text" name="totalb5" class="form-control" id="totalb5" value="0.00" readonly/> </td>
<td>RM50</td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="ambilanb50" class="form-control" id="bundle50" onkeyup="kiraan(this)" readonly/> </td>
<td><input type="text" name="totalb50" class="form-control" id="totalb50" value="0.00" readonly/> </td>
</tr>
<tr>
<td>RM10</td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="ambilanb10" class="form-control" id="bundle10" onkeyup="kiraan(this)" readonly/> </td>
<td><input type="text" name="totalb10" class="form-control" id="totalb10" value="0.00" readonly/> </td>
<td>RM100 </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="kiraan(this)"/> </td>
<td><input type="text" name="ambilanb100" class="form-control" id="bundle100" onkeyup="kiraan(this)" readonly/> </td>
<td><input type="text" name="totalb100" class="form-control" id="totalb100" value="0.00" readonly/> </td>
</tr>
</table>
</div>
<div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<div class="tab-pane fade show active" id="profile" role="tabpanel" aria-labelledby="profile-tab">
<table class="table">
<tr>