diff --git a/app/Http/Controllers/DenominasiController.php b/app/Http/Controllers/DenominasiController.php index 18eee9e..fa3811c 100644 --- a/app/Http/Controllers/DenominasiController.php +++ b/app/Http/Controllers/DenominasiController.php @@ -15,9 +15,12 @@ class DenominasiController extends Controller public function listdenominasi($kodcaw) { - + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $data=Denominasi::on($cawangan['mysql'])->orderby('tarikh','desc')->limit(1)->get(); + $data=Denominasi::on($cawangan['mysql'])->where('tarikh','=',$current->toDateString())->limit(1)->get(); + return response()->json($data); } @@ -104,4 +107,61 @@ class DenominasiController extends Controller return response()->json($denominasiupdate,200); } + + public function createdenominasi($kodcaw) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $deno = Denominasi::on($cawangan['mysql'])->orderby('tarikh','desc')->first(); + + $savedeno = Denominasi::on($cawangan['mysql'])->create([ + + 'tarikh' => $current->toDateString(), + 'bd1' => $deno['bd1'], + 'b1' => $deno['b1'], + 'bd5' => $deno['bd5'], + 'b5' => $deno['b5'], + 'bd10' => $deno['bd10'], + 'b10' => $deno['b10'], + 'bd20' => $deno['bd20'], + 'b20' => $deno['b20'], + 'bd50' => $deno['bd50'], + 'b50' => $deno['b50'], + 'bd100' => $deno['bd100'], + 'b100' => $deno['b100'], + 'txtring1' => $deno['txtring1'], + 'k1' => $deno['k1'], + 'txtring5' => $deno['txtring5'], + 'k5' => $deno['k5'], + 'txtsen1' => $deno['txtsen1'], + 'k01' => $deno['k01'], + 'txtsen5' => $deno['txtsen5'], + 'k05' => $deno['k05'], + 'txtsen10' => $deno['txtsen10'], + 'k010' => $deno['k010'], + 'txtsen20' => $deno['txtsen20'], + 'k020' => $deno['k020'], + 'txtsen50' => $deno['txtsen50'], + 'k050' => $deno['k050'], + 'txtring10' => $deno['txtring10'], + 'k10' => $deno['k10'], + 'txtring20' => $deno['txtring20'], + 'k20' => $deno['k20'], + 'txtring50' => $deno['txtring50'], + 'k50' => $deno['k50'], + 'txtring100' => $deno['txtring100'], + 'k100' => $deno['k100'], + 'txtring1000' => $deno['txtring1000'], + 'k1000' => $deno['k1000'], + 'jumlahbundle' => $deno['jumlahbundle'], + 'txtjumlah' => $deno['txtjumlah'], + 'nota' => $deno['nota'], + 'jumlahkeping' => $deno['jumlahkeping'] + ]); + + return response()->json($savedeno); + } } \ No newline at end of file diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 7360b79..ad31112 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -383,6 +383,47 @@ class GadaiController extends Controller return response()->json($gadai); } + public function dashboardall($kodcaw) + { + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $array_dashboard = []; + + //Gadai Terkumpul + $gadai = Gadai::on($cawangan['mysql']) + ->where('sttebus','=','') + ->whereYear('t_gadai','=',$current->year) + ->orderBy('t_gadai','desc') + ->sum('pinjaman'); + + //Tebus Terkumpul + $tebus = Gadai::on($cawangan['mysql']) + ->where('sttebus','=','T') + ->whereYear('t_gadai','=',$current->year) + ->orderBy('t_gadai','desc') + ->sum('pinjaman'); + + //Upah Terkumpul + + + //Variasi + $variasi = $gadai - $tebus; + + + //Outstanding + $outstanding = Gadai::on($cawangan['mysql']) + // ->where('sttebus','=','') + ->orderBy('t_gadai','desc') + ->sum('pinjaman'); + + array_push($array_dashboard,["gadai" => $gadai,"tebus" => $tebus, "variasi" => $variasi, "outstanding" => $outstanding]); + + return response()->json($array_dashboard); + } + public function gadaiRingkasanTerkumpul($kodcaw,$tarikh){ $current = Carbon::now(); diff --git a/app/Http/Controllers/TunaiController.php b/app/Http/Controllers/TunaiController.php index 661eab9..9a62a2f 100644 --- a/app/Http/Controllers/TunaiController.php +++ b/app/Http/Controllers/TunaiController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Cawangan; use App\Tunai; +use App\Gadai; use App\AddTunai; use App\RequestTeller; use Illuminate\Http\Request; @@ -21,11 +22,31 @@ class TunaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()]])->get(); - return response()->json($tunai); + $tunai=Tunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()]])->orderBy('tarikh','desc')->get(); + return response()->json($tunai); } + public function countgadaidantebus($kodcaw) + { + $current = Carbon::now(); + $current = new Carbon(); + + $array_GT = []; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $gadaicount=Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=',$current->toDateString()]])->count(); + $gadaijumlah=Gadai::on($cawangan['mysql'])->where([['sttebus','=',''],['t_gadai','=',$current->toDateString()]])->sum('pinjaman'); + + $tebuscount=Gadai::on($cawangan['mysql'])->where([['sttebus','=','T'],['t_gadai','=',$current->toDateString()]])->count(); + $tebusjumlah=Gadai::on($cawangan['mysql'])->where([['sttebus','=','T'],['t_gadai','=',$current->toDateString()]])->sum('pinjaman'); + + array_push($array_GT,['gcount' => $gadaicount, 'gjumlah' => $gadaijumlah, 'tcount' => $tebuscount, 'tjumlah' => $tebusjumlah]); + + return response()->json($array_GT); + } + public function sumBakiTunai($kodcaw) { @@ -101,7 +122,7 @@ class TunaiController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $tunai=Tunai::on($cawangan['mysql']) - ->where([['kodcaw','=',$kodcaw],['tarikh','<=',$current->toDateString()],['kodlaluan','=',$kodlaluan]]) + ->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$kodlaluan]]) ->orderBy('tarikh','desc') ->first(); return response()->json($tunai); @@ -123,7 +144,7 @@ class TunaiController extends Controller 'tarikh' => $current->toDateString(), 'kodcaw'=> $request->kodcaw, - 'kodlaluan'=>$request->KodLaluan, + 'kodlaluan'=>$request->kodlaluan, 'tambah'=>$request->tambah, 'kurang'=>$request->kurang, 'nota'=>$request->nota @@ -144,13 +165,24 @@ class TunaiController extends Controller return response()->json($addtunai); } - public function getRequestTeller($kodcaw,$kodlaluan) + public function getAddTunaibyKodlaluan($kodcaw,$kodlaluan) + { + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $addtunai=AddTunai::on($cawangan['mysql'])->where([['kodcaw','=',$kodcaw],['tarikh','=',$current->toDateString()],['kodlaluan','=',$kodlaluan]])->get(); + return response()->json($addtunai); + } + + public function getRequestTeller($kodcaw) { $current = Carbon::now(); $current = new Carbon(); - $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['kodlaluan','=',$kodlaluan],['update','=',0]])->get(); + $requestteller=RequestTeller::on('mysql7')->where([['kodcaw','=',$kodcaw],['update','=',0]])->get(); return response()->json($requestteller); } @@ -168,7 +200,7 @@ class TunaiController extends Controller $current = Carbon::now(); $current = new Carbon(); - + $reqteller=RequestTeller::on('mysql7')->create([ 'tarikh' => $current->toDateString(), diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 540c6d8..aed4aa8 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -15,9 +15,14 @@ class VaultController extends Controller public function list($kodcaw) { + $current = Carbon::now(); + $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $vault=Vault::on($cawangan['mysql'])->where('kodcaw','=',$kodcaw)->orderby('tarikh','desc')->limit(1)->get(); + $vault=Vault::on($cawangan['mysql']) + ->where('kodcaw','=',$kodcaw) + ->where('tarikh','=',$current->toDateString()) + ->orderby('tarikh','desc')->limit(1)->get(); return response()->json($vault); @@ -34,7 +39,6 @@ class VaultController extends Controller 'masuk'=>$request->masuk, 'keluar'=>$request->keluar, - 'bakiawal'=>$request->bakiawal, 'bakiakhir'=>$request->bakiakhir, 'bakieod'=>$request->bakieod @@ -52,16 +56,40 @@ class VaultController extends Controller $current = Carbon::now(); $current = new Carbon(); - + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $vault=Vault::on($cawangan['mysql'])->create([ + + $vault = Vault::on($cawangan['mysql'])->orderby('tarikh','desc')->first(); + + $vaultcreate = Vault::on($cawangan['mysql'])->create([ + 'kodcaw'=>$request->kodcaw, + 'tarikh'=> $current->toDateString(), + 'bakiawal' => $vault['bakiakhir'], + 'keluar' => 0, + 'masuk' => 0, + 'bakiakhir' => 0, + 'bakieod' => 0, + 'pendahuluan' => 0, + 'serahan' => 0, + '1sen' => $vault['1sen'], + '5sen' => $vault['5sen'], + '10sen' => $vault['10sen'], + '20sen' => $vault['20sen'], + '50sen' => $vault['50sen'], + 'rm1' => $vault['rm1'], + 'rm2' => $vault['rm2'], + 'rm5' => $vault['rm5'], + 'rm10' => $vault['rm10'], + 'rm50' => $vault['rm50'], + 'rm100' => $vault['rm100'], + 'rm1000' => $vault['rm1000'], + 'totpanjar' => $vault['totpanjar'] + + ]); - 'kodcaw'=>$request->kodcaw, - 'tarikh'=> $current->toDateString() - ]); - - + return response()->json($vaultcreate,201); } } \ No newline at end of file diff --git a/app/RequestTeller.php b/app/RequestTeller.php index f6d6a2b..c9879f5 100644 --- a/app/RequestTeller.php +++ b/app/RequestTeller.php @@ -13,7 +13,7 @@ class RequestTeller extends Model * * @var array */ - protected $fillable = ['no','KodLaluan','modal','serahan','tarikh','update','kodcaw']; + protected $fillable = ['no','kodlaluan','modal','serahan','tarikh','update','kodcaw']; /** * The attributes excluded from the model's JSON form. diff --git a/routes/web.php b/routes/web.php index 5b04084..1cac794 100644 --- a/routes/web.php +++ b/routes/web.php @@ -173,7 +173,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API BARU + $router->get('Dashboard_all/{kodcaw}',['uses'=>'GadaiController@dashboardall']); $router->get('VaultController/{kodcaw}',['uses'=>'VaultController@list']); + $router->get('countGT/{kodcaw}',['uses'=>'TunaiController@countgadaidantebus']); $router->post('daftarVault/{kodcaw}',['uses'=>'VaultController@create']); $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']); $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']); @@ -185,6 +187,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('SenaraiPenebusanKhazanah/{kodcaw}',['uses'=>'TebusController@listSerahKhazanah']); $router->get('GetCurrentTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getCurrentTunai']); $router->get('getAddTunai/{kodcaw}/',['uses' =>'TunaiController@getAddTunai']); + $router->get('getAddTunai/{kodcaw}/{kodlaluan}',['uses' =>'TunaiController@getAddTunaibyKodlaluan']); $router->put('gadai/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@GadaiHapus']); $router->put('tebus/hapus/{kodcaw}/{norujukan}', ['uses' => 'GadaiController@TebusHapus']); $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit @@ -213,7 +216,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //API REQUEST TELLER $router->post('requestTeller/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@createRequestTeller']); - $router->get('requestTeller/get/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@getRequestTeller']); + $router->get('requestTeller/get/{kodcaw}',['uses' => 'TunaiController@getRequestTeller']); $router->put('requestTeller/update/{kodcaw}/{kodlaluan}',['uses' => 'TunaiController@updateRequestTeller']); //API WAKIL @@ -235,6 +238,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ //DENOMINASI $router->get('DenominasiController/{kodcaw}',['uses'=>'DenominasiController@listdenominasi']); $router->put('DenominasiUpdate/{kodcaw}',['uses'=>'DenominasiController@updatedenominasi']); + $router->post('DenominasiCreate/{kodcaw}',['uses'=>'DenominasiController@createdenominasi']); });