diff --git a/notes/deploy.txt b/notes/deploy.txt index e4f4578..351170b 100644 --- a/notes/deploy.txt +++ b/notes/deploy.txt @@ -17,10 +17,13 @@ dotnet publish -c Release -o ./../publish/ --no-self-contained -r linux-x64 2.5) Runtime - make sure if runtime changed that server has latest -2.7) remove old backup just delete it's in /srv/coreapps/rockfish.last +2.7) in rockfish.last to remove **ALL** files and folders!! DANGER: /srv/coreapps/rockfish.last# rm * -r 2.8) BACKUP backup old version and db etc with this command run from /srv/coreapps folder: -cp -r rockfish rockfish.last + +in rockfish.last to copy over all current rockfish files and folders: +root@ubuntu-s-1vcpu-1gb-amd-sfo3-01:/srv/coreapps/rockfish.last# cp -a ../rockfish/. . + 2.9) delete all in rockfish folder except db folder diff --git a/util/RfNotify.cs b/util/RfNotify.cs index aeb9db5..3532155 100644 --- a/util/RfNotify.cs +++ b/util/RfNotify.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Linq; using Microsoft.EntityFrameworkCore; using rockfishCore.Models; +using System.Globalization; namespace rockfishCore.Util { @@ -54,7 +55,7 @@ namespace rockfishCore.Util // string companyName = ct.Customer.Select(r => new { r.Id, r.Name }) // .Where(r => r.Id == purchases[0].CustomerId) // .First().Name; - string companyName=cust.Name; + string companyName = cust.Name; //TAGS EXPECTED: {{BODY=}}, {{TITLE=}} //REPLACEMENT TOKENS EXPECTED: {{SUBLIST}} @@ -64,8 +65,10 @@ namespace rockfishCore.Util var pr = products.Where(p => p.ProductCode == pc.ProductCode).First(); decimal dRenew = Convert.ToDecimal(pr.RenewPrice) / 100m; decimal dMonthly = Convert.ToDecimal(pr.RenewPrice) / 1200m; - string sRenew = String.Format("{0:C}", dRenew); - string sMonthly = String.Format("{0:C}", dMonthly); + //string sRenew = String.Format("{0:C}", dRenew); + string sRenew = dRenew.ToString("c", new CultureInfo("en-US")); + //string sMonthly = String.Format("{0:C}", dMonthly); + string sMonthly = dMonthly.ToString("c", new CultureInfo("en-US")); string sRenewDate = DateUtil.EpochToDate(pc.ExpireDate).ToString("D"); sublist.Append("\t- "); diff --git a/wwwroot/js/app.api.js b/wwwroot/js/app.api.js index ede405e..b89cf4e 100644 --- a/wwwroot/js/app.api.js +++ b/wwwroot/js/app.api.js @@ -29,7 +29,7 @@ app.api = (function () { generateFromRequest, licenseEmailResponse; - RockFishVersion = "6.10"; + RockFishVersion = "6.11"; ////////////////////////////////////////////////////////////////////////////////////// // NOT AUTHORIZED ERROR HANDLER