Index: WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/HandelsKlantKortingsPercentageBepaler.cls.xml
===================================================================
diff -u -r67081 -r68174
--- WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/HandelsKlantKortingsPercentageBepaler.cls.xml (.../HandelsKlantKortingsPercentageBepaler.cls.xml) (revision 67081)
+++ WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/HandelsKlantKortingsPercentageBepaler.cls.xml (.../HandelsKlantKortingsPercentageBepaler.cls.xml) (revision 68174)
@@ -32,6 +32,7 @@
Set KortingsPercentages.LBX = ..KortingService.GeefKortingInfoVoorDecrypteer(Personality.GeefID(), KlantId, ##class(DOM.PM.enu.Variant).LegraboxPure()).Percentage * 100
Set KortingsPercentages.TBX = ..KortingService.GeefKortingInfoVoorDecrypteer(Personality.GeefID(), KlantId, ##class(DOM.PM.enu.Variant).TandemboxAntaro()).Percentage * 100
Set KortingsPercentages.TAX = ..KortingService.GeefKortingInfoVoorDecrypteer(Personality.GeefID(), KlantId, ##class(DOM.PM.enu.Variant).Taorbox()).Percentage * 100
+ Set KortingsPercentages.MVX = ..KortingService.GeefKortingInfoVoorDecrypteer(Personality.GeefID(), KlantId, ##class(DOM.PM.enu.Variant).Merivobox()).Percentage * 100
Set KortingsPercentages.OL = ..KortingService.GeefKortingInfoVoorDecrypteer(Personality.GeefID(), KlantId, ##class(DOM.PM.enu.Variant).Orgalux()).Percentage * 100
Quit KortingsPercentages
Index: WS/Vhisie4/Auth/DecrypteerResponse/KortingPercentages.cls.xml
===================================================================
diff -u -r62080 -r68174
--- WS/Vhisie4/Auth/DecrypteerResponse/KortingPercentages.cls.xml (.../KortingPercentages.cls.xml) (revision 62080)
+++ WS/Vhisie4/Auth/DecrypteerResponse/KortingPercentages.cls.xml (.../KortingPercentages.cls.xml) (revision 68174)
@@ -19,6 +19,11 @@
+
+TECH.Decimal
+
+
+
TECH.Decimal
@@ -41,6 +46,9 @@
OL
+
+MVX
+
Index: vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/HandelsKlantKortingsPercentageBepaler/Bepaal/Test.cls.xml
===================================================================
diff -u -r67081 -r68174
--- vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/HandelsKlantKortingsPercentageBepaler/Bepaal/Test.cls.xml (.../Test.cls.xml) (revision 67081)
+++ vhUnitTest/WSimpl/Vhisie4/Auth/HandelAuthenticator/Decrypteerder/HandelsKlantKortingsPercentageBepaler/Bepaal/Test.cls.xml (.../Test.cls.xml) (revision 68174)
@@ -16,13 +16,16 @@
Set TbxKorting.Percentage = 0.222
Set TaxKorting = ##class(DOM.VKP.dto.KortingInfo).%New()
Set TaxKorting.Percentage = 0.333
+ Set MvxKorting = ##class(DOM.VKP.dto.KortingInfo).%New()
+ Set MvxKorting.Percentage = 0.444
Set OlKorting = ##class(DOM.VKP.dto.KortingInfo).%New()
- Set OlKorting.Percentage = 0.444
+ Set OlKorting.Percentage = 0.555
Set KortingServiceMock = ##class(vhTest.Mock.DOM.VKP.KortingService).%New()
Do KortingServiceMock.VerwachtMethodCall("GeefKortingInfoVoorDecrypteer",DummyPersonality.GeefID(),DummyPersonality.GeefPrefix()_KlantId,##class(DOM.PM.enu.Variant).LegraboxPure()).DanReturn(LbxKorting)
Do KortingServiceMock.VerwachtMethodCall("GeefKortingInfoVoorDecrypteer",DummyPersonality.GeefID(),DummyPersonality.GeefPrefix()_KlantId,##class(DOM.PM.enu.Variant).TandemboxAntaro()).DanReturn(TbxKorting)
Do KortingServiceMock.VerwachtMethodCall("GeefKortingInfoVoorDecrypteer",DummyPersonality.GeefID(),DummyPersonality.GeefPrefix()_KlantId,##class(DOM.PM.enu.Variant).Taorbox()).DanReturn(TaxKorting)
+ Do KortingServiceMock.VerwachtMethodCall("GeefKortingInfoVoorDecrypteer",DummyPersonality.GeefID(),DummyPersonality.GeefPrefix()_KlantId,##class(DOM.PM.enu.Variant).Merivobox()).DanReturn(MvxKorting)
Do KortingServiceMock.VerwachtMethodCall("GeefKortingInfoVoorDecrypteer",DummyPersonality.GeefID(),DummyPersonality.GeefPrefix()_KlantId,##class(DOM.PM.enu.Variant).Orgalux()).DanReturn(OlKorting)
Set HandelsKlantKortingsPercentageBepaler = ##class(WSimpl.Vhisie4.Auth.HandelAuthenticator.Decrypteerder.HandelsKlantKortingsPercentageBepaler).%New(KortingServiceMock)
@@ -33,6 +36,7 @@
Do $$$AssertEquals(KortingsPercentages.LBX,LbxKorting.Percentage*100)
Do $$$AssertEquals(KortingsPercentages.TBX,TbxKorting.Percentage*100)
Do $$$AssertEquals(KortingsPercentages.TAX,TaxKorting.Percentage*100)
+ Do $$$AssertEquals(KortingsPercentages.MVX,MvxKorting.Percentage*100)
Do $$$AssertEquals(KortingsPercentages.OL,OlKorting.Percentage*100)
Do KortingServiceMock.Verifieer()
Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r67231 -r68174
--- WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 67231)
+++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml (.../KortingBewaarder.cls.xml) (revision 68174)
@@ -87,6 +87,7 @@
Do ..BewaarKortingMetVariant(Personality, ##class(DOM.PM.enu.Variant).LegraboxPure())
Do ..BewaarKortingMetVariant(Personality, ##class(DOM.PM.enu.Variant).Taorbox())
Do ..BewaarKortingMetVariant(Personality, ##class(DOM.PM.enu.Variant).TandemboxAntaro())
+ Do ..BewaarOptioneleKortingMetVariant(Personality, ##class(DOM.PM.enu.Variant).Merivobox())
Do ..BewaarOptioneleKortingMetVariant(Personality, ##class(DOM.PM.enu.Variant).Orgalux())
]]>
Index: vhUnitTest/DOM/VKP/KortingService/Test.cls.xml
===================================================================
diff -u -r29059 -r68174
--- vhUnitTest/DOM/VKP/KortingService/Test.cls.xml (.../Test.cls.xml) (revision 29059)
+++ vhUnitTest/DOM/VKP/KortingService/Test.cls.xml (.../Test.cls.xml) (revision 68174)
@@ -33,6 +33,16 @@
]]>
+
+
+
+
+
+
+
+
KlantID:DOM.VKP.VanHoeckeKlantID,Familie:DOM.PM.enu.Familie,Variant:DOM.PM.enu.Variant,Aantal:%Integer,Percentage:TECH.Percentage
1
@@ -61,6 +71,8 @@
Do ..MaakKorting(..#KlantID1,##class(DOM.PM.enu.Familie).Lade(),##class(DOM.PM.enu.Variant).LegraboxPure(),50,0.35)
Do ..MaakKorting(..#KlantID1,##class(DOM.PM.enu.Familie).Lade(),##class(DOM.PM.enu.Variant).TandemboxAntaro(),1,0.30)
Do ..MaakKorting(..#KlantID2,##class(DOM.PM.enu.Familie).Lade(),##class(DOM.PM.enu.Variant).LegraboxPure(),1,0.10)
+ Do ..MaakKorting(..#KlantID2,##class(DOM.PM.enu.Familie).Lade(),##class(DOM.PM.enu.Variant).Merivobox(),1,0.15)
+ Do ..MaakKorting(..#KlantID2,##class(DOM.PM.enu.Familie).Lade(),##class(DOM.PM.enu.Variant).Orgalux(),1,0.10)
]]>