This commit is contained in:
LAPTOP-DGCU80CH\user1
2020-12-06 11:25:01 +08:00
parent b6543ad26f
commit e0b299a0f3
3 changed files with 140 additions and 31 deletions
+2 -1
View File
@@ -65,7 +65,8 @@ class Gadai extends Model
'tebus', 'tebus',
'bakihargajualan', 'bakihargajualan',
'hargajualan', 'hargajualan',
'upah12' 'upah12',
'tagkomuditi'
]; ];
/** /**
+130 -30
View File
@@ -93,31 +93,35 @@ class GadaiController extends Controller
$t_kontrak = new Carbon(); $t_kontrak = new Carbon();
$t_kontrak = $t_kontrak->addMonths(12)->subDays(1); $t_kontrak = $t_kontrak->addMonths(12)->subDays(1);
// dd($t_matang);
$margin_pinjam = $request->percentpinj *100; $margin_pinjam = $request->percentpinj *100;
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); $cawangan = Cawangan::on('mysql7')
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array( ->where('kodcaw','=',$request->kodcaw)
'nilaimarhun' => $request->nilaimarhun, ->first();
'berat'=> $request->berat, $gadai = Gadai::on($cawangan['mysql'])
'pinjaman' => $request->pinjaman, ->where('norujukan','=',$norujukan)
'kadarupah' => $request->kadarupah, ->update(array(
'marhun' => $request->marhun, 'nilaimarhun' => $request->nilaimarhun,
'percentpinj' => $margin_pinjam, 'berat'=> $request->berat,
'teller' => $request->teller, 'pinjaman' => $request->pinjaman,
'bakipjm' => $request->pinjaman, 'kadarupah' => $request->kadarupah,
'bakiupah' => $request->upah6, 'marhun' => $request->marhun,
'jbg' => 0.5, 'percentpinj' => $margin_pinjam,
't_update' => $current->toDateString(), 'teller' => $request->teller,
'cetak' => 0, 'bakipjm' => $request->pinjaman,
'upah12' => $request->upah12, 'bakiupah' => $request->upah6,
'hargajualan' => $request->hargajualan, 'jbg' => 0.5,
'bakihargajualan' => $request->hargajualan, 't_update' => $current->toDateString(),
'tagserah' => 0, 'cetak' => 0,
't_matang' => $t_matang, 'upah12' => $request->upah12,
't_matang1' => $t_kontrak, 'hargajualan' => $request->hargajualan,
'tempoh' => 0.5, 'bakihargajualan' => $request->hargajualan,
'kuantiti' => $request->kuantiti_marhun 'tagserah' => 0,
)); 't_matang' => $t_matang,
't_matang1' => $t_kontrak,
'tempoh' => 0.5,
'kuantiti' => $request->kuantiti_marhun,
'tagkomuditi' => 0
));
return response()->json($gadai, 200); return response()->json($gadai, 200);
} }
@@ -202,15 +206,23 @@ class GadaiController extends Controller
} }
public function showTebusToday($kodcaw,$norujukan){ public function showTebusToday($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $cawangan = Cawangan::on('mysql7')
->where('kodcaw','=',$kodcaw)
->first();
$gadai_data = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first(); $gadai_data = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->first();
$upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->get(); $transaction = Transaction::on('mysql7')
->where('norujukan','=',$norujukan)
->get();
$transaction_keuntungan = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->get(); $transaction_keuntungan = TransaksiKeuntungan::on('mysql7')
->where('norujukan','=',$norujukan)
->get();
$totalBayaranKeuntungan = 0; $totalBayaranKeuntungan = 0;
$totalBayaran = 0; $totalBayaran = 0;
@@ -235,7 +247,12 @@ class GadaiController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$current->toDateString()],['cetak','=',0]])->get(); $gadai = Gadai::on($cawangan['mysql'])
->where([
['t_gadai','=',$current->toDateString()],
['cetak','=',0]
])
->get();
return response()->json($gadai); return response()->json($gadai);
} }
@@ -246,7 +263,12 @@ class GadaiController extends Controller
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$gadai = Gadai::on($cawangan['mysql'])->where([['t_gadai','=',$current->toDateString()],['cetak','=',1],['tagserah','=',0]])->get(); $gadai = Gadai::on($cawangan['mysql'])
->where([
['t_gadai','=',$current->toDateString()],
['cetak','=',1],['tagserah','=',0]
])
->get();
return response()->json($gadai); return response()->json($gadai);
} }
@@ -265,4 +287,82 @@ class GadaiController extends Controller
return response('Batal Berjaya', 200); return response('Batal Berjaya', 200);
} }
public function pembelianKomuditi($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->update(array(
'tagkomuditi' => 1
));
return response()->json($gadai,200);
}
public function cetakSAG($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->update(array(
'cetak' => 1
));
return response()->json($gadai,200);
}
public function serahMarhun($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])
->where('norujukan','=',$norujukan)
->update(array(
'tagserah' => 1
));
return response()->json($gadai,200);
}
public function serahMarhunKhazanah($kodcaw){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$current = Carbon::now();
$current = new Carbon();
$gadai = Gadai::on($cawangan['mysql'])
->where([
['t_gadai','=',$current->toDateString()],
['cetak','=',1],['tagserah','=',1],
['semakbarcode','!=','Lulus']
])
->get();
return response()->json($gadai);
}
public function barcodeScan($kodcaw,$norujukan){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'semakbarcode'=>'Lulus'
));
return response()->json($gadai,200);
}
public function serahPetiBesi($kodcaw){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$current = Carbon::now();
$current = new Carbon();
$gadai = Gadai::on($cawangan['mysql'])
->where([
['t_gadai','=',$current->toDateString()],
['cetak','=',1],['tagserah','=',1],
['semakbarcode','=','Lulus']
])
->get();
return response()->json($gadai);
}
} }
+8
View File
@@ -42,6 +42,14 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->put('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@updateOneGadaiByNorujukan']); $router->put('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@updateOneGadaiByNorujukan']);
$router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']);
$router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']); $router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']);
$router->put('gadai/norujukan/komuditi/{kodcaw}/{norujukan}',['uses'=>'GadaiController@pembelianKomuditi']);
$router->put('gadai/norujukan/cetak/{kodcaw}/{norujukan}',['uses'=>'GadaiController@cetakSAG']);
$router->put('gadai/norujukan/serah/{kodcaw}/{norujukan}',['uses'=>'GadaiController@serahMarhun']);
$router->get('gadai/serah_marhun/khazanah/{kodcaw}',['uses'=>'GadaiController@serahMarhunKhazanah']);
$router->get('gadai/serah_marhun/khazanah/petibesi/{kodcaw}',['uses'=>'GadaiController@serahPetiBesi']);
$router->put('gadai/serah_marhun/khazanah/{kodcaw}/{norujukan}',['uses'=>'GadaiController@barcodeScan']);
$router->delete('gadai/batal/{kodcaw}/{norujukan}',['uses'=>'GadaiController@batalGadai']); $router->delete('gadai/batal/{kodcaw}/{norujukan}',['uses'=>'GadaiController@batalGadai']);