Merge branch 'pipiv2' into 'master'

fix tempoh ke jbg

See merge request online-sistem1/kaunter!97
This commit is contained in:
hafifie rahman
2021-04-13 07:53:33 +00:00
6 changed files with 15 additions and 14 deletions
@@ -518,6 +518,9 @@
<td>{{ number_format($totalsemua,2) }}</td>
</tr>
</table>
<h5>CATATAN:</h5> Serahan kepada peti besi ialah sebanyak <span>RM </span>
Baki Tunai Semasa sebanyak <span>RM </span>
<br>
<br>
+4 -6
View File
@@ -278,6 +278,7 @@
$('input[name="bayaran"]').val(amaunkiraan);
$('#denominasipanjar').modal('hide');
// $('#amaunkiraan').val(0);
}
//Modal Reset
@@ -295,7 +296,7 @@
$('#SelenggaraModal').on('hidden.bs.modal', function (e) {
$(this)
.find("input,textarea,select")
.val('')
.val(0)
.end()
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
@@ -335,14 +336,11 @@
$('#denominasipanjar').on('hidden.bs.modal', function (e) {
$(this)
.find("input,textarea,select")
.find("input")
.val('')
.end()
.find("input[type=checkbox], input[type=radio]")
.prop("checked", "")
.end();
$('#amaunkiraan').val();
$('#amaunkiraan').val(0);
});
//End Modal Reset
+2 -2
View File
@@ -409,7 +409,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
</tr>
<tr>
@@ -502,7 +502,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
</tr>
<tr>
@@ -409,7 +409,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td>
</tr>
<tr>
@@ -505,7 +505,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td>: Tempoh Simpan</td><td> {{ $gadai['jbg'] }} </td>
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
+2 -2
View File
@@ -410,7 +410,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
</tr>
<tr>
@@ -509,7 +509,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
</tr>
@@ -410,7 +410,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> </td> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
</tr>
<tr>
@@ -511,7 +511,7 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['tempoh'] }} </td>
<td colspan="3">No K/P </td> <td>: {{ $customers_info['kpbaru'] }} </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> Tempoh Simpan</td><td>: {{ $gadai['jbg'] }} </td>
</tr>