root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix quote/offer display on reports

Browse source
This commit is contained in:
Frede Hundewadt 2022-08-26 09:03:48 +02:00
parent 77b54a5e40
commit 1c70a4a44b
3 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Wonky.Client/Components/ActivityTableComponent.razor
View file

@ -41,8 +41,8 @@
<td>@activity.Demo</td> <td>@activity.Demo</td>
<td>@activity.Sales</td> <td>@activity.Sales</td>
<td>@activity.OfficeNote</td> <td>@activity.OfficeNote</td>
<td class="text-end">@activity.SasAmount</td> <td class="text-end">@($"{activity.SasAmount:N2}")</td>
<td class="text-end">@(activity.StatusTypeEnum == "Quote" ? 0 : activity.OrderAmount)</td> <td class="text-end">@(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}")</td>
<td class="text-center">@if(activity.OurRef.Contains("T:")){<i class="oi oi-phone"></i>}</td> <td class="text-center">@if(activity.OurRef.Contains("T:")){<i class="oi oi-phone"></i>}</td>
<td class="text-center">@if(activity.Express){<i class="oi oi-flash"></i>}</td> <td class="text-center">@if(activity.Express){<i class="oi oi-flash"></i>}</td>
<td class="text-end">@if(activity.StatusTypeEnum == "Quote"){<i class="oi oi-calculator"></i>}</td> <td class="text-end">@if(activity.StatusTypeEnum == "Quote"){<i class="oi oi-calculator"></i>}</td>

26
Wonky.Client/Pages/ReportNewPageAdvisor.razor
View file

@ -229,29 +229,31 @@
<th scope="col">Note</th> <th scope="col">Note</th>
<th scope="col" class="text-end">sas</th> <th scope="col" class="text-end">sas</th>
<th scope="col" class="text-end">Beløb</th> <th scope="col" class="text-end">Beløb</th>
<th scope="col" class="text-center">T</th> <th scope="col" class="text-center"><i class="oi oi-phone"></i></th>
<th scope="col" class="text-center">H</th> <th scope="col" class="text-center"><i class="oi oi-flash"></i></th>
<th scope="col" class="text-center"><i class="oi oi-calculator"></i></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach (var activity in _activities) @foreach (var activity in _activities)
{ {
<tr> <tr>
<td>@activity.Company.Name</td> <td class="text-sm-start">@activity.Company.Name</td>
<td>@activity.Company.City</td> <td class="text-sm-start">@activity.Company.City</td>
<td>@activity.Demo</td> <td class="text-sm-start">@activity.Demo</td>
<td>@activity.Sales</td> <td class="text-sm-start">@activity.Sales</td>
<td>@activity.OfficeNote</td> <td class="text-sm-start">@activity.OfficeNote</td>
<td class="text-end">@activity.SasAmount</td> <td class="text-end">@($"{activity.SasAmount:N2}")</td>
<td class="text-end">@activity.OrderAmount</td> <td class="text-center">@(activity.StatusTypeEnum.Contains("Quote") ? $"{0:N2}" : $"{activity.OrderAmount:N2}")</td>
<td class="text-center">@if(activity.OurRef.Contains("T:")){<i class="oi oi-phone"></i>}</td> <td class="text-center">@if(activity.OurRef.Contains("T:")){ <i class="oi oi-phone"></i> }</td>
<td class="text-center">@if(activity.Express){<i class="oi oi-flash"></i>}</td> <td class="text-center">@if(activity.Express){ <i class="oi oi-flash"></i> }</td>
<td class="text-center">@if(activity.StatusTypeEnum == "Quote"){ <i class="oi oi-calculator"></i> }</td>
</tr> </tr>
} }
<tr> <tr>
<td colspan="5"></td> <td colspan="5"></td>
<td class="text-end">Total</td> <td class="text-end">Total</td>
<td class="text-end">@_activities.Sum(x => x.OrderAmount)</td> <td class="text-end">@_activities.Where(x => x.StatusTypeEnum != "Quote").Sum(x => x.OrderAmount)</td>
<td colspan="2"></td> <td colspan="2"></td>
</tr> </tr>
</tbody> </tbody>

8
Wonky.Client/wwwroot/appsettings.json
View file

@ -1,13 +1,13 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Client", "name": "Wonky Client",
"version": "0.11.30", "version": "0.11.103",
"rc": false, "rc": true,
"sandBox": true, "sandBox": false,
"image": "grumpy-coder.png" "image": "grumpy-coder.png"
}, },
"apiConfig": { "apiConfig": {
"innoBaseUrl": "https://api.innotec.dk", "innoBaseUrl": "https://zeta.innotec.dk",
"glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=",
"glsId": "", "glsId": "",
"serviceVirk": "api/v2/services/virk", "serviceVirk": "api/v2/services/virk",