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

fix conflict

Browse Source
This commit is contained in:
afiq
2021-06-20 15:49:05 +08:00
parent afd76521a2 4be155da22
commit d3c6abca03
5 changed files with 119 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/KhazanahController.php
+1 -1
View File
@@ -4160,7 +4160,7 @@ class KhazanahController extends Controller
$upahsimpanxtra = $xtra['upahsimpan'];
$bakilelongxtra = $xtra['bakilelong'];
$utgterkumpulxtra = $xtra['untungrugiterkumpul'];
$rugilelongxtra = -($xtra['kerugianlelong']);
$rugilelongxtra = -($xtra['kerugianlelong']);
}
//Terkumpul
resources/views/khazanah/panjar.blade.php
+108
View File
@@ -212,6 +212,114 @@
}
function kiraanpanjar(datakeyin)
{
var idkey = $(datakeyin).attr('id');
var valkey = $(datakeyin).val();
var amount = 0;
let amountkiraan = 0;
var validate = parseFloat($(datakeyin).data('amaun'));
$.each(arrayambilan, function( index, arr ){
if(arr[0] == idkey)
{
arrayambilan[index][1] = totalamount(idkey,valkey);
}
amount += arr[1];
});
if(Number(valkey) > Number(validate))
{
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Jumlah denominasi melebihi kadar'
});
$(datakeyin).val('');
}
else
{
$('#amaunkiraan').val(amount);
}
switch(idkey) {
case 'bundle1':
amountkiraan += (valkey * 100);
$('#totalb1').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'bundle20':
amountkiraan += (valkey * 1000);
$('#totalb20').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'bundle5':
amountkiraan += (valkey * 500);
$('#totalb5').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'bundle50':
amountkiraan += (valkey * 5000);
$('#totalb50').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'bundle10':
amountkiraan += (valkey * 1000);
$('#totalb10').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'bundle100':
amountkiraan += (valkey * 5000);
$('#totalb100').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'sen1':
amountkiraan += (valkey * 0.01);
$('#totalsen1').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'sen5':
amountkiraan += (valkey * 0.05);
$('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'sen10':
amountkiraan += (valkey * 0.10);
$('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'sen20':
amountkiraan += (valkey * 0.20);
$('#totalsen20').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'sen50':
amountkiraan += (valkey * 0.50);
$('#totalsen50').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'ringgit1':
amountkiraan += (valkey * 1);
$('#totalring1').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'ringgit5':
amountkiraan += (valkey * 5);
$('#totalring5').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'ringgit10':
amountkiraan += (valkey * 10);
$('#totalring10').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'ringgit20':
amountkiraan += (valkey * 20);
$('#totalring20').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'ringgit50':
amountkiraan += (valkey * 50);
$('#totalring50').val(formatter.format(amountkiraan.toFixed(2)));
break;
case 'ringgit100':
amountkiraan += (valkey * 100);
$('#totalring100').val(formatter.format(amountkiraan.toFixed(2)));
break;
}
}
function checkformpanjar(formdata)
{
resources/views/penebusan/index.blade.php
+5 -5
View File
@@ -1367,7 +1367,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tebus Separuh";
}
let jumpinjam = $('#bakipinjaman').val();
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1641,7 +1641,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman";
}
let jumpinjam = $('#hargapembiayaansemasa').val();
let jumpinjam = $('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -1985,7 +1985,7 @@
komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber + "|" + marg + "| Auto Tawarruq";
}
let jumpinjam = $('#bakipinjaman').val();
let jumpinjam = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,"");
let teller = "{{ Auth::user()->name }}";
Swal.fire({
@@ -2234,7 +2234,7 @@
sumberat += parseFloat(value);
});
var jenistebus = $('#sltjenistebus').find(":selected").val();
var jenistebus = $('#sltjenistebus').find(":selected").val();
var nopelanggan = "{{ $gadai['nopelanggan'] }}";
var jbg = "{{ $gadai['tempoh'] }}";
var kadarupah = "{{ $gadai['kadarupah'] }}";
@@ -2639,4 +2639,4 @@ function pembatalanbalik()
</script>
@endsection
@endsection
resources/views/print/resittebussebelum.blade.php
+1 -1
View File
@@ -570,4 +570,4 @@ hr.new5 {
</tr>
</table>
<br>
<br>
resources/views/print/suratgadaianhilang.blade.php
+4 -4
View File
@@ -28,12 +28,12 @@
<br>
@php
$poskod = Http::get($api_url . '/api/poskod/' . $customers[0]['poskod'])->json();
$poskod = Http::get($api_url . '/api/poskod/' . $customers['poskod'])->json();
$negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
$daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
@endphp
<p style=" text-align: justify;text-justify: inter-word;line-height: 1.6;">Saya, <b>{{ $customers[0]['nama'] }}</b>, No. K/P : <b>@php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp</b> yang beralamat di <b>{{ strtoupper($customers[0]['alamat1']) . ', ' . $customers[0]['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }}</b> dengan sesungguhnya dan sebenarnya mengaku bahawa: -</p>
<p style=" text-align: justify;text-justify: inter-word;line-height: 1.6;">Saya, <b>{{ $customers['nama'] }}</b>, No. K/P : <b>@php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp</b> yang beralamat di <b>{{ strtoupper($customers['alamat1']) . ', ' . $customers['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }}</b> dengan sesungguhnya dan sebenarnya mengaku bahawa: -</p>
<ol>
<li style=" text-align: justify;text-justify: inter-word;line-height: 1.6;"><b>Surat Gadaian Ar-Rahn Cawangan <span>@php $namacawangan = substr($cawangan_detail['namacaw'],7); $rendoh = strtolower($namacawangan);echo ucwords($rendoh); @endphp</span></b> kepunyaan saya telah hilang dalam simpanan @php if(strtoupper($polis[0]['komen1']) == 'SIMPANAN') { echo '.'; }else{ echo 'kerana <b>' . $polis[0]['komen1'] . '</b>.'; } @endphp Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.</li>
@@ -77,7 +77,7 @@
<td></td>
</tr>
<tr>
<td style="font-weight: bold;">{{ $customers[0]['nama'] }}</td>
<td style="font-weight: bold;">{{ $customers['nama'] }}</td>
<td class="tableright">)</td>
<td style="text-align: right;">........................................................</td>
</tr>
@@ -112,4 +112,4 @@
<p style="text-align: center;margin: 0;">Pesuruhjaya Sumpah</p>
<p style="text-align: center;margin: 0;">atau Notari Awam )</p>
</body>
</html>
</html>