From 0790ae40bafd55f6f4a2c2737a18cae448ee3cf8 Mon Sep 17 00:00:00 2001 From: TheCoreDev Date: Wed, 5 May 2021 22:37:10 +0200 Subject: [PATCH] Recettes : on finalise la fonction d'impression de la recette --- local/modules/Recettes/I18n/fr_FR.php | 4 +- local/modules/Recettes/Loop/ProductsLoop.php | 5 +- .../default/assets/css/Recettes.css | 15 ++++- templates/frontOffice/custom/recette.html | 62 ++++++++++--------- 4 files changed, 50 insertions(+), 36 deletions(-) diff --git a/local/modules/Recettes/I18n/fr_FR.php b/local/modules/Recettes/I18n/fr_FR.php index 37739a64..d3f4932e 100644 --- a/local/modules/Recettes/I18n/fr_FR.php +++ b/local/modules/Recettes/I18n/fr_FR.php @@ -17,5 +17,7 @@ return array( 'Quantity needed' => 'Quantité nécessaire', 'Quantity proposed' => 'Quantité proposée', 'Select' => 'Sélectionner', - 'Add to cart' => 'Ajouter ces produits au panier', + 'Add to cart' => 'Ajouter au panier', + 'Print recipe' => 'Imprimer la recette', + 'Some products may not be in stock' => '* les produits que vous ne pouvez pas cocher ne sont plus en stock', ); diff --git a/local/modules/Recettes/Loop/ProductsLoop.php b/local/modules/Recettes/Loop/ProductsLoop.php index 4d3257aa..db6369bd 100644 --- a/local/modules/Recettes/Loop/ProductsLoop.php +++ b/local/modules/Recettes/Loop/ProductsLoop.php @@ -3,7 +3,6 @@ namespace Recettes\Loop; use Recettes\Model\RecipeProductsQuery; -use Thelia\Action\AttributeAv; use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\LoopResult; use Thelia\Core\Template\Element\LoopResultRow; @@ -12,8 +11,6 @@ use Thelia\Core\Template\Loop\Argument\Argument; use Thelia\Core\Template\Loop\Argument\ArgumentCollection; use Thelia\Model\AttributeAvI18nQuery; use Thelia\Model\AttributeCombinationQuery; -use Thelia\Model\AttributeI18n; -use Thelia\Model\AttributeI18nQuery; use Thelia\Model\ProductI18nQuery; use Thelia\Model\ProductSaleElementsQuery; @@ -40,11 +37,13 @@ class ProductsLoop extends BaseLoop implements PropelSearchLoopInterface $productLabel = ProductI18nQuery::create()->findOneById($pse->getProductId())->getTitle(); $attributeCombination = AttributeCombinationQuery::create()->findOneByProductSaleElementsId($product->getPseId()); $unity = AttributeAvI18nQuery::create()->findOneById($attributeCombination->getAttributeAvId())->getTitle(); + $inStock = $pse->getQuantity(); $loopResultRow = new LoopResultRow($product); $loopResultRow ->set("RECIPE_ID", $product->getRecipeId()) ->set("PSE_ID", $product->getPseId()) + ->set("IN_STOCK", $inStock > 0) ->set("PRODUCT_LABEL", $productLabel) ->set("QUANTITY_NEEDED", $product->getQuantity()) ->set("QUANTITY_PROPOSED", $product->getNbOfProducts()) diff --git a/local/modules/Recettes/templates/frontOffice/default/assets/css/Recettes.css b/local/modules/Recettes/templates/frontOffice/default/assets/css/Recettes.css index 73030cc9..c4ac20ff 100644 --- a/local/modules/Recettes/templates/frontOffice/default/assets/css/Recettes.css +++ b/local/modules/Recettes/templates/frontOffice/default/assets/css/Recettes.css @@ -65,7 +65,7 @@ div.entete span b { white-space: nowrap; } .cellule-large { - width: 40%; + width: 20%; } .cellule-etroite { width: 1%; @@ -80,5 +80,16 @@ div.entete span b { font-weight: bold; } .bouton-imprimer { + margin: 20px 0; text-align: center; -} \ No newline at end of file +} + +@media print { + .footer-block, + header, + .nav-breadcrumb, + .table-ingredients tr:last-of-type, + #tarteaucitronAlertBig { + display: none !important; + } +} diff --git a/templates/frontOffice/custom/recette.html b/templates/frontOffice/custom/recette.html index c385a9d7..3dbb4510 100644 --- a/templates/frontOffice/custom/recette.html +++ b/templates/frontOffice/custom/recette.html @@ -57,28 +57,28 @@

{intl l='Ingredients' d='recettes'}

- - - - + + + + {loop type="recipe_products" name="products-loop" recipe_id=$ID} - - - - + + + + {/loop} - - - - + + + +
{intl l="Ingredient" d="recettes"}{intl l="Quantity needed" d="recettes"}{intl l="Quantity proposed" d="recettes"}{intl l="Select" d="recettes"}{intl l="Ingredient" d="recettes"}{intl l="Quantity needed" d="recettes"}{intl l="Quantity proposed" d="recettes"}{intl l="Select" d="recettes"}
{$PRODUCT_LABEL}{$QUANTITY_NEEDED}{$QUANTITY_PROPOSED} ({$UNITY}){$PRODUCT_LABEL}{$QUANTITY_NEEDED}{$QUANTITY_PROPOSED} ({$UNITY})
-
- -
-
{intl l="Some products may not be in stock" d="recettes"} +
+ +
+

@@ -89,21 +89,19 @@

- - {loop type="recipe_steps" name="steps-loop" recipe_id=$ID} - - - - - {/loop} -
{$STEP}{$DESCRIPTION}
- + + {loop type="recipe_steps" name="steps-loop" recipe_id=$ID} + + + + + {/loop} +
{$STEP}{$DESCRIPTION}
{/loop} -
- -
-
+
+ +
{/if} {/block} @@ -123,5 +121,9 @@ } }); + $(".bouton-imprimer button").click(function () { + window.print(); + }); + -{/block} \ No newline at end of file +{/block}