Merge branch 'master' of https://github.com/djChika/ELT.Gateway into master

This commit is contained in:
vchikalkin 2021-11-19 10:59:40 +03:00
commit 22c3340081
7 changed files with 1606 additions and 974 deletions

View File

@ -1,9 +1,4 @@
{ {
"ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf",
"Version": "15.0.40203.910",
"GettingStartedDocument": {
"Uri": "https://go.microsoft.com/fwlink/?linkid=858517"
},
"ExtendedData": { "ExtendedData": {
"inputs": [ "inputs": [
"http://evolucia.elt-poisk.com/soap.php?wsdl" "http://evolucia.elt-poisk.com/soap.php?wsdl"
@ -15,14 +10,6 @@
"namespaceMappings": [ "namespaceMappings": [
"*, ELTKasko" "*, ELTKasko"
], ],
"references": [
"System.ServiceModel, {System.ServiceModel.Primitives, 4.4.4}",
"System.ServiceModel.Duplex, {System.ServiceModel.Duplex, 4.4.4}",
"System.ServiceModel.Http, {System.ServiceModel.Http, 4.4.4}",
"System.ServiceModel.NetTcp, {System.ServiceModel.NetTcp, 4.4.4}",
"System.ServiceModel.Primitives, {System.ServiceModel.Primitives, 4.4.4}",
"System.ServiceModel.Security, {System.ServiceModel.Security, 4.4.4}"
],
"sync": true, "sync": true,
"targetFramework": "netcoreapp3.1", "targetFramework": "netcoreapp3.1",
"typeReuseMode": "All" "typeReuseMode": "All"

File diff suppressed because it is too large Load Diff

View File

@ -1,9 +1,4 @@
{ {
"ProviderId": "Microsoft.VisualStudio.ConnectedService.Wcf",
"Version": "15.0.40203.910",
"GettingStartedDocument": {
"Uri": "https://go.microsoft.com/fwlink/?linkid=858517"
},
"ExtendedData": { "ExtendedData": {
"inputs": [ "inputs": [
"http://evolucia.elt-poisk.com/soaposago.php?wsdl" "http://evolucia.elt-poisk.com/soaposago.php?wsdl"
@ -15,14 +10,6 @@
"namespaceMappings": [ "namespaceMappings": [
"*, ELTOsago" "*, ELTOsago"
], ],
"references": [
"System.ServiceModel, {System.ServiceModel.Primitives, 4.4.4}",
"System.ServiceModel.Duplex, {System.ServiceModel.Duplex, 4.4.4}",
"System.ServiceModel.Http, {System.ServiceModel.Http, 4.4.4}",
"System.ServiceModel.NetTcp, {System.ServiceModel.NetTcp, 4.4.4}",
"System.ServiceModel.Primitives, {System.ServiceModel.Primitives, 4.4.4}",
"System.ServiceModel.Security, {System.ServiceModel.Security, 4.4.4}"
],
"sync": true, "sync": true,
"targetFramework": "netcoreapp3.1", "targetFramework": "netcoreapp3.1",
"typeReuseMode": "All" "typeReuseMode": "All"

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using ELT.Client.Models.Insurance; using ELT.Client.Models.Insurance;
@ -26,6 +25,11 @@ namespace ELT.Client.Managers.Insurance
kaskoParams.Mark = preRequestData.Brand; kaskoParams.Mark = preRequestData.Brand;
kaskoParams.Model = preRequestData.Model; kaskoParams.Model = preRequestData.Model;
var specialMachinery = preRequestData.SpecialMachinery;
specialMachinery.SpecialMachineryMark = preRequestData.Brand;
specialMachinery.SpecialMachineryModel = preRequestData.Model;
kaskoParams.SpecialMachinery = specialMachinery;
var result = new Dictionary<string, KASKOCalculationResult>(); var result = new Dictionary<string, KASKOCalculationResult>();
@ -40,11 +44,12 @@ namespace ELT.Client.Managers.Insurance
} }
, null , null
, companyId , companyId
, null , 0
, null , null
, null , null
, "13" , "13"
, null , null
, null
, false , false
, null , null
, null , null

View File

@ -1,9 +1,12 @@
namespace ELT.Client.Models.Insurance using ELTKasko;
namespace ELT.Client.Models.Insurance
{ {
public class ELTPreData public class ELTPreData
{ {
public string Kladr { get; set; } public string Kladr { get; set; }
public string Brand { get; set; } public string Brand { get; set; }
public string Model { get; set; } public string Model { get; set; }
public SpecialMachinery SpecialMachinery { get; set; }
} }
} }

View File

@ -23,8 +23,6 @@
"launchBrowser": false, "launchBrowser": false,
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_ENVIRONMENT": "Development",
"eltPassword": "evo12345",
"eltLogin": "dmitrienko"
}, },
"applicationUrl": "http://localhost:2121" "applicationUrl": "http://localhost:2121"
}, },