Skip to content

Fix(Sales): Resolve "characters not found" issue #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fix(Sales): Resolve "characters not found" issue #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e8af525
This will resolve characters not found on sales pages
SpeedyD Dec 9, 2022
d8047f3
refactor: fix blade formatting
SpeedyD Dec 9, 2022
19c1341
Merge branch 'develop' into fix/missing-character-sale
SpeedyD Jun 12, 2023
34dc3b0
Ternary operators, someone?
SpeedyD Jun 12, 2023
5478b14
Merge branch 'develop' of https://github.com/corowne/lorekeeper into …
SpeedyD Jun 15, 2023
ab5c210
Merge branch 'develop' of https://github.com/corowne/lorekeeper into …
SpeedyD Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions resources/views/admin/sales/_character_select_entry.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@

@if ($sales->characters->count() > 1)
<div class="form-group text-right">
{!! Form::checkbox('character_is_open[' . $character->character->slug . ']', 1, $character->is_open, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
{!! Form::checkbox('character_is_open[' . ($$character->character->slug ?? 'character-not-found') . ']', 1, $character->is_open, ['class' => 'form-check-input', 'data-toggle' => 'toggle']) !!}
{!! Form::label('character_is_open', 'Is Open', ['class' => 'form-check-label ml-3']) !!} {!! add_help('Whether or not this particular character is open or available. If the sale post itself is closed, all character sales attached will also be displayed as closed.') !!}
</div>
@else
{!! Form::hidden('character_is_open[' . $character->character->slug . ']', 1) !!}
{!! Form::hidden('character_is_open[' . ($character->character->slug ?? 'character-not-found') . ']', 1) !!}
@endif

{!! Form::hidden('new_entry[]', 0) !!}
Expand Down
199 changes: 109 additions & 90 deletions resources/views/sales/_character.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,104 +1,123 @@
<div class="card h-100">
<div class="m-1">
<div class="row">
<div class="col-md-6 text-center align-self-center">
<a href="{{ $character->character->url }}"><img src="{{ $loop->count == 1 ? $character->image->imageUrl : $character->image->thumbnailUrl }}" class="mw-100 img-thumbnail" alt="{{ $character->fullName }}" /></a>
</div>
<div class="col-md text-center">
<div class="mt-2">
<h5>
{{ $character->displayType }}: <a href="{{ $character->character->url }}">{!! $character->character->slug !!}</a> ・ <span
class="{{ $character->is_open && $character->sales->is_open ? 'text-success' : '' }}">[{{ $character->is_open && $character->sales->is_open ? 'Open' : 'Closed' }}]</span><br />
<small>
{!! $character->image->species->displayName !!} ・ {!! $character->image->rarity->displayName !!}<br />
</small>
</h5>
@if ($character->character)
<div class="col-md-6 text-center align-self-center">
<a href="{{ $character->character->url }}"><img src="{{ $loop->count == 1 ? $character->image->imageUrl : $character->image->thumbnailUrl }}" class="mw-100 img-thumbnail" alt="{{ $character->fullName }}" /></a>
</div>
<div class="col-md text-center">
<div class="mt-2">
<h5>
{{ $character->displayType }}: <a href="{{ $character->character->url }}">{!! $character->character->slug !!}</a> ・ <span
class="{{ $character->is_open && $character->sales->is_open ? 'text-success' : '' }}">[{{ $character->is_open && $character->sales->is_open ? 'Open' : 'Closed' }}]</span><br />
<small>
{!! $character->image->species->displayName !!} ・ {!! $character->image->rarity->displayName !!}<br />
</small>
</h5>

@if ($loop->count == 1)
<div class="mb-2">
@if (Config::get('lorekeeper.extensions.traits_by_category'))
<div>
@php
$traitgroup = $character->image
->features()
->get()
->groupBy('feature_category_id');
@endphp
@if ($character->image->features()->count())
@foreach ($traitgroup as $key => $group)
<div>
@if ($group->count() > 1)
<div>
@if ($loop->count == 1)
<div class="mb-2">
@if (Config::get('lorekeeper.extensions.traits_by_category'))
<div>
@php
$traitgroup = $character->image
->features()
->get()
->groupBy('feature_category_id');
@endphp
@if ($character->image->features()->count())
@foreach ($traitgroup as $key => $group)
<div>
@if ($group->count() > 1)
<div>
<strong>{!! $key ? $group->first()->feature->category->displayName : 'Miscellaneous' !!}:</strong>
@foreach ($group as $feature)
{!! $feature->feature->displayName !!}@if ($feature->data)
({{ $feature->data }})
@endif{{ !$loop->last ? ', ' : '' }}
@endforeach
</div>
@else
<strong>{!! $key ? $group->first()->feature->category->displayName : 'Miscellaneous' !!}:</strong>
@foreach ($group as $feature)
{!! $feature->feature->displayName !!}@if ($feature->data)
({{ $feature->data }})
@endif{{ !$loop->last ? ', ' : '' }}
@endforeach
</div>
@else
<strong>{!! $key ? $group->first()->feature->category->displayName : 'Miscellaneous' !!}:</strong>
{!! $group->first()->feature->displayName !!}
@if ($group->first()->data)
({{ $group->first()->data }})
@endif
@endif
</div>
@endforeach
@else
<div>No traits listed.</div>
@endif
</div>
@else
<div>
<?php $features = $character->image
->features()
->with('feature.category')
->get(); ?>
@if ($features->count())
@foreach ($features as $feature)
<div>
@if ($feature->feature->feature_category_id)
<strong>{!! $feature->feature->category->displayName !!}:</strong>
@endif {!! $feature->feature->displayName !!} @if ($feature->data)
({{ $feature->data }})
{!! $group->first()->feature->displayName !!}
@if ($group->first()->data)
({{ $group->first()->data }})
@endif
@endif
</div>
@endforeach
@else
<div>No traits listed.</div>
@endif
</div>
</div>
@endforeach
@else
<div>No traits listed.</div>
@endif
</div>
@else
<div>
<?php $features = $character->image
->features()
->with('feature.category')
->get(); ?>
@if ($features->count())
@foreach ($features as $feature)
<div>
@if ($feature->feature->feature_category_id)
<strong>{!! $feature->feature->category->displayName !!}:</strong>
@endif {!! $feature->feature->displayName !!} @if ($feature->data)
({{ $feature->data }})
@endif
</div>
@endforeach
@else
<div>No traits listed.</div>
@endif
</div>
@endif
</div>
@endif

<h6>
<div class="mb-2">
Design:
@foreach ($character->image->designers as $designer)
{!! $designer->displayLink() !!}{{ !$loop->last ? ', ' : '' }}
@endforeach ・
Art:
@foreach ($character->image->artists as $artist)
{!! $artist->displayLink() !!}{{ !$loop->last ? ', ' : '' }}
@endforeach
</div>

{!! $character->price !!}
{!! isset($character->link) || isset($character->data['end_point']) ? '<br/>' : '' !!}
@if (isset($character->data['end_point']))
{{ $character->data['end_point'] }}
@endif
{{ isset($character->link) && (!isset($character->sales->comments_open_at) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()) && isset($character->data['end_point']) ? ' ・ ' : '' }}
@if (isset($character->link) && (!isset($character->sales->comments_open_at) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()))
<a href="{{ $character->link }}">{{ $character->typeLink }}</a>
@endif
</div>
@endif
</h6>

<h6>
<div class="mb-2">
Design:
@foreach ($character->image->designers as $designer)
{!! $designer->displayLink() !!}{{ !$loop->last ? ', ' : '' }}
@endforeach ・
Art:
@foreach ($character->image->artists as $artist)
{!! $artist->displayLink() !!}{{ !$loop->last ? ', ' : '' }}
@endforeach
</div>
<p>{!! $character->description !!}</p>
</div>
</div>
@else
<div class="col-md-6 text-center align-self-center">
<div class="text-danger character-info" data-id="0">Character not found.</div>
</div>
<div class="col-md text-center">
<div class="mt-2">
<h5>
Character not found.
</h5>

{!! $character->price !!}
{!! isset($character->link) || isset($character->data['end_point']) ? '<br/>' : '' !!}
@if (isset($character->data['end_point']))
{{ $character->data['end_point'] }}
@endif
{{ isset($character->link) && (!isset($character->sales->comments_open_at) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()) && isset($character->data['end_point']) ? ' ・ ' : '' }}
@if (isset($character->link) && (!isset($character->sales->comments_open_at) || (Auth::check() && Auth::user()->hasPower('edit_pages')) || $character->sales->comments_open_at < Carbon\Carbon::now()))
<a href="{{ $character->link }}">{{ $character->typeLink }}</a>
@endif
</h6>
<h6>
If you see this text, please contact an administrator.
</h6>

<p>{!! $character->description !!}</p>
<p>This should only occur if a character was deleted. This entry was likely left in error, or is currently in the process of being removed.</p>
</div>
</div>
</div>
@endif
</div>
</div>
</div>