From 6959b9637f4905b4d4404a2ade22022a247bf2d9 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 23 Nov 2022 02:47:14 +0800 Subject: [PATCH 01/14] pembaikian surat gadai hilang --- resources/views/print/suratgadaianhilang.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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']) }} - ) + + From 1a0a7572bf895551e97bd1819f93f206b6ac4b55 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 5 Dec 2022 11:16:03 +0800 Subject: [PATCH 02/14] issues fix bugs production --- app/Http/Controllers/UserController.php | 31 +++++++++++ public/js/main.js | 6 +-- resources/views/aliran_tunai/index.blade.php | 19 ++++--- resources/views/user/edit.blade.php | 53 +++++++++++++++++++ resources/views/user/edit_operasi.blade.php | 49 +++++++++++++++++ resources/views/user/index.blade.php | 5 ++ resources/views/user/index_operasi.blade.php | 2 + .../views/user/update_password.blade.php | 8 +-- routes/web.php | 2 + 9 files changed, 159 insertions(+), 16 deletions(-) create mode 100644 resources/views/user/edit.blade.php create mode 100644 resources/views/user/edit_operasi.blade.php 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/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/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..834e02b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -82,6 +82,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'); From e88832912fddbeb3087cd1ed5517f9f2133eaed5 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 6 Dec 2022 01:04:48 +0800 Subject: [PATCH 03/14] fix issue pusher teller --- app/Events/PendahuluanSerahan.php | 4 +++- app/Http/Controllers/KhazanahController.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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..08c75e9 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1149,7 +1149,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 +1229,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 +3079,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'); } From 42c9c08f88a2dc87bf75d95dae53b51f5d83e258 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 7 Dec 2022 01:50:49 +0800 Subject: [PATCH 04/14] fix issue cetak sag --- resources/views/homepage/penilai/home.blade.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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/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/routes/web.php b/routes/web.php index 3d5f47d..50ca013 100644 --- a/routes/web.php +++ b/routes/web.php @@ -337,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'); From e53c516c16aad413556fee2a05a50fb43c2f165a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 20 Dec 2022 22:52:09 +0800 Subject: [PATCH 12/14] fix negative value for rugi lelong xtra --- app/Services/ImbangdugaServices.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index 3d1e188..ed6c43f 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -75,7 +75,7 @@ class ImbangdugaServices $data = ($kodcaw === '1STOP') ? floatval(6727.10) : $value; break; case 'rugilelongxtra': - $data = ($kodcaw === '1STOP') ? floatval(10079.30) : -($value); + $data = ($kodcaw === '1STOP') ? floatval(-10079.30) : -($value); break; case 'bakilelongxtra': $data = ($kodcaw === '1STOP') ? floatval(123.20) : $value; @@ -231,8 +231,7 @@ class ImbangdugaServices $data = ($imbangdugaiteration->neg_values == 1) ? $data = -1 * abs($data) : $data; $data = ($imbangdugaiteration['variable'] == 'untungrugiterkumpul') ? $data + $penyelarasan['penyelarasan'] : $data; }else $data = 0; - if($imbangdugaiteration['variable'] == 'pend_terakru') - + $data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw); /* declare for protected above */ From 8a088404cf1673deb1dd2564ab5c1fc7f7604f68 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 21 Dec 2022 01:50:08 +0800 Subject: [PATCH 13/14] adding backup imbang duga --- app/Http/Controllers/KhazanahController.php | 23 +++++++++---- app/Services/ImbangdugaServices.php | 32 +++++++++++++++++++ .../laporan/imbangduga_akru.blade.php | 11 +++++-- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d36253e..88a121a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4127,15 +4127,17 @@ class KhazanahController extends Controller $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{ @@ -4143,17 +4145,24 @@ class KhazanahController extends Controller $tarikh_imbangan2 = $request->datetimepicker2; } - $response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2); + + + 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; - - $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]; 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/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index ed6c43f..92aebe7 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -259,4 +259,36 @@ class ImbangdugaServices $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]); + } + } + } + + $array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']]; + return response($array_all); + } + + } + } \ No newline at end of file diff --git a/resources/views/khazanah/laporan/imbangduga_akru.blade.php b/resources/views/khazanah/laporan/imbangduga_akru.blade.php index 2eded65..1dc98dd 100644 --- a/resources/views/khazanah/laporan/imbangduga_akru.blade.php +++ b/resources/views/khazanah/laporan/imbangduga_akru.blade.php @@ -16,6 +16,11 @@
    + @if(session()->has('error')) +
    + {{ session()->get('error') }} +
    + @endif
    @@ -30,7 +35,7 @@
    -
    +
    @@ -51,7 +56,9 @@ $('#datetimepicker2').datepicker({ format: 'dd-mm-yyyy', }); - $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,18)); + $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,19)); + $('#datetimepicker2').datepicker('setEndDate', new Date()); + }); function loadingmodal() From c744e232884d9a3a8fe36798bc31576d9a991596 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Wed, 21 Dec 2022 16:27:06 +0800 Subject: [PATCH 14/14] updated server 21/12/2022 --- app/Services/ImbangdugaServices.php | 10 +++++++++- resources/views/khazanah/info.blade.php | 13 +++++++++++-- resources/views/lelongan/index.blade.php | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index 92aebe7..e6f94d9 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -285,10 +285,18 @@ class ImbangdugaServices } } + + 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); } } -} \ No newline at end of file + private static function glcode_compare($a, $b) { + return strcmp($a['glcode'], $b['glcode']); + } + +} diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index ca05497..753a83f 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -155,6 +155,7 @@ Margin Tempoh Keuntungan + Lelong @@ -170,6 +171,7 @@ Pembiayaan Margin Tempoh + Lelong @@ -507,6 +509,11 @@ if(jenistebus == "belum_tebus"){ var urlroute = '{{ route("penebusan.khazanah", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); + if(gadai_detail['taglel'] == 1){ + var taglel = 'Akan Dilelong'; + }else{ + var taglel = ''; + } if(gadai_detail["bakihargajualan"] == null){ xtawarruq.row.add([ '', @@ -515,7 +522,8 @@ gadai_detail['t_matang'], 'RM '+formatter.format(gadai_detail['pinjaman']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['tempoh'] + gadai_detail['tempoh'], + taglel ]).draw(); }else{ if(gadai_detail['lelong_tawarruq'] == 0){ @@ -532,7 +540,8 @@ 'RM '+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['tempoh'], - 'RM '+ upahsemasa + 'RM '+ upahsemasa, + taglel ]).draw(); } }else if(jenistebus == "sudah_tebus"){ 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,"");