Compare commits
2 Commits
d18c735b63
...
feature/gi
| Author | SHA1 | Date | |
|---|---|---|---|
| 484a288da1 | |||
| 7e1560c11f |
@@ -1,5 +1,7 @@
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
workflow_dispatch:
|
||||
jobs:
|
||||
deploy-job:
|
||||
|
||||
@@ -20,11 +20,8 @@ final class PromosController extends BaseController
|
||||
|
||||
|
||||
$promos = Product::select($this->database->getConnection()->raw("distinct json_extract(promotions, '$.slug') as slug, json_extract(promotions, '$.tag') as tag"))
|
||||
->addSelect('countries.locale')
|
||||
->whereRaw("json_extract(promotions, '$.tag') is not null")
|
||||
->join('countries', 'products.country_id', '=', 'countries.id')
|
||||
->get()
|
||||
->groupBy('locale');
|
||||
->get();
|
||||
|
||||
return $this->render('productList.html.twig', ['products' => $products, 'listType' => 'promos' . $promo, 'promos' => $promos->toArray()]);
|
||||
}
|
||||
|
||||
@@ -7,13 +7,9 @@ use Krzysiej\RyobiCrawler\Twig\AppExtension;
|
||||
use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
|
||||
use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
|
||||
use Symfony\Bundle\TwigBundle\TwigBundle;
|
||||
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
|
||||
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
|
||||
use Symfony\Component\DependencyInjection\Reference;
|
||||
use Symfony\Component\HttpKernel\Kernel as BaseKernel;
|
||||
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
|
||||
use Twig\Extra\Cache\CacheExtension;
|
||||
use Twig\Extra\Cache\CacheRuntime;
|
||||
use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
|
||||
|
||||
class Kernel extends BaseKernel
|
||||
|
||||
@@ -6,17 +6,9 @@
|
||||
{% endif %}
|
||||
|
||||
{% if listType starts with 'promos' %}
|
||||
<ul class="list-group list-group-flush">
|
||||
{% for locale, promoByLocale in promos %}
|
||||
<li class="list-group-item">
|
||||
<h5 class="d-inline-block"><span class="badge bg-info">{{ locale | upper }}</span></h5>
|
||||
{% for promo in promoByLocale %}
|
||||
<a href="{{ path('app_promos', {'promo': promo.slug}) }}"><span
|
||||
class="badge bg-info">PROMO: {{ promo.tag }} [{{ promo.locale | upper }}]</span></a>
|
||||
{% for promo in promos %}
|
||||
<a href="{{ path('app_promos', {'promo': promo.slug}) }}"><span class="badge bg-info">PROMO: {{ promo.tag }}</span></a>
|
||||
{% endfor %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
|
||||
@@ -52,11 +44,11 @@
|
||||
<span class="badge text-bg-warning">out of stock</span>
|
||||
{% endif %}
|
||||
{% if product.isDiscontinued() %}
|
||||
<a href="{{ path('app_discontinued') }}"><span class="badge text-bg-secondary" data-bs-toggle="tooltip"
|
||||
data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span></a>
|
||||
<span class="badge text-bg-secondary" data-bs-toggle="tooltip"
|
||||
data-bs-title="Last update: {{ product.lastSeen }}">is discontinued</span>
|
||||
{% endif %}
|
||||
{% if product.isNew() %}
|
||||
<a href="{{ path('app_new') }}"><span class="badge text-bg-success">is new</span></a>
|
||||
<span class="badge text-bg-success">is new</span>
|
||||
{% endif %}
|
||||
<span class="badge text-bg-light"><a
|
||||
href="{{ path('app_search', {'search': product.subTitle}) }}"
|
||||
|
||||
Reference in New Issue
Block a user