fix: pdf template addresses controlling

fix: Getting uploaded object uri

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+# [0.20.0]
+
+* feat: Customize pdf templates by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/667
+* feat: Onboard accounts to Stripe Connect by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/668
+* feat: Upload company logo to invoice templates by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/670
+* fix: Invoice pdf customize by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/672
+* fix: Invoice customize bugs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/673
+* feat: Clean up payment links endpoints by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/674
+* feat: Hook up company logo to server-side pdf templates by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/675
+* feat: Company branding preferences by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/677
+* feat: Pdf templates customer/company addresses by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/678
+* fix: Listen to Stripe session completed event by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/679
+* feat: Track pdf templates Posthog events by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/680
+* fix: Branding customize content by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/681
+* feat: Listen to Stripe integration events by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/682
+* feat: Hook up customer/company address to invoice preview of payment page by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/683
+
 # [0.19.17]
 
 * fix: Un-categorize bank transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/663

packages/server/src/services/Attachments/utils.ts

@@ -1,7 +1,9 @@
 import path from 'path';
 import config from '@/config';
 
-
 export const getUploadedObjectUri = (objectKey: string) => {
-  return path.join(config.s3.endpoint, config.s3.bucket, objectKey);
-}
+  return new URL(
+    path.join(config.s3.bucket, objectKey),
+    config.s3.endpoint
+  ).toString();
+};

packages/webapp/src/containers/Sales/CreditNotes/CreditNoteCustomize/constants.ts

@@ -62,12 +62,12 @@ export const fieldsGroups = [
         label: 'Credit Note #',
       },
       {
-        enableKey: 'showBilledToAddress',
+        enableKey: 'showCustomerAddress',
         labelKey: 'billedToLabel',
         label: 'Bill To',
       },
       {
-        enableKey: 'showBilledFromAddress',
+        enableKey: 'showCompanyAddress',
         label: 'Billed From',
       },
     ],

packages/webapp/src/containers/Sales/Estimates/EstimateCustomize/constants.ts

@@ -25,7 +25,7 @@ export const initialValues = {
 
   // Customer address
   showCustomerAddress: true,
-  
+
   // Company address
   showCompanyAddress: true,
   companyAddress: '',
@@ -73,12 +73,12 @@ export const fieldsGroups = [
         label: 'Expiration Date',
       },
       {
-        enableKey: 'showBilledToAddress',
+        enableKey: 'showCustomerAddress',
         labelKey: 'billedToLabel',
         label: 'Bill To',
       },
       {
-        enableKey: 'showBilledFromAddress',
+        enableKey: 'showCompanyAddress',
         label: 'Billed From',
       },
     ],

packages/webapp/src/containers/Sales/Invoices/InvoiceCustomize/constants.ts

@@ -83,12 +83,12 @@ export const fieldsGroups = [
         label: 'Due Date',
       },
       {
-        enableKey: 'showBillingToAddress',
+        enableKey: 'showCustomerAddress',
         labelKey: 'billedToLabel',
         label: 'Bill To',
       },
       {
-        enableKey: 'showBilledFromAddress',
+        enableKey: 'showCompanyAddress',
         label: 'Billed From',
       },
     ],

packages/webapp/src/containers/Sales/PaymentsReceived/PaymentReceivedCustomize/constants.ts

@@ -59,12 +59,12 @@ export const fieldsGroups = [
         label: 'Payment Date',
       },
       {
-        enableKey: 'showBillingToAddress',
+        enableKey: 'showCustomerAddress',
         labelKey: 'billedToLabel',
         label: 'Bill To',
       },
       {
-        enableKey: 'showBilledFromAddress',
+        enableKey: 'showCompanyAddress',
         label: 'Billed From',
       },
     ],

packages/webapp/src/containers/Sales/Receipts/ReceiptCustomize/constants.ts

@@ -21,7 +21,7 @@ export const initialValues = {
   // Company name
   companyName: 'Bigcapital Technology, Inc.',
 
-  // Customer address 
+  // Customer address
   showCustomerAddress: true,
 
   // Company address
@@ -67,12 +67,12 @@ export const fieldsGroups = [
         label: 'Receipt Date',
       },
       {
-        enableKey: 'showBilledToAddress',
+        enableKey: 'showCustomerAddress',
         labelKey: 'billedToLabel',
         label: 'Bill To',
       },
       {
-        enableKey: 'showBilledFromAddress',
+        enableKey: 'showCompanyAddress',
         label: 'Billed From',
       },
     ],