From 06ab8f48c80dc08a8d823e3b0faa4ba06ea5b281 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Wed, 9 Mar 2022 20:33:24 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- .../AyaNova/Controllers/CustomerController.cs | 8 ----- server/AyaNova/util/DbUtil.cs | 33 +++++++++++++++++-- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 2c3525c1..7c905164 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -48,7 +48,7 @@ "AYANOVA_DATA_PATH": "c:\\temp\\ravendata", "AYANOVA_USE_URLS": "http://*:7575;", //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8", //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", diff --git a/server/AyaNova/Controllers/CustomerController.cs b/server/AyaNova/Controllers/CustomerController.cs index c149d38e..295a7d85 100644 --- a/server/AyaNova/Controllers/CustomerController.cs +++ b/server/AyaNova/Controllers/CustomerController.cs @@ -78,14 +78,6 @@ namespace AyaNova.Api.Controllers return BadRequest(new ApiErrorResponse(ModelState)); var o = await biz.GetAsync(id); if (o == null) return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND)); - - -await NotifyEventHelper.AddGeneralNotifyEvent(NotifyEventType.GeneralNotification, @" Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque ullamcorper lectus nibh, vitae commodo enim vulputate tincidunt. In euismod posuere ante a consectetur. Ut at odio mauris. Nullam auctor nisi nibh, nec eleifend elit ultricies non. Proin pharetra, mi vel lobortis egestas, lectus leo commodo lorem, placerat dictum est ligula in augue. In in eros consectetur, scelerisque massa non, commodo ex. Integer varius libero eu ex blandit sollicitudin. Integer a tincidunt erat, ac maximus ligula. Nulla ac cursus ex. In hendrerit tortor at sem dictum euismod. Nam eu lacus vel massa sodales auctor. Morbi ullamcorper viverra molestie. Phasellus a turpis ac tellus scelerisque bibendum. - -Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nunc eget pharetra erat. Proin et consequat mi, quis eleifend leo. Duis vehicula nisl ipsum, ac viverra elit sodales sed. Suspendisse eu velit lobortis, iaculis nibh quis, pretium leo. Morbi accumsan sit amet magna quis dictum. Vestibulum fringilla felis vitae metus condimentum, ac aliquet massa consequat. Cras cursus non tellus at tincidunt. - -Etiam id ornare nunc. Praesent porttitor aliquet velit a fringilla. Aenean malesuada ex ac elit semper imperdiet. Praesent pharetra vehicula nisl, aliquet aliquet neque rhoncus ac. Nunc convallis eget nibh ut laoreet. Cras finibus fermentum aliquet. Donec vel ipsum et augue volutpat malesuada vulputate et orci. Fusce nec leo mauris. Integer fringilla dolor eu enim sodales, id ornare lectus congue. Vestibulum nisi ligula, maximus et sapien vel, ultricies sagittis massa. Quisque felis eros, pulvinar non massa eu, lacinia accumsan erat. In facilisis neque et ultricies imperdiet. Cras eleifend quis nunc sit amet tristique. Mauris dignissim gravida lacus, vel euismod arcu imperdiet a. Quisque egestas id erat ut ornare. ", "Error", null, 1); - return Ok(ApiOkResponse.Response(o)); } diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index ff28d15b..efcc9d0f 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -350,7 +350,36 @@ namespace AyaNova.Util cmd.CommandText = "update apurchaseorderitem set workorderitempartrequestid=null;"; await cmd.ExecuteNonQueryAsync(); - cmd.CommandText = "update aglobalbizsettings set taxpartpurchaseid=null,taxpartsaleid=null,taxratesaleid=null;"; + //cmd.CommandText = "update aglobalbizsettings set taxpartpurchaseid=null,taxpartsaleid=null,taxratesaleid=null;"; + cmd.CommandText = "update aglobalbizsettings set " + + "webaddress =null, phone1 =null, phone2 =null, emailaddress =null, postaddress =null, postcity =null, postregion =null, postcountry =null, postcode =null, " + + "address =null, city =null, region =null, country =null, latitude=null, longitude =null, " + + "filtercasesensitive = FALSE, " + + "useinventory = TRUE, " + + "allowscheduleconflicts = TRUE, " + + "workordercompletebyage = '00:00:00', " + + "workordertraveldefaultminutes = 0, " + + "worklaborscheduledefaultminutes = 0, " + + "signaturetitle =null, " + + "signatureheader =null, " + + "signaturefooter =null, " + + "customerservicerequestinfotext =null, " + + "customerallowcsr = FALSE, customerallowcsrintags ='{}', " + + "customerallowcreateunit = FALSE, customerallowcreateunitintags ='{}', " + + "customerallowviewwo = FALSE, customerallowviewwointags ='{}', " + + "customerworkorderreport1tags ='{}', customerworkorderreport2tags ='{}', " + + "customerworkorderreport3tags ='{}', customerworkorderreport4tags ='{}', customerworkorderreport5tags ='{}', " + + "customerallowwowiki = FALSE, customerallowwowikiintags ='{}', " + + "customerallowwoattachments = FALSE, customerallowwoattachmentsintags ='{}', " + + "customerallowusersettings = FALSE, customerallowusersettingsintags ='{}', " + + "customerallownotifyserviceimminent = FALSE, customerallownotifyserviceimminentintags ='{}', " + + "customerallownotifycsraccepted = FALSE, customerallownotifycsracceptedintags ='{}', " + + "customerallownotifycsrrejected = FALSE, customerallownotifycsrrejectedintags ='{}', " + + "customerallownotifywocreated = FALSE, customerallownotifywocreatedintags ='{}', " + + "customerallownotifywocompleted = FALSE, customerallownotifywocompletedintags ='{}', " + + "taxpartpurchaseid=null,taxpartsaleid=null,taxratesaleid=null, " + + "customerdefaultworkorderreportid=null, customertagworkorderreport1id=null, customertagworkorderreport2id=null, " + + "customertagworkorderreport3id=null, customertagworkorderreport4id=null, customertagworkorderreport5id=null "; await cmd.ExecuteNonQueryAsync(); //reset global settings cache taxes ServerGlobalBizSettings.Cache.TaxPartPurchaseId = null; @@ -464,7 +493,7 @@ namespace AyaNova.Util await EraseTableAsync("anotifyevent", conn); await EraseTableAsync("anotifydeliverylog", conn); await EraseTableAsync("anotifysubscription", conn); - await EraseTableAsync("acustomernotifyevent", conn); + await EraseTableAsync("acustomernotifyevent", conn); await EraseTableAsync("acustomernotifydeliverylog", conn); await EraseTableAsync("acustomernotifysubscription", conn);