diff --git a/Wonky.Client/Pages/CrmActivityViewPage.razor b/Wonky.Client/Pages/CrmActivityViewPage.razor index 6f755767..39a03caa 100644 --- a/Wonky.Client/Pages/CrmActivityViewPage.razor +++ b/Wonky.Client/Pages/CrmActivityViewPage.razor @@ -32,7 +32,7 @@

@ReportItem.Company.Name

@if (ReportItem.StatusTypeEnum.ToLower() is "quote") { -

TILBUD @ReportItem.ESalesNumber

+

TILBUD @ReportItem.ESalesNumber

} @if (ReportItem.VisitTypeEnum.ToLower() == "phone" || ReportItem.OurRef.Contains("T:")) { diff --git a/Wonky.Client/Pages/CrmQuotes.razor b/Wonky.Client/Pages/CrmQuotes.razor index b64a5e33..2db46fb8 100644 --- a/Wonky.Client/Pages/CrmQuotes.razor +++ b/Wonky.Client/Pages/CrmQuotes.razor @@ -5,7 +5,7 @@

Åbne tilbud

-
+
@@ -27,10 +27,10 @@ { foreach (var quote in Quotes) { - -
+
+
@quote.Company.Name @@ -41,9 +41,10 @@
@($"{quote.OrderAmount:N2}")
-
- -
+
+
+
+
@if (!string.IsNullOrWhiteSpace(quote.OfficeNote)) {
Note
@@ -52,7 +53,7 @@
}
- +
} } else diff --git a/Wonky.Client/Pages/CrmQuotes.razor.cs b/Wonky.Client/Pages/CrmQuotes.razor.cs index 9b4b820e..3255c9aa 100644 --- a/Wonky.Client/Pages/CrmQuotes.razor.cs +++ b/Wonky.Client/Pages/CrmQuotes.razor.cs @@ -11,7 +11,7 @@ public partial class CrmQuotes : IDisposable [Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } private List Quotes { get; set; } = new(); - private bool Working = true; + private bool Working { get; set; } = true; protected override async Task OnInitializedAsync() { @@ -23,6 +23,15 @@ public partial class CrmQuotes : IDisposable Working = false; } + private void SetQuote(int status) + { + // todo - implement update quote from status + // status matches QuoteStatusEnum + // 0 - None + // 1 - Win + // 2 - Lose + // 3 - Draw + } public void Dispose() { Interceptor.DisposeEvent(); diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 27db5b5e..9cdbddce 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.85.2", + "version": "0.85.4", "rc": true, "sandBox": false, "image": "grumpy-coder.png" diff --git a/Wonky.Entity/Views/ReportItemView.cs b/Wonky.Entity/Views/ReportItemView.cs index 1e6a2b37..6d7853a9 100644 --- a/Wonky.Entity/Views/ReportItemView.cs +++ b/Wonky.Entity/Views/ReportItemView.cs @@ -21,96 +21,128 @@ public class ReportItemView /// Customer company info /// public ReportItemCustomer Company { get; set; } = new(); + /// /// Lines /// public List Lines { get; set; } = new(); - /// - /// entity id for sales rep - /// - public string SalesRepId { get; set; } = ""; + /// /// Activity entity id /// public string ActivityId { get; set; } = ""; - /// - /// Entity CreateTimestamp as string - /// - public string CreateTimestamp { get; set; } = ""; + /// /// Closed sale /// public bool Closed { get; set; } + /// - /// ProcessStatus as string + /// Entity CreateTimestamp as string /// - public string ProcessStatusEnum { get; set; } = ""; + public string CreateTimestamp { get; set; } = ""; + /// - /// express flag + /// CRM Note /// - public bool Express { get; set; } - /// - /// ESales number - /// - public string ESalesNumber { get; set; } = ""; - /// - /// Order amount - /// - public decimal OrderAmount { get; set; } - /// - /// Order safe seal amount - /// - public decimal SasAmount { get; set; } - /// - /// Order date - /// - public string OrderDate { get; set; } = ""; - /// - /// Office note - /// - public string OfficeNote { get; set; } = ""; + public string CrmNote { get; set; } = ""; + /// /// Product demo /// public string Demo { get; set; } = ""; - /// - /// Product sale resume - /// - public string Sales { get; set; } = ""; - /// - /// Our reference - /// - public string OurRef { get; set; } = ""; - /// - /// Customer reference - /// - public string YourRef { get; set; } = ""; - /// - /// Customer reference number - /// - public string ReferenceNumber { get; set; } = ""; - /// - /// Visit type enum as string - /// - public string VisitTypeEnum { get; set; } = ""; - /// - /// Status type enum as string - /// - public string StatusTypeEnum { get; set; } = ""; - /// - /// Customer deliver name - /// - public string DlvName { get; set; } = ""; + /// /// Customer delivery address line 1 /// public string DlvAddress1 { get; set; } = ""; + /// /// Customer delivery address line 2 /// public string DlvAddress2 { get; set; } = ""; + + /// + /// Customer deliver name + /// + public string DlvName { get; set; } = ""; + /// /// Customer delivery post code and city name /// - public string DlvZipCity { get; set; } = ""; + public string DlvZipCity { get; set; } = ""; + /// + /// ESales number + /// + public string ESalesNumber { get; set; } = ""; + + /// + /// express flag + /// + public bool Express { get; set; } + + /// + /// Office note + /// + public string OfficeNote { get; set; } = ""; + + /// + /// Order amount + /// + public decimal OrderAmount { get; set; } + + /// + /// Order date + /// + public string OrderDate { get; set; } = ""; + + /// + /// Our reference + /// + public string OurRef { get; set; } = ""; + + /// + /// ProcessStatus as string + /// + public string ProcessStatusEnum { get; set; } = ""; + + /// + /// QuoteStatus as string + /// + public string QuoteStatusEnum { get; set; } = ""; + + /// + /// Customer reference number + /// + public string ReferenceNumber { get; set; } = ""; + + /// + /// Product sale resume + /// + public string Sales { get; set; } = ""; + + /// + /// entity id for sales rep + /// + public string SalesRepId { get; set; } = ""; + + /// + /// Order safe seal amount + /// + public decimal SasAmount { get; set; } + + /// + /// Status type enum as string + /// + public string StatusTypeEnum { get; set; } = ""; + + /// + /// Visit type enum as string + /// + public string VisitTypeEnum { get; set; } = ""; + + /// + /// Customer reference + /// + public string YourRef { get; set; } = ""; } \ No newline at end of file