Invoice pdf fixes (#1666)

* Fixed image on pdf's * Ok i will sneak it in here * Fixed price alignment * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Changed the order back pice, quantity * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
bornhack · Sep 28, 2024 · e8445bf · e8445bf
1 parent 3737f49
commit e8445bf
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -206,3 +206,4 @@ You can also specify details like:
 * Thomas Steen Rasmusssen https://github.com/tykling
 * Víðir Valberg Guðmundsson https://github.com/valberg
 * Ximin Luo https://github.com/infinity0
+* zarya https://github.com/zarya
diff --git a/src/shop/templates/pdf/creditnote.html b/src/shop/templates/pdf/creditnote.html
@@ -34,7 +34,7 @@
     display: block;
     height: 150px;
     background: no-repeat top center url('{% static 'img/bornhack-2024/logo/bornhack-2024-logo-s.png' %}');
-    background-size: 100% 100%;
+    background-size: 571px 150px;
   }
 
   .footer {
@@ -57,6 +57,10 @@
         /*display: block;*/
     text-align: center;
   }
+
+  .alignRight {
+    text-align: right;
+  }
 </style>
 
 <header>
@@ -85,13 +89,13 @@ <h2>CREDITNOTE</h2>
       <td>
         <b>Product</b>
       </td>
-      <td align="right">
-        <b>Price</b>
-      </td>
       <td>
         <b>Quantity</b>
       </td>
-      <td align="right">
+      <td align="right" class="alignRight">
+        <b>Price</b>
+      </td>
+      <td align="right" class="alignRight">
         <b>Total</b>
       </td>
     </tr>
@@ -104,13 +108,13 @@ <h2>CREDITNOTE</h2>
           <td>
             {{ rpr.opr.product.name }}
           </td>
-          <td align="right">
-            {{ rpr.opr.product.price|currency }}
-          </td>
           <td>
             {{ rpr.quantity }}
           </td>
-          <td align="right">
+          <td align="right" class="alignRight">
+            {{ rpr.opr.product.price|currency }}
+          </td>
+          <td align="right" class="alignRight">
             {{ rpr.total|currency }}
           </td>
         </tr>
@@ -121,37 +125,37 @@ <h2>CREDITNOTE</h2>
         <td>
           {{ creditnote.text }}
         </td>
-        <td align="right">
-          {{ creditnote.amount|currency }}
-        </td>
         <td>
           1
         </td>
-        <td align="right">
+        <td align="right" class="alignRight">
+          {{ creditnote.amount|currency }}
+        </td>
+        <td align="right" class="alignRight">
           {{ creditnote.amount|currency }}
         </td>
       </tr>
     {% endif %}
     <tr><td style="height: 1px; line-height: 1px; border-top: 1pt solid black;" colspan="4">&nbsp;</td></tr>
 
     <tr>
-      <td align="right" colspan="3">
+      <td align="right" colspan="3" class="alignRight">
         {% if creditnote.danish_vat %}
           <strong>Danish VAT (25%)</strong>
         {% else %}
           <strong>No VAT</strong>
         {% endif %}
       </td>
-      <td align="right">
+      <td align="right" class="alignRight">
         {{ creditnote.vat|currency }}
       </td>
     </tr>
 
     <tr>
-      <td align="right" colspan="3">
+      <td align="right" colspan="3" class="alignRight">
         <strong>Total</strong>
       </td>
-      <td align="right">
+      <td align="right" class="alignRight">
         {{ creditnote.amount|currency }}
       </td>
     </tr>

diff --git a/src/shop/templates/pdf/custominvoice.html b/src/shop/templates/pdf/custominvoice.html
@@ -34,7 +34,7 @@
     display: block;
     height: 150px;
     background: no-repeat top center url('{% static 'img/bornhack-2024/logo/bornhack-2024-logo-s.png' %}');
-    background-size: 100% 100%;
+    background-size: 571px 150px;
   }
 
   .footer {
@@ -57,6 +57,10 @@
         /*display: block;*/
     text-align: center;
   }
+
+  .alignRight {
+    text-align: right;
+  }
 </style>
 
 <header>
@@ -97,28 +101,28 @@ <h2>INVOICE</h2>
           <td>
             {{ invoice.customorder.text|linebreaks }}
           </td>
-          <td align="right">
+          <td align="right" class="alignRight">
             {{ invoice.customorder.amount|currency }}
           </td>
         </tr>
         <tr>
-          <td align="right">
+          <td align="right" class="alignRight">
             {% if invoice.customorder.danish_vat %}
               <strong>Included Danish VAT (25%)</strong>
             {% else %}
               <strong>No VAT</strong>
             {% endif %}
           </td>
-          <td align="right">
+          <td align="right" class="alignRight">
             {{ invoice.customorder.vat|currency }}
           </td>
         </tr>
 
         <tr>
-          <td align="right">
+          <td align="right" class="alignRight">
             <strong>Total</strong>
           </td>
-          <td align="right">
+          <td align="right" class="alignRight">
             {{ invoice.customorder.amount|currency }}
           </td>
         </tr>

diff --git a/src/shop/templates/pdf/invoice.html b/src/shop/templates/pdf/invoice.html
@@ -35,7 +35,7 @@
     display: block;
     height: 150px;
     background: no-repeat top center url('{% static 'img/bornhack-2024/logo/bornhack-2024-logo-s.png' %}');
-    background-size: 100% 100%;
+    background-size: 571px 150px;
   }
 
   .footer {
@@ -58,6 +58,10 @@
         /*display: block;*/
     text-align: center;
   }
+
+  .alignRight {
+    text-align: right;
+  }
 </style>
 
 <header>
@@ -91,13 +95,13 @@ <h2>INVOICE</h2>
       <td>
         <b>Name</b>
       </td>
-      <td align="right">
-        <b>Price</b>
-      </td>
       <td>
         <b>Quantity</b>
       </td>
-      <td align="right">
+      <td align="right" class="alignRight">
+        <b>Price</b>
+      </td>
+      <td align="right" class="alignRight">
         <b>Total</b>
       </td>
     </tr>
@@ -110,13 +114,13 @@ <h2>INVOICE</h2>
         <td>
           {{ order_product.product.name }}
         </td>
-        <td align="right">
-          {{ order_product.product.price|currency }}
-        </td>
         <td>
           {{ order_product.quantity }}
         </td>
-        <td align="right">
+        <td align="right" class="alignRight">
+          {{ order_product.product.price|currency }}
+        </td>
+        <td align="right" class="alignRight">
           {{ order_product.total|currency }}
         </td>
       </tr>
@@ -130,7 +134,7 @@ <h2>INVOICE</h2>
       <td>
         <strong>Included Danish VAT (25%)</strong>
       </td>
-      <td align="right">
+      <td align="right" class="alignRight">
         {{ invoice.order.vat|currency }}
       </td>
     </tr>
@@ -141,7 +145,7 @@ <h2>INVOICE</h2>
       <td>
         <strong>Invoice Total</strong>
       </td>
-      <td align="right">
+      <td align="right" class="alignRight">
         {{ invoice.order.total|currency }}
       </td>
     </tr>

diff --git a/src/shop/templates/pdf/proforma_invoice.html b/src/shop/templates/pdf/proforma_invoice.html
@@ -34,7 +34,7 @@
     display: block;
     height: 150px;
     background: no-repeat top center url('{% static 'img/bornhack-2024/logo/bornhack-2024-logo-s.png' %}');
-    background-size: 100% 100%;
+    background-size: 571px 150px;
   }
 
   .footer {
@@ -57,6 +57,10 @@
         /*display: block;*/
     text-align: center;
   }
+
+  .alignRight {
+    text-align: right;
+  }
 </style>
 <header>
   <div>
@@ -89,13 +93,13 @@ <h2>PROFORMA INVOICE</h2>
       <td>
         <b>Name</b>
       </td>
-      <td align="right">
-        <b>Price
+      <td>
+        <b>Quantity
         </td>
-        <td>
-          <b>Quantity
+        <td align="right" class="alignRight">
+          <b>Price
           </td>
-          <td align="right">
+          <td align="right" class="alignRight">
             <b>Total
             </td>
           </tr>
@@ -109,13 +113,13 @@ <h2>PROFORMA INVOICE</h2>
               <td>
                 {{ order_product.product.name }}
               </td>
-              <td align="right">
-                {{ order_product.product.price|currency }}
-              </td>
               <td>
                 {{ order_product.quantity }}
               </td>
-              <td align="right">
+              <td align="right" class="alignRight">
+                {{ order_product.product.price|currency }}
+              </td>
+              <td align="right" class="alignRight">
                 {{ order_product.total|currency }}
               </td>
             </tr>
@@ -130,7 +134,7 @@ <h2>PROFORMA INVOICE</h2>
             <td>
               <strong>Included Danish VAT (25%)</strong>
             </td>
-            <td align="right">
+            <td align="right" class="alignRight">
               {{ order.vat|currency }}
             </td>
 
@@ -141,7 +145,7 @@ <h2>PROFORMA INVOICE</h2>
             <td>
               <strong>Invoice Total</strong>
             </td>
-            <td align="right">
+            <td align="right" class="alignRight">
               {{ order.total|currency }}
             </td>
           </tr>

diff --git a/src/tickets/templates/pdf/ticket.html b/src/tickets/templates/pdf/ticket.html
@@ -33,7 +33,7 @@
     display: block;
     height: 150px;
     background: no-repeat top center url('{% static 'img/bornhack-2024/logo/bornhack-2024-logo-s.png' %}');
-    background-size: 100% 100%;
+    background-size: 571px 150px;
   }
 
   .footer {