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

Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into fixkaunter

Browse Source
This commit is contained in:
hafifierahman
2022-04-27 23:51:57 +08:00
parent b562074528 92c98615af
commit a99fe41fc2
8 changed files with 86 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/initiateTunai.php
+14 -2
View File
@@ -12,7 +12,7 @@ class initiateTunai extends Command
*
* @var string
*/
protected $signature = 'initiate:tunai';
protected $signature = 'initiate:tunai {--all : all zone} {--1 : update zone 1} {--2 : update zone 2} {--3 : update zone3}';
/**
* The console command description.
@@ -38,7 +38,19 @@ class initiateTunai extends Command
*/
public function handle()
{
$updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/initiate/tunai')->json();
if($this->option('all')){
$zone = 'all';
}else if($this->option('1')){
$zone = '1';
}else if ($this->option('2')){
$zone = '2';
}else if ($this->option('3')){
$zone = '3';
}
$updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/initiate/tunai',[
'zone' => $zone
])->json();
if($updateOnline == 'successful'){
return 0;
}else{
app/Console/Commands/keluarLelong.php
+17 -3
View File
@@ -12,7 +12,7 @@ class keluarLelong extends Command
*
* @var string
*/
protected $signature = 'keluar:lelong';
protected $signature = 'keluar:lelong {--all : all zone} {--1 : update zone 1} {--2 : update zone 2} {--3 : update zone3}';
/**
* The console command description.
@@ -38,8 +38,22 @@ class keluarLelong extends Command
*/
public function handle()
{
$updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong')->json();
$updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong/tawarruq')->json();
if($this->option('all')){
$zone = 'all';
}else if($this->option('1')){
$zone = '1';
}else if ($this->option('2')){
$zone = '2';
}else if ($this->option('3')){
$zone = '3';
}
$updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong',[
'zone' => $zone
])->json();
$updateOnline = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/keluar/lelong/tawarruq',[
'zone' => $zone
])->json();
if($updateOnline == 'successful'){
return 0;
}else{
app/Console/Commands/updateJbg.php
+3 -1
View File
@@ -50,7 +50,9 @@ class updateJbg extends Command
$updatejbg = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/updatejbgsemasa',[
'zone' => $zone
])->json();
$updatejbgLelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/updatejbglelong')->json();
$updatejbgLelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/updatejbglelong',[
'zone' => $zone
])->json();
$hapusGadaiNull = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/hapus/gadai/null')->json();
if($updatejbg == 'successful'){
$this->info('Success');
resources/views/khazanah/laporan/datalejer_am.blade.php
+25 -25
View File
@@ -25,7 +25,7 @@
<form method="post">
@csrf
<div class="row">
<div class="col-sm-2">Mula</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
@@ -33,22 +33,22 @@
<div class="col-sm-2">Hingga</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
<br>
<br>
<div class="row">
<div class="col-sm-1"> </div> <div class="col-sm-6"></div>
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank" formaction="{{route('cetak.lejer_am')}}">
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Lejer AM" formtarget="_blank" formaction="{{route('cetak.lejer_am')}}">
</div>
</div>
<br>
<div class="row">
<div class="col-sm-1"> </div>
<div class="col-sm-6"> </div>
<div class="col-sm-6"> </div>
<div class="col-sm-1"> </div>
<div class="col-sm-6"> </div>
<div class="col-sm-6"> </div>
</div>
@@ -75,7 +75,7 @@
format: 'dd-mm-yyyy'
});
var current = new Date();
var current_date = current.getDate();
@@ -105,11 +105,11 @@
}
});
});
</script>
@@ -157,7 +157,7 @@ $(document).ready( function () {
<div class="modal" id="myModal">
<div class="modal-dialog">
<div class="modal-content">
<!-- Modal Header -->
<div class="modal-header">
<h5 class="modal-title">Laporan Imbangan Duga Cawangan</h5>
@@ -176,7 +176,7 @@ $(document).ready( function () {
}
#details td, #details th {
padding: 8px;
font-size:11px;
}
@@ -196,25 +196,25 @@ $(document).ready( function () {
</style>
<form action="{{route('imbangduga.cetak')}}" method="post">
@csrf
<table id="details">
<tr>
<td> <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker3" name="datetimepicker3" autocomplete="off" aria-describedby="basic-addon1"> </td>
</tr>
<tr>
<td> <input type="submit" class="btn btn-success ml-md-5" id="submit_button" name="submit_button" value="Jana Laporan" > </td>
</tr>
</table>
</form>
@@ -224,7 +224,7 @@ $(document).ready( function () {
</div>
<!-- Modal footer -->
resources/views/khazanah/laporan/imbangduga.blade.php
+1 -1
View File
@@ -27,7 +27,7 @@
<div class="col-sm-2">Tarikh</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
<br>
<br>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan " formaction="{{route('imbangduga.cetak')}}"></div>
resources/views/khazanah/laporan/ringkasanharian.blade.php
+1 -1
View File
@@ -34,7 +34,7 @@
</form>
</div>
</div>
</div>
</div>
</div>
resources/views/khazanah/laporan/stokaudit.blade.php
+7 -7
View File
@@ -30,18 +30,18 @@
.radiostyle .radio-green:hover {
box-shadow: 5px 5px #888888;
}
.radiostyle .radio-red:hover {
box-shadow: 5px 5px #888888;
}
.radiostyle .radio-yellow:hover {
box-shadow: 5px 5px #888888;
}
.radiostyle .radio-green input[type="radio"]:checked{
@@ -92,12 +92,12 @@
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
<input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
</div>
</div>
</div>
<br><br>
<div class="row">
<div class="btn-group-toggle col-md-12 col-sm-12 mb-4 radiostyle" data-toggle="buttons">
<label class="btn btn-lg radio-yellow">
<input autocomplete="off" type="radio" name="radaktif" id="option1" value="aktif" autocomplete="off" checked>
@@ -128,7 +128,7 @@
format: 'dd-mm-yyyy'
});
});
</script>
@endsection
resources/views/print/sag.blade.php
+18 -15
View File
@@ -5,10 +5,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script>
// $(document).ready(function () {
// window.print();
// window.onfocus=function(){ window.close();}
// });
$(document).ready(function () {
window.print();
window.onfocus=function(){ window.close();}
});
</script>
<style>
@@ -415,7 +415,8 @@
<body>
<div class="grid-container">
<div id="header_surat1">
<p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
<p>PERMODALAN KELANTAN BERHAD (70168-U)</p>
<p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
<p>{{ $cawangan_detail['namacaw'] }}</p>
<p>{{ $cawangan_detail['alamat1'] }}</p>
<p>{{ $cawangan_detail['alamat2'] }}</p>
@@ -873,12 +874,13 @@
<div class="grid-container">
<div id="header_surat1">
<p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
<p>{{ $cawangan_detail['namacaw'] }}</p>
<p>{{ $cawangan_detail['alamat1'] }}</p>
<p>{{ $cawangan_detail['alamat2'] }}</p>
<p>PERMODALAN KELANTAN BERHAD (70168-U)</p>
<p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
<p>{{ $cawangan_detail['namacaw'] }}</p>
<p>{{ $cawangan_detail['alamat1'] }}</p>
<p>{{ $cawangan_detail['alamat2'] }}</p>
<p>{{ $cawangan_detail['notel'] }}</p>
<p>{{ $cawangan_detail['notel'] }}</p>
</div>
<div id="header_surat2">
<img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px;" alt="User Image" class="center" >
@@ -1333,11 +1335,12 @@
<div class='page-break'> </div>
<div class="grid-container">
<div id="header_surat1">
<p>KOPERASI PERMODALAN KELANTAN BERHAD</p>
<p>{{ $cawangan_detail['namacaw'] }}</p>
<p>{{ $cawangan_detail['alamat1'] }}</p>
<p>{{ $cawangan_detail['alamat2'] }}</p>
<p>{{ $cawangan_detail['notel'] }}</p>
<p>PERMODALAN KELANTAN BERHAD (70168-U)</p>
<p>KOPERASI PERMODALAN KELANTAN BERHAD (D-5-0228)</p>
<p>{{ $cawangan_detail['namacaw'] }}</p>
<p>{{ $cawangan_detail['alamat1'] }}</p>
<p>{{ $cawangan_detail['alamat2'] }}</p>
<p>{{ $cawangan_detail['notel'] }}</p>
</div>
<div id="header_surat2">