Index: cspBasis/GAProdTBox.cls.xml =================================================================== diff -u -r531 -r548 --- cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 531) +++ cspBasis/GAProdTBox.cls.xml (.../GAProdTBox.cls.xml) (revision 548) @@ -45,6 +45,11 @@ For i=1:1:$LL(lbGetData) Do Quit:($IsObject(KLMini)) . Do:($LG(lbGetData,i)="Stg") gkdDataFromStorage . Do:($LG(lbGetData,i)="Ext") gkdDataFromExternal + + If blnHFLB { + Do gkdDataPercentageViaSoap(sDomVERW,KLNr) + } + Quit KLMini gkdInitialize Set blnVHEPN=(sDomVERW=##class(APPS.TBXWeb.enu.TBXHandel).VanHoecke()) @@ -67,6 +72,16 @@ Set lbGetData=$$PiecesToList^vhLib(flgGetFrom,";") ;$CASE(flgGetFrom, "Ext":$LB("Ext"), "Stg":$LB("Stg"), "Stg;Ext":$LB("Stg","Ext"), "Ext;Stg":$LB("Ext","Stg"), :"") Set KLNr=$G(KLNr) Quit + +gkdDataPercentageViaSoap(sDomVERW,KLNr) + New DesignCode,Aantal + If $IsObject(KLMini) { + Set DesignCode=$G(DCM) + Set Aantal=1 + Set KLMini.Korting="" + Set KLMini.Korting=##class(cspBasis.GAProdTBox).GeefKortingPercentageTBX(sDomVERW,KLNr,DesignCode,Aantal) + } + Quit gkdDataFromStorage ; Deze macro's zijn in commentaar gezet door WimV op 14/12/2010 ; #define SepData "\" @@ -284,7 +299,7 @@ Set $ZTRAP="geaSoapErrorLW" Set lbEmails=Client.GetEmailAdressenLB(KLNr) Set $ZTRAP="" - Quit $G(lbEmails) + Quit geaSoapAddToLog2 New lbExtras @@ -351,6 +366,58 @@ ]]> + +1 +DomeinVerwerker:APPS.TBXWeb.enu.TBXHandel,KlantNummer:%String,DesignCodeModus:%String,Aantal:%Integer +0 +%Float + locNdx="_$G(locNdx)_" "_$$$LCVT(lbLocations)) + Do:(locNdx<0) gkpSoapAddToLog ; Problem: no location + Quit:('Result) + Do:(locNdx>1) gkpSoapAddToLog ; Not the first location + Set $ZTRAP="gkpSoapErrorLW" + Set KortingPercentage=Client.GetKortingPercentageTBXHandel(DomeinVerwerker,KlantNummer,Familie,Variant,Aantal) + Set $ZTRAP="" + Quit + +gkpSoapAddToLog + New lbExtras + Set lbExtras=$$PeekSOAPBuildLog^cspBasis.SOAPlib(SoapClass,method,lbLocations,locNdx) + Do ##class(cspBasis.GAProdTBox).AddToLog("SOAP_BACKUP",$G(%session.Data("DOMAIN")),$G(%session.Data("KLNR")),$G(%session.Data("MODE")),wsID,$G(%session.Data("VERW")),$G(Taal),,lbExtras) + Quit + +gkpSoapErrorLW + Set $ZTRAP="" + New CustomMsg + Set CustomMsg=SoapClass_" - "_method_"() : KLNr"_$G(KLNr)_"."_$S(locNdx>1:" ["_$LG(lbLocations,locNdx)_"]" ,1:"") + Do SOAPErrorMail^cspBasis.SOAPlib("TBX_ERR",,CustomMsg,,Client) + Set KLMini="" + Quit +]]> + + Get Bulk settings from global, specifiek voor KLNr