Tweak donation banners and some type safety

This commit is contained in:
Alex Cabal 2025-01-06 13:25:02 -06:00
parent c07b4cec1e
commit 0105bfefa4
3 changed files with 5 additions and 4 deletions

View file

@ -63,7 +63,7 @@ if($donationDrive->IsStretchEnabled){
</header>
<? }else{ ?>
<header>
<p>Help us meet our stretch goal of<br/> <?= number_format($donationDrive->TargetDonationCount) ?> new patrons by <?= $deadline ?></p>
<p><? if($timeLeft->days <= 1){ ?><?= $timeString ?> left—<br/>Help us meet our stretch goal of<br/> <?= number_format($donationDrive->TargetDonationCount) ?> new patrons<? }else{ ?>Help us meet our stretch goal of<br/> <?= number_format($donationDrive->TargetDonationCount) ?> new patrons by <?= $deadline ?><? } ?></p>
</header>
<? } ?>
<div class="progress"<? if($donationDrive->IsStretchEnabled){ ?> style="--stretch-starting-position: <?= $stretchStartingPosition ?>%; --stretch-base-counter-position: <?= $stretchStartingPosition - 1 ?>%"<? } ?>>

View file

@ -1,4 +1,5 @@
<?
use function Safe\preg_match;
use function Safe\preg_replace;
$page = HttpInput::Int(GET, 'page') ?? 1;

View file

@ -38,13 +38,13 @@ try{
catch(Exceptions\DuplicateEbookException $ex){
// If the `Ebook` already exists, create the `Project` anyway.
$project->Ebook = Ebook::GetByIdentifier($project->Ebook->Identifier);
if(!$project->Ebook->EbookPlaceholder?->IsInProgress){
if($project->Ebook->EbookPlaceholder !== null && !$project->Ebook->EbookPlaceholder->IsInProgress){
$project->EbookId = $project->Ebook->EbookId;
$_SESSION['is-only-ebook-project-created'] = true;
// Set the placeholder to in progress.
$project->Ebook->EbookPlaceholder?->IsInProgress = true;
$project->Ebook->EbookPlaceholder?->Save();
$project->Ebook->EbookPlaceholder->IsInProgress = true;
$project->Ebook->EbookPlaceholder->Save();
}
else{
// `Ebook` exists and it's not a placeholder, so really fail.