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

Merge branch 'lapfix' of https://gitlab.com/online-sistem1/kaunter into lapfix

Browse Source
This commit is contained in:
hafifierahman
2021-11-12 01:17:21 +08:00
parent ec7c29250a eee1ab6105
commit 773b674541
6 changed files with 154 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Events/SerahanPenilai.php
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Events;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
class SerahanPenilai implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $kodcaw,$message;
public function __construct($kodcaw,$message)
{
$this->kodcaw = $kodcaw;
$this->message = $message;
}
public function broadcastOn()
{
return ['serahanpenilai-notify'];
}
public function broadcastAs()
{
return 'trigger-serahanpenilai';
}
}
app/Http/Controllers/GadaianController.php
+3
View File
@@ -6,6 +6,7 @@ namespace App\Http\Controllers;
use App\Events\StatusLiked; use App\Events\StatusLiked;
use App\Events\NotifikasiPembayaran; use App\Events\NotifikasiPembayaran;
use App\Events\Dashboard\GadaiNotify; use App\Events\Dashboard\GadaiNotify;
use App\Events\SerahanPenilai;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -282,6 +283,8 @@ class GadaianController extends Controller
} }
} }
event(new SerahanPenilai($auth_user['cawangan'],"LULUS"));
return redirect()->route('home'); return redirect()->route('home');
} }
app/Http/Controllers/PenebusanController.php
+14 -3
View File
@@ -5,6 +5,8 @@ namespace App\Http\Controllers;
//Events //Events
use App\Events\Dashboard\TebusNotify; use App\Events\Dashboard\TebusNotify;
use App\Events\Dashboard\KeuntunganNotify; use App\Events\Dashboard\KeuntunganNotify;
use App\Events\Dashboard\GadaiNotify;
use App\Events\SerahanPenilai;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Http;
@@ -66,9 +68,9 @@ class PenebusanController extends Controller
if($updatetebus) if($updatetebus)
{ {
return response('success'); event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new TebusNotify('lulus',$auth_user['cawangan'])); return response('success');
}else{ }else{
return response('fail'); return response('fail');
} }
@@ -117,6 +119,8 @@ class PenebusanController extends Controller
'bakiakhir' => $bakiakhir 'bakiakhir' => $bakiakhir
]); ]);
event(new KeuntunganNotify('lulus',Auth::user()->cawangan));
return response()->json($updateTunai,200); return response()->json($updateTunai,200);
} }
@@ -376,6 +380,8 @@ class PenebusanController extends Controller
])->json(); ])->json();
} }
event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new GadaiNotify('lulus',Auth::user()->cawangan));
$this->AliranTunaiController->alirantunaiTebus($request); $this->AliranTunaiController->alirantunaiTebus($request);
} }
@@ -513,6 +519,8 @@ class PenebusanController extends Controller
])->json(); ])->json();
} }
event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new GadaiNotify('lulus',Auth::user()->cawangan));
$this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request); $this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request);
@@ -658,6 +666,9 @@ class PenebusanController extends Controller
} }
event(new TebusNotify('lulus',Auth::user()->cawangan));
event(new GadaiNotify('lulus',Auth::user()->cawangan));
$this->AliranTunaiController->alirantunaiTebus($request); $this->AliranTunaiController->alirantunaiTebus($request);
@@ -666,7 +677,7 @@ class PenebusanController extends Controller
} }
//Wakil Function - Jangan kacau saya nak makan kacang ni!! //Wakil Function
public function getfirstWakil() public function getfirstWakil()
{ {
resources/views/homepage/penilai/home.blade.php
+1 -2
View File
@@ -218,7 +218,7 @@
</div> </div>
<form action="{{ route('marhun.serah') }}" method="post"> <form action="{{ route('marhun.serah') }}" method="post">
@csrf @csrf
<input type="text" name="norujukanpilih" id="norujukanpilih" > <input type="text" name="norujukanpilih" id="norujukanpilih" hidden>
<button type="submit" id="btn-serah" class='btn btn-primary' disabled>Serah Marhun</button> <button type="submit" id="btn-serah" class='btn btn-primary' disabled>Serah Marhun</button>
</form> </form>
</div> </div>
@@ -281,7 +281,6 @@
var channel = pusher.subscribe('gadai-notify'); var channel = pusher.subscribe('gadai-notify');
channel.bind('trigger-gadai', function(data) { channel.bind('trigger-gadai', function(data) {
console.log('push');
fetchGadaianEverytime(); fetchGadaianEverytime();
}); });
resources/views/khazanah/gadaian.blade.php
+50 -1
View File
@@ -118,7 +118,7 @@
@php @php
$marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json(); $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
@endphp @endphp
<a href="#" data-toggle="modal" data-berat="{{$gadaian['berat']}}" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" <a style="user-select: none;" href="#" data-toggle="modal" data-berat="{{$gadaian['berat']}}" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}"
data-target="#marhunModal"> {{$gadaian['norujukan']}}</a> data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
</td> </td>
<td>{{ number_format($gadaian['pinjaman'],2) }}</td> <td>{{ number_format($gadaian['pinjaman'],2) }}</td>
@@ -194,6 +194,13 @@
</div> </div>
<script> <script>
var api_url = "<?php echo $api_url ?>"; var api_url = "<?php echo $api_url ?>";
var cawangan = "{{ Auth::user()->cawangan }}";
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
//modal //modal
var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({ var tablegadaianmasuk = $('#table-gadaian-semasa').DataTable({
@@ -204,6 +211,18 @@
// "scrollX": true // "scrollX": true
}); });
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('serahanpenilai-notify');
channel.bind('trigger-serahanpenilai', function(data) {
fetchGadaianEverytime();
});
$(document).ready(function(){ $(document).ready(function(){
$('#norujukan_barcode').focus(); $('#norujukan_barcode').focus();
}) })
@@ -239,6 +258,36 @@
}) })
function fetchGadaianEverytime(){
tablegadaianmasuk.clear().draw();
$.ajax({
method:'get',
url: api_url + '/api/gadai/serah_marhun/khazanah/' + cawangan,
success:function(data){
var count = 0;
$.each(data,function(index,gadaianmasuk){
$.ajax({
url: api_url + '/api/marhun/' + gadaianmasuk['norujukan'],
method:'get',
success:function(rekodmarhun){
count++;
tablegadaianmasuk.row.add([
count,
'<a style="user-select: none;" href="#" data-toggle="modal" data-berat=' + gadaianmasuk['berat'] + ' data-marhun=' + JSON.stringify(rekodmarhun) + ' data-pinjaman=' + gadaianmasuk['pinjaman'] + ' data-norujukan=' + gadaianmasuk['norujukan'] + ' data-hargajualan=' + gadaianmasuk['hargajualan'] + ' data-kodcaw=' + gadaianmasuk['kodcaw'] + ' data-target="#marhunModal"> ' + gadaianmasuk['norujukan'] + '</a>',
formatter.format(gadaianmasuk['pinjaman']),
formatter.format(gadaianmasuk['nilaimarhun']),
gadaianmasuk['teller']
]).draw();
}
});
});
}
});
}
// function checkserah(func){ // function checkserah(func){
// event.preventDefault(); // event.preventDefault();
// var norujukan = $('#norujukan_barcode').val(); // var norujukan = $('#norujukan_barcode').val();
resources/views/khazanah/tebus.blade.php
+55 -2
View File
@@ -104,7 +104,7 @@
// dd($marhun); // dd($marhun);
@endphp @endphp
<a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}" <a href="#" style="user-select: none;" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}"
data-target="#marhunModal"> {{$ls['norujukan']}} </a></td> data-target="#marhunModal"> {{$ls['norujukan']}} </a></td>
<td>{{ $ls['teller'] }}</td> <td>{{ $ls['teller'] }}</td>
<td>{{ $ls['jenistebus'] }}</td> <td>{{ $ls['jenistebus'] }}</td>
@@ -165,7 +165,14 @@
<script> <script>
var api_url = "<?php echo $api_url ?>"; var api_url = "<?php echo $api_url ?>";
var cawangan = "{{ Auth::user()->cawangan }}";
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({ var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
@@ -175,6 +182,22 @@ var api_url = "<?php echo $api_url ?>";
"ordering": true "ordering": true
}); });
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('tebus-notify');
channel.bind('trigger-tebus', function(data) {
fetchTebusEverytime();
});
$(document).ready(function(){
$('#norujukan_barcode').focus();
})
$(document).ready(function(){ $(document).ready(function(){
$('#norujukan_barcode').focus(); $('#norujukan_barcode').focus();
}) })
@@ -205,6 +228,36 @@ var api_url = "<?php echo $api_url ?>";
}); });
}); });
function fetchTebusEverytime(){
table_gadaian_semasa.clear().draw();
$.ajax({
method:'get',
url: api_url + '/api/listSerahMarhunController/' + cawangan,
success:function(data){
var count = 0;
$.each(data,function(index,tebusmasuk){
$.ajax({
url: api_url + '/api/marhun/' + tebusmasuk['norujukan'],
method:'get',
success:function(rekodmarhun){
count++;
table_gadaian_semasa.row.add([
count,
'<a style="user-select: none;" href="#" data-toggle="modal" data-marhun=' + JSON.stringify(rekodmarhun) + ' data-norujukan=' + tebusmasuk['norujukan'] + ' data-kodcaw=' + tebusmasuk['kodcaw'] + ' data-target="#marhunModal"> ' + tebusmasuk['norujukan'] + '</a>',
tebusmasuk['teller'],
tebusmasuk['jenistebus'],
tebusmasuk['nilaimarhun']
]).draw();
}
});
});
}
});
}
// function checkserah(func){ // function checkserah(func){
// event.preventDefault(); // event.preventDefault();
// var norujukan = $('#norujukan_barcode').val(); // var norujukan = $('#norujukan_barcode').val();