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

Merge branch 'pipi' into 'master'

Browse Source 
fix wakil

See merge request online-sistem1/kaunter!40
This commit is contained in:
hafifie rahman
2021-01-17 01:25:34 +00:00
parent 27fb3873b4 10ac9e9373
commit d70eb2e7d2
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+1 -1
View File
@@ -373,7 +373,7 @@ class GadaianController extends Controller
// dd($wakil); // dd($wakil);
if(sizeof($wakil) != 0) if(sizeof($wakil) != 0)
$wakil = $wakil[0]; $wakil = $wakil[0];
return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction')); return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
} }
app/Http/Controllers/PenebusanController.php
+1 -2
View File
@@ -287,7 +287,6 @@ class PenebusanController extends Controller
$auth_user = Auth::user(); $auth_user = Auth::user();
//////////////////////// ////////////////////////
/// UPDATE TEBUS API//// /// UPDATE TEBUS API////
/////////////////////// ///////////////////////
@@ -416,7 +415,7 @@ class PenebusanController extends Controller
$getfirstwakil = Http::get(config('api.url') . '/api/getwakil/'. $auth_user['cawangan'])->json(); $getfirstwakil = Http::get(config('api.url') . '/api/getwakil/'. $auth_user['cawangan'])->json();
if(sizeof($getfirstwakil) != 0) if(sizeof($getfirstwakil) != 0)
return $getfirstwakil[0]['NOWAKIL']; return $getfirstwakil[0]['nowakil'];
else else
return $getfirstwakil; return $getfirstwakil;
} }
resources/views/penebusan/index.blade.php
+4 -3
View File
@@ -752,7 +752,8 @@ function bayaransemua()
var marhun = "{{ $gadai['marhun'] }}"; var marhun = "{{ $gadai['marhun'] }}";
var nowakil = nw; var nowakil = nw;
alert(nw);
return;
$.ajax({ $.ajax({
method:'put', method:'put',
@@ -1296,8 +1297,8 @@ function wakilfunction(e)
title: 'Maklumat anda Berjaya Direkodkan!' title: 'Maklumat anda Berjaya Direkodkan!'
}); });
console.log(data.NOWAKIL); console.log(data.nowakil);
nw = data.NOWAKIL; nw = data.nowakil;
$('#wakiltxt').prop( "disabled", true ); $('#wakiltxt').prop( "disabled", true );
$(e).html("Ubah"); $(e).html("Ubah");
resources/views/print/resittebus.blade.php
+4 -4
View File
@@ -408,11 +408,11 @@ hr.new5 {
</tr> </tr>
<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> <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>
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr> </tr>
</table> </table>
<br> <br>
@@ -509,12 +509,12 @@ hr.new5 {
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp</td> <td colspan="3"> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td> </td><td> </td><td> </td><td> </td>
</tr> </tr>
</table> </table>
<br> <br>
resources/views/print/resittebussebelum.blade.php
+4 -4
View File
@@ -408,11 +408,11 @@ hr.new5 {
</tr> </tr>
<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> <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>
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr> </tr>
</table> </table>
<br> <br>
@@ -503,12 +503,12 @@ hr.new5 {
<tr> <tr>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['NAMA'];} else echo ''; @endphp </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> <t/d> <td> </td><td> </td><td> </td><td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['NOKP']; else echo ''; @endphp</td> <td colspan="3"> <td> </td><td> </td><td> </td><td> </td> <td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td> </td><td> </td><td> </td><td> </td>
</tr> </tr>
</table> </table>
<br> <br>