feat(invoices): add due date

KickRP · Aug 30, 2024 · 8bdb21d · 8bdb21d
1 parent d32324c
commit 8bdb21d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/server/accounts/db.ts b/server/accounts/db.ts
@@ -312,8 +312,6 @@ export async function CreateInvoice(invoice: Omit<OxAccountInvoice, 'id'>) {
 
   if (!player?.charId) return 'no_charId';
 
-  console.log(JSON.stringify(invoice, null, 2));
-
   const hasPermission = await player.hasAccountPermission(invoice.fromId, 'sendInvoice');
 
   if (!hasPermission) return 'no_permission';
@@ -323,8 +321,8 @@ export async function CreateInvoice(invoice: Omit<OxAccountInvoice, 'id'>) {
   if (!targetAccount) return 'no_target_account';
 
   return db.insert(
-    'INSERT INTO accounts_invoices (`creatorId`, `fromId`, `toId`, `amount`, `message`) VALUES (?, ?, ?, ?, ?)',
-    [invoice.creatorId, invoice.fromId, invoice.toId, invoice.amount, invoice.message]
+    'INSERT INTO accounts_invoices (`creatorId`, `fromId`, `toId`, `amount`, `message`, `dueDate`) VALUES (?, ?, ?, ?, ?, ?)',
+    [invoice.creatorId, invoice.fromId, invoice.toId, invoice.amount, invoice.message, invoice.dueDate]
   );
 }
 

diff --git a/sql/install.sql b/sql/install.sql
@@ -220,7 +220,9 @@ CREATE TABLE IF NOT EXISTS `accounts_invoices`
     `toId`      INT UNSIGNED                          NOT NULL,
     `amount`    INT UNSIGNED                          NOT NULL,
     `message`   VARCHAR(255)                          NULL,
-    `date`      TIMESTAMP DEFAULT CURRENT_TIMESTAMP() NOT NULL,
+    `sentAt`    TIMESTAMP DEFAULT CURRENT_TIMESTAMP() NOT NULL,
+    `dueDate`   TIMESTAMP                             NOT NULL,
+    `paidAt`    TIMESTAMP                             NULL,
     CONSTRAINT `accounts_invoices_accounts_id_fk`
         FOREIGN KEY (`fromId`) REFERENCES `accounts` (`id`),
     CONSTRAINT `accounts_invoices_accounts_id_fk_2`
@@ -231,12 +233,6 @@ CREATE TABLE IF NOT EXISTS `accounts_invoices`
         FOREIGN KEY (`creatorId`) REFERENCES `characters` (`charId`)
 );
 
-
-
-
-
-
-
 /*!40101 SET SQL_MODE=IFNULL(@OLD_SQL_MODE, '') */;
 
 /*!40014 SET FOREIGN_KEY_CHECKS=IFNULL(@OLD_FOREIGN_KEY_CHECKS, 1) */;

diff --git a/types/index.ts b/types/index.ts
@@ -163,6 +163,7 @@ export interface OxAccountInvoice {
   toId: number;
   amount: number;
   message?: string;
-  sentAt?: number;
+  sentAt: number;
+  dueDate: number;
   paidAt?: number;
 }