From 0db4bacff4634017b3534b392ca102524bcbba71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20P=C5=82aczek?=
 <krzysztof.placzek@eobuwie.com.pl>
Date: Thu, 21 Nov 2024 10:05:55 +0100
Subject: [PATCH 1/2] Add some bootstrap badged in place of promos count,
 discount percent and previous price.

---
 templates/productList.html.twig | 2 +-
 templates/template.html.twig    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/productList.html.twig b/templates/productList.html.twig
index a0e08d2..b8f05df 100644
--- a/templates/productList.html.twig
+++ b/templates/productList.html.twig
@@ -29,7 +29,7 @@
                 </td>
                 <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
                 <td class="align-middle">{{ product.price.last.price | format_currency('PLN', {}, 'pl') }}</td>
-                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span class="text-decoration-line-through text-warning">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span class="text-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</td>
+                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span class="badge text-bg-warning text-decoration-line-through">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span class="badge text-bg-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</td>
             </tr>
         {% endfor %}
     </table>
diff --git a/templates/template.html.twig b/templates/template.html.twig
index bc05a88..beadfaf 100644
--- a/templates/template.html.twig
+++ b/templates/template.html.twig
@@ -19,7 +19,7 @@
         <div class="collapse navbar-collapse" id="navbarNav">
             <ul class="navbar-nav me-auto mb-2 mb-lg-0">
                 <li class="nav-item">
-                    <a class="nav-link active" aria-current="page" href="{{ path('app_promos') }}">Promos ({{ promosCount() }})</a>
+                    <a class="nav-link active" aria-current="page" href="{{ path('app_promos') }}">Promos <span class="badge text-bg-secondary">{{ promosCount() }}</span></a>
                 </li>
             </ul>
             <form class="d-flex col-lg-6 col-sm-8" role="search" action="{{ path('app_search') }}">
-- 
2.52.0


From a6b108cb74219fbfda972b7a29b000cd83dd9468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20P=C5=82aczek?=
 <krzysztof.placzek@eobuwie.com.pl>
Date: Sat, 23 Nov 2024 11:34:00 +0100
Subject: [PATCH 2/2] Add a badge for stock

---
 composer.json                      |  4 +++-
 composer.lock                      | 14 +++++++-------
 src/Controller/IndexController.php |  5 ++++-
 src/Models/Product.php             |  7 +++++++
 templates/productList.html.twig    | 19 ++++++++++++++-----
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 299ddad..90e860a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "require": {
         "guzzlehttp/guzzle": "^7.0",
-        "symfony/var-dumper": "^7.0",
         "illuminate/database": "11.26.0.0",
         "ext-json": "*",
         "symfony/console": "^7.0",
@@ -18,5 +17,8 @@
         "psr-4": {
             "Krzysiej\\RyobiCrawler\\": "src/"
         }
+    },
+    "require-dev": {
+        "symfony/var-dumper": "^7.1"
     }
 }
diff --git a/composer.lock b/composer.lock
index 184cebc..edcee65 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4eef5feb5e2635d7fb7c69c8ed01a84c",
+    "content-hash": "a6920081bf40809334b8dda2da16752d",
     "packages": [
         {
             "name": "brick/math",
@@ -4123,16 +4123,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.1.5",
+            "version": "v7.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "e20e03889539fd4e4211e14d2179226c513c010d"
+                "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e20e03889539fd4e4211e14d2179226c513c010d",
-                "reference": "e20e03889539fd4e4211e14d2179226c513c010d",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8",
+                "reference": "7bb01a47b1b00428d32b5e7b4d3b2d1aa58d3db8",
                 "shasum": ""
             },
             "require": {
@@ -4186,7 +4186,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.5"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.8"
             },
             "funding": [
                 {
@@ -4202,7 +4202,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-16T10:07:02+00:00"
+            "time": "2024-11-08T15:46:42+00:00"
         },
         {
             "name": "symfony/var-exporter",
diff --git a/src/Controller/IndexController.php b/src/Controller/IndexController.php
index 71a6b45..0203711 100644
--- a/src/Controller/IndexController.php
+++ b/src/Controller/IndexController.php
@@ -11,7 +11,10 @@ final class IndexController extends BaseController
     #[Route('/', name: 'app_home')]
     public function __invoke(): Response
     {
-        $products = Product::with('price')->orderByDesc('starred')->orderByDesc('created_by')->get();
+        $products = Product::with(['currentStock', 'price'])
+            ->orderByDesc('starred')
+            ->orderByDesc('created_by')
+            ->get();
         return $this->render('productList.html.twig', ['products' => $products]);
     }
 }
diff --git a/src/Models/Product.php b/src/Models/Product.php
index 54fd545..4ddb836 100644
--- a/src/Models/Product.php
+++ b/src/Models/Product.php
@@ -44,6 +44,13 @@ class Product extends Model
         return $this->hasMany(Stock::class);
     }
 
+    public function currentStock(): HasOne
+    {
+        return $this->stock()->one()->ofMany()->withDefault(function (Stock $stock) {
+            $stock->stock = 0;
+        });
+    }
+
     public function toggleStarred(): self
     {
         $this->starred = !$this->starred;
diff --git a/templates/productList.html.twig b/templates/productList.html.twig
index b8f05df..fec8a01 100644
--- a/templates/productList.html.twig
+++ b/templates/productList.html.twig
@@ -7,7 +7,6 @@
             <th></th>
             <th></th>
             <th>Name</th>
-            <th class="d-none d-md-table-cell">Code</th>
             <th>Categories</th>
             <th></th>
             <th>Price</th>
@@ -16,10 +15,18 @@
         </thead>
         {% for product in products %}
             <tr>
-                <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none" href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a></td>
+                <td class="align-middle font-weight-bold h3"><a class="text-warning text-decoration-none"
+                                                                href="{{ path('app_star', {'productId': product.id}) }}">{% if product.starred == true %}★{% else %} ☆ {% endif %}</a></td>
                 <td class="align-middle" style="width: 120px;"><img src='{{ product.image }}&width=70' class='border rounded p-1' alt='{{ product.name }}'/></td>
-                <td class="align-middle"><a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a></td>
-                <td class="align-middle d-none d-md-table-cell">{{ product.subTitle }}</td>
+                <td class="align-middle">
+                    <a href='{{ path('app_product', {'productId': product.id}) }}' class="text-decoration-none">{{ product.name }}</a>
+                    {% if product.currentStock.stock > 0 %}
+                        <span class="badge text-bg-light">stock: {{ product.currentStock.stock }}</span>
+                    {% else %}
+                        <span class="badge text-bg-warning">out of stock</span>
+                    {% endif %}
+                    <span class="badge text-bg-light">{{ product.subTitle }}</span>
+                </td>
                 <td class="align-middle">
                     <ul class='nav'>
                         {% for category in product.categories %}
@@ -29,7 +36,9 @@
                 </td>
                 <td class="align-middle"><a href='https://pl.ryobitools.eu/{{ product.url }}'>link</a></td>
                 <td class="align-middle">{{ product.price.last.price | format_currency('PLN', {}, 'pl') }}</td>
-                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span class="badge text-bg-warning text-decoration-line-through">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span class="badge text-bg-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</td>
+                <td class="align-middle">{% if product.price.last.price != product.price.last.productStandardPrice %}<span
+                            class="badge text-bg-warning text-decoration-line-through">{{ product.price.last.productStandardPrice | format_currency('PLN', {}, 'pl') }}</span>&nbsp;<span
+                            class="badge text-bg-success">{{ ((1 - product.price.last.price / product.price.last.productStandardPrice)*100)|number_format(0) }}%</span>{% else %}{% endif %}</td>
             </tr>
         {% endfor %}
     </table>
-- 
2.52.0