add laporan ringkasan terkumpul in services
This commit is contained in:
@@ -15,6 +15,7 @@ use App\Models\Lejeram;
|
|||||||
use App\Models\Cawangan;
|
use App\Models\Cawangan;
|
||||||
|
|
||||||
use App\Services\ImbangdugaServices as ImbanganDuga;
|
use App\Services\ImbangdugaServices as ImbanganDuga;
|
||||||
|
use App\Services\RingkasanHarianServices;
|
||||||
|
|
||||||
class AkaunController extends Controller
|
class AkaunController extends Controller
|
||||||
{
|
{
|
||||||
@@ -779,7 +780,7 @@ class AkaunController extends Controller
|
|||||||
$tarikh_cetak = $current->toDateString();
|
$tarikh_cetak = $current->toDateString();
|
||||||
|
|
||||||
if($request->datemula == null){
|
if($request->datemula == null){
|
||||||
$mula_date = '2017-01-01';
|
$mula_date = '2023-01-01';
|
||||||
}else{
|
}else{
|
||||||
$mula_date = $request->datemula;
|
$mula_date = $request->datemula;
|
||||||
}
|
}
|
||||||
@@ -790,13 +791,15 @@ class AkaunController extends Controller
|
|||||||
$hingga_date = $request->datehingga;
|
$hingga_date = $request->datehingga;
|
||||||
}
|
}
|
||||||
|
|
||||||
$laporan_ringkasan = Http::get($api_url . '/api/laporan/terkumpul',[
|
$ringkasan = new RingkasanHarianServices();
|
||||||
'kodcaw' => $request->kodcaw,
|
$laporan_ringkasan = $ringkasan->getRingkasanHarian($mula_date,$hingga_date,$request->kodcaw,'cawangan');
|
||||||
'mula' => $mula_date,
|
// $laporan_ringkasan = Http::get($api_url . '/api/laporan/terkumpul',[
|
||||||
'akhir' => $hingga_date
|
// 'kodcaw' => $request->kodcaw,
|
||||||
])->json();
|
// 'mula' => $mula_date,
|
||||||
|
// 'akhir' => $hingga_date
|
||||||
|
// ])->json();
|
||||||
|
|
||||||
$laporan_ringkasan = $laporan_ringkasan[0];
|
// $laporan_ringkasan = $laporan_ringkasan[0];
|
||||||
|
|
||||||
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$request->kodcaw)->json();
|
$cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$request->kodcaw)->json();
|
||||||
$cawangan_detail=$cawangan[0];
|
$cawangan_detail=$cawangan[0];
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Services;
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
|
||||||
|
class RingkasanHarianServices
|
||||||
|
{
|
||||||
|
|
||||||
|
public function getRingkasanHarian($mula,$hingga,$kodcaw = null,$jenisgenerate) : Array{
|
||||||
|
if($jenisgenerate == 'all'){
|
||||||
|
$response = Http::get(config('api.url'). '/admin/get/ringkasanharian/' ,[
|
||||||
|
'mula' => $mula,
|
||||||
|
'hingga' => $hingga,
|
||||||
|
'kodcaw' => 'all',
|
||||||
|
])->json();
|
||||||
|
}else{
|
||||||
|
$response = Http::get(config('api.url'). '/admin/get/ringkasanharian/' ,[
|
||||||
|
'mula' => $mula,
|
||||||
|
'hingga' => $hingga,
|
||||||
|
'kodcaw' => $kodcaw,
|
||||||
|
])->json();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function saveRingkasanHarian($mula,$hingga,$zone,$jenisgenerate) : Object{
|
||||||
|
if($jenisgenerate == 'daily'){
|
||||||
|
$response = Http::get(config('api.url'). '/admin/store/ringkasanharian/' ,[
|
||||||
|
'mula' => $mula,
|
||||||
|
'hingga' => $hingga,
|
||||||
|
'zone' => $zone,
|
||||||
|
])->json();
|
||||||
|
|
||||||
|
}else{
|
||||||
|
$response = Http::get(config('api.url'). '/admin/store/ringkasanharian/' ,[
|
||||||
|
'mula' => $mula,
|
||||||
|
'hingga' => $hingga,
|
||||||
|
'zone' => $zone,
|
||||||
|
])->json();
|
||||||
|
}
|
||||||
|
return response($response);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,9 +18,9 @@
|
|||||||
<input :value="$kodcaw" name="kodcaw" hidden/>
|
<input :value="$kodcaw" name="kodcaw" hidden/>
|
||||||
<input :value="$hostname" name="hostname" hidden/>
|
<input :value="$hostname" name="hostname" hidden/>
|
||||||
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
|
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Mula</span>
|
||||||
<input id="tarikhmula" name="datemula" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
|
<input id="tarikhmula" name="datemula" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" min="2023-01-01" :max="maxDate"/>
|
||||||
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Hingga</span>
|
<span style="background-color: #F9FAFB" class="text-gray-600 border border-2 rounded-l px-4 py-2 whitespace-no-wrap">Hingga</span>
|
||||||
<input id="tarikhhingga" name="datehingga" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" />
|
<input id="tarikhhingga" name="datehingga" class="border border-2 border-l-0 rounded-r px-4 py-2 w-80r mr-2" type="date" min="2023-01-01" :max="maxDate"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -40,10 +40,18 @@ export default {
|
|||||||
data(){
|
data(){
|
||||||
return{
|
return{
|
||||||
jenisgenerate:'none',
|
jenisgenerate:'none',
|
||||||
kodcaw:''
|
kodcaw:'',
|
||||||
|
maxDate: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
this.setMaxDate();
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
setMaxDate() {
|
||||||
|
const today = new Date().toISOString().split('T')[0];
|
||||||
|
this.maxDate = today;
|
||||||
|
},
|
||||||
async generatepdf(){
|
async generatepdf(){
|
||||||
await this.setJenis('pdf');
|
await this.setJenis('pdf');
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user