diff --git a/local/modules/PlanificationLivraison/I18n/fr_FR.php b/local/modules/PlanificationLivraison/I18n/fr_FR.php index dfbc3d02..c538fb27 100644 --- a/local/modules/PlanificationLivraison/I18n/fr_FR.php +++ b/local/modules/PlanificationLivraison/I18n/fr_FR.php @@ -11,11 +11,12 @@ return array( 'Number of days needed for preparation' => 'Nombre de jours nécessaires pour préparation des commandes', 'Number of days' => 'Nombre de jours', 'Number of days - help' => 'A partir d\'aujourd\'hui 0h00', - 'Period to consider' => 'Commandes à livrer ou déposer sur la période', + 'Period to consider' => 'Prendre en compte les commandes passées sur la période', 'Red alert delay' => 'Nombre de jours du seuil CRITIQUE', 'Orange alert delay' => 'Nombre de jours du seuil URGENT', 'Orders for the next x days' => 'Produits à fournir pour la période du %start_date au %end_date inclus', 'Packaging' => 'Conditionnement', + 'Print the list' => 'Imprimer ce listing', 'Product' => 'Produit', 'Products to buy' => 'Liste des prochains achats à effectuer', 'Products to buy - short' => 'Liste des prochains achats', diff --git a/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/custom.css b/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/custom.css index edd72966..dc9926fd 100644 --- a/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/custom.css +++ b/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/custom.css @@ -9,10 +9,27 @@ h4 > b { color: red; } -i.icone-imprimante { - font-size: 26px; -} - #print-products-list { font-size: 18px; -} \ No newline at end of file +} + +.lancer-impression { + font-size: 16px; + font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; + font-weight: 600; + margin: 0 0 0 20px !important; + cursor: pointer; + background-color: red; + padding: 5px; + color: white; +} +.lancer-impression::before { + position: relative; + font-family: 'Glyphicons Halflings'; + content: "\e045"; + font-style: normal; + font-weight: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + padding-right: 8px; +} diff --git a/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/print.css b/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/print.css index 5fae2b7c..b709ae3e 100644 --- a/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/print.css +++ b/local/modules/PlanificationLivraison/templates/backOffice/default/assets/css/print.css @@ -3,9 +3,6 @@ #entete-recherche { display: none; } - #titre { - display: none; - } footer { display: none; } diff --git a/local/modules/PlanificationLivraison/templates/backOffice/default/liste-achats.html b/local/modules/PlanificationLivraison/templates/backOffice/default/liste-achats.html index aa556ec2..af3549d9 100644 --- a/local/modules/PlanificationLivraison/templates/backOffice/default/liste-achats.html +++ b/local/modules/PlanificationLivraison/templates/backOffice/default/liste-achats.html @@ -4,7 +4,7 @@ {$admin_current_location = 'module'} {/block} -{block name="page-title"}{intl l='Products to buy' d='planificationlivraison'}{/block} +{block name="page-title"}{intl l='Products to buy' d='planificationlivraison'}{/block} {block name="check-resource"}admin.module{/block} {block name="check-access"}view{/block} @@ -22,44 +22,36 @@

{intl l="Period to consider" d="planificationlivraison"}

-
+
+ {form name="planiflivraison.product.list"} +
+ {form_hidden_fields form=$form} -
- {form name="planiflivraison.product.list"} - - {form_hidden_fields form=$form} +
+
+
+ {form_field form=$form field="date-picker-start"} + {intl l="From" d="planificationlivraison"} + + {form_error form=$form field="date-picker-start"}{$message}{/form_error} + {/form_field} -
-
-
- {form_field form=$form field="date-picker-start"} - {intl l="From" d="planificationlivraison"} - - {form_error form=$form field="date-picker-start"}{$message}{/form_error} - {/form_field} - - {form_field form=$form field="date-picker-end"} - {intl l="To" d="planificationlivraison"} - - {form_error form=$form field="date-picker-end"}{$message}{/form_error} - {/form_field} + {form_field form=$form field="date-picker-end"} + {intl l="To" d="planificationlivraison"} + + {form_error form=$form field="date-picker-end"}{$message}{/form_error} + {/form_field} +
+ +

{intl l="Print the list" d="planificationlivraison"}

-
-
- -
-
- -

{intl l="Print the list" d="planificationlivraison"}

-
-
- - {/form} + + {/form} +
-

{intl l="Orders for the next x days" d="planificationlivraison" days={$previousDaysNumber} start_date={$startDate} end_date={$endDate}}

@@ -123,6 +115,10 @@ // $('#date-picker-end').datepicker('update', endDate); }); + $(".lancer-impression").click(function () { + window.print(); + }); + {/block}