diff --git a/app/Console/Commands/DailyImbangDuga.php b/app/Console/Commands/DailyImbangDuga.php
index a3637fe..2020e84 100644
--- a/app/Console/Commands/DailyImbangDuga.php
+++ b/app/Console/Commands/DailyImbangDuga.php
@@ -54,7 +54,7 @@ class DailyImbangDuga extends Command
foreach($array_cawangan as $caw)
{
- if($caw['zone'] == $zone)
+ if($caw['version'] == 'v2')
{
$response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']);
}
diff --git a/app/Console/Commands/generateAkruProblem.php b/app/Console/Commands/generateAkruProblem.php
index e16cfd3..21eb4ac 100644
--- a/app/Console/Commands/generateAkruProblem.php
+++ b/app/Console/Commands/generateAkruProblem.php
@@ -63,7 +63,7 @@ class generateAkruProblem extends Command
$updateIG = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/updateImbangDuga',[
'zone' => $zone,
- 'tarikh' => $previousmonth,
+ 'tarikh' => $previousmonth->toDateString(),
])->json();
$this->info('sucess');
diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php
index b31d6ab..73a5dcf 100644
--- a/app/Http/Controllers/PenebusanController.php
+++ b/app/Http/Controllers/PenebusanController.php
@@ -257,7 +257,8 @@ class PenebusanController extends Controller
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
- 'nilai_marhun' => $array1['n_marhun']
+ 'nilai_marhun' => $array1['n_marhun'],
+ 'kuantiti' => $array1['bil']
])->json();
}
@@ -300,6 +301,10 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan,
])->json();
+ if($updatetebus == 'duplicate'){
+ return response()->json('duplicate');
+ }
+
//////////////////////
/// MAKING NEW SAG////
/////////////////////
@@ -352,7 +357,7 @@ class PenebusanController extends Controller
'harga' => $array1['harga'],
'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'],
- 'nilai_marhun' => $array1['n_marhun']
+ 'kuantiti' => $array1['bil']
])->json();
}
@@ -457,6 +462,9 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan,
])->json();
+ if($updatetebus == 'duplicate'){
+ return response()->json('duplicate');
+ }
//////////////////////
/// MAKING NEW SAG////
@@ -511,6 +519,7 @@ class PenebusanController extends Controller
'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'],
'jenisAT' => $request->jenisAT
+ 'kuantiti' => $array1['bil']
])->json();
}
@@ -616,6 +625,9 @@ class PenebusanController extends Controller
"bakipelanggan" => $request->bakipelanggan,
])->json();
+ if($updatetebus == 'duplicate'){
+ return response()->json('duplicate');
+ }
//////////////////////
/// MAKING NEW SAG////
@@ -675,6 +687,7 @@ class PenebusanController extends Controller
'tag_permata' => $array1['tag_permata'],
'berat_batu_permata' => $array1['berat_batu_permata'],
'nilai_marhun' => $array1['n_marhun']
+ 'kuantiti' => $array1['bil']
])->json();
}
diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php
index df7425b..f4909cc 100644
--- a/app/Services/ImbangdugaServices.php
+++ b/app/Services/ImbangdugaServices.php
@@ -56,7 +56,7 @@ class ImbangdugaServices
if($kodcaw == '010219')
if($tarikh >= '2022-11-24')
- $data = $value - 78379.9;
+ $data = $value;
else $data = $value;
else $data = $value;
break;
@@ -64,7 +64,12 @@ class ImbangdugaServices
if($kodcaw == '010219')
if($tarikh < '2022-11-24')
$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;
break;
case 'jualan1stop':
diff --git a/config/redeemoption.php b/config/redeemoption.php
index 5987f20..8ddf12b 100644
--- a/config/redeemoption.php
+++ b/config/redeemoption.php
@@ -1,7 +1,7 @@
env('ENABLE_TAMBAHPINJAM',1),
- 'enable_separuh' => env('ENABLE_SEPARUH',1),
- 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1)
+ 'enable_separuh' => env('ENABLE_SEPARUH',0),
+ 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',0)
];
-?>
\ No newline at end of file
+?>
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index 894ea38..2fe5024 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -1634,7 +1634,7 @@
});
}
- function ubahPembiayaanSemulaErrorHandling()
+ async function ubahPembiayaanSemulaErrorHandling()
{
let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked')
@@ -1655,7 +1655,7 @@
return true;
}
- let isPS = checkPS(selected.value)
+ let isPS = await checkPS(selected.value)
if(isPS === true){
Swal.fire({
@@ -1670,9 +1670,9 @@
return false;
}
- function ubahfunc(e){
+ async function ubahfunc(e){
- let isError = ubahPembiayaanSemulaErrorHandling()
+ let isError = await ubahPembiayaanSemulaErrorHandling()
if(isError){
return;
}
diff --git a/resources/views/operasi/daftar_kakitangan.blade.php b/resources/views/operasi/daftar_kakitangan.blade.php
index bd284f0..bfc3bc0 100644
--- a/resources/views/operasi/daftar_kakitangan.blade.php
+++ b/resources/views/operasi/daftar_kakitangan.blade.php
@@ -124,12 +124,12 @@
| {{ $staff->name }} |
{{ strtoupper($staff->roles) }} |
- @if($staff->cawangan == 'operasi')
+ @if($staff->cawangan == 'operasi' || $staff->cawangan == 'callcenter' || $staff->cawangan == 'admin')
{{ ucwords($staff->cawangan) }}
@else
@php
$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
@endif
|
diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php
index ae778d0..ff47d3b 100644
--- a/resources/views/print/sag_ujrah_3.blade.php
+++ b/resources/views/print/sag_ujrah_3.blade.php
@@ -231,13 +231,13 @@
display: flex;
justify-content: center;
align-items: center;
- margin-top: -140px;
+ margin-top: -135px;
}
.main-kaki-sag {
border: 1px solid black;
padding: 10px;
- width: 200px;
+ width: 245px;
transform: rotate(-90deg);
font-size: 9px;
}
@@ -1644,7 +1644,7 @@
'" alt="barcode" />';
@endphp
- {{ $gadai_detail['percentpinj'] }}%
+ {{-- {{ $gadai_detail['percentpinj'] }}%
--}}
-