This commit is contained in:
LAPTOP-DGCU80CH\user1
2020-11-08 15:59:21 +08:00
parent ba7e18eee1
commit 4f463412b0
11 changed files with 325 additions and 45 deletions
+69
View File
@@ -0,0 +1,69 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Mail;
use App\Cawangan;
use App\Gadai;
use Carbon\Carbon;
class DailyGadai extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'gadai:daily';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Update JBG for every active gadai';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$cawangan = Cawangan::on('mysql7')->get();
$current = Carbon::now();
foreach($cawangan as $cawangan_mysql){
$all_gadai = Gadai::on($cawangan_mysql['mysql'])->where('sttebus','!=','L')->orWhere('sttebus','!=','T')->get();
foreach($all_gadai as $gadai){
$tarikh_gadai = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
$diff = date_diff($tarikh_gadai,$current);
$month = $diff->format("%m");
$days = $diff->format("%d");
$days = $days + 1;
if($days >= 1 && $days <= 15)
{
$extensivemonth = 0.5;
}
else if($days >= 16)
{
$extensivemonth = 1;
}
$tempoh_gadai = $month + $extensivemonth;
Gadai::on($cawangan_mysql['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(
'jbg' => $tempoh_gadai
));
}
}
}
}
+7 -1
View File
@@ -5,6 +5,10 @@ namespace App\Console;
use Illuminate\Console\Scheduling\Schedule;
use Laravel\Lumen\Console\Kernel as ConsoleKernel;
use App\Cawangan;
use App\Gadai;
use Carbon\Carbon;
class Kernel extends ConsoleKernel
{
/**
@@ -13,7 +17,7 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
//
Commands\DailyGadai::class,
];
/**
@@ -25,5 +29,7 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule)
{
//
$schedule->command('gadai:daily')->daily()->at('00:00')->timezone('Asia/Kuala_Lumpur');
}
}
+50 -3
View File
@@ -7,15 +7,62 @@ use Illuminate\Database\Eloquent\Model;
class Gadai extends Model
{
protected $table = 'gadai';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
// protected $fillable = [
// ];
protected $fillable = [
'kodcaw',
'norujukan',
'nopelanggan',
'nokp',
't_gadai',
'masa',
'nilaimarhun',
'berat',
'pinjaman',
'telahbayar',
'upahtelahbyr',
'CajTelahByr',
'ansuran',
'ansupah',
'kadarupah',
'tempoh',
't_Lelong',
't_Hapus',
'sttebus',
'terima',
'cetak',
'tnCek',
'noCek',
'bkcode',
'teller',
'pelulus',
'cancelid',
'canceltime',
'f_lulus',
'tag',
'jbg',
'bakiPJM',
'bakiupah',
'marhun' ,
'taglel' ,
't_update',
'penilai' ,
'tagserah' ,
'namapelulus' ,
'percentpinj' ,
'namateller' ,
'jumtebus' ,
'upahnotis',
'tagpalsu' ,
'tagcetak' ,
'lel1stop' ,
'tebus',
];
/**
* The attributes excluded from the model's JSON form.
+33 -23
View File
@@ -19,7 +19,7 @@ class GadaiController extends Controller
public function gadaiTransactionByCawanganAndDay($cawangan_code,$date){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$cawangan_code)->first();
$gadaiTransaction = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$date)->get();
$gadaiTransaction = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$date)->count();
return response()->json($gadaiTransaction);
}
@@ -61,7 +61,7 @@ class GadaiController extends Controller
public function create($kodcaw,Request $request)
{
$current = Carbon::now();
$current = Carbon::now()->setTimezone('Asia/Kuala_Lumpur');;
$current = new Carbon();
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
@@ -71,31 +71,24 @@ class GadaiController extends Controller
'nopelanggan' => $request->nopelanggan,
'nokp' => $request->nokp,
't_gadai' => $current->toDateString(),
'masa' =>$current->toTimeString(),
'nilaimarhun' => $request->nilaimarhun,
'n_marhuns' => $request->nilaimarhun,
'berat' => $request->berat,
'pinjaman' => $request->pinjaman,
'kadarupah' => $request->kadarupah,
'tempoh' => 6,
't_matang' => $current->addMonths(6)->subDays(1),
'sttebus' => '',
'marhun' => $request->marhun,
'jantina' => $request->jantina,
'bangsa' => $request->bangsa,
'jenistebus' => '',
'penilai' => 'AFIQ',
'namapenilai' => 'Afiq',
'namapelulus' => 'Afiq',
'percentpinj' => $request->percentpinj,
'namateller' => 'Afiq',
'tagpalsu' => 0,
'tellernew' => '',
'tagcall' => ''
'masa' =>$current->toTimeString()
]);
return response()->json($gadai, 201);
}
public function daftarGadaiMarhun($norujukan,Request $request)
{
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'nilaimarhun' => $request->nilaimarhun,
'pinjaman' => $request->pinjaman,
'kadarupdah' => $request->kadarupah,
'marhun' => $request->marhun,
'percentpinj' => $request->percentpinj
));
return response()->json($gadai, 200);
}
public function update($id, Request $request)
{
$gadai = Gadai::findOrFail($id);
@@ -104,6 +97,23 @@ class GadaiController extends Controller
return response()->json($gadai, 200);
}
public function getTransactionByTarikh($kodcaw,$tarikh){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai_transaction = Gadai::on($cawangan['mysql'])->where('t_gadai','=',$tarikh)->get();
return response()->json($gadai);
}
public function updateOneGadaiByNorujukan($norujukan,$kodcaw,Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
''
));
return response()->json($gadai);
}
public function delete($id)
{
Gadai::findOrFail($id)->delete();
+1 -18
View File
@@ -43,23 +43,6 @@ class MarhunController extends Controller
$current = Carbon::now();
$current = new Carbon();
$nota = "";
if($request->rosak != ""){
$nota = $nota . $request->rosak;
}
if($request->putus != ""){
$nota = $nota . ', ' . $request->putus;
}
if($request->patah != ""){
$nota = $nota . ', ' . $request->patah;
}
if($request->permata != ""){
$nota = $nota . ', ' . $request->permata;
}
if($request->sebelah != ""){
$nota = $nota . ', ' . $request->sebelah;
}
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
$marhun = Marhun::on($cawangan['mysql'])->create([
'kodcaw'=> $kodcaw,
@@ -67,7 +50,7 @@ class MarhunController extends Controller
't_gadai' => $current->toDateString(),
'bil' => 1,
'marhun' => $request->marhun,
'nota' => $nota,
'nota' => $request->nota,
'karat' => $request->karat,
'berat' => $request->berat_emas,
'harga' => $request->harga,
@@ -0,0 +1,15 @@
<?php
namespace App\Http\Controllers;
use App\MaxPinjaman;
use Illuminate\Http\Request;
class MaxPinjamanController extends Controller
{
public function getAllMaxPinjaman(){
$pinjaman = MaxPinjaman::on('mysql7')->get();
return response()->json($pinjaman);
}
}
@@ -0,0 +1,57 @@
<?php
namespace App\Http\Controllers;
use App\Transaction;
use Illuminate\Http\Request;
use Carbon\Carbon;
class TransactionController extends Controller
{
public function duitMasuk(Request $request){
$current = Carbon::now();
$current = new Carbon();
$transaction = Transaction::on('mysql7')->create([
'trans_type' => $request->trans_type,
'norujukan' => $request->norujukan,
'nokp' => $request->nokp,
'teller' => $request->teller,
'kodcaw' => $request->kodcaw,
'duit_masuk' => $request->duit_masuk,
'created_at' => $current,
]);
return response()->json($transaction,201);
}
public function duitKeluar(Request $request){
$current = Carbon::now();
$current = new Carbon();
$transaction = Transaction::on('mysql7')->create([
'trans_type' => $request->trans_type,
'norujukan' => $request->norujukan,
'nokp' => $request->nokp,
'teller' => $request->teller,
'kodcaw' => $request->kodcaw,
'duit_keluar' => $request->duit_keluar,
'created_at' => $current,
]);
return response()->json($transaction,201);
}
public function showAllTransaction(){
$transaction = Transaction::on('mysql7')->get();
return response()->json($transaction);
}
public function getTransactionByRujukan($norujukan){
$transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->get();
return response()->json($transaction);
}
}
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class MaxPinjaman extends Model
{
protected $table = 'max_pinjaman';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'user_type','max'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class Transaction extends Model
{
protected $table = 'transaction';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'trans_type','norujukan','nokp','teller','kodcaw','duit_masuk','duit_keluar','created_at'
];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
// protected $hidden = [];
}
+24
View File
@@ -95,5 +95,29 @@ return [
'prefix' => '',
'strict' => false,
],
'mysql8' => [
'driver' => 'mysql',
'host' => env('DB_HOST_8'),
'port' => env('DB_PORT'),
'database' => env('DB_DATABASE_8'),
'username' => env('DB_USERNAME_8'),
'password' => env('DB_PASSWORD_8'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
'mysql9' => [
'driver' => 'mysql',
'host' => env('DB_HOST_9'),
'port' => env('DB_PORT'),
'database' => env('DB_DATABASE_9'),
'username' => env('DB_USERNAME_9'),
'password' => env('DB_PASSWORD_9'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => '',
'strict' => false,
],
],
];
+17
View File
@@ -34,10 +34,15 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('gadai/{noic}',['uses'=>'GadaiController@showOneGadai']);
$router->get('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukan']);
$router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']);
$router->post('gadai/{kodcaw}',['uses'=>'GadaiController@create']);
$router->delete('gadai/{id}', ['uses' => 'GadaiController@delete']);
$router->put('gadai/{id}', ['uses' => 'GadaiController@update']);
$router->get('gadai/{cawangan_code}/{date}',['uses'=>'GadaiController@gadaiTransactionByCawanganAndDay']);
$router->put('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@updateOneGadaiByNorujukan']);
$router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']);
//Lelong API
$router->get('lelong',['uses'=>'LelongController@showAllLelongs']);
@@ -64,12 +69,24 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('cawangan',['uses'=>'CawanganController@showAllCawangans']);
$router->get('cawangan/{code_cawangan}',['uses'=>'CawanganController@showOneCawangan']);
//Poskod API
$router->get('poskod',['uses'=>'PoskodController@showAllPoskod']);
$router->get('poskod/{poskod}',['uses'=>'PoskodController@showOnePoskod']);
//Negeri API
$router->get('negeri/{kodnegeri}',['uses'=>'NegeriController@showOneNegeri']);
//Daerah API
$router->get('daerah/{koddaerah}',['uses'=>'DaerahController@showOneDaerah']);
//Bank API
$router->get('bank',['uses'=>'BankController@showAllBank']);
//Transaction API
$router->post('transaction/duit_masuk',['uses'=>'TransactionController@duitMasuk']);
$router->post('transaction/duit_keluar',['uses'=>'TransactionController@duitKeluar']);
$router->get('transaction',['uses'=>'TransactionController@showAllTransaction']);
$router->get('transaction/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukan']);
$router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);
});