diff --git a/app/CawanganAR.php b/app/CawanganAR.php index 7521d5e..2e767c2 100644 --- a/app/CawanganAR.php +++ b/app/CawanganAR.php @@ -13,6 +13,7 @@ class CawanganAR extends Model 'kodcaw', 'syarikat', 'min', - 'max' + 'max', + 'penyelarasan' ]; } diff --git a/app/Console/Commands/DailyAkru.php b/app/Console/Commands/DailyAkru.php new file mode 100644 index 0000000..83efce4 --- /dev/null +++ b/app/Console/Commands/DailyAkru.php @@ -0,0 +1,61 @@ +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'; + } + } +} diff --git a/app/Console/Commands/DailyImbangDuga.php b/app/Console/Commands/DailyImbangDuga.php new file mode 100644 index 0000000..a3637fe --- /dev/null +++ b/app/Console/Commands/DailyImbangDuga.php @@ -0,0 +1,65 @@ +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; + } +} diff --git a/app/Events/PendahuluanSerahan.php b/app/Events/PendahuluanSerahan.php index ab97a35..b6ca1ff 100644 --- a/app/Events/PendahuluanSerahan.php +++ b/app/Events/PendahuluanSerahan.php @@ -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() diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 69127d0..88a121a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -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')); + } + } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 444e7a9..3588530 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -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.'); + } } diff --git a/app/ImbangDuga.php b/app/ImbangDuga.php new file mode 100644 index 0000000..b3d8e69 --- /dev/null +++ b/app/ImbangDuga.php @@ -0,0 +1,22 @@ += '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']); + } + +} diff --git a/public/js/main.js b/public/js/main.js index dc37820..e1620b1 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -465,8 +465,7 @@ async function openuptambahdanserah(e) var channel = pusher.subscribe('pendahuluanserahan-notice'); channel.bind('penserahan-event', function(data) { - console.log(data); - if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw) + if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw && data.kodlaluan == teller) { Swal.fire({ icon: 'success', @@ -630,9 +629,8 @@ function tambahdanserahanfunc(e) var channel = pusher.subscribe('pendahuluanserahan-notice'); channel.bind('penserahan-event', function(data) { // let message = JSON.stringify(data); - console.log(data); - if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw) + if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw && data.kodlaluan == teller) { Swal.fire({ icon: 'success', diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 0db0a5c..fc2b555 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -8,13 +8,17 @@ @if($countproses > 0) @endif @@ -31,7 +35,7 @@
  • Home
  • Aliran Tunai
    • - +
    @@ -561,7 +565,6 @@ function cetakserahankeseluruhan() { - console.log('ets'); let urlroute = '{{ route("laporan.serahanteller") }}'; window.open(urlroute, '_blank'); diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 77b28b5..06029b6 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -260,6 +260,7 @@ + +@endsection + + + diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 3ce4fd1..53d0ac2 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -111,6 +111,9 @@ {{--
    Audit Customer
    --}} +
    + Imbang Duga Akru +
    diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index bd54bfe..d4c7ee7 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -550,7 +550,7 @@ function ubahwakil(e) } - let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val(); + let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val().replace(/[^0-9.-]+/g,""); let cajlain = 0.00; let cajlelong = $('#cajlelong').val(); let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,""); diff --git a/resources/views/print/laporan_imbangduga-akru.blade.php b/resources/views/print/laporan_imbangduga-akru.blade.php new file mode 100644 index 0000000..a584c77 --- /dev/null +++ b/resources/views/print/laporan_imbangduga-akru.blade.php @@ -0,0 +1,486 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + + + +
    LAPORAN IMBANGAN DUGA CAWANGAN
    + + + + + + + + +
    Tarikh Laporan {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} Tarikh Cetak {{$tarikh_cetak}}
    +
    + + + + + + + + + + + + + + @foreach($hartasemasa as $index => $assets) + @if($assets->amaun != 0) + + + + + + @endif + @endforeach + + + + + + + +
    Kod GL Keterangan Amaun
    HARTA SEMASA
    {{ $assets->glcode }}{{ $assets->descpt }}{{ number_format($assets->amaun,2) }}
    JUMLAH {{ number_format($totalhartasemasa,2) }}
    +
    + + + + + + @foreach($tanggungansemasa as $index => $liabilities) + @if($liabilities->amaun != 0) + + + + + + @endif + @endforeach + + + + + + + +
    TANGGUNGAN SEMASA
    {{ $liabilities->glcode }}{{ $liabilities->descpt }}{{ number_format($liabilities->amaun,2) }}
    JUMLAH {{ number_format($totaltanggungansemasa,2) }}
    +
    + +
    +
    + + + \ No newline at end of file diff --git a/resources/views/print/suratgadaianhilang.blade.php b/resources/views/print/suratgadaianhilang.blade.php index b267ba5..688453c 100644 --- a/resources/views/print/suratgadaianhilang.blade.php +++ b/resources/views/print/suratgadaianhilang.blade.php @@ -89,8 +89,8 @@ @endphp - di {{ strtoupper($daerah['namadaerah']) }} - ) + + diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php new file mode 100644 index 0000000..3ffc8bc --- /dev/null +++ b/resources/views/user/edit.blade.php @@ -0,0 +1,53 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + +
    +
    + @csrf +
    +
    +
    +
    +
    +
    Nama
    +
    + @error('nama') {{ $message }} @enderror +
    +
    No Telefon
    +
    + @error('notel') {{ $message }} @enderror +
    +
    Email
    +
    +
    +
    +
    +
    +
    No Kad Pengenalan
    +
    +
    Jawatan
    +
    +
    Baki Perubatan
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +@endsection \ No newline at end of file diff --git a/resources/views/user/edit_operasi.blade.php b/resources/views/user/edit_operasi.blade.php new file mode 100644 index 0000000..bcb5b3d --- /dev/null +++ b/resources/views/user/edit_operasi.blade.php @@ -0,0 +1,49 @@ +@extends('layouts.app_operasi') + +@section('content') +
    +
    +
    + +
    +
    +
    +
    + @csrf +
    +
    +
    +
    NAMA
    +
    + @error('nama') {{ $message }} @enderror +
    +
    NO TELEFON
    +
    + @error('notel') {{ $message }} @enderror +
    +
    +
    +
    +
    +
    NO KP
    +
    +
    JAWATAN
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +@endsection \ No newline at end of file diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index 9166d71..e8e1d8a 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -13,6 +13,10 @@
    + + @if(Session::has('success')) +
    {{ Session::get('success') }}
    + @endif
    @@ -36,6 +40,7 @@
    + Kemaskini Profil Kemaskini Katalaluan
    diff --git a/resources/views/user/index_operasi.blade.php b/resources/views/user/index_operasi.blade.php index cf6d494..b4371a8 100644 --- a/resources/views/user/index_operasi.blade.php +++ b/resources/views/user/index_operasi.blade.php @@ -32,6 +32,8 @@
    + Kemaskini Profil + Kemaskini Katalaluan diff --git a/resources/views/user/update_password.blade.php b/resources/views/user/update_password.blade.php index 4e1caff..cdde4d9 100644 --- a/resources/views/user/update_password.blade.php +++ b/resources/views/user/update_password.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.app') +@extends('layouts.app_operasi') @section('content')
    @@ -23,7 +23,7 @@ @endforeach
    - +
    @@ -31,7 +31,7 @@
    - +
    @@ -39,7 +39,7 @@
    - +
    diff --git a/routes/web.php b/routes/web.php index 3f7bcc0..50ca013 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,7 @@ 'login','uses'=>'HomeController@index']); -Route::get('/testtry',function(){ +Route::get('/testtry',function(ImbangdugaServices $imbangduga){ - return view('testing'); + // return view('testing'); + $test = $imbangduga->OperationImbangDuga('KB2'); + dd($test->getContent()); }); @@ -82,6 +84,8 @@ Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranT Route::put('/aliran_tunai/advansur',['as'=>'alirantunai.advansur','uses' => 'AliranTunaiController@alirantunaiUpahBknTawarruq'])->middleware('auth','teller'); Route::get('/harga_emas','HargaEmasController@index')->middleware('auth','teller'); Route::get('/profile',['as'=>'profile','uses'=>'UserController@index'])->middleware('auth'); +Route::get('/profile/edit',['as'=>'profile.edit','uses'=>'UserController@edit'])->middleware('auth'); +Route::post('/profile/edit/store',['as'=>'profile.editstore','uses'=>'UserController@editStore'])->middleware('auth'); Route::get('/customer/search',['as'=>'customer.search','uses'=>'CustomersController@search'])->middleware('auth','teller'); Route::post('/customer/store',['as'=>'customer.store','uses'=>'CustomersController@store'])->middleware('auth','teller'); Route::post('/gadai/store',['as'=>'gadai.store','uses'=>'GadaianController@store'])->middleware('auth','teller'); @@ -333,6 +337,9 @@ route::post('/cetaklejer_am',['as'=>'cetak.lejer_am', 'uses'=>'KhazanahControlle Route::get('laporan/dataimbangduga',['as'=> 'laporan.imbangduga' , 'uses'=>'KhazanahController@laporanImbangduga' ])->middleware('auth','khazanah'); Route::post('/laporan/imbangduga',['as' =>'imbangduga.cetak', 'uses'=>'KhazanahController@cetakImbangDuga'])->middleware('auth', 'khazanah'); +Route::get('laporan/imbangduga-akru',['as'=> 'laporan.imbangdugaakru' , 'uses'=>'KhazanahController@ImbangDugaAkru' ])->middleware('auth','khazanah'); +Route::post('/laporan/cetak/imbangduga-akru',['as' =>'imbangdugaakru.cetak', 'uses'=>'KhazanahController@cetakimbangdugaAkru'])->middleware('auth', 'khazanah'); + Route::get('khazanah/jana_permohonan',['as'=> 'permohonan.jana' , 'uses'=>'KhazanahController@JanaPermohonan' ])->middleware('auth','khazanah'); Route::post('khazanah/jana_permohonan/proses_permohonan',['as'=> 'permohonan.proses' , 'uses'=>'KhazanahController@ProsesPermohonan'])->middleware('auth','khazanah');