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

Merge branch 'production' of https://bitbucket.org/arrahn-pkb/kaunter into annur-rebate

Browse Source
This commit is contained in:
nurafrinaalimi16
2024-12-03 12:50:30 +08:00
parent 9307ea5e1d 3cbc26aebe
commit a2350d36f3
11 changed files with 136 additions and 92 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)
{
if($caw['zone'] == $zone)
if($caw['version'] == 'v2')
{
$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',[
'zone' => $zone,
'tarikh' => $previousmonth,
'tarikh' => $previousmonth->toDateString(),
])->json();
$this->info('sucess');
app/Http/Controllers/PenebusanController.php
+15 -2
View File
@@ -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();
}
app/Services/ImbangdugaServices.php
+7 -2
View File
@@ -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':
config/redeemoption.php
+2 -2
View File
@@ -1,7 +1,7 @@
<?php
return [
'enable_tambahpinjam' => 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)
];
?>
resources/views/callcenter/v2/info.blade.php
+8 -9
View File
@@ -118,26 +118,25 @@
<input type="text" class="form-control" name="rugilelong" id="rugilelong" readonly value="{{ number_format($rugilelong,2) }}">
</div>
</div>
<div class="col-md-12 d-flex justify-content-end mt-3">
<button class="btn btn-primary" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
<div class="col-md-12 mt-md-3 justify-content-between form-group row">
<div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
<label class="btn btn-primary">
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai.
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
</label>
<label class="btn btn-primary">
<label class="btn btn-secondary">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
</label>
<label class="btn btn-primary">
<label class="btn btn-secondary">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
</label>
</div>
<div class='col-md-3'>
{{-- <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> --}}
</div>
<div class="col-md-3 text-right">
<button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<div class="card">
resources/views/customers/v2/info.blade.php
+39 -22
View File
@@ -12,7 +12,7 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12 col-lg-12">
<div class="card">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -89,9 +89,7 @@
</div>
</div>
<div class="col-md-6">
<div class="form-group row">
<div class="col-md-4">
<b>No Telefon</b>
@@ -119,30 +117,48 @@
</div>
</div>
</div>
</div>
<div class="col-md-12 mt-md-3 justify-content-between form-group row">
<div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
<label class="btn btn-primary">
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
<!-- footer card -->
<div class="mr-4 form-group d-flex justify-content-end">
<button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<!-- button -->
<div class="col-md-10 mt-md-2 justify-content-between form-group row">
<div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>
Pembiayaan Belum Selesai
</label>
<label class="btn btn-primary">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">
Pembiayaan Sudah Selesai
</label>
<label class="btn btn-primary">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">
Lelong
</label>
</div>
<div class='col-md-3'>
<button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
<div class="col-md-3 text-right">
<a class="btn btn-primary" style="margin-right:-50px" id="daftar_gadai">Daftar Pembiayaan</a>
</div>
</div>
</div>
<!-- card -->
<div class="col-md-12 col-lg-12">
<div class="card">
<div class="card-body">
<nav class="mb-3">
<!-- button -->
<div class="mr-2 form-group d-flex justify-content-end">
<a class="btn btn-primary button-spacing" id="daftar_gadai">Daftar Pembiayaan</a>
</div>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
@php
$activate_tab = request()->session()->pull('activate_tab', 'SAG_lama');
@@ -254,6 +270,7 @@
</div>
</div>
</div>
</div>
<!-- Modal -->
<div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
@@ -1617,7 +1634,7 @@
});
}
function ubahPembiayaanSemulaErrorHandling()
async function ubahPembiayaanSemulaErrorHandling()
{
let selected = document.querySelector('#navtawarruqdannottawarruq input[type="radio"][name="belum"]:checked')
@@ -1638,7 +1655,7 @@
return true;
}
let isPS = checkPS(selected.value)
let isPS = await checkPS(selected.value)
if(isPS === true){
Swal.fire({
@@ -1653,9 +1670,9 @@
return false;
}
function ubahfunc(e){
async function ubahfunc(e){
let isError = ubahPembiayaanSemulaErrorHandling()
let isError = await ubahPembiayaanSemulaErrorHandling()
if(isError){
return;
}
resources/views/khazanah/v2/info.blade.php
+28 -12
View File
@@ -1,5 +1,11 @@
@extends('layouts.app')
<style>
#daftar_gadai{
color:#fff !important;
}
</style>
@section('content')
@include('modal.historytebus')
@@ -10,7 +16,7 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-12 col-lg-12">
<div class="card">
<nav aria-label="breadcrumb">
<ol class="breadcrumb pb-3">
<li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
@@ -112,27 +118,37 @@
</div>
</div>
</div>
</div>
<div class="col-md-12 mt-md-3 justify-content-between form-group row">
<div class="btn-group btn-group-toggle col-md-6" data-toggle="buttons">
<label class="btn btn-primary">
<!-- footer card -->
<div class="mr-4 form-group d-flex justify-content-end">
<button class="btn btn-primary button-spacing" data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
<!-- button -->
<div class="col-md-10 mt-md-2 justify-content-between form-group row">
<div class="btn-group btn-group-toggle d-flex flex-fill" data-toggle="buttons">
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option1" value="belum_tebus" autocomplete="off" checked>Pembiayaan Belum Selesai
</label>
<label class="btn btn-primary">
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option2" value="sudah_tebus" autocomplete="off">Pembiayaan Sudah Selesai
</label>
<label class="btn btn-primary">
<label class="btn btn-secondary flex-fill">
<input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
</label>
</div>
<div class='col-md-3 text-right'>
</div>
<div class="col-md-3 text-right">
<button class='btn btn-primary' data-toggle="modal" style="margin-right:-50px" data-target="#customer_detail">Maklumat Pelanggan</button>
</div>
</div>
</div>
</div>
<div class="card">
<div class="card-body">
<nav class="mb-3">
resources/views/operasi/daftar_kakitangan.blade.php
+2 -2
View File
@@ -124,12 +124,12 @@
<td>{{ $staff->name }}</td>
<td>{{ strtoupper($staff->roles) }}</td>
<td>
@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
</td>
resources/views/print/sag_ujrah_3.blade.php
+3 -3
View File
@@ -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
</div>
<div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div>
{{-- <div class="percent-text">{{ $gadai_detail['percentpinj'] }}%</div> --}}
</div>
<div class="detail-kaki-sag">
<div class="ps-positioning {{ $is_pembiayaan_semula == false ? 'hidden' : '' }}">
resources/views/print/surat_wakil.blade.php
+6 -12
View File
@@ -152,22 +152,19 @@
<table id="details" style="margin-top:20px;">
<tr>
<td colspan="2">Saya seperti nama di atas, ingin memaklumkan kepada Ar-Rahn Koperasi Permodalan Kelantan Berhad
<td colspan="2">
Saya seperti nama di atas, ingin memaklumkan kepada Ar-Rahn Koperasi Permodalan Kelantan Berhad
bagi Cawangan {{ $cawangan_detail['namacaw'] }}, bahawa saya tidak dapat hadir untuk melakukan transaksi:
</td>
</tr>
<tr>
<td>
Penyelesaian Penuh
</td>
</tr>
<tr>
<td>
Penyelesaian Penuh dan Permohonan Pembiayaan Baru
<input type="checkbox"><strong>Penyelesaian Penuh</strong>
</td>
</tr>
</table>
<table id="details" style="margin-top:20px;">
<tr>
<td colspan="2">1. Saya melantik nama dibawah sebagai wakil bagi pihak saya untuk
@@ -200,11 +197,8 @@
</tr>
</table>
<table id="details" style="margin-top:20px;">
<tr>
<td colspan="2">2. Saya mengaku tidak akan membuat apa-apa <b>TUNTUTAN @ GANTI RUGI</b> atas kebarangkalian @
kerugian yang berlaku disebabkan perlantikan wakil bagi menyelesaikan pembiayaan saya.</td>
</tr>
<br>
<br>
</table>