From caca7139cb38854d5bc1cfee204c2e01eb26d3b3 Mon Sep 17 00:00:00 2001 From: Tina_Azure <-> Date: Thu, 6 Apr 2023 01:26:45 +0200 Subject: [PATCH] Template for customer request @MichaelYick give it a look over if this setup is proper Table modification for aditional details in spec --- setupdb.sh | 5 +- spec/spec.md | 23 ++++++++ .../customer_Freelancer_Template_Request.html | 54 +++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 templates/customer_Freelancer_Template_Request.html diff --git a/setupdb.sh b/setupdb.sh index f6a13d4..b2ed699 100644 --- a/setupdb.sh +++ b/setupdb.sh @@ -4,7 +4,9 @@ sudo -u postgres createdb --owner=cavecomm cavecomm 'contains all the informatio sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE cavecomm TO cavecomm;" sudo -u postgres psql -c "CREATE TABLE requests( id INT PRIMARY KEY GENERATED ALWAYS AS IDENTITY, + customerName text, customerEmailAddress text, + customerContactDetails text, freelancerID INT, templateID INT, currencyPreference varchar(6), @@ -15,7 +17,8 @@ sudo -u postgres psql -c "CREATE TABLE requests( upFrontInvoiceID text, onDeliverInvoiceID text, upFrontPaid boolean, - onDeliverPaid boolean + onDeliverPaid boolean, + completed boolean ); " cavecomm diff --git a/spec/spec.md b/spec/spec.md index d1f3a9d..01ccddd 100644 --- a/spec/spec.md +++ b/spec/spec.md @@ -50,6 +50,29 @@ $onDeliverInvoiceID - the ID of the invoice (for contacting BTCPayServer or Stri $upFrontPaid - A boolean representation of if the up-front Payment has been paid. $onDeliverPaid - A boolean representation of if the on-Deliver Payment has been paid. +modified Table structure + +$id +$customerName - name of customer +$customerEmailAddress +$customerContactDetails - extra details about contact or alternative contact options like discord +$freelancerID - id referencing freelancer +$templateID - id referencing template +$currencyPreference +$priceUpFront +$priceOnDeliver +$requestDescription +$accepted boolean +$upFrontInvoiceID +$onDeliverInvoiceID +$upFrontPaid +$onDeliverPaid +$completed - marker to set if the request has been completed + + +## email delivery +email is sent via email server given by the admin, while the software functions as a client to it. + # Interface +++ Datatransfer inbetween pages is performed with POST diff --git a/templates/customer_Freelancer_Template_Request.html b/templates/customer_Freelancer_Template_Request.html new file mode 100644 index 0000000..6a3d599 --- /dev/null +++ b/templates/customer_Freelancer_Template_Request.html @@ -0,0 +1,54 @@ + + + + + + +

Freelancer: {{freelancername}}

+

Template: {{templatename}}

+
+
+
+
+
+
+
+ +
+
+
Payment Information:
+
+ Currency: {{currencypreference}}
+ Price: {{pricetotal}} - Upfront: {{priceupfront}} - On Delivery: {{priceondeliver}} +

+ + +
+ +
+
+
+ +
+ + + + + + \ No newline at end of file