Merge branch 'aide_a_la_commande' into dev_cooperatic

orders/static/css/oders_helper_style.css

@@ -14,13 +14,13 @@
 .pill {
     border-radius: 30px;
     min-width: 200px;
-    min-height: 35px;
+    min-height: 40px;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    padding: 8px 15px 8px 15px;
-    margin: 0 10px 5px 0;
+    padding: 5px 30px 5px 30px;
+    margin: 0 10px 5px 10px;
 }
 
 .disabled {
@@ -84,6 +84,14 @@
 
 /* -- Order data */
 #order_data_container {
+    font-size: 1.8rem;
+}
+
+#order_data_separator {
+    margin: 0 10px 0 10px;
+}
+
+#order_forms_container {
     margin-top: 30px;
     display: flex;  
     justify-content: space-evenly;
@@ -157,14 +165,7 @@
 /* -- Footer */
 
 #main_content_footer {
-    margin: 10px 0 35px 0;
-}
-
-#footer_orders_recap {
-    width: 100%;
-    display: flex;
-    justify-content: space-evenly;
-    margin-bottom: 15px;
+    margin: 20px 0 40px 0;
 }
 
 #footer_actions {
@@ -173,28 +174,26 @@
     justify-content: space-between;
 }
 
-#suppliers_total_values {
-    display: flex;
-}
-
-.supplier_total_item {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
 /* -- Suppliers list */
 #suppliers_container {
     display: flex;
     justify-content: center;
     align-items: center;
     flex-wrap: wrap; 
-    margin: 20px 0 20px 0;
+    margin: 30px 0 20px 0;
 }
 
 .supplier_pill {
-    background-color: #e7e9ed;
+    background-color: #e7e9edc5;
+    border: 1px solid black;
+}
+
+.pill_supplier_name {
+    font-weight: bold;
+}
+
+.supplier_total_value_container {
+    font-size: 1.5rem;
 }
 
 .remove_supplier_icon {

products/models.py

@@ -468,7 +468,7 @@ class CagetteProducts(models.Model):
         try:
             today = datetime.date.today().strftime("%Y-%m-%d")
 
-            if len(supplier_ids) > 0:
+            if supplier_ids is not None and len(supplier_ids) > 0:
                 # Get products/supplier relation
                 f = ["product_tmpl_id", 'date_start', 'date_end', 'package_qty', 'price', 'name']
                 c = [['name', 'in', [ int(x) for x in supplier_ids]]]
@@ -503,8 +503,8 @@ class CagetteProducts(models.Model):
 
             sales_average_params = {
                 'ids': ptids, 
-                'from': '2019-04-10', 
-                'to': '2019-08-10',
+                # 'from': '2019-04-10', 
+                # 'to': '2019-08-10',
             }
             sales = CagetteProducts.get_template_products_sales_average(sales_average_params)
 
@@ -515,7 +515,7 @@ class CagetteProducts(models.Model):
             
             # Add supplier data to product data
             for i, fp in enumerate(filtered_products_t):
-                if len(supplier_ids) > 0:
+                if supplier_ids is not None and len(supplier_ids) > 0:
                     psi_item = next(item for item in psi if item["product_tmpl_id"] is not False and item["product_tmpl_id"][0] == fp["id"])
                     filtered_products_t[i]['suppliersinfo'] = [{
                         'supplier_id': int(psi_item["name"][0]),

templates/orders/helper.html

@@ -41,10 +41,14 @@
     
         <div class="header txtcenter">
             <h1>Aide à la commande</h1>
-            <i>Commande : <span class="order_name_container"></span></i>
+            <p id="order_data_container">
+                Commande : <span class="order_name_container"></span> 
+                <span id="order_data_separator"> | </span>
+                Total HT : <span id="order_total_value">0</span>€
+            </p>
         </div>
     
-        <div class="txtcenter" id="order_data_container">
+        <div class="txtcenter" id="order_forms_container">
             <form action="javascript:;" id="coverage_form">
                 <input type="number" name="coverage_days" id="coverage_days_input" placeholder="Nb jours de couverture" min="1">
                 <button type="submit" class='btn--primary'>Calculer les besoins</button>
@@ -55,7 +59,7 @@
             </form>
         </div>
     
-        <div class="txtcenter" id="suppliers_container"></div>
+        <div id="suppliers_container"></div>
     
         <div class="main" style="display:none;">
             <div class="table_area">
@@ -64,14 +68,6 @@
         </div>
 
         <div id="main_content_footer" style="display:none;">
-            <div id="footer_orders_recap">
-                <div id="suppliers_total_values">
-                    <h4>Total /fournisseur : </h4><div id="suppliers_total_values_container"></div>
-                </div>
-                <div id="order_total_value_container">
-                    <h4>Total : <span id="order_total_value"></span></h4>
-                </div>
-            </div>
             <div id="footer_actions">
                 <div class="add_product_container">
                     <div id="product_form_container">
@@ -121,6 +117,9 @@
                     <span class="pill_supplier_name"></span>
                     <i class="fas fa-times remove_supplier_icon"></i>
                 </div>
+                <div class="supplier_total_value_container">
+                    Total: <span class="supplier_total_value">0</span>€
+                </div>
             </div>
         </div>