KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request 'feature: include cara terima in reports' (#14) from feature/tagging-cara-terima into main

Browse Source 
Reviewed-on: #14
This commit was merged in pull request #14.
This commit is contained in:
ismailmasseran
2026-09-20 09:38:22 +08:00
parent 8de9d872f9 2f6f06d3e3
commit 79bc41d211
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gadai.php
+4
View File
@@ -9,6 +9,10 @@ class Gadai extends Model
protected $table = 'gadai'; protected $table = 'gadai';
public $timestamps = false; public $timestamps = false;
protected $attributes = [
'cara_terima' => 'TUNAI',
];
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
* *
app/Http/Controllers/GadaiController.php
+3 -1
View File
@@ -537,7 +537,7 @@ class GadaiController extends Controller
public function getLaporanGadai($kodcaw,$tarikh){ public function getLaporanGadai($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent') $gadai_data = Gadai::on($cawangan['mysql'])->select('cara_terima','t_gadai','norujukan','nokp','semakbarcode','masa','berat','nilaimarhun','pinjaman','upah12','percentpinj','teller','nokp','ujrah','onepercent')
->where('t_gadai','=',$tarikh) ->where('t_gadai','=',$tarikh)
->orderBy('teller') ->orderBy('teller')
->orderBy('sirig') ->orderBy('sirig')
@@ -551,6 +551,7 @@ class GadaiController extends Controller
array_push($gadai,[ array_push($gadai,[
"t_gadai"=> $gadaiData['t_gadai'], "t_gadai"=> $gadaiData['t_gadai'],
"norujukan"=> $gadaiData['norujukan'], "norujukan"=> $gadaiData['norujukan'],
"cara_terima"=> $gadaiData['cara_terima'],
"nama"=> $customer_info['nama'], "nama"=> $customer_info['nama'],
"nokp"=> $gadaiData['nokp'], "nokp"=> $gadaiData['nokp'],
"semakbarcode"=> $gadaiData['semakbarcode'], "semakbarcode"=> $gadaiData['semakbarcode'],
@@ -626,6 +627,7 @@ class GadaiController extends Controller
"alamat1" => optional($customer)->alamat1, "alamat1" => optional($customer)->alamat1,
"t_gadai" => $g->t_gadai, "t_gadai" => $g->t_gadai,
"norujukan" => $g->norujukan, "norujukan" => $g->norujukan,
"cara_terima" => $g->cara_terima,
"norujukan"=> $g->norujukan, "norujukan"=> $g->norujukan,
"nokp"=> $g->nokp, "nokp"=> $g->nokp,