fix audio operasi

This commit is contained in:
MUHD HAFIFIE
2021-05-16 14:42:09 +08:00
parent 0f96ef1efe
commit 7074d2da71
11 changed files with 1350 additions and 202 deletions
+6 -6
View File
@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Carbon\Carbon; use Carbon\Carbon;
use PDF; use PDF;
use DateTime;
class KhazanahController extends Controller class KhazanahController extends Controller
{ {
@@ -1209,7 +1210,6 @@ class KhazanahController extends Controller
$bakiperubatan = 0; $bakiperubatan = 0;
switch ($request->jenismodal) { switch ($request->jenismodal) {
case "selenggara": case "selenggara":
$kategori = "Baiki dan Selenggara"; $kategori = "Baiki dan Selenggara";
@@ -1289,6 +1289,9 @@ class KhazanahController extends Controller
'jumlahkeping' => "0" 'jumlahkeping' => "0"
]); ]);
$myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil);
$tarikhbil = $myDateTime->format('dmY');
$panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[ $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[
'deskripsi' => $request->deskripsi, 'deskripsi' => $request->deskripsi,
@@ -1298,7 +1301,7 @@ class KhazanahController extends Controller
'id' => $auth_user['name'], 'id' => $auth_user['name'],
'bakiperubatan' => $bakiperubatan, 'bakiperubatan' => $bakiperubatan,
'nobaucer' => $request->baucer, 'nobaucer' => $request->baucer,
'nobil' => "3213231", 'nobil' => $tarikhbil,
'tuntutoleh' => $request->tuntutan 'tuntutoleh' => $request->tuntutan
])->json(); ])->json();
@@ -1551,8 +1554,6 @@ class KhazanahController extends Controller
]); ]);
} }
else else
{ {
@@ -1575,8 +1576,6 @@ class KhazanahController extends Controller
'kredit'=>$kredit_panjar, 'kredit'=>$kredit_panjar,
'hariini'=>$hariini_panjar, 'hariini'=>$hariini_panjar,
'kelmarin'=>$kelmarin_panjar, 'kelmarin'=>$kelmarin_panjar,
]); ]);
$LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json(); $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
@@ -1613,6 +1612,7 @@ class KhazanahController extends Controller
$actype=$get_glCode_Details[0]['acttype']; //keterangan acctype $actype=$get_glCode_Details[0]['acttype']; //keterangan acctype
$get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json(); $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
if(sizeof($get_Panjar_AM)==0) if(sizeof($get_Panjar_AM)==0)
{ {
$jumlah=0.0; $jumlah=0.0;
@@ -914,4 +914,24 @@ class PenebusanController extends Controller
return $totalnilaimarhun; return $totalnilaimarhun;
} }
public function PenebusanKhazanah($norujukan){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
$noic = $gadaidetail[0][0]['nokp'];
$customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
$marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json();
$marhun = $marhundetail[0];
$nama = $customerdetail[0]['nama'];
$gadai = $gadaidetail[0][0];
$nilaihargasemasa = $this->tukaranhargaemas($norujukan);
return view('penebusan.index-khazanah',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
}
} }
+2 -2
View File
@@ -522,7 +522,7 @@
gadai_detail['t_matang'], gadai_detail['t_matang'],
'RM '+formatter.format(gadai_detail['pinjaman']), 'RM '+formatter.format(gadai_detail['pinjaman']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'] gadai_detail['tempoh']
]).draw(); ]).draw();
}else{ }else{
tablegadai.row.add([ tablegadai.row.add([
@@ -545,7 +545,7 @@
gadai_detail['t_update'], gadai_detail['t_update'],
'RM '+formatter.format(gadai_detail['bakipjm']), 'RM '+formatter.format(gadai_detail['bakipjm']),
(((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
gadai_detail['jbg'] gadai_detail['tempoh']
]).draw(); ]).draw();
}else if(jenistebus == "lelong"){ }else if(jenistebus == "lelong"){
var urlroute = '{{ route("lelongan", ":id") }}'; var urlroute = '{{ route("lelongan", ":id") }}';
@@ -174,7 +174,7 @@
<div class="col-3 mx-1"> <div class="col-3 mx-1">
<div class="row"> <div class="row">
<a href="{{ route('khazanah.pelanggan') }}" class="btn btn-danger btn-lg btn-block mb-3">Pelanggan</a> <a href="{{ route('khazanah.pelanggan') }}" class="btn btn-info btn-lg btn-block mb-3">Pelanggan</a>
</div> </div>
<div class="row"> <div class="row">
<a href="{{ route('laporan') }}" class="btn btn-info btn-lg btn-block mb-3">Laporan</a> <a href="{{ route('laporan') }}" class="btn btn-info btn-lg btn-block mb-3">Laporan</a>
+1 -1
View File
@@ -465,7 +465,7 @@
url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'], url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
success:function(upahsemasa){ success:function(upahsemasa){
if(jenistebus == "belum_tebus"){ if(jenistebus == "belum_tebus"){
var urlroute = '{{ route("penebusan", ":id") }}'; var urlroute = '{{ route("penebusan.khazanah", ":id") }}';
urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
if(gadai_detail["bakihargajualan"] == null){ if(gadai_detail["bakihargajualan"] == null){
xtawarruq.row.add([ xtawarruq.row.add([
@@ -131,8 +131,22 @@
$('#linkz').text(data.namateller + " Pohon Kelulusan"); $('#linkz').text(data.namateller + " Pohon Kelulusan");
$("#linkz").attr("href", "{{ url('kelulusan') }}"); $("#linkz").attr("href", "{{ url('kelulusan') }}");
if(window.location.pathname === '/operasi/kelulusan')
{
location.reload();
}else{
console.log('luar kelulusan');
audio.play(); audio.play();
audio.muted = false; audio.muted = false;
var countlagu = 1;
audio.onended = function() {
if(countlagu <= 3){
countlagu++;
console.log(countlagu);
this.play();
}
}
}
const Toast = Swal.mixin({ const Toast = Swal.mixin({
toast: true, toast: true,
@@ -159,6 +159,23 @@
minimumFractionDigits: 2 minimumFractionDigits: 2
}); });
var audio = new Audio("{{ asset('sound/3.wav') }}");
// audio.muted = true;
if (tablekelulusan.data().any()) {
audio.play();
audio.addEventListener('ended', function() {
this.currentTime = 0;
this.play();
}, false);
console.log('betul');
}else{
audio.loop = false;
audio.muted = true;
}
$('#kelulusanmodal').on('show.bs.modal', function(event) { $('#kelulusanmodal').on('show.bs.modal', function(event) {
let button = $(event.relatedTarget); let button = $(event.relatedTarget);
let norujukan = $(button).data('norujukan'); let norujukan = $(button).data('norujukan');
File diff suppressed because it is too large Load Diff
@@ -298,6 +298,22 @@
</table> </table>
<h4>Laporan Transaksi Gadaian</h4>
<br>
<table id="details">
<thead>
<th>Bil</th>
<th>Jenis</th>
<th>Penebusan(RM)</th>
</thead>
<tr>
<td> 0 </td>
<td>Rugi Lelong</td>
<td> 0.00 </td>
</tr>
</table>
@@ -260,7 +260,7 @@
</tr> </tr>
@endif @endif
@endif @endif
@php $counter++; $masuk = true;@endphp @php $counter++; $masuk = true;$totalnm += floatval($item['n_marhun']);$totalberat += floatval($item['berat']); @endphp
@else @else
@if($item['norujukan'] == $marhun[$index-1]['norujukan']) @if($item['norujukan'] == $marhun[$index-1]['norujukan'])
{{-- <td>masuk 1</td> --}} {{-- <td>masuk 1</td> --}}
+1
View File
@@ -127,6 +127,7 @@ Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahCo
Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah'); Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah');
Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah'); Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah');
Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah'); Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah');
Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah');
Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah'); Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']); Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);