Added information on SAS for sales lines
This commit is contained in:
parent
ff9d9ae3c5
commit
7adc5b2b49
15 changed files with 119 additions and 86 deletions
|
@ -104,6 +104,7 @@
|
||||||
<th class="text-end" scope="col">Pris</th>
|
<th class="text-end" scope="col">Pris</th>
|
||||||
<th class="text-end" scope="col">R%</th>
|
<th class="text-end" scope="col">R%</th>
|
||||||
<th class="text-end" scope="col">Beløb</th>
|
<th class="text-end" scope="col">Beløb</th>
|
||||||
|
<th class="text-center" scope="col">SAS</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -117,6 +118,7 @@
|
||||||
<td class="text-end">@($"{line.Price:N2}")</td>
|
<td class="text-end">@($"{line.Price:N2}")</td>
|
||||||
<td class="text-end">@($"{line.Discount:N2}")</td>
|
<td class="text-end">@($"{line.Discount:N2}")</td>
|
||||||
<td class="text-end">@($"{line.LineSum:N2}")</td>
|
<td class="text-end">@($"{line.LineSum:N2}")</td>
|
||||||
|
<td class="text-center"><i class="bi- @(line.Sas ? "bi-check-square" : "bi-square")"></i></td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -84,6 +84,7 @@
|
||||||
<th class="text-end" scope="col">Antal</th>
|
<th class="text-end" scope="col">Antal</th>
|
||||||
<th class="text-end" scope="col">Pris</th>
|
<th class="text-end" scope="col">Pris</th>
|
||||||
<th class="text-end" scope="col">Rabat</th>
|
<th class="text-end" scope="col">Rabat</th>
|
||||||
|
<th class="text-center" scope="col">SAS</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -95,6 +96,7 @@
|
||||||
<td class="text-end">@line.Quantity</td>
|
<td class="text-end">@line.Quantity</td>
|
||||||
<td class="text-end">@line.Price</td>
|
<td class="text-end">@line.Price</td>
|
||||||
<td class="text-end">@line.Discount</td>
|
<td class="text-end">@line.Discount</td>
|
||||||
|
<td class="text-center"><i class="bi- @(line.Sas ? "bi-check-square" : "bi-square")"></i></td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -72,6 +72,7 @@
|
||||||
<th class="text-end" scope="col">Antal</th>
|
<th class="text-end" scope="col">Antal</th>
|
||||||
<th class="text-end" scope="col">Pris</th>
|
<th class="text-end" scope="col">Pris</th>
|
||||||
<th class="text-end" scope="col">Rabat</th>
|
<th class="text-end" scope="col">Rabat</th>
|
||||||
|
<th class="text-center" scope="col">SAS</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -83,6 +84,7 @@
|
||||||
<td class="text-end">@line.Qty</td>
|
<td class="text-end">@line.Qty</td>
|
||||||
<td class="text-end">@line.Price</td>
|
<td class="text-end">@line.Price</td>
|
||||||
<td class="text-end">@line.Discount</td>
|
<td class="text-end">@line.Discount</td>
|
||||||
|
<td class="text-center"><i class="bi- @(line.Sas ? "bi-check-square" : "bi-square")"></i></td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -80,6 +80,7 @@
|
||||||
<th class="text-end" scope="col">Antal</th>
|
<th class="text-end" scope="col">Antal</th>
|
||||||
<th class="text-end" scope="col">Pris</th>
|
<th class="text-end" scope="col">Pris</th>
|
||||||
<th class="text-end" scope="col">Rabat</th>
|
<th class="text-end" scope="col">Rabat</th>
|
||||||
|
<th class="text-center" scope="col">SAS</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -91,6 +92,7 @@
|
||||||
<td class="text-end">@line.Quantity</td>
|
<td class="text-end">@line.Quantity</td>
|
||||||
<td class="text-end">@line.Price</td>
|
<td class="text-end">@line.Price</td>
|
||||||
<td class="text-end">@line.Discount</td>
|
<td class="text-end">@line.Discount</td>
|
||||||
|
<td class="text-center"><i class="bi- @(line.Sas ? "bi-check-square" : "bi-square")"></i></td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -72,6 +72,7 @@
|
||||||
<th class="text-end" scope="col">Antal</th>
|
<th class="text-end" scope="col">Antal</th>
|
||||||
<th class="text-end" scope="col">Pris</th>
|
<th class="text-end" scope="col">Pris</th>
|
||||||
<th class="text-end" scope="col">Rabat</th>
|
<th class="text-end" scope="col">Rabat</th>
|
||||||
|
<th class="text-center" scope="col">SAS</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -83,6 +84,7 @@
|
||||||
<td class="text-end">@line.Qty</td>
|
<td class="text-end">@line.Qty</td>
|
||||||
<td class="text-end">@line.Price</td>
|
<td class="text-end">@line.Price</td>
|
||||||
<td class="text-end">@line.Discount</td>
|
<td class="text-end">@line.Discount</td>
|
||||||
|
<td class="text-center"><i class="bi- @(line.Sas ? "bi-check-square" : "bi-square")"></i></td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -502,6 +502,10 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
||||||
.ToList();
|
.ToList();
|
||||||
_activity.Lines = lines;
|
_activity.Lines = lines;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* debug logging
|
||||||
|
*/
|
||||||
|
Logger.LogDebug("activity => {}", JsonSerializer.Serialize(_activity));
|
||||||
/*
|
/*
|
||||||
* send reqeust
|
* send reqeust
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
<span class="input-group-text" id="at">
|
<span class="input-group-text" id="at">
|
||||||
<i class="bi-at"></i>
|
<i class="bi-at"></i>
|
||||||
</span>
|
</span>
|
||||||
<InputText type="email" class="form-control" aria-described-by="at"
|
<InputText id="username" name="username" type="email" class="form-control" aria-described-by="at"
|
||||||
@bind-Value="CredentialDto.Email" autocomplete="username"/>
|
@bind-Value="CredentialDto.Email" autocomplete="username"/>
|
||||||
<ValidationMessage For="@(() => CredentialDto.Email)"/>
|
<ValidationMessage For="@(() => CredentialDto.Email)"/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
<span class="input-group-text" id="key">
|
<span class="input-group-text" id="key">
|
||||||
<i class="bi-key"></i>
|
<i class="bi-key"></i>
|
||||||
</span>
|
</span>
|
||||||
<InputText type="password" class="form-control" aria-described-by="key"
|
<InputText id="password" name="password" type="password" class="form-control" aria-described-by="key"
|
||||||
@bind-Value="CredentialDto.Password" autocomplete="current-password"/>
|
@bind-Value="CredentialDto.Password" autocomplete="current-password"/>
|
||||||
<ValidationMessage For="@(() => CredentialDto.Password)"/>
|
<ValidationMessage For="@(() => CredentialDto.Password)"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -118,6 +118,7 @@
|
||||||
<th class="text-end" scope="col">Pris</th>
|
<th class="text-end" scope="col">Pris</th>
|
||||||
<th class="text-end" scope="col">R%</th>
|
<th class="text-end" scope="col">R%</th>
|
||||||
<th class="text-end" scope="col">Beløb</th>
|
<th class="text-end" scope="col">Beløb</th>
|
||||||
|
<th class="text-center" scope="col">SAS</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -130,6 +131,7 @@
|
||||||
<td class="text-end">@($"{line.Price:N2}")</td>
|
<td class="text-end">@($"{line.Price:N2}")</td>
|
||||||
<td class="text-end">@($"{line.Discount:N2}")</td>
|
<td class="text-end">@($"{line.Discount:N2}")</td>
|
||||||
<td class="text-end">@($"{line.LineSum:N2}")</td>
|
<td class="text-end">@($"{line.LineSum:N2}")</td>
|
||||||
|
<td class="text-center"><i class="bi- @(line.Sas ? "bi-check-square" : "bi-square")"></i></td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
<tr>
|
<tr>
|
||||||
|
|
|
@ -43,7 +43,6 @@ public partial class SystemUserCreatePage : IDisposable
|
||||||
private EditContext FormContext { get; set; }
|
private EditContext FormContext { get; set; }
|
||||||
private bool _formInvalid = true;
|
private bool _formInvalid = true;
|
||||||
private bool Working { get; set; } = true;
|
private bool Working { get; set; } = true;
|
||||||
private bool _readOnly;
|
|
||||||
private PasswordInput PasswdInput { get; set; } = new();
|
private PasswordInput PasswdInput { get; set; } = new();
|
||||||
private RoleAssignment AssignedRoles { get; set; } = new();
|
private RoleAssignment AssignedRoles { get; set; } = new();
|
||||||
|
|
||||||
|
@ -73,16 +72,12 @@ public partial class SystemUserCreatePage : IDisposable
|
||||||
* UI message
|
* UI message
|
||||||
*/
|
*/
|
||||||
Toaster.ShowInfo("Sender data til server ...");
|
Toaster.ShowInfo("Sender data til server ...");
|
||||||
/*
|
|
||||||
* Make fields reaonly
|
|
||||||
*/
|
|
||||||
_readOnly = true;
|
|
||||||
/*
|
/*
|
||||||
* Raise working flag
|
* Raise working flag
|
||||||
*/
|
*/
|
||||||
Working = true;
|
Working = true;
|
||||||
/*
|
/*
|
||||||
* ensure companyId is set correct
|
* ensure companyId is set if new user is eShop user
|
||||||
*/
|
*/
|
||||||
UserForm.CompanyId = UserForm.EShop ? _company.CompanyId : "";
|
UserForm.CompanyId = UserForm.EShop ? _company.CompanyId : "";
|
||||||
/*
|
/*
|
||||||
|
@ -93,6 +88,7 @@ public partial class SystemUserCreatePage : IDisposable
|
||||||
* Map form input to a model the backend expects
|
* Map form input to a model the backend expects
|
||||||
*/
|
*/
|
||||||
NewUserDto = Mapper.MapCreateUser(UserForm);
|
NewUserDto = Mapper.MapCreateUser(UserForm);
|
||||||
|
Logger.LogDebug("NewUserDto {}", JsonSerializer.Serialize(NewUserDto));
|
||||||
/*
|
/*
|
||||||
* Send Post Request
|
* Send Post Request
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"appInfo": {
|
"appInfo": {
|
||||||
"name": "Wonky Online",
|
"name": "Wonky Online",
|
||||||
"version": "179.1",
|
"version": "181.0",
|
||||||
"rc": true,
|
"rc": true,
|
||||||
"sandBox": true,
|
"sandBox": true,
|
||||||
"image": "grumpy-coder.png",
|
"image": "grumpy-coder.png",
|
||||||
|
|
|
@ -20,56 +20,56 @@ namespace Wonky.Entity.DTO;
|
||||||
|
|
||||||
public class ActivityLineDto
|
public class ActivityLineDto
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Item Sku
|
|
||||||
/// </summary>
|
|
||||||
[MaxLength(30, ErrorMessage = "Højst 30 teng i varenummer")]
|
|
||||||
public string Sku { get; set; } = "";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Description
|
|
||||||
/// </summary>
|
|
||||||
[MaxLength(50, ErrorMessage = "Højst 50 tegn i teksten")]
|
|
||||||
public string Text { get; set; } = "";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// ShortName
|
|
||||||
/// </summary>
|
|
||||||
[MaxLength(30, ErrorMessage = "Maks 30 tegn i forkortelse")]
|
|
||||||
public string ShortName { get; set; } = "";
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Quantity
|
|
||||||
/// </summary>
|
|
||||||
public int Qty { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Line price
|
|
||||||
/// </summary>
|
|
||||||
public decimal Price { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Line discount
|
/// Line discount
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal Discount { get; set; }
|
public decimal Discount { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Line amount
|
/// Line amount
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal LineAmount { get; set; }
|
public decimal LineAmount { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// warehouse pick location
|
||||||
|
/// </summary>
|
||||||
|
public string Location { get; set; } = "";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Line number
|
/// Line number
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int LineNumber { get; set; }
|
public int LineNumber { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Line price
|
||||||
|
/// </summary>
|
||||||
|
public decimal Price { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Quantity
|
||||||
|
/// </summary>
|
||||||
|
public int Qty { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Sas indicator
|
/// Sas indicator
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool Sas { get; set; }
|
public bool Sas { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// warehouse pick location
|
/// ShortName
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Location { get; set; } = "";
|
[MaxLength(30, ErrorMessage = "Maks 30 tegn i forkortelse")]
|
||||||
|
public string ShortName { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Item Sku
|
||||||
|
/// </summary>
|
||||||
|
[MaxLength(30, ErrorMessage = "Højst 30 teng i varenummer")]
|
||||||
|
public string Sku { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Description
|
||||||
|
/// </summary>
|
||||||
|
[MaxLength(50, ErrorMessage = "Højst 50 tegn i teksten")]
|
||||||
|
public string Text { get; set; } = "";
|
||||||
}
|
}
|
|
@ -18,9 +18,10 @@ namespace Wonky.Entity.Views;
|
||||||
|
|
||||||
public class InvoiceLineView
|
public class InvoiceLineView
|
||||||
{
|
{
|
||||||
|
public string Discount { get; set; } = "";
|
||||||
|
public string Price { get; set; } = "";
|
||||||
|
public string Qty { get; set; } = "";
|
||||||
public string Sku { get; set; } = "";
|
public string Sku { get; set; } = "";
|
||||||
public string Text { get; set; } = "";
|
public string Text { get; set; } = "";
|
||||||
public string Qty { get; set; } = "";
|
public bool Sas { get; set; }
|
||||||
public string Price { get; set; } = "";
|
|
||||||
public string Discount { get; set; } = "";
|
|
||||||
}
|
}
|
|
@ -29,5 +29,4 @@ public class ProductInventoryItemView
|
||||||
public string LastInvoiceDate { get; set; } = "";
|
public string LastInvoiceDate { get; set; } = "";
|
||||||
public string Sku { get; set; } = "";
|
public string Sku { get; set; } = "";
|
||||||
public string VendorItemNo { get; set; } = "";
|
public string VendorItemNo { get; set; } = "";
|
||||||
|
|
||||||
}
|
}
|
|
@ -18,45 +18,53 @@ namespace Wonky.Entity.Views;
|
||||||
|
|
||||||
public class ReportItemCustomer
|
public class ReportItemCustomer
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Company entity id
|
|
||||||
/// </summary>
|
|
||||||
public string CompanyId { get; set; } = "";
|
|
||||||
/// <summary>
|
|
||||||
/// Company name
|
|
||||||
/// </summary>
|
|
||||||
public string Name { get; set; } = "";
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Company account
|
/// Company account
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Account { get; set; } = "";
|
public string Account { get; set; } = "";
|
||||||
/// <summary>
|
|
||||||
/// Company office phone
|
|
||||||
/// </summary>
|
|
||||||
public string Phone { get; set; } = "";
|
|
||||||
/// <summary>
|
|
||||||
/// Company VAT registration number
|
|
||||||
/// </summary>
|
|
||||||
public string VatNumber { get; set; } = "";
|
|
||||||
/// <summary>
|
|
||||||
/// Company address city name
|
|
||||||
/// </summary>
|
|
||||||
public string City { get; set; } = "";
|
|
||||||
/// <summary>
|
|
||||||
/// Company address postal coce
|
|
||||||
/// </summary>
|
|
||||||
public string ZipCode { get; set; } = "";
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Company address line 1
|
/// Company address line 1
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Address1 { get; set; } = "";
|
public string Address1 { get; set; } = "";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Company address address line 2
|
/// Company address address line 2
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Address2 { get; set; } = "";
|
public string Address2 { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Company address city name
|
||||||
|
/// </summary>
|
||||||
|
public string City { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Company entity id
|
||||||
|
/// </summary>
|
||||||
|
public string CompanyId { get; set; } = "";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Company email address
|
/// Company email address
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Email { get; set; } = "";
|
public string Email { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Company name
|
||||||
|
/// </summary>
|
||||||
|
public string Name { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Company office phone
|
||||||
|
/// </summary>
|
||||||
|
public string Phone { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Company VAT registration number
|
||||||
|
/// </summary>
|
||||||
|
public string VatNumber { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Company address postal coce
|
||||||
|
/// </summary>
|
||||||
|
public string ZipCode { get; set; } = "";
|
||||||
}
|
}
|
|
@ -22,36 +22,49 @@ public class ReportItemLine
|
||||||
/// Line description
|
/// Line description
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Description { get; set; } = "";
|
public string Description { get; set; } = "";
|
||||||
/// <summary>
|
|
||||||
/// Line item SKU
|
|
||||||
/// </summary>
|
|
||||||
public string Sku { get; set; } = "";
|
|
||||||
/// <summary>
|
|
||||||
/// Line item quantity
|
|
||||||
/// </summary>
|
|
||||||
public int Quantity { get; set; }
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Line item discount
|
/// Line item discount
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal Discount { get; set; }
|
public decimal Discount { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// Line item price
|
|
||||||
/// </summary>
|
|
||||||
public decimal Price { get; set; }
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Line number
|
/// Line number
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int LineNumber { get; set; }
|
public int LineNumber { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Line sum
|
/// Line sum
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public decimal LineSum { get; set; }
|
public decimal LineSum { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// Flag line as picked
|
|
||||||
/// </summary>
|
|
||||||
public bool Picked { get; set; }
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Warehouse pick location
|
/// Warehouse pick location
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Location { get; set; } = "";
|
public string Location { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Flag line as picked
|
||||||
|
/// </summary>
|
||||||
|
public bool Picked { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Line item price
|
||||||
|
/// </summary>
|
||||||
|
public decimal Price { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Line item quantity
|
||||||
|
/// </summary>
|
||||||
|
public int Quantity { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sas flag
|
||||||
|
/// </summary>
|
||||||
|
public bool Sas { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Line item SKU
|
||||||
|
/// </summary>
|
||||||
|
public string Sku { get; set; } = "";
|
||||||
}
|
}
|
Loading…
Reference in a new issue