for new installs, centralize some stuff that was spread around different config files.

11 files changed, 28 insertions, 32 deletions

diff --git a/conf/alerter_template b/conf/alerter_template
index 5177e4ea1..6fb66b77d 100644
--- a/conf/alerter_template
+++ b/conf/alerter_template
@@ -1,20 +1,18 @@
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $first; } { $last; }:
 
   We thank you for your continuing patronage.  This notice is to remind you
-that your { $payby } used to pay SISD.COM for Internet
-service will expire on { use Date::Format; time2str("%x", $expdate); }.  Please provide us with new billing
-information so that we may continue your service uninterrupted.
+that your { $payby } used to pay { $company_name; } for Internet
+service will expire on { use Date::Format; time2str("%B %o, %Y", $expdate); }.  Please provide us with new
+billing information so that we may continue your service uninterrupted.
 
 Very Truly Yours,
 
-  SISD Service Team
-
+  { $company_name; } Service Team
 
 
diff --git a/conf/company_address b/conf/company_address
new file mode 100644
index 000000000..38248622a
--- /dev/null
+++ b/conf/company_address
@@ -0,0 +1,2 @@
+1234 Example Lane
+Exampleton, CA  54321
diff --git a/conf/company_name b/conf/company_name
new file mode 100644
index 000000000..2cd53232c
--- /dev/null
+++ b/conf/company_name
@@ -0,0 +1 @@
+ExampleCo
diff --git a/conf/impending_recur_template b/conf/impending_recur_template
index 9075ac8bf..deb396ac3 100644
--- a/conf/impending_recur_template
+++ b/conf/impending_recur_template
@@ -1,20 +1,20 @@
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $first; } { $last; }:
 
   We thank you for your continuing patronage.  This notice is to remind you
-that your { $packages->[0] } Internet service will expire on { use Date::Format; time2str("%x", $recurdates->[0]); }.
+that your { $packages->[0] } Internet service
+will expire on { use Date::Format; time2str("%B %o, %Y", $recurdates->[0]); }.
 At that time we will begin charging you on a recurring basis so that we may
 continue your service uninterrupted.
 
 Very Truly Yours,
 
-  SISD Service Team
+  { $company_name; } Service Team
 
 
 
diff --git a/conf/invoice_latexfooter b/conf/invoice_latexfooter
index 527c356f5..2e32123f1 100644
--- a/conf/invoice_latexfooter
+++ b/conf/invoice_latexfooter
@@ -1 +1 @@
-Ivan Kohler~~~Freeside - open-source billing
+[@-- $company_name --@]
diff --git a/conf/invoice_latexnotes b/conf/invoice_latexnotes
index 46af6d6fe..5303d3cc4 100644
--- a/conf/invoice_latexnotes
+++ b/conf/invoice_latexnotes
@@ -3,6 +3,6 @@
 %%
 \section*{\textsc{Notes}}
 \begin{enumerate}
-\item Please make your check payable to \textbf{Ivan Kohler}.
+\item Please make your check payable to \textbf{[@-- $company_name --@]}.
 \item If you have any questions please email or telephone.
 \end{enumerate}
diff --git a/conf/invoice_latexreturnaddress b/conf/invoice_latexreturnaddress
deleted file mode 100644
index 95067e230..000000000
--- a/conf/invoice_latexreturnaddress
+++ /dev/null
@@ -1,3 +0,0 @@
-Ivan Kohler\\*
-12345 Test Lane\\*
-Truckee, CA~~96161
diff --git a/conf/invoice_latexsmallfooter b/conf/invoice_latexsmallfooter
index 527c356f5..2e32123f1 100644
--- a/conf/invoice_latexsmallfooter
+++ b/conf/invoice_latexsmallfooter
@@ -1 +1 @@
-Ivan Kohler~~~Freeside - open-source billing
+[@-- $company_name --@]
diff --git a/conf/invoice_template b/conf/invoice_template
index 4b2c64bcb..b33c4dda1 100644
--- a/conf/invoice_template
+++ b/conf/invoice_template
@@ -1,11 +1,10 @@
 
                                  Invoice
-                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  FS-{ $invnum; }
+                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  Invoice #{ $invnum; }
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $address[0]; }
@@ -24,4 +23,4 @@ Truckee, CA  96161
   );
 }
 
- -=> Freeside - open-source billing for ISPs - http://www.sisd.com/freeside <=-
+ -=> { $company_name; } <=-
diff --git a/conf/invoice_template_statement b/conf/invoice_template_statement
index 674416a87..db0291544 100644
--- a/conf/invoice_template_statement
+++ b/conf/invoice_template_statement
@@ -1,11 +1,10 @@
 
                                  Statement
-                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  FS-{ $invnum; }
+                                 { substr("Page $page of $total_pages          ", 0, 19); } { use Date::Format; time2str("%x", $date); }  Invoice #{ $invnum; }
 
 
-Ivan Kohler
-12345 Test Lane
-Truckee, CA  96161
+{ $company_name; }
+{ $company_address; }
 
 
 { $address[0]; }
@@ -24,4 +23,4 @@ Truckee, CA  96161
   );
 }
 
- -=> Freeside - open-source billing for ISPs - http://www.sisd.com/freeside <=-
+ -=> { $company_name; } <=-
diff --git a/conf/welcome_letter b/conf/welcome_letter
index 3fcf04e68..be7b484ca 100644
--- a/conf/welcome_letter
+++ b/conf/welcome_letter
@@ -113,9 +113,9 @@
 %  Your content goes here
 Dear [@-- $first --@] [@-- $last --@]:\\
 \\
-  Thank you for choosing Freeside.  We aim to meet all the billing needs of
-  [@-- $company --@].  Please do not hesitate to contact us for any additional
-  service or features you require.\\
+  Thank you for choosing [@-- $company_name --@].  We aim to meet all of your
+  needs.  Please do not hesitate to contact us for any additional
+  services or assistance.\\
 
 \end{document}