Merge pull request #71 from Tolfix/dev

v2.0
Tolfix · Jan 22, 2022 · b189944 · b189944
2 parents 482cd22 + 016d0aa
commit b189944
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 39 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpg-api",
-  "version": "v1.9",
+  "version": "v2.0",
   "description": "Central Payment Gateway",
   "main": "./build/Main.js",
   "dependencies": {
@@ -36,7 +36,7 @@
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^6.1.4",
     "mongoose-auto-increment": "^5.0.1",
-    "node-fetch": "^2.6.6",
+    "node-fetch": ">=3.1.1",
     "nodemailer": "^6.7.0",
     "npm": "^7.20.5",
     "paypal-rest-sdk": "^1.8.1",

diff --git a/src/Email/Templates/CSS/GetTableStyle.ts b/src/Email/Templates/CSS/GetTableStyle.ts
@@ -16,4 +16,4 @@ border-collapse: collapse;
         padding: 7px 5px;
         border-top: 1px solid #E6E6E6;
     }
-`
+` as const;
diff --git a/src/Email/Templates/General/Footer.ts b/src/Email/Templates/General/Footer.ts
@@ -1,8 +1,10 @@
 export default `
-<div style="font-size: 21px;
-color: #999;
-padding: 20px 5px 10px;
-text-align: center;">
-    <a href="https://github.com/Tolfix/cpg-api">cpg-api</a> &copy; 
+<div style="
+    font-size: 21px;
+    color: #999;
+    padding: 20px 5px 10px;
+    text-align: center;
+">
+    &copy; <a href="https://github.com/Tolfix/cpg-api">CPG-API</a>
 </div>
 `;
diff --git a/src/Email/Templates/General/Header.ts b/src/Email/Templates/General/Header.ts
@@ -1,11 +1,13 @@
-import { Company_Logo_Url, Company_Name } from "../../../Config";
+import { Company_Logo_Url, Company_Name, Company_Website } from "../../../Config";
 
 export default async () => `
 <div style="margin-bottom: 5px;
 padding: 10px 0;
 text-align: center;">
     <div class="logo">
-        <img width="256" src="${await Company_Logo_Url()}" alt="${await Company_Name()}" />
+        <a href="${await Company_Website()}" target="_blank">
+            <img width="256" src="${await Company_Logo_Url()}" alt="${await Company_Name()}" />
+        </a>
     </div>
 </div>
 `;
diff --git a/src/Email/Templates/General/UseStyles.ts b/src/Email/Templates/General/UseStyles.ts
@@ -12,25 +12,25 @@ export default async (s: string) =>
             </style>
         </head>
         <body>
-            ${await Header()}
-            
-            <div style="background-color: #F4F4F4;
-            padding: 10px;
-            margin: 10px auto;
-            max-width: 650px;
-            width: auto;
-            line-height: 20px;">
+            <div style="
+                background-color: #F4F4F4;
+                padding: 10px;
+                margin: 10px auto;
+                max-width: 650px;
+                width: auto;
+                line-height: 20px;"
+            >
+                ${await Header()}
                 <div style="
                     background-color: #FFF;
                     padding: 20px; }
-                    content p:last-child {
-                    margin: 0;"
+                        content p:last-child {
+                        margin: 0;"
                 >
                     ${s}
                 </div>
+                ${Footer}
             </div>
-
-            ${Footer}
         </body>
     </html> 
     `

diff --git a/src/Email/Templates/Invoices/Invoice.template.ts b/src/Email/Templates/Invoices/Invoice.template.ts
@@ -19,7 +19,7 @@ export default async (invoice: IInvoice, customer: ICustomer) => await UseStyles
         OCR number: ${(invoice.dates.invoice_date as string).replaceAll("-", "")}${invoice.id}
     </p>
     <p>
-        Your payment method is: ${invoice.payment_method}
+        Your payment method is: ${(invoice.payment_method).firstLetterUpperCase().replaceAll("_", " ")}
     </p>
     <p>
         Tax due: ${invoice.tax_rate}%
@@ -36,20 +36,20 @@ export default async (invoice: IInvoice, customer: ICustomer) => await UseStyles
             Click me to pay.
         </a>
         ` : ''}
-        ${invoice.payment_method === "credit_card" ? `<br />
+        ${invoice.payment_method === "credit_card" ? `
         <a href="${Full_Domain}/v2/stripe/pay/${invoice.uid}" target="_blank">
             Click me to pay.
         </a>
+        <p>
+            <strong>
+                To pay automatic invoice, you need to setup your payment method. It will automatic pay when a invoice is 14 days ahead. <br />
+                <a href="${Full_Domain}/v2/stripe/setup/${customer.uid}" target="_blank">
+                    Click here to setup your payment method.
+                </a>
+            </strong>
+        </p>
+        ` : ''}
     </p>
-    <p>
-        <strong>
-            To pay automatic invoice, you need to setup your payment method. It will automatic pay when a invoice is 14 days ahead. <br />
-            <a href="${Full_Domain}/v2/stripe/setup/${customer.id}" target="_blank">
-                Click here to setup your payment method.
-            </a>
-        </strong>
-    </p>
-    ` : ''}
 
     <table style="${GetTableStyle}">
         <thead>

diff --git a/src/Email/Templates/Orders/NewOrderCreated.ts b/src/Email/Templates/Orders/NewOrderCreated.ts
@@ -57,9 +57,9 @@ export default async (order: IOrder, customer: ICustomer) => await UseStyles(str
                     {
                         result += stripIndents`
                         <tr>
-                            <td>+ ${c?.name}</td>
-                            <td>+ 1</td>
-                            <td>+ ${c?.price} ${await Company_Currency()}</td>
+                            <td>+ ${p?.name} - ${c?.name}</td>
+                            <td>1</td>
+                            <td>${c?.price} ${await Company_Currency()}</td>
                         </tr>`
                     }
                 }

diff --git a/src/Lib/Invoices/CreatePDFInvoice.ts b/src/Lib/Invoices/CreatePDFInvoice.ts
@@ -22,6 +22,7 @@ import {
 } from "../../Config";
 import qrcode from "qrcode";
 import GetText from "../../Translation/GetText";
+import GetOCRNumber from "./GetOCRNumber";
 
 export default function createPDFInvoice(invoice: IInvoice): Promise<string>
 {
@@ -72,7 +73,7 @@ export default function createPDFInvoice(invoice: IInvoice): Promise<string>
                 "city": Customer.billing.city,
                 "country": Customer.billing.country,
                 "custom1": `<br/><strong>Customer ID:</strong> ${Customer.id}`,
-                "custom2": `<br/><strong>OCR Number:</strong> ${(invoice.dates.invoice_date as string).replaceAll("-", "")}${invoice.id}`,
+                "custom2": `<br/><strong>OCR Number:</strong> ${GetOCRNumber(invoice)}`,
                 "custom3": `
                 <br/>
                 <div style="
@@ -88,7 +89,7 @@ export default function createPDFInvoice(invoice: IInvoice): Promise<string>
                         Swish
                         <div>
                             <img 
-                            src="data:image/png;base64,${await createSwishQRCode(Swish_Payee_Number, (invoice.amount)+(invoice.amount)*(invoice.tax_rate/100), `Invoice ${invoice.id}`)}" 
+                            src="data:image/png;base64,${await createSwishQRCode(Swish_Payee_Number, (invoice.amount)+(invoice.amount)*(invoice.tax_rate/100), `OCR ${GetOCRNumber(invoice)}`)}" 
                             width="64">
                         </div>
                         ` : ''}

diff --git a/src/Lib/Invoices/GetOCRNumber.ts b/src/Lib/Invoices/GetOCRNumber.ts
@@ -0,0 +1,11 @@
+import { IInvoice } from "../../Interfaces/Invoice.interface";
+
+/**
+ * @description
+ * Template looks somewhat like this: YYMMDD(ID)
+ * YY = year
+ * MM = month
+ * DD = day
+ * ID = invoice id
+ */
+export default (i: IInvoice) => `${(i.dates.invoice_date as string).replaceAll("-", "")}${i.id}`
diff --git a/src/Lib/Orders/newInvoice.ts b/src/Lib/Orders/newInvoice.ts
@@ -47,7 +47,7 @@ export async function createInvoiceFromOrder(order: IOrder)
     for await(let product of Products)
     {
         if(Promotion_Code)
-        // @ts-ignore
+            // @ts-ignore
             product = await getNewPriceOfPromotionCode(Promotion_Code, product);
         const category = await getCategoryByProduct(product);
         items.push({

diff --git a/src/Main.ts b/src/Main.ts
@@ -8,6 +8,7 @@ Logger.info("Adding .env variables");
 
 import "./Mods/Map.mod";
 import "./Mods/Number.mod";
+import "./Mods/String.mod";
 
 Logger.info(`Loading ./Events/Node.events`);
 import "./Events/Node.events";

diff --git a/src/Mods/String.mod.ts b/src/Mods/String.mod.ts
@@ -0,0 +1,17 @@
+export{};
+
+declare global
+{
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface String
+    {
+        firstLetterUpperCase(): string
+    }
+}
+
+Object.defineProperty(String.prototype, "firstLetterUpperCase", {
+    value: function()
+    {
+        return this.charAt(0).toUpperCase() + this.slice(1);
+    }
+});