From cb00711bbc9dea577882879911898b128c4c3197 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 27 Jun 2023 13:50:05 +0200 Subject: [PATCH] FEAT add salesRep to office customer list FEAT add streetName to office customer search component FEAT customer product history -> item history --- Wonky.Client/Components/AppVersion.razor | 2 +- .../OfficeCountryCustomerListComponent.razor | 96 +-- .../SearchCustomerColumnComponent.razor | 1 + .../HttpInterceptorService.cs | 58 +- ...eCustomerInventoryItemHistoryOverlay.razor | 61 ++ ...stomerInventoryItemHistoryOverlay.razor.cs | 62 ++ .../OfficeCustomerListInventoryOverlay.razor | 6 +- ...fficeCustomerListInventoryOverlay.razor.cs | 13 +- .../Pages/AdvisorActivityCreatePage.razor | 612 +++++++++--------- .../Pages/AdvisorActivityCreatePage.razor.cs | 18 +- .../Pages/AdvisorCustomerViewEditPage.razor | 87 ++- .../AdvisorCustomerViewEditPage.razor.cs | 89 +-- Wonky.Client/wwwroot/appsettings.json | 4 +- Wonky.Client/wwwroot/index.html | 2 +- alpha-build.sh | 4 +- eta-build.sh | 9 +- zeta-build.sh | 9 +- 17 files changed, 668 insertions(+), 465 deletions(-) create mode 100644 Wonky.Client/OverlayOffice/OfficeCustomerInventoryItemHistoryOverlay.razor create mode 100644 Wonky.Client/OverlayOffice/OfficeCustomerInventoryItemHistoryOverlay.razor.cs diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index 8a9594d8..909b1ba5 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -29,7 +29,7 @@ { [Inject] IOptions? AppInfo { get; set; } private AppInfo? _app; - private bool _production = true; + // private bool _production = true; protected override void OnInitialized() { diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor index f5890ea1..8ce63e9b 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor @@ -19,67 +19,69 @@ @using Wonky.Client.OverlayOffice @if (CompanyList.Any()) { -
+
@foreach (var company in CompanyList) {
- @company.Name + @company.Name
-
-
Sidst besøgt
-
@company.LastVisit
-
Næste besøg
-
@company.NextVisit
-
-
- @* -
-
-
- Sidst besøgt: @company.LastVisit -
-
- Næste besøg: @company.NextVisit -
-
-
- *@ -
-
-
Konto
-
@company.Account
-
Org Nr.
-
@company.VatNumber
-
-
-
Telefon
-
@company.Phone
-
-
-
Adresse
-
@company.Address1 @(string.IsNullOrWhiteSpace(company.Address2) ? "" : ",") @company.Address2
-
-
-
Post By
-
@company.CountryCode.ToUpper()-@company.ZipCode @company.City
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Konto@company.AccountOrg Nr.@(string.IsNullOrWhiteSpace(@company.VatNumber) ? "~/~" : @company.VatNumber)
Telefon@company.Phone
Adresse@company.Address1 @(string.IsNullOrWhiteSpace(company.Address2) ? "" : ",") @company.Address2
Post By@company.CountryCode.ToUpper()-@company.ZipCode @company.City
+ Sælgernr. + + @company.SalesRep +
Sidst besøgt + @company.LastVisit +
Næste besøg + @company.NextVisit +
- +
- +
- +
- Bestilling + Bestilling
@@ -87,9 +89,9 @@
}
- - - + + + } else { diff --git a/Wonky.Client/Components/SearchCustomerColumnComponent.razor b/Wonky.Client/Components/SearchCustomerColumnComponent.razor index 1a8b1239..3c20cc3f 100644 --- a/Wonky.Client/Components/SearchCustomerColumnComponent.razor +++ b/Wonky.Client/Components/SearchCustomerColumnComponent.razor @@ -16,6 +16,7 @@ - - - @* - ***************** Remove item ***************************** - *@ - - - - } - } - - - Total - @($"{DraftProvider.Draft.Total:N2}") - - - @* - ***************** Price catalog overlay button ***************************** - *@ - - - - - +
- @* Create Draft line ----------------------------------------------------- *@ -
-
- @if (!string.IsNullOrWhiteSpace(_selectedItem.Name) && ShowItem) - { - + +
+ @* Draft lines in draft -----------------------------------------------------*@ +
+
+
- + + - - - - - - + + + + + + + + - - - + + + + + + + + - - - - + + } + } + + + + + +
Kladdelinje + Ordrekladde Global kladde (udløber efter @(DraftProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) + + @* + ***************** Reset draft ***************************** + *@ + +
AntalPrisRabatSASVarenr.
NavnVarenrAntalEnhedspris%LinjesumSAS
- - -
- - @* - ***************** Product Price history overlay button ********************* + @if (DraftProvider.Draft.Items.Count > 0) + { + @foreach (var cartItem in DraftProvider.Draft.Items) + { +
@cartItem.Item.Name@cartItem.Item.Sku@cartItem.Quantity@($"{cartItem.Price:N2}")@($"{cartItem.Discount:N2}")@($"{cartItem.LineTotal:N2}") + + + @* + ***************** Remove item ***************************** *@ - - - - - - - @_selectedItem.Sku + +
Total@($"{DraftProvider.Draft.Total:N2}") @* - ***************** Add item button ***************************** - *@ - + ***************** Price catalog overlay button ***************************** + *@ +
- } +
+ @* Create Draft line ----------------------------------------------------- *@ +
+
+ @if (!string.IsNullOrWhiteSpace(_selectedItem.Name) && ShowItem) + { + + + + + + + + + + + + + + + + + + + + + + + + +
Kladdelinje
AntalPrisRabatSASVarenr.
+ + +
+ + @* + ***************** Product Price history overlay button ********************* + *@ + +
+ 		+ + + + @_selectedItem.Sku + @* + ***************** Add item button ***************************** + *@ + +
+ } +
+
+ @* end draft line ------------------------------------------------- *@ - @* end draft line ------------------------------------------------- *@ - @*
*@ @* Delivery address *@
@@ -387,47 +389,47 @@ else
- } - + } + -
-
- Stamkort -
-
- @* +
+
+ Stamkort +
+
+ @* ***************** Confirm product check overlay button ***************************** ***************** Continue by submitton order to erp ***************************** *@ - + +
-
+ + + + + + + + + + + + + + } } - - - - - - - - - - - - - - - diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 09693717..321b165b 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -104,6 +104,7 @@ public partial class AdvisorActivityCreatePage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); + _userPref = await PreferenceService.GetProfile(); _salesRep = await UserInfo.GetUserInfo(); @@ -190,14 +191,6 @@ public partial class AdvisorActivityCreatePage : IDisposable // raise flag if report is closed ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); - // Ask for confirmation of date - // Logger.LogDebug("Preferences.DateConfirmed => {}", _userPref.DateConfirmed); - if (!_userPref.DateConfirmed) - { - PromptDateConfirm = $"Aktiviteter oprettes med dato {SelectedDate.ToShortDateString()}. Er dette OK?"; - WorkDateOverlay.Show(); - } - // Lines may already have been added from the company inventory page if (DraftProvider.Draft.DraftType == "order") { @@ -218,7 +211,14 @@ public partial class AdvisorActivityCreatePage : IDisposable Working = false; - // StateHasChanged(); + // Ask for confirmation of date + Logger.LogDebug("Preferences.DateConfirmed => {}", _userPref.DateConfirmed); + if (!_userPref.DateConfirmed) + { + PromptDateConfirm = $"Aktiviteter oprettes med dato {SelectedDate.ToShortDateString()}. Er dette OK?"; + WorkDateOverlay.Show(); + } + StateHasChanged(); } diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor index 72caf388..5bdc8694 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor @@ -17,20 +17,20 @@ @using Wonky.Client.Components @attribute [Authorize(Roles = "Advisor")] @page "/advisor/customers/{CompanyId}" -Stamkort for @_infoDrawer.Content.Name +Stamkort for @_company.Name -@if (!string.IsNullOrWhiteSpace(_infoDrawer.Content.Account)) +@if (!string.IsNullOrWhiteSpace(_company.Account)) { - @if (!string.IsNullOrWhiteSpace(_infoDrawer.Content.Blocked)) + @if (!string.IsNullOrWhiteSpace(_company.Blocked)) {
-

Ring til kontoret. Denne konto er spærret med kode '@_infoDrawer.Content.Blocked'

+

Ring til kontoret. Denne konto er spærret med kode '@_company.Blocked'

}
- @_infoDrawer.Content.Name (@_infoDrawer.Content.Account) + @_company.Name (@_company.Account)
@@ -46,75 +46,74 @@ { Statistik } - - + Tilbage
// erp context - +
@* Company Name *@
- - + +
@* Company Attention *@
- - + +
@* Address 1 *@
- - + +
@* Address 2 *@
- - + +
@* Post Code *@
- - + +
@* City Name *@
- - + +
@* Email *@
- - + +
@* Phone *@
- - + +
@* Mobile *@
- - + +
@* Email *@
- - + +
@if (!_kanvas) @@ -125,12 +124,12 @@
+ @bind-Value="@_company.Segment" disabled="@(_erpEditDisabled)"> - +
@@ -154,7 +153,7 @@
@* Save erp data *@
- +
@* vat number*@
@@ -164,8 +163,8 @@ - - + +
@* Enable edit/save vatnumber *@ @@ -183,7 +182,7 @@ brreg.no break; case "se": - allabolag.se + allabolag.se break; }
@@ -241,19 +240,19 @@
- @if (string.IsNullOrWhiteSpace(_infoDrawer.Content.Note)) + @if (string.IsNullOrWhiteSpace(_company.Note)) { - + } else { - + } - +
@* Save CRM data button *@
- +
@* crm context - contacts *@ @@ -309,14 +308,14 @@
- - + +
- +
} @@ -340,8 +339,8 @@ } - - diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs index e4c9dbe2..5c5829d1 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs @@ -38,14 +38,14 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerViewEditPage : IDisposable { // ########################################################################### + [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } - [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } - [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public IAdvisorCustomerRepository AdvisorCustomerRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository CustomerHistoryRepo { get; set; } [Inject] public IAdvisorContactRepository ContactRepo { get; set; } - [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public VatInfoLookupService VatService { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } @@ -56,7 +56,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable [Parameter] public string CompanyId { get; set; } = ""; // ########################################################################### - private EditContext _erpContext; + private EditContext _erpFormContext; private DateTime _lastVisit; private DateTime _nextVisit; private VatAddress _companyVatAddress = new(); @@ -114,23 +114,19 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /* * setup form context */ - _erpContext = new EditContext(_company); - /* - * assign event handlers to context - */ - _erpContext.OnFieldChanged += HandleFieldChanged; - _erpContext.OnValidationStateChanged += ValidationChanged!; + _erpFormContext = new EditContext(_company); + _erpFormContext.OnFieldChanged += HandleFieldChanged; + _erpFormContext.OnValidationStateChanged += ValidationChanged!; /* * fetch user info from local storage */ _userInfo = await UserInfoService.GetUserInfo(); _countryCode = _userInfo.CountryCode.ToLower(); _countryIsDk = _countryCode == "dk"; - /* - * get InfoDrawer.Company from drawer - */ - _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId, force:true); - _company = _infoDrawer.Content; + _company = await AdvisorCustomerRepo.GetCompanyById(CompanyId); + _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId); + _infoDrawer.Content = _company; + await DrawerService.StoreInfoDrawerAsync(CompanyId, _infoDrawer); /* * internal _enableActivity flag */ @@ -215,6 +211,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable { _companyVatAddress = PrepareVatAddress(_company); } + // await GetContacts(CompanyId); } /* * remove loading image @@ -228,39 +225,43 @@ public partial class AdvisorCustomerViewEditPage : IDisposable if (firstRender) { await GetContacts(CompanyId); - _ = await DrawerService.GetActivityDrawerAsync(CompanyId); + _ = await DrawerService.GetActivityDrawerAsync(CompanyId, force:true); if (!_company.Account.StartsWith("NY")) { - _ = await HistoryRepo.RequestErpSync(CompanyId, _company.HistorySync, false); - _ = await DrawerService.GetInvoiceDrawerAsync(CompanyId); - _ = await DrawerService.GetInventoryDrawerAsync(CompanyId); - _ = await DrawerService.GetStatisticDrawerAsync(CompanyId); + await ReloadHistory(); } } } - private async Task ReloadHistory() + private async Task ReloadHistory(bool force = false) { - Toaster.ShowInfo("Afventer svar fra tjenester ..."); + if (force) + { + Toaster.ShowInfo("Afventer svar fra tjenester ..."); + } _enableLink = 0; _enableActivity = 0; - _ = await DrawerService.GetActivityDrawerAsync(CompanyId, true); - - var newSync = await HistoryRepo.RequestErpSync(CompanyId, _company.HistorySync, true); + var newSync = await CustomerHistoryRepo.RequestErpSync(CompanyId, _company.HistorySync, force); + await Task.Delay(500); if (!string.IsNullOrWhiteSpace(newSync)) { - _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId, true); - _company = _infoDrawer.Content; - _ = await DrawerService.GetInvoiceDrawerAsync(CompanyId, true); - _ = await DrawerService.GetInventoryDrawerAsync(CompanyId, true); - _ = await DrawerService.GetStatisticDrawerAsync(CompanyId, true); + if (!_company.Account.StartsWith("NY")) + { + _ = await DrawerService.GetInvoiceDrawerAsync(CompanyId, force); + _ = await DrawerService.GetInventoryDrawerAsync(CompanyId, force); + _ = await DrawerService.GetStatisticDrawerAsync(CompanyId, force); + } + _ = await DrawerService.GetActivityDrawerAsync(CompanyId, force); } _enableLink = 1; _enableActivity = _company.ValidVat; - // StateHasChanged(); - Toaster.ShowSuccess("Alle tjenester har svaret."); + StateHasChanged(); + if (force) + { + Toaster.ShowSuccess("Alle tjenester har svaret."); + } } @@ -286,7 +287,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable /* * send update reqeust */ - await CustomerRepo.UpdateCrmData(CompanyId, _company); + await AdvisorCustomerRepo.UpdateCrmData(CompanyId, _company); } @@ -429,7 +430,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable _company.LastVisit = $"{_lastVisit:yyyy-MM-dd}"; _company.NextVisit = $"{_nextVisit:yyyy-MM-dd}"; _company.IsHidden = 0; - var result = await CustomerRepo.UpdateCrmData(CompanyId, _company); + var result = await AdvisorCustomerRepo.UpdateCrmData(CompanyId, _company); if (!string.IsNullOrWhiteSpace(result.CompanyId)) { _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId, true); @@ -451,7 +452,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable _erpEditDisabled = true; _working = true; Toaster.ShowInfo("Vent venligst ..."); - var result = await CustomerRepo.UpdateErpData(CompanyId, _company); + var result = await AdvisorCustomerRepo.UpdateErpData(CompanyId, _company); if (!string.IsNullOrWhiteSpace(result.CompanyId)) { _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId, true); @@ -486,7 +487,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable _working = true; _vatEditDisabled = true; Toaster.ShowInfo("Vent venligst ..."); - var result = await CustomerRepo.UpdateCompanyVat(CompanyId, _company.VatNumber); + var result = await AdvisorCustomerRepo.UpdateCompanyVat(CompanyId, _company.VatNumber); if (!string.IsNullOrWhiteSpace(result.CompanyId)) { _infoDrawer = await DrawerService.GetInfoDrawerAsync(CompanyId, true); @@ -576,13 +577,13 @@ public partial class AdvisorCustomerViewEditPage : IDisposable */ private void ValidationChanged(object sender, ValidationStateChangedEventArgs e) { - _erpContext.OnFieldChanged -= HandleFieldChanged; - _erpContext.OnValidationStateChanged -= ValidationChanged!; + _erpFormContext.OnFieldChanged -= HandleFieldChanged; + _erpFormContext.OnValidationStateChanged -= ValidationChanged!; - _erpContext = new EditContext(_company); + _erpFormContext = new EditContext(_company); - _erpContext.OnFieldChanged += HandleFieldChanged; - _erpContext.OnValidationStateChanged += ValidationChanged!; + _erpFormContext.OnFieldChanged += HandleFieldChanged; + _erpFormContext.OnValidationStateChanged += ValidationChanged!; } @@ -592,7 +593,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable public void Dispose() { Interceptor.DisposeEvent(); - _erpContext.OnFieldChanged -= HandleFieldChanged; - _erpContext.OnValidationStateChanged -= ValidationChanged!; + _erpFormContext.OnFieldChanged -= HandleFieldChanged; + _erpFormContext.OnValidationStateChanged -= ValidationChanged!; } } \ No newline at end of file diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index dfc50b34..0c8e1074 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "173.0", + "version": "177.1", "rc": true, "sandBox": true, "image": "grumpy-coder.png", @@ -11,7 +11,7 @@ "LogLevel": { "Default": "Debug", "System": "Debug", - "Microsoft": "None" + "Microsoft": "Information" }, "Debug": { "LogLevel": { diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 61348050..fefc6ffd 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -17,7 +17,7 @@ - +
diff --git a/alpha-build.sh b/alpha-build.sh index 56878ccf..330178d6 100755 --- a/alpha-build.sh +++ b/alpha-build.sh @@ -10,13 +10,15 @@ FOLDER="alpha-client" sed -i "s|\"version\".*|\"version\": \"$1\",|g" "${FILE}" sed -i 's|\"rc\".*|\"rc\": false,|g' "${FILE}" -sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}" +sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}" sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}" sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}" +sed -i 's|\"Microsoft\": \"None\",|\"Microsoft\": \"Information\",|g' "${FILE}" sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}" +dotnet clean dotnet publish -c release cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/* "/a/projects/inno/version-sync/${FOLDER}" diff --git a/eta-build.sh b/eta-build.sh index 582618cd..3a849a4c 100755 --- a/eta-build.sh +++ b/eta-build.sh @@ -10,22 +10,25 @@ FOLDER="eta-${1}" sed -i "s|\"version\".*|\"version\": \"${1}\",|g" "${FILE}" sed -i 's|\"rc\".*|\"rc\": true,|g' "${FILE}" -sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}" +sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}" sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}" sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}" +sed -i 's|\"Microsoft\": \"Information\",|\"Microsoft\": \"None\",|g' "${FILE}" sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}" +dotnet clean dotnet publish -c release -cp --recursive "/a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish" "/a/projects/inno/version-sync/client/${FOLDER}" +cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" # RESET TO DEVELOPMENT -sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}" +sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}" sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}" sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}" +sed -i 's|\"Microsoft\": \"None\",|\"Microsoft\": \"Information\",|g' "${FILE}" sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}" diff --git a/zeta-build.sh b/zeta-build.sh index 4418a970..95bf5f52 100755 --- a/zeta-build.sh +++ b/zeta-build.sh @@ -10,22 +10,25 @@ FOLDER="zeta-${1}" sed -i "s|\"version\":.*|\"version\": \"$1\",|g" "${FILE}" sed -i 's|\"rc\":.*|\"rc\": true,|g' "${FILE}" -sed -i 's|\"sandbox\":.*|\"sandbox\": false,|g' "${FILE}" +sed -i 's|\"sandBox\":.*|\"sandBox\": false,|g' "${FILE}" sed -i 's|\"Default": \"Debug\",|\"Default": \"None\",|g' "${FILE}" sed -i 's|\"System": \"Debug\",|\"System": \"None\",|g' "${FILE}" +sed -i 's|\"Microsoft\": \"Information\",|\"Microsoft\": \"None\",|g' "${FILE}" sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://zeta.innotec.dk\",|g' "${FILE}" +dotnet clean dotnet publish -c release -cp --recursive "/a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish" "/a/projects/inno/version-sync/client/${FOLDER}" +cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" # RESET TO DEVELOPMENT -sed -i 's|\"sandbox\".*|\"sandbox\": true,|g' "${FILE}" +sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}" sed -i 's|\"Default": \"None\",|\"Default": \"Debug\",|g' "${FILE}" sed -i 's|\"System": \"None\",|\"System": \"Debug\",|g' "${FILE}" +sed -i 's|\"Microsoft\": \"None\",|\"Microsoft\": \"Information\",|g' "${FILE}" sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}"