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

Merge branch 'apiaku' into 'master'

Browse Source 
fix scene

See merge request online-sistem1/api_arrahn!33
This commit is contained in:
hafifie rahman
2021-02-07 06:52:26 +00:00
parent bfd9dd3105 224ac2b649
commit b07c9b19dc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
-1
View File
@@ -175,7 +175,6 @@ class GadaiController extends Controller
"percentpinj" => $request->percentpinj, "percentpinj" => $request->percentpinj,
"jumtebus" => $request->jumtebus, "jumtebus" => $request->jumtebus,
"upahnotis" => $request->upahnotis, "upahnotis" => $request->upahnotis,
"upahpercuma" => $request->upahpercuma,
"upahdibayar" => $request->upahdibayar, "upahdibayar" => $request->upahdibayar,
"semakbarcode" => $request->semakbarcode, "semakbarcode" => $request->semakbarcode,
"historygadaian" => $request->historygadaian, "historygadaian" => $request->historygadaian,
app/Http/Controllers/TebusController.php
+6 -4
View File
@@ -288,7 +288,9 @@ class TebusController extends Controller
'rebate' => $rebet, 'rebate' => $rebet,
'marhuntebus' => $request->marhun, 'marhuntebus' => $request->marhun,
'historygadaian' => $request->historygadaian, 'historygadaian' => $request->historygadaian,
'tarikhbyrn' => $current->toDateString() 'tarikhbyrn' => $current->toDateString(),
'teller' => $request->teller
]); ]);
$create_inoutmar = InOutMar::on($cawangan['mysql'])->create([ $create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
@@ -296,13 +298,13 @@ class TebusController extends Controller
'masa' => $current->toTimeString(), 'masa' => $current->toTimeString(),
'norujukan' => $norujukan, 'norujukan' => $norujukan,
'nm' => $request->nilai_marhun, 'nm' => $request->nilai_marhun,
'pkd' => "kosong", 'pkd' => $request->teller,
'drp' => "kosong", 'drp' => $request->teller,
'bln' => $current->month, 'bln' => $current->month,
'thn' => $current->year, 'thn' => $current->year,
'tag' => 0, 'tag' => 0,
'jenistebus' => $request->jenistebus, 'jenistebus' => $request->jenistebus,
'namateller' => "nama teller" 'namateller' => $request->teller
]); ]);
return response()->json($update_gadai, 201); return response()->json($update_gadai, 201);