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

Merge branch 'Feature#Editing' into 'new-super'

Browse Source 
add nama wakil dekat ansuran

See merge request online-sistem1/kaunter!222
This commit is contained in:
hafifie rahman
2023-03-05 10:57:12 +00:00
parent 103a39ae33 a91ecf72b7
commit def687b3a0
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaianController.php
+7 -1
View File
@@ -357,6 +357,7 @@ class GadaianController extends Controller
$transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
@@ -367,7 +368,12 @@ class GadaianController extends Controller
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info'));
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $transaction['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
}
public function resitbelumansurans($id)
app/Http/Controllers/PenebusanController.php
+2 -1
View File
@@ -82,7 +82,8 @@ class PenebusanController extends Controller
$updategadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadaikaunter/'. $request->kodcaw .'/norujukan/' . $request->norujukan,[
'bayaran' => $request->bayaran,
'teller' => $request->teller
'teller' => $request->teller,
'nowakil' => $request->nowakil
])->json();
$getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$request->kodcaw,['kodlaluan' => $request->teller])->json();
resources/views/penebusan/index.blade.php
+2 -2
View File
@@ -1197,7 +1197,6 @@
///////////
}else if($('#sltjenistebus').find(":selected").val() == 'A'){
let adadah = false;
$.ajax({
@@ -1259,7 +1258,8 @@
"bayaran" : bayar,
"kodcaw" : kodcaw,
"norujukan" : norujukan,
"teller" : teller
"teller" : teller,
"nowakil" : nw
},
success:function(success_data){
resources/views/print/resit_tuntutbaki.blade.php
+2 -2
View File
@@ -194,7 +194,7 @@
<td></td>
</tr>
<tr>
<th colspan ="5"><b><u>RESIT BAYARAN LEBIHAN LELONGAN</u></b></th>
<th colspan ="5"><b><u>RESIT BAYARAN {{ ($lelong['jumlah'] > 0) ? 'LEBIHAN LELONGAN' : 'RUGI LELONGAN' }}</u></b></th>
<th> </th>
<th> </th>
<th></th>
@@ -256,7 +256,7 @@
<th></th>
</tr>
<tr>
<th>Lebihan Lelongan</th>
<th>{{ ($lelong['jumlah'] > 0) ? 'Lebihan Lelongan' : 'Rugi Lelongan' }}</th>
<td>RM {{ number_format($lelong['jumlah'],2) }}</td>
<th></th>
</tr>
resources/views/print/resitansuran.blade.php
+4 -4
View File
@@ -385,11 +385,11 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: </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>
<td colspan="3">No K/P Wakil </td> <td>: </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>
</table>
<br>
@@ -487,11 +487,11 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: </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>
<td colspan="3">No K/P Wakil </td> <td>: </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>
</table>
<br>