Quicksilver release version 12.0.0

episerver · Apr 17, 2018 · 48e5723 · 48e5723
1 parent 12859f6
commit 48e5723
Show file tree

Hide file tree

Showing 124 changed files with 1,419 additions and 1,424 deletions.
diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs
@@ -3,6 +3,6 @@
 
 
 [assembly: AssemblyCopyright("Copyright ? 2018 Episerver")]
-[assembly: AssemblyVersion("11.8.3.0")]
-[assembly: AssemblyInformationalVersion("11.8.3")]
-[assembly: AssemblyFileVersion("11.8.3.2973")]
+[assembly: AssemblyVersion("12.0.0.0")]
+[assembly: AssemblyInformationalVersion("12.0.0")]
+[assembly: AssemblyFileVersion("12.0.0.3009")]
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.resx
@@ -1230,8 +1230,11 @@
   <data name="Items" xml:space="preserve">
     <value>Items</value>
   </data>
-  <data name="Total_Before_Tax_And_Shipping" xml:space="preserve">
-    <value>Total Before Tax and Shipping</value>
+  <data name="Total_Excluding_Shipping_Includes_Tax" xml:space="preserve">
+    <value>Total excluding shipping (includes tax)</value>
+  </data>
+  <data name="Total_Excluding_Shipping_And_Tax" xml:space="preserve">
+    <value>Total excluding shipping and tax</value>
   </data>
   <data name="OrderNote_NewPOPattern_ViaPP" xml:space="preserve">
     <value>New purchase order placed by {0} in {1} from payment plan {2}</value>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/Order/OrderStrings.sv.resx
@@ -1218,8 +1218,11 @@
   <data name="Items" xml:space="preserve">
     <value>Artiklar</value>
   </data>
-  <data name="Total_Before_Tax_And_Shipping" xml:space="preserve">
-    <value>Totalsumma före moms och leverans</value>
+  <data name="Total_Excluding_Shipping_Includes_Tax" xml:space="preserve">
+    <value>Summa utan frakt (inklusive moms)</value>
+  </data>
+  <data name="Total_Excluding_Shipping_And_Tax" xml:space="preserve">
+    <value>Summa utan frakt och moms</value>
   </data>
   <data name="Inventory_Not_Check" xml:space="preserve">
     <value>Inte tillgänglig</value>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.resx
@@ -2268,4 +2268,10 @@
   <data name="Tax_Export_Description" xml:space="preserve">
     <value>You're about to export taxes.</value>
   </data>
+  <data name="Prices_Include_Tax" xml:space="preserve">
+    <value>Prices Include Tax</value>
+  </data>
+  <data name="Prices_Include_Tax_Information" xml:space="preserve">
+    <value>This property will affect how prices in this market are calculated in orders</value>
+  </data>
 </root>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx b/Sources/EPiServer.Reference.Commerce.Manager/App_GlobalResources/SharedStrings.sv.resx
@@ -2129,4 +2129,10 @@
   <data name="Restrictions" xml:space="preserve">
     <value>Begränsningar</value>
   </data>
+  <data name="Prices_Include_Tax" xml:space="preserve">
+    <value>Priser inkluderar moms</value>
+  </data>
+  <data name="Prices_Include_Tax_Information" xml:space="preserve">
+    <value>Styr hur den här marknadens priser beräknas i ordrar</value>
+  </data>
 </root>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Markets/Config/View/Market-List.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Markets/Config/View/Market-List.xml
@@ -15,6 +15,7 @@
           <Column headingText="{SharedStrings:Default_Language}" width="200" allowSorting="true" dataField="DefaultLanguage" />
           <Column headingText="{SharedStrings:Default_Currency}" allowSorting="true" dataField="DefaultCurrency" />
 					<Column headingText="{SharedStrings:Active}" id="active" allowSorting="true" dataField="IsEnabled" />
+          <Column headingText="{SharedStrings:Prices_Include_Tax}" id="pricesIncludeTax" allowSorting="true" dataField="PricesIncludeTax" />
 				</Columns>
 			</add>
 		</Grid>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Markets/Market/Tabs/MarketEditTab.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Markets/Market/Tabs/MarketEditTab.ascx
@@ -72,6 +72,14 @@
                 <ecf:BooleanEditControl ID="IsMarketActive" runat="server"></ecf:BooleanEditControl>
             </td>
         </tr>
+        <tr>
+            <td class="FormLabelCell">
+                <asp:Label runat="server" Text="<%$ Resources:SharedStrings, Prices_Include_Tax %>"></asp:Label>:</td>
+            <td class="FormFieldCell">
+                <ecf:BooleanEditControl ID="IsPricesIncludeTax" runat="server"></ecf:BooleanEditControl>&nbsp;
+                <asp:Label runat="server" CssClass="FormFieldDescription" Text="<%$ Resources:SharedStrings, Prices_Include_Tax_Information %>"></asp:Label>
+            </td>
+        </tr>
         <tr>
             <td colspan="2" class="FormSpacerCell">
             </td>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/CustomPrimitives/OrderStatus.ascx b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Order/CustomPrimitives/OrderStatus.ascx
@@ -55,7 +55,7 @@
 	</tr>
     <tr>
 		<td valign="top" style="width: 140px; font-weight:bold; text-align:right;padding: 5px;">
-			<asp:Label runat="server" ID="Label5" Text="<%$ Resources:OrderStrings, Total_Before_Tax_And_Shipping  %>"></asp:Label>:
+			<asp:Label runat="server" ID="lblTotalExcludingShippingAndTax" Text=""></asp:Label>:
 		</td>
 		<td style="padding: 5px;">
 			<asp:Label ID="lblTotal" runat="server"></asp:Label>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Web.config
@@ -8,7 +8,7 @@
   </system.web>
   -->
   <appSettings>
-    <add key="epi:HelpUrl" value="http://webhelp.episerver.com/18-1/home.htm" />
+    <add key="epi:HelpUrl" value="http://webhelp.episerver.com/18-2/home.htm" />
   </appSettings>
   <system.web>
     <pages validateRequest="false" enableEventValidation="false"></pages>