Merge branch 'Purchase_History_Table_Updated' into 'master'

Purchase History Table Updated

See merge request !30

templates/Admin/Forecasting.html

@@ -38,7 +38,7 @@
     {{form.as_table}}
 
  </table>
-<input type="submit" value="FORECAST" class="btn btn--radius-2 btn" style="background: #747578; border: none; color: white;"/>
+<input type="submit" value="FORECAST" class="btn btn--radius-2 btn" style="background: #02111f; border: none; color: white;"/>
 
 
  <div   role="alert">

templates/Admin/HighestDemand.html

@@ -38,7 +38,7 @@
     {{form.as_table}}
 
  </table>
-<input type="submit" value="FORECAST" class="btn btn--radius-2 btn-primary"/>
+<input type="submit" style="background: #02111f; border: none; color: white;" value="FORECAST" class="btn btn--radius-2 btn-primary"/>
 
 
  <div   role="alert">
@@ -58,7 +58,8 @@
 
             </div>
         </div>
-    </div><div class="alert alert-primary" style="background: #747578; border: none; color: white;" role="alert"  > © SMART SERVICE STATION 2022 </div>
+    </div>
 </div>
 
+<div class="alert alert-primary fixed-bottom mb-0 text-center" style="background: #747578; border: none; color: white;" role="alert"  > © SERVPORT 2022   </div>
 {% endblock content %}

templates/Admin/PurchaseHistory.html

@@ -24,7 +24,7 @@
 {% endif %}
 
             <div class="card-heading">
-                <h2 class="title" style="color:#02111f"> PURCHASE HISTORY  </h2>
+                <h2 class="title"> PURCHASE HISTORY  </h2>
             </div>
 
 
@@ -35,14 +35,16 @@
 
 
           <div class="container" style="overflow-x:auto;">
-             <center><b>CALTEX Delo Gold Ultra Engine Oil </b></center>
+              <b><center> PRODUCT : CALTEX DELO GOLD ULTRA </center></b>
                             <table class="table table-striped">
-
                                 <thead>
                                     <tr>
-                                        <th> 	  Month   </th>
-                                         <th> 	  CALTEX Delo Gold Ultra Qty   </th>
-                                            <th> 	   CALTEX Delo Gold Ultra  Price   </th>
+                                        <th style="text-align: center; vertical-align: middle;"> 	  Month   </th>
+                                         <th style="text-align: center; vertical-align: middle;"> 	  CALTEX Delo Gold Ultra   </th>
+                                            <th style="text-align: center; vertical-align: middle;"> 	    Price   </th>
+                                                  <th style="text-align: center; vertical-align: middle;"> 	  Substitude Product Price  </th>
+                                            <th style="text-align: center; vertical-align: middle;"> 	    Production cost per unit   </th>
+
 
                                     </tr>
                                 </thead>
@@ -50,11 +52,12 @@
                                     {% if d %}
                                     {% for i in d %}
                                     <tr>
-                                         <td>{{i.Month}}</td>
-
-                                        <td>{{i.CALTEX_Delo_Gold_Ultra}}</td>
-                                        <td>{{i.Price1}}</td>
+                                         <td style="text-align: center; vertical-align: middle;">{{i.Month}}</td>
 
+                                        <td style="text-align: center; vertical-align: middle;">{{i.CALTEX_Delo_Gold_Ultra}}</td>
+                                        <td style="text-align: center; vertical-align: middle;">{{i.Price1}}</td>
+                                        <td style="text-align: center; vertical-align: middle;">{{i.Substitude_Product_Price1}}</td>
+                                        <td style="text-align: center; vertical-align: middle;">{{i.Production_cost_per_unit1}}</td>
 
 
                                     </tr>
@@ -88,7 +91,7 @@
 
             <div class="card-body">
 
-  <input name="b_print" type="button" class="btn btn-primary btn-print" style="background:#02111f" onClick="printdiv('div_print');" value=" Print ">
+  <input name="b_print" style="background: #02111f; border:none;" type="button" class="btn btn-primary btn-print" onClick="printdiv('div_print');" value=" Print ">
  </div>
 
           <div class="alert alert-primary fixed-bottom mb-0 text-center" style="background: #747578; border: none; color: white;" role="alert"  > © SERVPORT 2022   </div>