fix skit2

This commit is contained in:
fifi97
2022-03-03 02:45:49 +08:00
parent a831fb4276
commit 91e9a72781
5 changed files with 198 additions and 177 deletions
+148 -138
View File
@@ -15,120 +15,6 @@ class ResitController extends Controller
return view('bajet.home');
}
public function resittebus($id)
{
$auth_user = Auth::user();
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
foreach($transaction as $trans)
{
$totaltransaction += $trans['duit_masuk'];
}
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction'));
}
public function resitadvansur($id)
{
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
$advansur = Http::get(config('api.url') . '/api/advansur/'. $auth_user['cawangan'] . '/'. $id)->json();
if($advansur['nowakil'] != 0){
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $advansur['nowakil'])->json();
if(sizeof($wakil) != 0){
$wakil = $wakil[0];
}
}
else
{
$wakil = [];
}
return view('print.resitadvansur',compact('gadai','customers_info','advansur','wakil'));
}
public function resittambahpinjam($id)
{
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'] ,[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
// dd($penebusan['nowakil']);
if($penebusan['nowakil'] != 0)
{
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
}
else
{
$wakil = [];
}
return view('print.resittambahpinjam',compact('gadai','customers_info','penebusan','wakil'));
}
public function resit($id)
{
@@ -146,10 +32,7 @@ class ResitController extends Controller
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info'));
return view('resit.resitansuran',compact('transaction','gadai','customers_info'));
}
public function resittebusseparuh($id)
@@ -159,6 +42,9 @@ class ResitController extends Controller
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
@@ -168,8 +54,7 @@ class ResitController extends Controller
$totaltransaction += $trans['duit_masuk'];
}
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
@@ -177,57 +62,182 @@ class ResitController extends Controller
// $customers_info = $customers_info[0];
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'],[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
return view('resit.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
}
public function resitautotawarruq($id)
{
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
foreach($transaction as $trans)
{
$totaltransaction += $trans['duit_masuk'];
}
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
$transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'],[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('resit.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
}
public function resittebus($id)
{
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $gadai['kodcaw'])->json();
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
foreach($transaction as $trans)
{
$totaltransaction += $trans['duit_masuk'];
}
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'],[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();
$totalBayaranAnsuran = Http::get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('resit.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
}
public function resitbelumtebus($id)
{
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'] ,[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
if($penebusan['nowakil'] != 0)
{
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
}
else
{
$wakil = [];
}
return view('resit.resittebussebelum',compact('gadai','customers_info','penebusan','wakil'));
}
public function resitadvansur($id)
{
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
foreach($transaction as $trans)
{
$totaltransaction += $trans['duit_masuk'];
}
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
$transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
$advansur = Http::get(config('api.url') . '/api/advansur/'. $gadai['kodcaw'] . '/'. $id)->json();
if($advansur['nowakil'] != 0){
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $advansur['nowakil'])->json();
if(sizeof($wakil) != 0){
$wakil = $wakil[0];
}
}
else
{
$wakil = [];
}
return view('resit.resitadvansur',compact('gadai','customers_info','advansur','wakil'));
}
public function resittambahpinjam($id)
{
$auth_user = Auth::user();
$gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
if(sizeof($gadai) != 0)
$gadai = $gadai[0][0];
$customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
$penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $gadai['kodcaw'] ,[ "norujukan" => $id])->json();
if(sizeof($penebusan) != 0)
$penebusan = $penebusan[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
if($penebusan['nowakil'] != 0)
{
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $gadai['kodcaw'] . '/code/' . $penebusan['nowakil'])->json();
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
}
else
{
$wakil = [];
}
return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
return view('resit.resittambahpinjam',compact('gadai','customers_info','penebusan','wakil'));
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

@@ -11,9 +11,9 @@
<div class="relative p-6 flex-auto">
<div class="grid grid-cols-3">
<div class="h-auto w-auto text-center p-6 mt-8 rounded-lg bg-yellow-300 border border-yellow-300">Hargajualan : RM {{ this.hargajualan }}</div>
<div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Pembiayaan : RM {{ this.pinjaman }}</div>
<div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Nilai Marhun : RM {{ this.nilaimarhun }}</div>
<div class="h-auto w-auto text-center p-6 mt-8 rounded-lg bg-yellow-300 border border-yellow-300">Hargajualan : RM {{ formatexchange(this.hargajualan) }}</div>
<div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Pembiayaan : RM {{ formatexchange(this.pinjaman) }}</div>
<div class="h-auto w-auto text-center p-6 mt-8 ml-2 rounded-lg bg-yellow-300 border border-yellow-300">Nilai Marhun : RM {{ formatexchange(this.nilaimarhun) }}</div>
</div>
<div class="flex justify-center mt-10 mb-10">
@@ -83,7 +83,7 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="bayaran.duit_masuk">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(bayaran.duit_masuk)">
</p>
</div>
</div>
@@ -154,7 +154,7 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="upah.upahDibayar">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(upah.upahDibayar)">
</p>
</div>
</div>
@@ -242,7 +242,7 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="rekod.pinjaman">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(rekod.pinjaman)">
</p>
</div>
</div>
@@ -304,6 +304,10 @@
<script>
import { createPopper } from "@popperjs/core";
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
export default {
props: {
@@ -329,6 +333,9 @@ export default {
}
},
methods: {
formatexchange: function(value){
return formatter.format(value)
},
toggleModal: function(){
this.showModal = false;
},
@@ -348,43 +355,40 @@ export default {
});
},
bayaranfunc: function(id){
// var urlroute = '{{ route("resit.ansuran", ":id") }}';
console.log(route().has('resit.ansuran'))
return window.route('resit.ansuran', id)
let urlroute = window.route('resit.ansuran', id)
window.open(urlroute, '_blank');
},
upahfunc: function(norujukan){
// var urlroute = '{{ route("resit.advansur", ":id") }}';
console.log(norujukan)
let urlroute = window.route('resit.advansur', id)
window.open(urlroute, '_blank');
},
rekodfunc: function(norujukan,sttebus,hargajualan){
let urlroute = '';
switch(sttebus) {
case 'P':
var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
urlroute = window.route('resit.tambahpinjam', norujukan)
window.open(urlroute, '_blank');
break;
case 'T':
if(hargajualan === '')
{
var urlroute = '{{ route("resit.belumtebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
urlroute = window.route('resit.belumtebus', norujukan)
window.open(urlroute, '_blank');
}else{
var urlroute = '{{ route("resit.tebus", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
urlroute = window.route('resit.tebus', norujukan)
window.open(urlroute, '_blank');
}
break;
case 'A':
var urlroute = '{{ route("resit.belumansurans", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
urlroute = window.route('resit.belumansurans', norujukan);
window.open(urlroute, '_blank');
break;
case 'S':
var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
urlroute = urlroute.replace(':id', tebusaz['norujukan']);
urlroute = window.route('resit.tebusseparuh', norujukan)
window.open(urlroute, '_blank');
break;
}
console.log(norujukan)
},
}
}
+10 -3
View File
@@ -252,7 +252,7 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="belumtebus.pinjaman">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(belumtebus.pinjaman)">
</p>
</div>
</div>
@@ -371,7 +371,7 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="sudahtebus.bakipjm">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(sudahtebus.bakipjm)">
</p>
</div>
</div>
@@ -489,7 +489,7 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="flex items-center">
<div class="ml-3">
<p class="text-gray-900 whitespace-no-wrap" v-text="lelong.bakipjm">
<p class="text-gray-900 whitespace-no-wrap" v-text="formatexchange(lelong.bakipjm)">
</p>
</div>
</div>
@@ -538,6 +538,10 @@ import { required, minLength, between } from 'vuelidate/lib/validators'
import modal from '../components/util/RekodBayaranModal.vue'
import pagination from '../components/pagination.vue'
const formatter = new Intl.NumberFormat('en-US', {
minimumFractionDigits: 2
});
export default {
components: {
pagination,
@@ -615,6 +619,9 @@ export default {
}
},
methods: {
formatexchange: function(value){
return formatter.format(value)
},
koddaerahCall: function(negeri,daerah) {
this.axios.get(this.$hostname + '/api/negeri/' + negeri).then(response => {
this.kodnegeri = response.data.negeri
+9 -9
View File
@@ -82,12 +82,12 @@ Route::get('/akaunhome/cetakperbelanjaan',['as'=>'cetak.perbelanjaan','uses'=>'A
//Resit
Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'ResitController@resit']);
Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'ResitController@resitansurans']);
Route::get('/resitbelumansurans/{id}',['as'=>'resit.belumansurans','uses'=>'ResitController@resitbelumansurans']);
Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'ResitController@resittebus']);
Route::get('/resit/advansur/{id}',['as'=>'resit.advansur','uses'=>'ResitController@resitadvansur']);
Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'ResitController@resittebusseparuh']);
Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'ResitController@resitbelumtebus']);
Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'ResitController@resittambahpinjam']);
Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'ResitController@resitautotawarruq']);
Route::get('/resit/{id}',['as'=>'resit.ansuran','uses'=>'App\Http\Controllers\ResitController@resit']);
Route::get('/resitansurans/{id}',['as'=>'resit.ansurans','uses'=>'App\Http\Controllers\ResitController@resitansurans']);
Route::get('/resitbelumansurans/{id}',['as'=>'resit.belumansurans','uses'=>'App\Http\Controllers\ResitController@resitbelumansurans']);
Route::get('/resit/tebus/{id}',['as'=>'resit.tebus','uses'=>'App\Http\Controllers\ResitController@resittebus']);
Route::get('/resit/advansur/{id}',['as'=>'resit.advansur','uses'=>'App\Http\Controllers\ResitController@resitadvansur']);
Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'App\Http\Controllers\ResitController@resittebusseparuh']);
Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'App\Http\Controllers\ResitController@resitbelumtebus']);
Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'App\Http\Controllers\ResitController@resittambahpinjam']);
Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'App\Http\Controllers\ResitController@resitautotawarruq']);