diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 97971eb2..ebeafa13 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -2374,7 +2374,7 @@ class LelongController extends Controller $current = $current_default->toDateString(); $lelong = Lelong::find($lelong_id, ['id', 'cajlelong']); - $lelong_bid_all = LelongBid::select('id')->where('lelong_id', '=', $lelong_id)->where('status_jual', '=', 0)->get(); + $lelong_bid_all = LelongBid::select('id', 'pinjaman', 'bakiupah')->where('lelong_id', '=', $lelong_id)->where('status_jual', '=', 0)->get(); $lelong_bid_all_pluck_id = $lelong_bid_all->pluck('id'); $lelong_bid_all_key_by_id = $lelong_bid_all->keyBy('id'); @@ -2416,10 +2416,8 @@ class LelongController extends Controller $lel_bid_true = $lelong_bid_all_key_by_id[$lel_bidder_menang->lelongbid_id]; $caj_lelong_bid = $lel_bidder_menang->hargabida * ($lelong->cajlelong / 100); - $baki_lelong_bid = $lel_bidder_menang->hargabida - $lel_bid_true->pinjaman - bcdiv($lel_bid_true->bakiupah, 1, 1) - round($caj_lelong_bid); - - $caj_lelong_bid = bcdiv($caj_lelong_bid, 1, 2); - $baki_lelong_bid = bcdiv($baki_lelong_bid, 1, 2); + $caj_lelong_bid = round($caj_lelong_bid, 1 ,1); + $baki_lelong_bid = $lel_bidder_menang->hargabida - $lel_bid_true->pinjaman - bcdiv($lel_bid_true->bakiupah, 1, 1) - $caj_lelong_bid; $cases_update_caj_lelong .= sprintf(' WHEN id = %d THEN %s ', $lel_bid_true->id, $caj_lelong_bid); $cases_update_baki_lelong .= sprintf(' WHEN id = %d THEN %s ', $lel_bid_true->id, $baki_lelong_bid); @@ -2508,14 +2506,7 @@ class LelongController extends Controller 'access_token' => env('WABOT_TOKEN_KEYS') ]); - $res_json = $response->json(); - if ($res_json['status'] == "error") { - $message = "WABOT: " . $res_json['message'] . " - " . $res_json['data']; - Log::error($message); - } else { - $message = "WABOT: Success " . $res_json['data']['key']['remoteJid'] . " - " . $res_json['data']['message']['extendedTextMessage']['text']; - Log::info($message); - } + Log::info("WABOT - menang bidaan " . $response); } Invoice::insert($invoice_array); diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 617ef2a1..a70f02c2 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -1382,6 +1382,7 @@ class ReportController extends Controller $total_keuntungan_asal = $transaksi_keuntungan->sum('bayaran_keuntungan'); $beza_keuntungan = $total_keuntungan_asal - $total_rebet; + $jbg_belum_bayar = 0; if ($gadai_true->tempohbayar == $gadai_true->tempoh) { $keuntungan_belum_bayar = 0.00; } else if ($gadai_true->tempohbayar >= 12) { @@ -1407,6 +1408,7 @@ class ReportController extends Controller foreach ($gadai_all as $index90 => $gadai) { if (!$transaksi_keuntungan_all->contains('norujukan', $gadai->norujukan)) { + $jbg_belum_bayar = 0; if ($gadai->tempohbayar == $gadai->tempoh) { $keuntungan_belum_bayar = 0.00; } else if ($gadai->tempohbayar >= 12) { diff --git a/app/Jobs/WhatsappNotisPeringatanKedua.php b/app/Jobs/WhatsappNotisPeringatanKedua.php index 0165b2fe..53e67977 100644 --- a/app/Jobs/WhatsappNotisPeringatanKedua.php +++ b/app/Jobs/WhatsappNotisPeringatanKedua.php @@ -164,7 +164,7 @@ Sekian, terima kasih.'; 'access_token' => env('WABOT_TOKEN_KEYS') ]); - Log::info("WABOT " . $response); + Log::info("WABOT - notis peringatan kedua " . $response); } sleep(2); } diff --git a/resources/views/pembida/senlelbelumbayarbidaan.blade.php b/resources/views/pembida/senlelbelumbayarbidaan.blade.php index 95146b06..a7e1e869 100644 --- a/resources/views/pembida/senlelbelumbayarbidaan.blade.php +++ b/resources/views/pembida/senlelbelumbayarbidaan.blade.php @@ -46,19 +46,19 @@ @forelse($arraysms as $index=> $lel) {{ $loop->iteration }} - {{ $lel['lelong_id']}} + {{ $lel['info']['lelong_id']}} @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['t_lelong'] ); + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['t_lelong'] ); $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp - - {{ $lel['caw_name']}} + + {{ $lel['info']['caw_name']}}
- @if($lel['sts_lelong'] == 3) + @if($lel['info']['sts_lelong'] == 3) @endif diff --git a/resources/views/pembida/statuspembayaran2.blade.php b/resources/views/pembida/statuspembayaran2.blade.php index 64832bd1..6343a8e4 100644 --- a/resources/views/pembida/statuspembayaran2.blade.php +++ b/resources/views/pembida/statuspembayaran2.blade.php @@ -64,6 +64,7 @@ Jumlah Bidaan Status Bayaran Jenis Bayaran + Status Serah