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

Update changes from server

Browse Source
This commit is contained in:
Amir
2023-05-25 12:05:19 +08:00
parent 44b861e67d
commit 996a3f6009
5 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+4 -13
View File
@@ -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);
app/Http/Controllers/ReportController.php
+2
View File
@@ -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) {
app/Jobs/WhatsappNotisPeringatanKedua.php
+1 -1
View File
@@ -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);
}
resources/views/pembida/senlelbelumbayarbidaan.blade.php
+5 -5
View File
@@ -46,19 +46,19 @@
@forelse($arraysms as $index=> $lel)
<tr>
<td>{{ $loop->iteration }}</td>
<td>{{ $lel['lelong_id']}}</td>
<td>{{ $lel['info']['lelong_id']}}</td>
<td>@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</td>
<td class="text-left">
<a class="btn m-1 btn-info" href=" {{ route('pembida.belumbayarbidaan', ['lelong_id'=>$lel['lelong_id'], 'kodcaw'=>$lel['kodcaw']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $lel['caw_name']}}
<a class="btn m-1 btn-info" href=" {{ route('pembida.belumbayarbidaan', ['lelong_id'=>$lel['info']['lelong_id'], 'kodcaw'=>$lel['info']['kodcaw']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
<span class="m-2">{{ $lel['info']['caw_name']}}
</span><br>
</td>
<td>
@if($lel['sts_lelong'] == 3)
@if($lel['info']['sts_lelong'] == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@endif
</td>
resources/views/pembida/statuspembayaran2.blade.php
+1
View File
@@ -64,6 +64,7 @@
<th class="text-right" style="min-width: 125px;">Jumlah Bidaan</th>
<th class="text-center">Status Bayaran</th>
<th class="text-center">Jenis Bayaran</th>
<th class="text-center">Status Serah</th>
</tr>
</thead>
<tbody>