Skip to content

Commit f6190aa

Browse files
leedavileedavi
committed
v4.2.4 - Calculation of tax on discount when tax included. #95 
1 parent 2c7bbca commit f6190aa

File tree

7 files changed

+45
-35
lines changed

7 files changed

+45
-35
lines changed

‎DNNpackager.dnnpack‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<root>
2-
<version>4.2.3</version>
2+
<version>4.2.4</version>
33
<websitedestrelpath>\DesktopModules\NBright\NBrightBuy</websitedestrelpath>
44
<websitedestbinrelpath>\bin</websitedestbinrelpath>
55
<!-- Include only files that match the regular expression -->

‎NBrightBuy15.sln‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29519.87
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.14.36408.4 d17.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NBrightBuy", "NBrightBuy.csproj", "{8F850303-BEC5-4247-9126-1E58F1402205}"
77
EndProject
@@ -41,21 +41,27 @@ Global
4141
{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4242
{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
4343
{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{747FC12A-3C5B-495E-90A6-47E999E16AAA}.Release|Any CPU.Build.0 = Release|Any CPU
4445
{3F96B553-3FDE-4F11-B7AD-E6D45A755327}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4546
{3F96B553-3FDE-4F11-B7AD-E6D45A755327}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
4647
{3F96B553-3FDE-4F11-B7AD-E6D45A755327}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{3F96B553-3FDE-4F11-B7AD-E6D45A755327}.Release|Any CPU.Build.0 = Release|Any CPU
4749
{930EFF5B-5B7B-4FC3-BC0F-7E4E8077E952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4850
{930EFF5B-5B7B-4FC3-BC0F-7E4E8077E952}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
4951
{930EFF5B-5B7B-4FC3-BC0F-7E4E8077E952}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{930EFF5B-5B7B-4FC3-BC0F-7E4E8077E952}.Release|Any CPU.Build.0 = Release|Any CPU
5053
{0BAF630B-7B63-4769-BBD1-8E2F1162945A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5154
{0BAF630B-7B63-4769-BBD1-8E2F1162945A}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
5255
{0BAF630B-7B63-4769-BBD1-8E2F1162945A}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{0BAF630B-7B63-4769-BBD1-8E2F1162945A}.Release|Any CPU.Build.0 = Release|Any CPU
5357
{88B7B5F9-09F2-4EF5-96C1-A4665A3B6832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5458
{88B7B5F9-09F2-4EF5-96C1-A4665A3B6832}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
5559
{88B7B5F9-09F2-4EF5-96C1-A4665A3B6832}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{88B7B5F9-09F2-4EF5-96C1-A4665A3B6832}.Release|Any CPU.Build.0 = Release|Any CPU
5661
{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5762
{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Razor|Any CPU.ActiveCfg = Razor|Any CPU
5863
{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
64+
{A634CB2D-946E-4C73-B7DC-0677CE5AA7D0}.Release|Any CPU.Build.0 = Release|Any CPU
5965
{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6066
{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Debug|Any CPU.Build.0 = Debug|Any CPU
6167
{EC815D38-62CF-4B46-8177-CF40CE1AAB62}.Razor|Any CPU.ActiveCfg = Release|Any CPU

‎OpenStore.dnn‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
33

4-
<package name="OS_ProductView" type="Module" version="4.2.3">
4+
<package name="OS_ProductView" type="Module" version="4.2.4">
55
<friendlyName>OS_ProductView</friendlyName>
66
<description>
77
OpenStore open source e-commerce for DNN.
@@ -135,6 +135,9 @@
135135
v04.02.01
136136
- property Fix to allow underscore Regex("^[a-zA-Z0-9_]*$")
137137

138+
v04.02.04
139+
- Fix to Tax calcultion to allow for discount.
140+
138141
</releaseNotes>
139142
<dependencies>
140143
<dependency type="CoreVersion">08.00.04</dependency>
@@ -267,7 +270,7 @@
267270
</package>
268271

269272

270-
<package name="OpenStoreBO" type="Skin" version="4.2.3">
273+
<package name="OpenStoreBO" type="Skin" version="4.2.4">
271274
<friendlyName>OpenStoreBO</friendlyName>
272275
<description>
273276
OpenStore Admin Panel
@@ -313,7 +316,7 @@
313316

314317

315318

316-
<package name="OS_DisplaySearch" type="Module" version="4.2.3">
319+
<package name="OS_DisplaySearch" type="Module" version="4.2.4">
317320
<friendlyName>OS_DisplaySearch</friendlyName>
318321
<description>
319322
OpenStore open source e-commerce for DNN.
@@ -394,7 +397,7 @@
394397
</components>
395398
</package>
396399

397-
<package name="OS_AddressAdmin" type="Module" version="4.2.3">
400+
<package name="OS_AddressAdmin" type="Module" version="4.2.4">
398401
<friendlyName>OS_AddressAdmin</friendlyName>
399402
<description>OpenStore open source e-commerce for DNN.
400403
Admin for clients addresses from the front office.
@@ -469,7 +472,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
469472
</components>
470473
</package>
471474

472-
<package name="OS_Payment" type="Module" version="4.2.3">
475+
<package name="OS_Payment" type="Module" version="4.2.4">
473476
<friendlyName>OS_Payment</friendlyName>
474477
<description>OpenStore open source e-commerce for DNN.
475478
Process payment of orders.
@@ -543,7 +546,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
543546
</components>
544547
</package>
545548

546-
<package name="OS_OrderAdmin" type="Module" version="4.2.3">
549+
<package name="OS_OrderAdmin" type="Module" version="4.2.4">
547550

548551
<friendlyName>OS_OrderAdmin</friendlyName>
549552
<description>OpenStore open source e-commerce for DNN.
@@ -619,7 +622,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
619622
</components>
620623
</package>
621624

622-
<package name="OS_ProfileForm" type="Module" version="4.2.3">
625+
<package name="OS_ProfileForm" type="Module" version="4.2.4">
623626
<friendlyName>OS_ProfileForm</friendlyName>
624627
<description>OpenStore open source e-commerce for DNN.
625628
This module creates a profile form that links to the DNN profile and NBS address.
@@ -695,7 +698,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
695698
</package>
696699

697700

698-
<package name="OS_Checkout" type="Module" version="4.2.3">
701+
<package name="OS_Checkout" type="Module" version="4.2.4">
699702
<friendlyName>OS_Checkout</friendlyName>
700703
<description>OpenStore open source e-commerce for DNN. Checkout process.
701704
</description>
@@ -769,7 +772,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
769772
</components>
770773
</package>
771774

772-
<package name="OS_MiniCart" type="Module" version="4.2.3">
775+
<package name="OS_MiniCart" type="Module" version="4.2.4">
773776
<friendlyName>OS_MiniCart</friendlyName>
774777
<description>OpenStore open source e-commerce for DNN. Mini cart view.
775778
</description>
@@ -843,7 +846,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
843846
</components>
844847
</package>
845848

846-
<package name="OS_FullCart" type="Module" version="4.2.3">
849+
<package name="OS_FullCart" type="Module" version="4.2.4">
847850
<friendlyName>OS_FullCart</friendlyName>
848851
<description>OpenStore open source e-commerce for DNN. full cart view.
849852
</description>
@@ -917,7 +920,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
917920
</components>
918921
</package>
919922

920-
<package name="OS_CategoryMenu" type="Module" version="4.2.3">
923+
<package name="OS_CategoryMenu" type="Module" version="4.2.4">
921924
<friendlyName>OS_CategoryMenu</friendlyName>
922925
<description>
923926
CategoryMenu Display
@@ -989,7 +992,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
989992
</components>
990993
</package>
991994

992-
<package name="OS_ProductFilter" type="Module" version="4.2.3">
995+
<package name="OS_ProductFilter" type="Module" version="4.2.4">
993996
<friendlyName>OS_ProductFilter</friendlyName>
994997
<description>
995998
Filter module for Ajax Product Display
@@ -1062,7 +1065,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
10621065
</components>
10631066
</package>
10641067

1065-
<package name="OS_ItemList" type="Module" version="4.2.3">
1068+
<package name="OS_ItemList" type="Module" version="4.2.4">
10661069
<friendlyName>OS_ItemList</friendlyName>
10671070
<description>
10681071
Itemlist admin for shopping/favorites list

‎OpenStoreUpgrade.dnn‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
33

4-
<package name="OS_ProductView" type="Module" version="4.2.3">
4+
<package name="OS_ProductView" type="Module" version="4.2.4">
55
<friendlyName>OS_ProductView</friendlyName>
66
<description>
77
OpenStore open source e-commerce for DNN.
@@ -132,6 +132,9 @@
132132

133133
v04.02.01
134134
- property Fix to allow underscore Regex("^[a-zA-Z0-9_]*$")
135+
136+
v04.02.04
137+
- Fix to Tax calcultion to allow for discount.
135138

136139
</releaseNotes>
137140
<dependencies>
@@ -264,7 +267,7 @@
264267
</components>
265268
</package>
266269

267-
<package name="OS_DisplaySearch" type="Module" version="4.2.3">
270+
<package name="OS_DisplaySearch" type="Module" version="4.2.4">
268271
<friendlyName>OS_DisplaySearch</friendlyName>
269272
<description>
270273
OpenStore open source e-commerce for DNN.
@@ -345,7 +348,7 @@
345348
</components>
346349
</package>
347350

348-
<package name="OS_AddressAdmin" type="Module" version="4.2.3">
351+
<package name="OS_AddressAdmin" type="Module" version="4.2.4">
349352
<friendlyName>OS_AddressAdmin</friendlyName>
350353
<description>OpenStore open source e-commerce for DNN.
351354
Admin for clients addresses from the front office.
@@ -420,7 +423,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
420423
</components>
421424
</package>
422425

423-
<package name="OS_Payment" type="Module" version="4.2.3">
426+
<package name="OS_Payment" type="Module" version="4.2.4">
424427
<friendlyName>OS_Payment</friendlyName>
425428
<description>OpenStore open source e-commerce for DNN.
426429
Process payment of orders.
@@ -494,7 +497,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
494497
</components>
495498
</package>
496499

497-
<package name="OS_OrderAdmin" type="Module" version="4.2.3">
500+
<package name="OS_OrderAdmin" type="Module" version="4.2.4">
498501

499502
<friendlyName>OS_OrderAdmin</friendlyName>
500503
<description>OpenStore open source e-commerce for DNN.
@@ -570,7 +573,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
570573
</components>
571574
</package>
572575

573-
<package name="OS_ProfileForm" type="Module" version="4.2.3">
576+
<package name="OS_ProfileForm" type="Module" version="4.2.4">
574577
<friendlyName>OS_ProfileForm</friendlyName>
575578
<description>OpenStore open source e-commerce for DNN.
576579
This module creates a profile form that links to the DNN profile and NBS address.
@@ -646,7 +649,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
646649
</package>
647650

648651

649-
<package name="OS_Checkout" type="Module" version="4.2.3">
652+
<package name="OS_Checkout" type="Module" version="4.2.4">
650653
<friendlyName>OS_Checkout</friendlyName>
651654
<description>OpenStore open source e-commerce for DNN. Checkout process.
652655
</description>
@@ -720,7 +723,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
720723
</components>
721724
</package>
722725

723-
<package name="OS_MiniCart" type="Module" version="4.2.3">
726+
<package name="OS_MiniCart" type="Module" version="4.2.4">
724727
<friendlyName>OS_MiniCart</friendlyName>
725728
<description>OpenStore open source e-commerce for DNN. Mini cart view.
726729
</description>
@@ -794,7 +797,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
794797
</components>
795798
</package>
796799

797-
<package name="OS_FullCart" type="Module" version="4.2.3">
800+
<package name="OS_FullCart" type="Module" version="4.2.4">
798801
<friendlyName>OS_FullCart</friendlyName>
799802
<description>OpenStore open source e-commerce for DNN. full cart view.
800803
</description>
@@ -868,7 +871,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
868871
</components>
869872
</package>
870873

871-
<package name="OS_CategoryMenu" type="Module" version="4.2.3">
874+
<package name="OS_CategoryMenu" type="Module" version="4.2.4">
872875
<friendlyName>OS_CategoryMenu</friendlyName>
873876
<description>
874877
CategoryMenu Display
@@ -940,7 +943,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
940943
</components>
941944
</package>
942945

943-
<package name="OS_ProductFilter" type="Module" version="4.2.3">
946+
<package name="OS_ProductFilter" type="Module" version="4.2.4">
944947
<friendlyName>OS_ProductFilter</friendlyName>
945948
<description>
946949
Filter module for Ajax Product Display
@@ -1013,7 +1016,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
10131016
</components>
10141017
</package>
10151018

1016-
<package name="OS_ItemList" type="Module" version="4.2.3">
1019+
<package name="OS_ItemList" type="Module" version="4.2.4">
10171020
<friendlyName>OS_ItemList</friendlyName>
10181021
<description>
10191022
Itemlist admin for shopping/favorites list

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("4.2.3.0")]
36-
[assembly: AssemblyFileVersion("4.2.3.0")]
35+
[assembly: AssemblyVersion("4.2.4.0")]
36+
[assembly: AssemblyFileVersion("4.2.4.0")]

‎Providers/TaxProvider/TaxProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public Double CalculateItemTax(NBrightInfo cartItemInfo, Dictionary<string, doub
168168
// loop through each item and calc the tax for each.
169169
Double taxtotal = 0;
170170

171-
var appliedcost = cartItemInfo.GetXmlPropertyDouble("genxml/appliedtotalcost");
171+
var appliedcost = cartItemInfo.GetXmlPropertyDouble("genxml/appliedtotalcost") - cartItemInfo.GetXmlPropertyDouble("genxml/totaldiscount");
172172
// check if dealer and if dealertotal cost exists. ()
173173
//if (cartItemInfo.GetXmlPropertyBool("genxml/isdealer")) appliedcost = cartItemInfo.GetXmlPropertyDouble("genxml/dealercost");
174174

‎README.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# OpenSource v4.2.3.0
1+
# OpenSource v4.2.4.0
22
OpenStore - E-Commerce for DNN
33

44
**OpenStore is still maintained, it is now considered feature full. More functionality will only be added as bug fixes and plugins.**
@@ -12,6 +12,4 @@ https://www.openstore-ecommerce.com
1212

1313
https://www.openstore-ecommerce.com/Fonctionnalites
1414

15-
16-
To load MSBuild NuGet use Package Manager:
17-
PM> Install-Package MSBuildTasks -Version 1.5.0.235
15+
[https://github.com/leedavi/DNNpackager](https://github.com/leedavi/DNNpackager)

0 commit comments

Comments
 (0)