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

added from server 24/11/2024

Browse Source
This commit is contained in:
root
2024-11-25 01:17:58 +08:00
parent 1b290283c5
commit 3cbc26aebe
8 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/DailyImbangDuga.php
+1 -1
View File
@@ -54,7 +54,7 @@ class DailyImbangDuga extends Command
foreach($array_cawangan as $caw) foreach($array_cawangan as $caw)
{ {
if($caw['zone'] == $zone) if($caw['version'] == 'v2')
{ {
$response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']); $response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']);
} }
app/Console/Commands/generateAkruProblem.php
+1 -1
View File
@@ -63,7 +63,7 @@ class generateAkruProblem extends Command
$updateIG = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/updateImbangDuga',[ $updateIG = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/updateImbangDuga',[
'zone' => $zone, 'zone' => $zone,
'tarikh' => $previousmonth, 'tarikh' => $previousmonth->toDateString(),
])->json(); ])->json();
$this->info('sucess'); $this->info('sucess');
app/Http/Controllers/PenebusanController.php
+15 -2
View File
@@ -257,7 +257,8 @@ class PenebusanController extends Controller
'karat' => $array1['karat'], 'karat' => $array1['karat'],
'berat_emas' => $array1['berat'], 'berat_emas' => $array1['berat'],
'harga' => $array1['harga'], 'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun'] 'nilai_marhun' => $array1['n_marhun'],
'kuantiti' => $array1['bil']
])->json(); ])->json();
} }
@@ -300,6 +301,10 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan, "bakipelanggan" => $request->bakipelanggan,
])->json(); ])->json();
if($updatetebus == 'duplicate'){
return response()->json('duplicate');
}
////////////////////// //////////////////////
/// MAKING NEW SAG//// /// MAKING NEW SAG////
///////////////////// /////////////////////
@@ -352,7 +357,7 @@ class PenebusanController extends Controller
'harga' => $array1['harga'], 'harga' => $array1['harga'],
'tag_permata' => $array1['tag_permata'], 'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'],
'nilai_marhun' => $array1['n_marhun'] 'kuantiti' => $array1['bil']
])->json(); ])->json();
} }
@@ -457,6 +462,9 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan, "bakipelanggan" => $request->bakipelanggan,
])->json(); ])->json();
if($updatetebus == 'duplicate'){
return response()->json('duplicate');
}
////////////////////// //////////////////////
/// MAKING NEW SAG//// /// MAKING NEW SAG////
@@ -511,6 +519,7 @@ class PenebusanController extends Controller
'tag_permata' => $array1['tag_permata'], 'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'],
'jenisAT' => $request->jenisAT 'jenisAT' => $request->jenisAT
'kuantiti' => $array1['bil']
])->json(); ])->json();
} }
@@ -616,6 +625,9 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan, "bakipelanggan" => $request->bakipelanggan,
])->json(); ])->json();
if($updatetebus == 'duplicate'){
return response()->json('duplicate');
}
////////////////////// //////////////////////
/// MAKING NEW SAG//// /// MAKING NEW SAG////
@@ -675,6 +687,7 @@ class PenebusanController extends Controller
'tag_permata' => $array1['tag_permata'], 'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'],
'nilai_marhun' => $array1['n_marhun'] 'nilai_marhun' => $array1['n_marhun']
'kuantiti' => $array1['bil']
])->json(); ])->json();
} }
app/Services/ImbangdugaServices.php
+7 -2
View File
@@ -56,7 +56,7 @@ class ImbangdugaServices
if($kodcaw == '010219') if($kodcaw == '010219')
if($tarikh >= '2022-11-24') if($tarikh >= '2022-11-24')
$data = $value - 78379.9; $data = $value;
else $data = $value; else $data = $value;
else $data = $value; else $data = $value;
break; break;
@@ -64,7 +64,12 @@ class ImbangdugaServices
if($kodcaw == '010219') if($kodcaw == '010219')
if($tarikh < '2022-11-24') if($tarikh < '2022-11-24')
$data = $value - 78379.9; $data = $value - 78379.9;
else $data = $value; else if($tarikh >= '2023-02-16'){
$hutang = Http::get(config('api.url').'/admin/ig/penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json();
$bayaran_hutang = Http::get(config('api.url').'/admin/ig/bayaran_penghutang' ,['kodcaw' => $kodcaw, 'tarikh' => $tarikh])->json();
$data = $hutang['bakihutang'] - $bayaran_hutang;
}else $data = $value;
//else $data = $value;
else $data = $value; else $data = $value;
break; break;
case 'jualan1stop': case 'jualan1stop':
config/redeemoption.php
+2 -2
View File
@@ -1,7 +1,7 @@
<?php <?php
return [ return [
'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1), 'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1),
'enable_separuh' => env('ENABLE_SEPARUH',1), 'enable_separuh' => env('ENABLE_SEPARUH',0),
'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1) 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',0)
]; ];
?> ?>
resources/views/customers/v2/info.blade.php
+4 -4
View File
@@ -1634,7 +1634,7 @@
}); });
} }
function ubahPembiayaanSemulaErrorHandling() async function ubahPembiayaanSemulaErrorHandling()
{ {
let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked') let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked')
@@ -1655,7 +1655,7 @@
return true; return true;
} }
let isPS = checkPS(selected.value) let isPS = await checkPS(selected.value)
if(isPS === true){ if(isPS === true){
Swal.fire({ Swal.fire({
@@ -1670,9 +1670,9 @@
return false; return false;
} }
function ubahfunc(e){ async function ubahfunc(e){
let isError = ubahPembiayaanSemulaErrorHandling() let isError = await ubahPembiayaanSemulaErrorHandling()
if(isError){ if(isError){
return; return;
} }
resources/views/operasi/daftar_kakitangan.blade.php
+2 -2
View File
@@ -124,12 +124,12 @@
<td>{{ $staff->name }}</td> <td>{{ $staff->name }}</td>
<td>{{ strtoupper($staff->roles) }}</td> <td>{{ strtoupper($staff->roles) }}</td>
<td> <td>
@if($staff->cawangan == 'operasi') @if($staff->cawangan == 'operasi' || $staff->cawangan == 'callcenter' || $staff->cawangan == 'admin')
{{ ucwords($staff->cawangan) }} {{ ucwords($staff->cawangan) }}
@else @else
@php @php
$cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json(); $cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
echo ($cawangan_staff) ? ucwords($cawangan_staff['details_caw']) : 'test'; echo (isset($cawangan_staff['details_caw'])) ? ucwords($cawangan_staff['details_caw']) : 'test';
@endphp @endphp
@endif @endif
</td> </td>
resources/views/print/sag_ujrah_3.blade.php
+3 -3
View File
@@ -231,13 +231,13 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin-top: -140px; margin-top: -135px;
} }
.main-kaki-sag { .main-kaki-sag {
border: 1px solid black; border: 1px solid black;
padding: 10px; padding: 10px;
width: 200px; width: 245px;
transform: rotate(-90deg); transform: rotate(-90deg);
font-size: 9px; font-size: 9px;
} }
@@ -1644,7 +1644,7 @@
'" alt="barcode" />'; '" alt="barcode" />';
@endphp @endphp
</div> </div>
<div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div> {{-- <div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div> --}}
</div> </div>
<div class="detail-kaki-sag"> <div class="detail-kaki-sag">
<div class="ps-positioning {{ $is_pembiayaan_semula == false ? 'hidden' : '' }}"> <div class="ps-positioning {{ $is_pembiayaan_semula == false ? 'hidden' : '' }}">