nitrobon
/
pipicar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nim_style 3

pull/15/head
nimtaurel 2025-05-19 18:50:20 +05:00
parent 8d0f8f2147
commit 3000011817
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/main/Components/Main.php
View File

@ -31,21 +31,21 @@ class Main extends Component
'ended_at' => Carbon::now()->addDays(3)->toDateString(), 'ended_at' => Carbon::now()->addDays(3)->toDateString(),
]); ]);
$response = (new \App\Http\Controllers\MobileApiController)->getAvailableMarksList($request); // $response = (new \App\Http\Controllers\MobileApiController)->getAvailableMarksList($request);
$this->params['cars'] = collect($response->getData(true))->filter(function ($item) {
return !empty($item['tariffs']);
})->values();
// $response = Http::get('https://cvm10.a7.kz/api/mobile/getAvailableMarksList', [
// 'started_at' => $started_at ?? Carbon::now()->toDateString(),
// 'ended_at' => $ended_at ?? Carbon::now()->addDays(3)->toDateString(),
// 'class' => $class_filters ?? null,
// 'bodywork' => $bodywork_filters ?? null,
// ]);
// //
// $this->params['cars'] = collect($response->json())->filter(function ($item) { // $this->params['cars'] = collect($response->getData(true))->filter(function ($item) {
// return !empty($item['tariffs']); // return !empty($item['tariffs']);
// })->values(); // })->values();
$response = Http::get('https://cvm10.a7.kz/api/mobile/getAvailableMarksList', [
'started_at' => $started_at ?? Carbon::now()->toDateString(),
'ended_at' => $ended_at ?? Carbon::now()->addDays(3)->toDateString(),
'class' => $class_filters ?? null,
'bodywork' => $bodywork_filters ?? null,
]);
$this->params['cars'] = collect($response->json())->filter(function ($item) {
return !empty($item['tariffs']);
})->values();
} }
} }

10
modules/main/views/main.blade.php
View File

@ -132,7 +132,7 @@
$tariffWithMin1 = collect($car['tariffs'])->firstWhere('min', 1); $tariffWithMin1 = collect($car['tariffs'])->firstWhere('min', 1);
$tariffWithMin3 = collect($car['tariffs'])->firstWhere('min', 3); $tariffWithMin3 = collect($car['tariffs'])->firstWhere('min', 3);
$tariffWithMin6 = collect($car['tariffs'])->firstWhere('min', 6); $tariffWithMin6 = collect($car['tariffs'])->firstWhere('min', 6);
$tariffWithMin15 = collect($car['tariffs'])->firstWhere('min', 15); $tariffWithMin16 = collect($car['tariffs'])->firstWhere('min', 16);
@endphp @endphp
<p class="m-0"> <p class="m-0">
@if($tariffWithMin1) @if($tariffWithMin1)
@ -208,7 +208,7 @@
<li><b>1-2 дня:</b><span id="tariffWithMin1"></span></li> <li><b>1-2 дня:</b><span id="tariffWithMin1"></span></li>
<li><b>3-5 дней:</b><span id="tariffWithMin3"></span></li> <li><b>3-5 дней:</b><span id="tariffWithMin3"></span></li>
<li><b>6-15 дней:</b><span id="tariffWithMin6"></span></li> <li><b>6-15 дней:</b><span id="tariffWithMin6"></span></li>
<li><b>16-30 дней:</b><span id="tariffWithMin15"></span></li> <li><b>16-30 дней:</b><span id="tariffWithMin16"></span></li>
<li><b>30+ дней:</b><span id="tariffWithMin30"></span></li> <li><b>30+ дней:</b><span id="tariffWithMin30"></span></li>
</ul> </ul>
<p>@lang('Расчет итоговой суммы к оплате рассчитывается (кол-во дней * базовую ставку)')</p> <p>@lang('Расчет итоговой суммы к оплате рассчитывается (кол-во дней * базовую ставку)')</p>
@ -360,13 +360,13 @@
const tariff1 = car.tariffs.find(t => t.min === 1)?.price ?? 0; const tariff1 = car.tariffs.find(t => t.min === 1)?.price ?? 0;
const tariff3 = car.tariffs.find(t => t.min === 3)?.price ?? 0; const tariff3 = car.tariffs.find(t => t.min === 3)?.price ?? 0;
const tariff6 = car.tariffs.find(t => t.min === 6)?.price ?? 0; const tariff6 = car.tariffs.find(t => t.min === 6)?.price ?? 0;
const tariff15 = car.tariffs.find(t => t.min === 15)?.price ?? 0; const tariff16 = car.tariffs.find(t => t.min === 16)?.price ?? 0;
document.getElementById('tariffWithMin1').innerHTML = `&nbsp;${tariff1} ₸`; document.getElementById('tariffWithMin1').innerHTML = `&nbsp;${tariff1} ₸`;
document.getElementById('tariffWithMin3').innerHTML = `&nbsp;${tariff3} ₸`; document.getElementById('tariffWithMin3').innerHTML = `&nbsp;${tariff3} ₸`;
document.getElementById('tariffWithMin6').innerHTML = `&nbsp;${tariff6} ₸`; document.getElementById('tariffWithMin6').innerHTML = `&nbsp;${tariff6} ₸`;
document.getElementById('tariffWithMin15').innerHTML = `&nbsp;${tariff15} ₸`; document.getElementById('tariffWithMin16').innerHTML = `&nbsp;${tariff16} ₸`;
document.getElementById('tariffWithMin30').innerHTML = `&nbsp;${(tariff1 * 0.4).toFixed(0)} ₸`; document.getElementById('tariffWithMin30').innerHTML = `&nbsp;${(tariff1 * 0.6).toFixed(0)} ₸`;
updateReturnDate(); updateReturnDate();
}); });