add function kali
This commit is contained in:
@@ -28,7 +28,7 @@ use App\Models\LelongBidMarhun;
|
||||
use App\Models\LelKarat;
|
||||
use App\Models\LogUser;
|
||||
use App\Models\LelongTebus;
|
||||
|
||||
use App\Models\Tetapan;
|
||||
|
||||
|
||||
|
||||
@@ -54,7 +54,8 @@ class SimulasiController extends Controller
|
||||
public function index()
|
||||
{
|
||||
$caw = Cawangan::all();
|
||||
return view('simulasi.janasimulasi',compact('caw'));
|
||||
$tetapan = Tetapan::where('id','=',1)->first();
|
||||
return view('simulasi.janasimulasi',compact('caw','tetapan'));
|
||||
}
|
||||
|
||||
public function janadata(Request $request)
|
||||
@@ -64,6 +65,7 @@ class SimulasiController extends Controller
|
||||
$bulan = (int)round($request->jbg);
|
||||
$fasa = $request->fasa;
|
||||
$jbg = $request->jbg;
|
||||
$kali = $request->kali;
|
||||
// dd($fasa);
|
||||
// dd($fasa);
|
||||
//create simulasi
|
||||
@@ -73,6 +75,7 @@ class SimulasiController extends Controller
|
||||
$simulasi->jbg = $request->jbg;
|
||||
$simulasi->cajlelong = $request->cajlelong;
|
||||
$simulasi->fasa = $request->fasa;
|
||||
$simulasi->kali = $request->kali;
|
||||
$simulasi->save();
|
||||
$simulasi_id = $simulasi->id;
|
||||
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
|
||||
@@ -136,8 +139,13 @@ class SimulasiController extends Controller
|
||||
$caw_simulasi->online = 'Online';
|
||||
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
|
||||
$caw_simulasi->fasa = $request->fasa;
|
||||
$caw_simulasi->kali = $request->kali;
|
||||
$caw_simulasi->save();
|
||||
// dd($caw_simulasi);
|
||||
|
||||
// $cawangan = Cawangan::whereIn('caw_code',$request->caw)->get();
|
||||
// $cawangan->kali = $request->kali;
|
||||
// $cawangan->update();
|
||||
|
||||
$suratcaw = $surat->where('kodcaw','=',$cawsimulasi->caw_code)->all();
|
||||
|
||||
@@ -871,10 +879,13 @@ class SimulasiController extends Controller
|
||||
$fasa = $request->fasa;
|
||||
$jbg = $request->jbg;
|
||||
$cajlelong = $request->cajlelong;
|
||||
$kali = $request->kali;
|
||||
// dd($kali);
|
||||
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
|
||||
$t_lelongdisplay = $t_lelong->format('d-m-Y');
|
||||
// $t_lelongdisplay = $t_lelong->format('d-m-Y');
|
||||
//dd($fasa);
|
||||
$tetapan = Tetapan::where('id','=',1)->first();
|
||||
if($t_lelong != null)
|
||||
{
|
||||
if($request->fasa == '1'){
|
||||
@@ -901,7 +912,7 @@ class SimulasiController extends Controller
|
||||
// $t_gadaisehingga = Carbon::parse($t_gadais);
|
||||
// $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
|
||||
|
||||
|
||||
|
||||
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
|
||||
->orderBy('cawangan.caw_name')
|
||||
->where('gadai.t_gadai', '<=', $jbgadai)
|
||||
@@ -910,6 +921,13 @@ class SimulasiController extends Controller
|
||||
->where('gadai.taglel', '=', 0)
|
||||
->where('gadai.tagpalsu', '=', 0)
|
||||
->where('gadai.tagpalsu2', '=', 0)
|
||||
// ->where('cawangan_simulasi.kali', '!=', $kali)
|
||||
->whereNotIn('cawangan.id', function($query) use ($kali) {
|
||||
$query->select('caw_id')
|
||||
->from('cawangan_simulasi')
|
||||
->where('kali', '=' ,$kali);
|
||||
})
|
||||
|
||||
->whereNotNull('gadai.upah12')
|
||||
->groupBy('gadai.kodcaw','cawangan.caw_name')
|
||||
->selectRaw('count(*) as bil_lelong,
|
||||
@@ -918,9 +936,11 @@ class SimulasiController extends Controller
|
||||
sum(pinjaman) as total_pembiayaan,
|
||||
sum(bakipjm) as total_bakipjm,
|
||||
gadai.kodcaw,
|
||||
cawangan.caw_name as caw_name')
|
||||
->get();
|
||||
|
||||
cawangan.caw_name as caw_name
|
||||
')
|
||||
|
||||
->get();
|
||||
// dd($senarai);
|
||||
$bil_lelong = sizeof($getsurat);
|
||||
}
|
||||
|
||||
@@ -987,7 +1007,8 @@ class SimulasiController extends Controller
|
||||
'jbgadai',
|
||||
'fasa',
|
||||
'jbg',
|
||||
'cajlelong'
|
||||
'cajlelong',
|
||||
'tetapan'
|
||||
|
||||
|
||||
));
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Http\Request;
|
||||
use Spatie\Permission\Models\Role;
|
||||
use Spatie\Permission\Models\Permission;
|
||||
use Carbon\Carbon;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Models\Gadai;
|
||||
use App\Models\GadaiMarhun;
|
||||
use App\Models\Cawangan;
|
||||
use App\Models\TransaksiKeuntungan;
|
||||
use App\Models\Tetapan;
|
||||
|
||||
use DateTime;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Input;
|
||||
|
||||
|
||||
|
||||
|
||||
class TetapanController extends Controller
|
||||
{
|
||||
//PC
|
||||
public function parameter(Request $request)
|
||||
{
|
||||
$caw = Cawangan::all();
|
||||
$tetapan = Tetapan::where('id','=',1)->first();
|
||||
// dd($tetapan);
|
||||
|
||||
return view('tetapan.parameter',compact('caw','tetapan'));
|
||||
|
||||
}
|
||||
|
||||
public function addparameter(Request $request)
|
||||
{
|
||||
$t_lelong = Carbon::parse($request->tarikh_lelong);
|
||||
$kali = $request->kali;
|
||||
//create tetapan
|
||||
$tetapan = Tetapan::find(1);
|
||||
// dd($tetapan);
|
||||
$tetapan->tetap_tarikh_lelong = $request->tarikh_lelong;
|
||||
$tetapan->kali = $request->kali;
|
||||
$tetapan->cajlelong = $request->cajlelong;
|
||||
$tetapan->update();
|
||||
|
||||
return redirect()->route('tetapan.parameter')
|
||||
->with('success','Tetapan Berjaya');
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class Tetapan extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'tetapan';
|
||||
|
||||
protected $fillable = [
|
||||
'tetap_id',
|
||||
'tetap_tarikh_lelong',
|
||||
'kali',
|
||||
'cajlelong'
|
||||
];
|
||||
|
||||
}
|
||||
@@ -37,6 +37,7 @@ class CreateSimulasisTable extends Migration
|
||||
$table->date('import_data_sts_date')->nullable();
|
||||
$table->string('lokasi')->nullable();
|
||||
$table->integer('fasa')->default(0);
|
||||
$table->integer('kali')->nullable();
|
||||
$table->timestamps();
|
||||
|
||||
$table->foreign('caw_id')
|
||||
|
||||
@@ -162,6 +162,18 @@ class CreateLelongsTable extends Migration
|
||||
// ->references('norujukan')->on('gadai')
|
||||
// ->onDelete('cascade');
|
||||
});
|
||||
|
||||
Schema::create('tetapan', function (Blueprint $table) {
|
||||
$table->bigIncrements('id');
|
||||
$table->datetime('tetap_tarikh_lelong')->nullable();
|
||||
$table->string('kali')->nullable();
|
||||
$table->integer('cajlelong')->nullable();
|
||||
$table->timestamps();
|
||||
|
||||
// $table->foreign('norujukan')
|
||||
// ->references('norujukan')->on('gadai')
|
||||
// ->onDelete('cascade');
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -123,6 +123,10 @@ class RolesSeeder extends Seeder
|
||||
'name' => 'importdata',
|
||||
'description' => 'Import Data Cawangan Dari LIVE to Master'
|
||||
]);
|
||||
Permission::create([
|
||||
'name' => 'tetapan',
|
||||
'description' => 'Tetapan Parameter'
|
||||
]);
|
||||
|
||||
|
||||
//account
|
||||
@@ -179,6 +183,7 @@ class RolesSeeder extends Seeder
|
||||
$role6->givePermissionTo('notistamatkontrak');
|
||||
$role6->givePermissionTo('kemaskinihargaasas');
|
||||
$role6->givePermissionTo('importdata');
|
||||
$role6->givePermissionTo('tetapan');
|
||||
|
||||
$role7 = Role::create(['name' => 'account']);
|
||||
$role7->givePermissionTo('pengesahanbayaran');
|
||||
|
||||
@@ -154,6 +154,9 @@
|
||||
</li>
|
||||
@endhasrole
|
||||
@hasrole('operasi')
|
||||
<li class="{{ (request()->is('tetapan/*')) ? 'active' : '' }}">
|
||||
<a href="{{url('tetapan/parameter')}}">Tetapan</a>
|
||||
</li>
|
||||
<li class="{{ (request()->is('importdata/*')) ? 'active' : '' }}">
|
||||
<a href="{{url('importdata/importdatacawangan')}}">Import Data</a>
|
||||
</li>
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<div class="form-group row">
|
||||
<label for="tarikh_lelong" class="col-sm-2 col-form-label">Tarikh Lelong</label>
|
||||
<div class="col-sm-3">
|
||||
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" placeholder="Tarikh">
|
||||
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" value = "{{$tetapan->tetap_tarikh_lelong}}">
|
||||
</div>
|
||||
<!-- <label for="hargaasas" class="col-sm-1 col-form-label">Harga Emas Asas</label>
|
||||
<div class="col-sm-4">
|
||||
@@ -61,7 +61,15 @@
|
||||
|
||||
<label for="cajlelong" class="col-sm-2 col-form-label">Caj Lelong</label>
|
||||
<div class="col-sm-4">
|
||||
<input type="text" class="form-control" id="cajlelong" name="cajlelong" value = '3'>
|
||||
<input type="text" class="form-control" id="cajlelong" name="cajlelong" value = "{{$tetapan->cajlelong}}" readonly>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
|
||||
<label for="cajlelong" class="col-sm-2 col-form-label">Kali</label>
|
||||
<div class="col-sm-4">
|
||||
<input type="text" class="form-control" id="kali" name="kali" value = "{{$tetapan->kali}}" readonly>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
|
||||
@@ -34,12 +34,13 @@
|
||||
echo($tarikhlelong);
|
||||
}
|
||||
@endphp</p>
|
||||
|
||||
<p> <b>Lelongan Kali Ke -</b> {{ $tetapan->kali }}</p>
|
||||
<input type="hidden" class="form-control" id="tarikh_lelong" name="tarikh_lelong" value="{{$t_lelong2}}">
|
||||
<input type="hidden" class="form-control" id="t_gadai" name="t_gadai" value="@php echo($t_gadai1) @endphp">
|
||||
<input type="hidden" class="form-control" id="jbg" name="jbg" value="{{$jbg}}">
|
||||
<input type="hidden" class="form-control" id="hargaasas" name="hargaasas" value="0.00">
|
||||
<input type="hidden" class="form-control" id="cajlelong" name="cajlelong" value="{{$cajlelong}}">
|
||||
<input type="hidden" class="form-control" id="kali" name="kali" value="{{$tetapan->kali}}">
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,71 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/css/select2.min.css" rel="stylesheet"/>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.10/js/select2.min.js"></script>
|
||||
<div class="container-fluid">
|
||||
<div class="row ">
|
||||
<div class="col-md-12 mx-auto card">
|
||||
<h3 class="pt-3">Tetapan Parameter</h3>
|
||||
|
||||
@if ($message = Session::get('failed'))
|
||||
<div class="alert alert-danger">
|
||||
<p>{{ $message }}</p>
|
||||
</div>
|
||||
@endif
|
||||
<!-- <form action="{{route('analisa.janadata')}}" method="POST" enctype="multipart/form-data"> -->
|
||||
<form action="{{route('tetapan.addparameter')}}" method="POST" enctype="multipart/form-data">
|
||||
@csrf
|
||||
<div class="form-group row">
|
||||
<label for="tarikh_lelong" class="col-sm-2 col-form-label">Tarikh Lelong</label>
|
||||
<div class="col-sm-3">
|
||||
<input type="date" class="form-control" id="tarikh_lelong" name="tarikh_lelong" value = "{{$tetapan->tetap_tarikh_lelong}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="jbg" class="col-sm-2 col-form-label">Lelong Kali Ke-</label>
|
||||
<div class="col-sm-4" id="fasa_1">
|
||||
<input type="text" class="form-control" id="kali" name="kali" value = "{{$tetapan->kali}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="cajlelong" class="col-sm-2 col-form-label">Caj Lelong</label>
|
||||
<div class="col-sm-4">
|
||||
<input type="text" class="form-control" id="cajlelong" name="cajlelong" value = "{{$tetapan->cajlelong}}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<div class="col-sm-10">
|
||||
<button type="submit" class="btn btn-primary">Simpan</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$('#caw').select2({
|
||||
width: '100%',
|
||||
placeholder: "Pilih Cawangan",
|
||||
allowClear: true
|
||||
});
|
||||
|
||||
$(document).ready(function () {
|
||||
$("input[name=fasa]").change(function(){
|
||||
|
||||
if($("#fasa1").is(':checked')){
|
||||
$("#jbg").val('').prop("readonly", false);
|
||||
}
|
||||
if($("#fasa2").is(':checked')){
|
||||
$("#jbg").val('12').prop("readonly", true);
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
|
||||
@endsection
|
||||
@@ -245,6 +245,11 @@ Route::group(['middleware' => ['permission:importdata'],'prefix'=>'importdata'],
|
||||
Route::get('/importdatagadai/{caw_id}',['as'=>'importdata.importdatagadai','uses'=>'ImportDataController@importdatagadai']);
|
||||
Route::get('/hapusdatacawangan/{caw_id}',['as'=>'importdata.hapusdatacawangan','uses'=>'ImportDataController@hapusdatacawangan']);
|
||||
});
|
||||
|
||||
Route::group(['middleware' => ['permission:tetapan'],'prefix'=>'tetapan'], function () {
|
||||
Route::get('/parameter',['as'=>'tetapan.parameter','uses'=>'TetapanController@parameter']);
|
||||
Route::post('/addparameter',['as'=>'tetapan.addparameter','uses'=>'TetapanController@addparameter']);
|
||||
});
|
||||
//Operasi
|
||||
|
||||
Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], function () {
|
||||
|
||||
Reference in New Issue
Block a user