Skip to content

T
totem_app
Commit 24c24ae1 by Giovanni Zucchelli
Options

modifiche

parent 4ca3ae19
Showing with 36 additions and 91 deletions
.vs/cosicomodo/v16/.suo
No preview for this file type
WpfKb/obj/Debug/WpfKb.csproj.FileListAbsolute.txt
......@@ -153,6 +153,7 @@ C:\Sviluppo\Selex\applicativo\Selex\cosicomodo_funzionante_vecchio_WSDL\WpfKb\ob
C:\Sviluppo\Selex\git\totem_app\WpfKb\bin\Debug\WpfKb.xml
C:\Sviluppo\Selex\git\totem_app\WpfKb\bin\Debug\WpfKb.dll
C:\Sviluppo\Selex\git\totem_app\WpfKb\bin\Debug\WpfKb.pdb
C:\Sviluppo\Selex\git\totem_app\WpfKb\obj\Debug\WpfKb.csprojAssemblyReference.cache
C:\Sviluppo\Selex\git\totem_app\WpfKb\obj\Debug\Controls\FloatingNumberKeyboard.g.cs
C:\Sviluppo\Selex\git\totem_app\WpfKb\obj\Debug\Controls\FloatingTouchScreenKeyboard.g.cs
C:\Sviluppo\Selex\git\totem_app\WpfKb\obj\Debug\GeneratedInternalTypeHelper.g.cs
......
cosicomodo/App.config
......@@ -49,7 +49,7 @@
<add key="serviceSocio" value="SUPEREMME"/>
<add key="serviceInsegna" value="PAN"/>
<add key="TaskBarShow" value="Off" />
<add key="FullScreenMode" value="On" />
<add key="FullScreenMode" value="Off" />
<!--
<add key="serviceInsegna" value="MERCATO" />
......
cosicomodo/LeggiCodice.xaml.cs
......@@ -77,7 +77,6 @@ namespace cosifacile
}
private delegate void SetPageDeleg(string code);
// delegate Vincita aspettaVincitaAsincrona(string aCode, Scontrino aScontrino, beCustomer aPlayCustomer, string aOcrFile);
private async void si_DataReceived(string code)
{
try
......@@ -264,30 +263,14 @@ namespace cosifacile
}
}
private statusType LeggiOld(string idOrder, string idCartafedelta, out getOrdersOutputType oType, RetailPoint rp)
{
oType = new getOrdersOutputType();
statusType tv = new statusType();
readType checkFirst = this.cardororder;
try
{
tv = parentWindow.sl.getOrdersOld(idOrder, idCartafedelta, checkFirst, out oType, rp);
}
catch (Exception ex)
{
parentWindow.logError(ex);
}
return tv;
}
private statusType Leggi(string code, out getOrdersOutputType oType, RetailPoint rp)
{
oType = new getOrdersOutputType();
statusType tv = new statusType();
readType checkFirst = this.cardororder;
//readType checkFirst = this.cardororder;
try
{
tv = parentWindow.sl.getOrders(code, this.cardororder, out oType, rp);
tv = parentWindow.sl.getOrders(code, readType.Card, out oType, rp);
if (oType.ordini == null)
{
readType checkType = this.cardororder == readType.Card ? readType.Order : readType.Card;
......@@ -352,7 +335,14 @@ namespace cosifacile
if (!string.IsNullOrEmpty(txtCode.Text))
{
getOrdersOutputType orders = new getOrdersOutputType();
this.cardororder = readType.Card;
if (txtCode.Text.Length <= 10)
{
this.cardororder = readType.Card;
}
else
{
this.cardororder = readType.Order;
}
string[] closingCards = Regex.Split(parentWindow.rp.closingCards, ";");
foreach (string current in closingCards)
......@@ -375,7 +365,7 @@ namespace cosifacile
}
}
}
serialPort.Close();
grdLoading.Visibility = System.Windows.Visibility.Visible;
var slowTask = Task<statusType>.Factory.StartNew(() => Leggi(txtCode.Text, out orders, parentWindow.rp));
statusType stat = await (slowTask);
......
cosicomodo/ServiceLayer.cs
......@@ -209,74 +209,6 @@ namespace cosifacile
}
public statusType getOrdersOld(string idOrder, string idCartafedelta, readType checkFirst, out getOrdersOutputType oType, RetailPoint rp)
{
ut.logMsg("Servizio getOrders");
ut.logMsg("idOrder: " + idOrder);
ut.logMsg("idCartafedelta: " + idCartafedelta);
statusType retValue = new statusType();
getOrdersInputType goit = new getOrdersInputType();
oType = new getOrdersOutputType();
getOrdersBinding gob = new getOrdersBinding();
try
{
gob.Url = rp.settings.urlGetOrder;
if(ConfigurationManager.AppSettings["mockService"] == "On")
{
gob.Url = ConfigurationManager.AppSettings["mockServiceUrl"].ToString();
}
gob.UseDefaultCredentials = true;
gob.Timeout = Convert.ToInt32(ConfigurationManager.AppSettings["webClientTimer"]);
propertiesType ordProperties = new propertiesType();
ordProperties.insegna = rp.settings.insegna; ;
ordProperties.socio = rp.settings.socio;
ordProperties.insegna = ConfigurationManager.AppSettings["serviceInsegna"];
ordProperties.socio = ConfigurationManager.AppSettings["serviceSocio"];
ordProperties.sistRichiedente = rp.settings.sistema;
getOrdersInputType ordContent = new getOrdersInputType();
string logdata = "";
if (!string.IsNullOrEmpty(idOrder))
{
ordContent.idOrdine = idOrder;
logdata = "idOrdine: " + idOrder;
}
else
{
if (idCartafedelta.Length < 13)
{
for (int i = idCartafedelta.Length; i < 13; i++)
{
idCartafedelta = "0" + idCartafedelta;
}
}
ordContent.idCartaFedelta = idCartafedelta;
ordContent.dataRicerca = DateTime.Now.AddDays(-10).ToString("yyyyMMddHHmmss");
logdata = "idCartaFedelta: " + idCartafedelta;
}
/////faccio log dell'operazione
insertAppLog(rp.rpId.ToString(), 1, logdata);
gob.Credentials = new System.Net.NetworkCredential(rp.settings.serviceUserName, rp.settings.servicePassword, "");
System.Net.ServicePointManager.ServerCertificateValidationCallback = CertificateHandler;
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
retValue = gob.getOrdersOperation(ordProperties, ordContent, out oType);
ut.logMsg("Servizio getOrders completato");
}
catch (Exception ex)
{
ut.logError(ex);
}
return retValue;
}
public statusType orderToDelivery(string[] idOrders, out orderToDeliveryOutputType otdot, RetailPoint rp, bool assistenza)
{
ut.logMsg("Servizio orderToDelivery");
......
cosicomodo/bin/Debug/cosicomodo.exe.config
......@@ -49,7 +49,7 @@
<add key="serviceSocio" value="SUPEREMME"/>
<add key="serviceInsegna" value="PAN"/>
<add key="TaskBarShow" value="Off" />
<add key="FullScreenMode" value="On" />
<add key="FullScreenMode" value="Off" />
<!--
<add key="serviceInsegna" value="MERCATO" />
......
cosicomodo/cosifacile.csproj
......@@ -13,6 +13,21 @@
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
......@@ -276,6 +291,13 @@
<ItemGroup>
<Resource Include="images\trasp_button.png" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment