Merge branch 'apiaku' into 'master'

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
2 changed files with 6 additions and 5 deletions
-1
View File
@@ -175,7 +175,6 @@ class GadaiController extends Controller
"percentpinj" => $request->percentpinj,
"jumtebus" => $request->jumtebus,
"upahnotis" => $request->upahnotis,
"upahpercuma" => $request->upahpercuma,
"upahdibayar" => $request->upahdibayar,
"semakbarcode" => $request->semakbarcode,
"historygadaian" => $request->historygadaian,
+6 -4
View File
@@ -288,7 +288,9 @@ class TebusController extends Controller
'rebate' => $rebet,
'marhuntebus' => $request->marhun,
'historygadaian' => $request->historygadaian,
'tarikhbyrn' => $current->toDateString()
'tarikhbyrn' => $current->toDateString(),
'teller' => $request->teller
]);
$create_inoutmar = InOutMar::on($cawangan['mysql'])->create([
@@ -296,13 +298,13 @@ class TebusController extends Controller
'masa' => $current->toTimeString(),
'norujukan' => $norujukan,
'nm' => $request->nilai_marhun,
'pkd' => "kosong",
'drp' => "kosong",
'pkd' => $request->teller,
'drp' => $request->teller,
'bln' => $current->month,
'thn' => $current->year,
'tag' => 0,
'jenistebus' => $request->jenistebus,
'namateller' => "nama teller"
'namateller' => $request->teller
]);
return response()->json($update_gadai, 201);