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

Merge remote-tracking branch 'origin/new-super' into afiqhamzah-feat-mykad-reader-registration

Browse Source
This commit is contained in:
afiq.hamzah
2022-12-26 11:56:00 +08:00
parent 6c40b6eec6 c744e23288
commit 18c066c2f1
24 changed files with 1278 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CawanganAR.php
+2 -1
View File
@@ -13,6 +13,7 @@ class CawanganAR extends Model
'kodcaw',
'syarikat',
'min',
'max'
'max',
'penyelarasan'
];
}
app/Console/Commands/DailyAkru.php
+61
View File
@@ -0,0 +1,61 @@
<?php
namespace App\Console\Commands;
use Exception;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Http;
class DailyAkru extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'akru:daily {--zone=1 : Choose which zone to update zone [1,2,3]}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Generate Daily Akrual For Trial Balance';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$zone = $this->option('zone');
if($zone < 1 || $zone > 3)
{
throw new Exception('The zone is not in the range!');
}
$updateAkruDaily = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/generateDaily',[
'zone' => $zone
])->json();
if($updateAkruDaily == 'succesful')
{
return 0;
}else{
return 'failed';
}
}
}
app/Console/Commands/DailyImbangDuga.php
+65
View File
@@ -0,0 +1,65 @@
<?php
namespace App\Console\Commands;
use Exception;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Http;
use App\Services\ImbangdugaServices;
class DailyImbangDuga extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'imbangduga:daily {--zone=1 : Choose which zone to update [1,2,3]}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Save Trial Balance in Database Daily';
/**
* Create a new command instance.
*
* @return void
*/
private $imbangduga;
public function __construct(ImbangdugaServices $imbangduga)
{
$this->imbangduga = $imbangduga;
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
$array_cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan')->json();
$zone = $this->option('zone');
if($zone < 1 || $zone > 3)
{
throw new Exception('The zone is not in the range!');
}
foreach($array_cawangan as $caw)
{
if($caw['zone'] == $zone)
{
$response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']);
}
}
return 0;
}
}
app/Events/PendahuluanSerahan.php
+3 -1
View File
@@ -13,11 +13,13 @@ class PendahuluanSerahan implements ShouldBroadcast
public $pengesahan;
public $cawangan;
public $kodlaluan;
public function __construct($pengesahan,$cawangan)
public function __construct($pengesahan,$cawangan,$kodlaluan)
{
$this->pengesahan = $pengesahan;
$this->cawangan = $cawangan;
$this->kodlaluan = $kodlaluan;
}
public function broadcastOn()
app/Http/Controllers/KhazanahController.php
+61 -3
View File
@@ -2,6 +2,8 @@
namespace App\Http\Controllers;
use App\Services\ImbangdugaServices as ImbanganDuga;
//Events
use App\Events\StatusLiked;
use App\Events\NotifikasiPembayaran;
@@ -1149,7 +1151,7 @@ class KhazanahController extends Controller
]);
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan']));
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan'],$request->teller));
$updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
@@ -1229,7 +1231,7 @@ class KhazanahController extends Controller
]);
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan']));
event(new PendahuluanSerahan("Lulus",$auth_user['cawangan'],$request->teller));
$updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[
'kodlaluan' => $request->teller,
@@ -3079,7 +3081,7 @@ class KhazanahController extends Controller
'kodlaluan'=>$kodlaluan
]);
event(new PendahuluanSerahan("Batal",$auth_user['cawangan']));
event(new PendahuluanSerahan("Batal",$auth_user['cawangan'],$kodlaluan));
return response('Berjaya');
}
@@ -4109,4 +4111,60 @@ class KhazanahController extends Controller
return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak'));
}
public function ImbangDugaAkru(){
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
return view('khazanah.laporan.imbangduga_akru', compact('cawangan_info','api_url'));
}
public function cetakimbangdugaAkru(Request $request){
$auth_user = Auth::user();
$api_url = config('api.url');
$current = Carbon::now();
$current = new Carbon();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$tarikh_cetak = $current->toDateString();
$tarikh_imbangan= $current->toDateString();
$tarikh_imbangan2= $current->toDateString();
$tarikh_cetak = $current->toDateString();
if($request->datetimepicker2 == null){
$tarikh_cetak = $current->toDateString();
}else{
$split_date = explode('-',$request->datetimepicker2);
$tarikh_imbangan2 = $request->datetimepicker2;
}
if($tarikh_imbangan2 < $current->toDateString()){
$response = (new ImbanganDuga())->GetImbangDugaBackup($auth_user['cawangan'],$request->datetimepicker2);
}else{
$response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2);
}
if($response->getContent() == 'notfound')
{
return redirect()->route('laporan.imbangdugaakru')->with('error','Tiada Rekod Dijumpai Dalam Imbang Duga Backup!');
}
$array_ig = json_decode($response->getContent());
$hartasemasa = $array_ig->array_harta;
$tanggungansemasa = $array_ig->array_tanggungan;
$totalhartasemasa = $array_ig->sum_harta;
$totaltanggungansemasa = $array_ig->sum_tanggungan;
return view('print.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
}
}
app/Http/Controllers/UserController.php
+31
View File
@@ -24,4 +24,35 @@ class UserController extends Controller
return view('user.index_operasi',compact('cawangan_info','api_url','auth_user'));
}
}
public function edit(){
$api_url = config('api.url');
$auth_user = Auth::user();
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
if($auth_user->roles == 'teller' || $auth_user->roles == 'ppc' || $auth_user->roles == 'pc'){
return view('user.edit',compact('cawangan_info','api_url','auth_user'));
}else{
return view('user.edit_operasi',compact('cawangan_info','api_url','auth_user'));
}
}
public function editStore(Request $request){
$validated = $request->validate([
'nama' => 'required|max:255',
'notel' => 'required|numeric|min:10',
]);
$auth_user = Auth::user();
$user = User::find($auth_user->id);
$user->name = $request->nama;
$user->no_telefon = $request->notel;
$user->save();
return redirect()->route('profile')->with('success', 'Perubahan Maklumat Pengguna Telah Dikemaskini.');
}
}
app/ImbangDuga.php
+22
View File
@@ -0,0 +1,22 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Model;
class ImbangDuga extends Model
{
protected $table = 'imbangdugadata';
protected $fillable = [
'no',
'descpt',
'glcode',
'api_redirect',
'variable',
'single_var',
'is_array',
'jenis',
'neg_values'
];
}
app/Services/ImbangdugaServices.php
+302
View File
@@ -0,0 +1,302 @@
<?php
namespace App\Services;
use App\CawanganAR;
use App\ImbangDuga;
use Illuminate\Support\Facades\Http;
use Carbon\Carbon;
class ImbangdugaServices
{
protected float $tunaiditangan = 0;
protected float $pembiayaantawarruq = 0;
protected float $bayaranpendahuluan = 0;
protected float $pinjamankoop = 0;
protected float $emaspalsu = 0;
protected float $serahan = 0;
protected float $pindahkekpkb = 0;
protected float $penghutangkaki = 0;
protected float $phapuskira = 0;
protected float $belian1stop = 0;
protected float $keun_penggadai = 0;
protected float $bds = 0;
protected float $perubatan = 0;
protected float $keraian = 0;
protected float $rugilelong = 0;
protected float $bakilelong = 0;
protected float $wtd = 0;
protected float $untungrugiterkumpul = 0;
protected float $keun_sebenar = 0;
protected float $pendahuluan = 0;
protected float $cajlelong = 0;
protected float $pend_terakru = 0;
protected float $cajperkhidmatan = 0;
protected float $cajlelongxtra = 0;
protected float $upahsimpan = 0;
protected float $bakilelongxtra = 0;
protected float $kerugianlelong = 0;
protected float $utgterkumpulxtra = 0;
protected float $jualan1stop = 0;
protected float $hapuskira = 0;
private function SwitchFuncImbangDuga($value = 0.0,$name_variable = null,$tarikh,$kodcaw) : Float{
$value = floatval($value);
switch ($name_variable) {
case 'tunaiditangan' :
if($tarikh >= '2021-04-22' && $tarikh < '2021-05-05'){
$advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $kodcaw,['tarikh' => $tarikh])->json();
$data = floatval($value) - floatval($advansurharini);
}else $data = $value;
if($kodcaw == '010219')
if($tarikh >= '2022-11-24')
$data = $value - 78379.9;
else $data = $value;
else $data = $value;
break;
case 'penghutangkaki' :
if($kodcaw == '010219')
if($tarikh < '2022-11-24')
$data = $value - 78379.9;
else $data = $value;
else $data = $value;
break;
case 'jualan1stop':
$data = ($kodcaw === '1STOP') ? floatval(129857.00) : 0;
break;
case 'belian1stop':
$data = ($kodcaw === '1STOP') ? floatval(122446.50) : 0;
break;
case 'utgterkumpulxtra':
$data = ($kodcaw === '1STOP') ? floatval(6727.10) : $value;
break;
case 'rugilelongxtra':
$data = ($kodcaw === '1STOP') ? floatval(-10079.30) : -($value);
break;
case 'bakilelongxtra':
$data = ($kodcaw === '1STOP') ? floatval(123.20) : $value;
break;
case 'cajlelongxtra':
$data = ($kodcaw === '1STOP') ? floatval(25.50) : 0;
break;
case 'upahsimpanxtra':
$data = ($kodcaw === '1STOP') ? floatval(4894.40) : $value;
break;
case null:
$data = 0;
break;
default:
$data = $value;
break;
}
return floatval($data);
}
private function InsertImbangDugaBackup($tarikh,$kodcaw,$sum_harta = 0.0,$sum_tanggungan = 0.0,$tagtally = 0) : String{
$insert_imbangduga_backup = Http::get(config('api.url'). '/admin/laporan/akrual/insertImbangDuga',[
'tarikh' => $tarikh,
'kodcaw' => $kodcaw,
'tunaiditangan' => ($this->tunaiditangan) ? $this->tunaiditangan : 0,
'pembiayaantawarruq' => ($this->pembiayaantawarruq) ? $this->pembiayaantawarruq : 0,
'bayaranpendahuluan' => ($this->bayaranpendahuluan) ? $this->bayaranpendahuluan : 0,
'pinjamankoop' => ($this->pinjamankoop) ? $this->pinjamankoop : 0,
'emaspalsu' => ($this->emaspalsu) ? $this->emaspalsu : 0,
'serahan' => ($this->serahan) ? $this->serahan : 0,
'bds' => ($this->bds) ? $this->bds : 0,
'perubatan' => ($this->perubatan) ? $this->perubatan : 0,
'keraian' => ($this->keraian) ? $this->keraian : 0,
'rugilelong' => ($this->rugilelong) ? $this->rugilelong : 0,
'bakilelong' => ($this->bakilelong) ? $this->bakilelong: 0,
'wtd' => ($this->wtd) ? $this->wtd : 0,
'untungrugiterkumpul' => ($this->untungrugiterkumpul) ? $this->untungrugiterkumpul : 0,
'keun_sebenar' => ($this->keun_sebenar) ? $this->keun_sebenar : 0,
'pendahuluan' => ($this->pendahuluan) ? $this->pendahuluan : 0,
'cajlelong' => ($this->cajlelong) ? $this->cajlelong : 0,
'pindahkekpkb' => ($this->pindahkekpkb) ? $this->pindahkekpkb : 0,
'penghutangkaki' => ($this->penghutangkaki) ? $this->penghutangkaki : 0,
'phapuskira' => ($this->phapuskira) ? $this->phapuskira : 0,
'belian1stop' => ($this->belian1stop) ? $this->belian1stop : 0,
'keun_penggadai' => ($this->keun_penggadai) ? $this->keun_penggadai : 0,
'pend_terakru' => ($this->pend_terakru) ? $this->pend_terakru : 0,
'cajperkhidmatan' => ($this->cajperkhidmatan) ? $this->cajperkhidmatan : 0,
'cajlelongxtra' => ($this->cajlelongxtra) ? $this->cajlelongxtra : 0,
'upahsimpanxtra' => ($this->upahsimpan) ? $this->upahsimpan : 0,
'bakilelongxtra' => ($this->bakilelongxtra) ? $this->bakilelongxtra : 0,
'rugilelongxtra' => ($this->kerugianlelong) ? $this->kerugianlelong : 0,
'utgterkumpulxtra' => ($this->utgterkumpulxtra) ? $this->utgterkumpulxtra : 0,
'jualan1stop' => ($this->jualan1stop) ? $this->jualan1stop : 0,
'hapuskira' => ($this->hapuskira) ? $this->hapuskira : 0,
'totalharta' => $sum_harta,
'totaltanggungan' => $sum_tanggungan,
'tagtally' => $tagtally,
])->json();
if($insert_imbangduga_backup == 'success')
return 'successful';
else
return 'error';
}
public function OperationImbangDuga($kodcaw){
$current = Carbon::now();
$current = new Carbon();
$tarikh = $current->toDateString();
$imbangdugadata = ImbangDuga::orderBy('glcode')->get();
$array_harta = [];
$array_tanggungan = [];
$summation_harta = 0;
$summation_tanggungan = 0;
$penyelarasan = CawanganAR::select('penyelarasan')->where('kodcaw',$kodcaw)->get()->toArray();
$penyelarasan = $penyelarasan[0];
foreach($imbangdugadata as $index => $imbangdugaiteration){
if($imbangdugaiteration->api_redirect != null){
if($imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'pend_terakru'){
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json();
}else{
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json();
}
if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']};
$data = ($imbangdugaiteration->neg_values == 1) ? $data = -1 * abs($data) : $data;
$data = ($imbangdugaiteration['variable'] == 'untungrugiterkumpul') ? $data + $penyelarasan['penyelarasan'] : $data;
}else $data = 0;
$data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw);
/* declare for protected above */
if($imbangdugaiteration->is_array == 1){
$nama = $imbangdugaiteration['single_var'];
if($imbangdugaiteration['variable'] == 'bakilelongxtra'){
$nama = $imbangdugaiteration['variable'];
}else if($imbangdugaiteration['variable'] == 'utgterkumpulxtra'){
$nama = $imbangdugaiteration['variable'];
}
$this->$nama = $data;
}else $this->{$imbangdugaiteration['variable']} = $data;
if($imbangdugaiteration->jenis == 'harta'){
$summation_harta += $data;
array_push($array_harta,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]);
}else{
$summation_tanggungan += $data;
array_push($array_tanggungan,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]);
}
}
$tagtally = (number_format($summation_harta,2) == number_format($summation_tanggungan,2)) ? 1 : 0;
$response = $this->InsertImbangDugaBackup($tarikh,$kodcaw,$summation_harta,$summation_tanggungan,$tagtally);
if($response == 'successful'){
return response('succesful');
}else{
return response('error');
}
}
public function ViewImbangDugaAROS($kodcaw,$tarikh){
$current = Carbon::now();
$current = new Carbon();
$tarikh = $current->toDateString();
$imbangdugadata = ImbangDuga::orderBy('glcode')->get();
$array_harta = [];
$array_tanggungan = [];
$summation_harta = 0;
$summation_tanggungan = 0;
$penyelarasan = CawanganAR::select('penyelarasan')->where('kodcaw',$kodcaw)->get()->toArray();
$penyelarasan = $penyelarasan[0];
foreach($imbangdugadata as $index => $imbangdugaiteration){
if($imbangdugaiteration->api_redirect != null){
if($imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'pend_terakru'){
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json();
}else{
${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json();
}
if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']};
$data = ($imbangdugaiteration->neg_values == 1) ? $data = -1 * abs($data) : $data;
$data = ($imbangdugaiteration['variable'] == 'untungrugiterkumpul') ? $data + $penyelarasan['penyelarasan'] : $data;
}else $data = 0;
$data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw);
/* declare for protected above */
if($imbangdugaiteration->is_array == 1){
$nama = $imbangdugaiteration['single_var'];
if($imbangdugaiteration['variable'] == 'bakilelongxtra'){
$nama = $imbangdugaiteration['variable'];
}else if($imbangdugaiteration['variable'] == 'utgterkumpulxtra'){
$nama = $imbangdugaiteration['variable'];
}
$this->$nama = $data;
}else $this->{$imbangdugaiteration['variable']} = $data;
if($imbangdugaiteration->jenis == 'harta'){
$summation_harta += $data;
array_push($array_harta,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]);
}else{
$summation_tanggungan += $data;
array_push($array_tanggungan,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]);
}
}
$array_ig = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $summation_harta,'sum_tanggungan' => $summation_tanggungan];
return response($array_ig);
}
public function GetImbangDugaBackup($kodcaw,$tarikh){
$date = date_create_from_format('j-m-Y', $tarikh);
$new_date = date_format($date, 'Y-m-d');
$response = Http::get(config('api.url'). '/api/Backup/ImbangDuga/' . $kodcaw,['tarikh' => $new_date])->json();
if($response == 'notfound' || $response == null)
{
return response('notfound');
}else{
$array_harta = [];
$array_tanggungan = [];
foreach($response as $variable=>$res)
{
if($variable !== 'recno' && $variable !== 'kodcaw' && $variable !== 'tarikh' && $variable !== 'totalharta' && $variable !== 'totaltanggungan' && $variable !== 'tagtally' && $variable !== 'created_at' && $variable !== 'updated_at'){
$imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray();
if($imbangdugadata['jenis'] == 'harta'){
array_push($array_harta,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]);
}else{
array_push($array_tanggungan,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]);
}
}
}
uasort($array_harta, array($this,'glcode_compare'));
uasort($array_tanggungan, array($this,'glcode_compare'));
$array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']];
return response($array_all);
}
}
private static function glcode_compare($a, $b) {
return strcmp($a['glcode'], $b['glcode']);
}
}