Quicksilver release version 11.7.1

episerver · Jan 30, 2018 · 5545588 · 5545588
1 parent 7f0d913
commit 5545588
Show file tree

Hide file tree

Showing 31 changed files with 242 additions and 386 deletions.
diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs
@@ -3,6 +3,6 @@
 
 
 [assembly: AssemblyCopyright("Copyright ? 2018 Episerver")]
-[assembly: AssemblyVersion("11.7.0.0")]
-[assembly: AssemblyInformationalVersion("11.7.0")]
-[assembly: AssemblyFileVersion("11.7.0.2869")]
+[assembly: AssemblyVersion("11.7.1.0")]
+[assembly: AssemblyInformationalVersion("11.7.1")]
+[assembly: AssemblyFileVersion("11.7.1.2891")]
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Config/View/Catalog-List.xml b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Config/View/Catalog-List.xml
@@ -25,7 +25,7 @@
 				-->
 					<Column width="50" headingText="" columnType="Action" dataField="ID">
 						<Item imageUrl="~/Apps/Shell/styles/Images/edit.gif" commandName="cmdCatalogGridEdit" commandParameters="CatalogId" toolTip="Edit" permissions="catalog:ctlg:mng:edit"></Item>
-						<Item imageUrl="~/Apps/Shell/styles/Images/toolbar/export.png" commandName="cmdCatalogGridCatalogExport" commandParameters="CatalogId,Name" ToolTip="Export" permissions="catalog:ctlg:mng:export" />
+						<Item imageUrl="~/Apps/Shell/styles/Images/toolbar/export.png" commandName="cmdCatalogGridCatalogExport" commandParameters="CatalogId" ToolTip="Export" permissions="catalog:ctlg:mng:export" />
 					</Column>
 					<Column width="400" allowSorting="true" dataField="Name" headingText="{SharedStrings:Name}" id="Name" columnType="HyperLink" dataNavigateUrlFields="CatalogId" dataNavigateUrlFormatString="javascript:CSManagementClient.ChangeView('Catalog','Node-List', 'catalogid={0}&amp;catalognodeid=');" dataTextFields="Name" dataTextFormatString="{0}" dataTextEncode="true"></Column>
 					<Column width="150" columnType="DateTime" allowSorting="true" dataField="StartDate" headingText="{SharedStrings:Available_From}"></Column>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Scripts/CatalogClient.js b/Sources/EPiServer.Reference.Commerce.Manager/Apps/Catalog/Scripts/CatalogClient.js
@@ -1,57 +1,49 @@
 // JScript File
-function Mediachase_CatalogClient()
-{
+function Mediachase_CatalogClient() {
     // Properties
-    
+
     // Method Mappings   
-    this.CreateCatalog = function(source)
-    {
+    this.CreateCatalog = function (source) {
         CSManagementClient.ChangeView('Catalog', 'Edit');
-    }; 
-
-    this.CreateNode = function(source)
-    {
+    };
+
+    this.CreateNode = function (source) {
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
-        CSManagementClient.ChangeView('Catalog', 'Node-Edit', 'catalogid='+catalogid+'&catalognodeid='+catalognodeid);
+        CSManagementClient.ChangeView('Catalog', 'Node-Edit', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid);
     };
 
-    this.CreateProductItem = function(source)
-    {
+    this.CreateProductItem = function (source) {
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
-        CSManagementClient.ChangeView('Catalog', 'Product-Edit', 'catalogid='+catalogid+'&catalognodeid='+catalognodeid+'&type=Product');
-    };    
-
-    this.CreateVariationItem = function(source)
-    {
+        CSManagementClient.ChangeView('Catalog', 'Product-Edit', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&type=Product');
+    };
+
+    this.CreateVariationItem = function (source) {
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
-        CSManagementClient.ChangeView('Catalog', 'Variation-Edit', 'catalogid='+catalogid+'&catalognodeid='+catalognodeid+'&type=Variation');
-    };        
+        CSManagementClient.ChangeView('Catalog', 'Variation-Edit', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&type=Variation');
+    };
 
-    this.CreatePackageItem = function(source)
-    {
+    this.CreatePackageItem = function (source) {
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
         CSManagementClient.ChangeView('Catalog', 'CatalogPackage-Edit', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&type=Package');
-    };        
+    };
 
-    this.CreateProductBundleItem = function(source)
-    {
+    this.CreateProductBundleItem = function (source) {
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
-        CSManagementClient.ChangeView('Catalog', 'Bundle-Edit', 'catalogid='+catalogid+'&catalognodeid='+catalognodeid+'&type=Bundle');
-    };        
-
-    this.CreateDynPackageItem = function(source)
-    {
+        CSManagementClient.ChangeView('Catalog', 'Bundle-Edit', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&type=Bundle');
+    };
+
+    this.CreateDynPackageItem = function (source) {
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
-        CSManagementClient.ChangeView('Catalog', 'DynamicPackage-Edit', 'catalogid='+catalogid+'&catalognodeid='+catalognodeid+'&type=DynamicPackage');
+        CSManagementClient.ChangeView('Catalog', 'DynamicPackage-Edit', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&type=DynamicPackage');
     };
 
-    this.OpenItem = function(type, id, extParams) {
+    this.OpenItem = function (type, id, extParams) {
         type = type.trim().toLowerCase();
         var catalogid = CSManagementClient.QueryString("catalogid");
         var catalognodeid = CSManagementClient.QueryString("catalognodeid");
@@ -61,7 +53,7 @@ function Mediachase_CatalogClient()
         else if (type == 'variation')
             CSManagementClient.ChangeView("Catalog", "Variation-Edit", 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&catalogentryid=' + id + '&' + extParams);
         else if (type == 'package')
-        	CSManagementClient.ChangeView("Catalog", "CatalogPackage-Edit", 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&catalogentryid=' + id + '&' + extParams);
+            CSManagementClient.ChangeView("Catalog", "CatalogPackage-Edit", 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&catalogentryid=' + id + '&' + extParams);
         else if (type == 'bundle')
             CSManagementClient.ChangeView("Catalog", "Bundle-Edit", 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&catalogentryid=' + id + '&' + extParams);
         else if (type == 'dynamicpackage')
@@ -73,107 +65,87 @@ function Mediachase_CatalogClient()
                 CSManagementClient.ChangeView("Catalog", "Node-Edit", 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid + '&nodeid=' + id);
         }
     };
-
-    this.ViewItem = function(type, id)
-    {
+
+    this.ViewItem = function (type, id) {
         type = type.trim().toLowerCase();
         var catalogid = CSManagementClient.QueryString("catalogid");
-       
-        if(type=='node')
-            CSManagementClient.ChangeView("Catalog","Node-List",'catalogid='+catalogid+'&catalognodeid='+id);
+
+        if (type == 'node')
+            CSManagementClient.ChangeView("Catalog", "Node-List", 'catalogid=' + catalogid + '&catalognodeid=' + id);
         else
             this.OpenItem(type, id);
     };
-
-    this.OpenItem2 = function(params)
-    {
+
+    this.OpenItem2 = function (params) {
         var id = '';
         var type = '';
-        try
-        {
+        try {
             var cmdObj = Sys.Serialization.JavaScriptSerializer.deserialize(params);
             id = cmdObj.CommandArguments.ID;
             type = cmdObj.CommandArguments.Type;
         }
-        catch(e)
-        {
+        catch (e) {
             alert('A problem occured with retrieving parameters for function OpenItem');
             return;
         }
         this.OpenItem(type, id);
     };
-
-    this.EditCatalog = function(params)
-    {
+
+    this.EditCatalog = function (params) {
         var id = '';
-
-        try
-        {
+
+        try {
             var cmdObj = Sys.Serialization.JavaScriptSerializer.deserialize(params);
             id = cmdObj.CommandArguments.CatalogId;
         }
-        catch(e)
-        {
+        catch (e) {
             alert('A problem occured with retrieving parameters for function EditCatalog');
             return;
         }
-
-        CSManagementClient.ChangeView("Catalog","Edit",'catalogid='+id);
-    };        
-
-    this.MoveCopyOpenDialog = function(source)
-    {
-        if(CSManagementClient.ListHasItemsSelected(source))
-        {            
+
+        CSManagementClient.ChangeView("Catalog", "Edit", 'catalogid=' + id);
+    };
+
+    this.MoveCopyOpenDialog = function (source) {
+        if (CSManagementClient.ListHasItemsSelected(source)) {
             MoveCopy_OpenDialog();
         }
     };
-
-    this.CSVImportCatalog = function()
-    {
+
+    this.CSVImportCatalog = function () {
         CSManagementClient.ChangeView('Catalog', 'Catalog-CSVImport', '');
     };
-
-    this.ImportCatalog = function()
-    {
+
+    this.ImportCatalog = function () {
         CSManagementClient.ChangeView('Catalog', 'Catalog-Import', '');
     };
-
-    this.ExportCatalog = function(params)
-    {
-        if (params != null)
-        {
+
+    this.ExportCatalog = function (params) {
+        if (params != null) {
             var items = Toolbar_GetSelectedGridItems(params);
-
-            if (items)
-            {
+            if (items) {
                 var splitter = ';';
-                
+
                 // remove trailing splitter
-                if( (items.length > 1) && (items.lastIndexOf(splitter) == items.length-1) )
-                    items = items.substring(0, items.length-1);
+                if ((items.length > 1) && (items.lastIndexOf(splitter) == items.length - 1))
+                    items = items.substring(0, items.length - 1);
 
                 // get array of selected items
                 var selectedItems = items.split(splitter);
-                if(selectedItems.length == 0)
-                {
+                if (selectedItems.length == 0) {
                     alert("You must select a catalog before you can perform export.");
                     return;
                 }
-                else if(selectedItems.length > 1)
-                {
+                else if (selectedItems.length > 1) {
                     alert('You must select only one catalog!');
                     return;
                 }
-                else if(selectedItems.length == 1)
-                {
+                else if (selectedItems.length == 1) {
                     var keys = selectedItems[0].split(CSManagementClient.EcfListView_PrimaryKeySeparator);
-                    if(keys && (keys.length >= 2))
-                    {
+                    if (keys && (keys.length >= 1)) {
                         var id = keys[0];
-                        var name = keys[1];
-
-                        CSManagementClient.ChangeView('Catalog', 'Catalog-Export', 'catalogid='+id+'&catalogname='+encodeURI(name));
+
+                        CSManagementClient.ChangeView('Catalog', 'Catalog-Export', 'catalogid=' + id);
                     }
                     else
                         alert('Invalid primaryKey!');
@@ -182,60 +154,49 @@ function Mediachase_CatalogClient()
             }
         }
     };
-
-    this.ExportCatalog2 = function(params)
-    {
+
+    this.ExportCatalog2 = function (params) {
         var catalogId = '';
-        var catalogName = '';
-        try
-        {
+        try {
             var cmdObj = Sys.Serialization.JavaScriptSerializer.deserialize(params);
-            catalogId = cmdObj.CommandArguments.SiteId;
-            catalogName = cmdObj.CommandArguments.Name;
+            catalogId = cmdObj.CommandArguments.CatalogId;
         }
-        catch(e)
-        {
+        catch (e) {
             alert('A problem occured with retrieving parameters for function ExportCatalog2');
             return;
         }
-        CSManagementClient.ChangeView('Catalog', 'Catalog-Export', 'catalogid='+catalogId+'&catalogname='+encodeURI(catalogName));
+        CSManagementClient.ChangeView('Catalog', 'Catalog-Export', 'catalogid=' + catalogId);
     };
 
-    this.CatalogSaveRedirect = function(catalogid, catalognodeid) {
+    this.CatalogSaveRedirect = function (catalogid, catalognodeid) {
         var catalogid = catalogid != null && catalogid.length > 0 ? catalogid : CSManagementClient.QueryString("catalogid");
         var catalognodeid = catalognodeid != null && catalognodeid.length > 0 ? catalognodeid : CSManagementClient.QueryString("catalognodeid");
         CSManagementClient.ChangeView('Catalog', 'Node-List', 'catalogid=' + catalogid + '&catalognodeid=' + catalognodeid);
     };
-    
+
     //-------------------------- Currencies -------------------------------------
-    this.NewCurrency = function()
-    {
+    this.NewCurrency = function () {
         CSManagementClient.ChangeView('Catalog', 'Currency-Edit', '');
     };
-
-    this.EditCurrency = function(currencyId)
-    {
-        CSManagementClient.ChangeView('Catalog', 'Currency-Edit', 'currencyid='+currencyId);
+
+    this.EditCurrency = function (currencyId) {
+        CSManagementClient.ChangeView('Catalog', 'Currency-Edit', 'currencyid=' + currencyId);
     };
-
-    this.EditCurrency2 = function(params)
-    {
+
+    this.EditCurrency2 = function (params) {
         var currencyId = '';
-        try
-        {
+        try {
             var cmdObj = Sys.Serialization.JavaScriptSerializer.deserialize(params);
             currencyId = cmdObj.CommandArguments.CurrencyId;
         }
-        catch(e)
-        {
+        catch (e) {
             alert('A problem occured with retrieving parameters for method EditCurrency2');
             return;
         }
         this.EditCurrency(currencyId);
     };
-
-    this.CurrencySaveRedirect = function()
-    {
+
+    this.CurrencySaveRedirect = function () {
         CSManagementClient.ChangeView('Catalog', 'Currencies-List', '');
     };
 };

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/17-6/home.htm" />
+    <add key="epi:HelpUrl" value="http://webhelp.episerver.com/18-1/home.htm" />
   </appSettings>
   <system.web>
     <pages validateRequest="false" enableEventValidation="false"></pages>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.app.config b/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.app.config
@@ -7,16 +7,7 @@
     <add name="RegisteredRole" value="Registered" />
   </Roles>
   <Connection connectionStringName="EcfSqlConnection" />
-  <Cache enabled="true" appTimeout="0:0:10" />
-  <Languages>
-    <add key="en-us" value="English" />
-    <add key="da-DK" value="Danish" />
-    <add key="sv-SE" value="Svenska" />
-    <add key="fi-FI" value="Suomi" />
-    <add key="nl-NL" value="Netherlands" />
-    <add key="nb-NO" value="Norsk" />
-    <add key="fr-FR" value="French" />
-  </Languages>
+  <Cache enabled="true" appTimeout="0:0:10" />  
   <Features>
     <add feature="SerializedCarts" state="Enabled" type="Mediachase.Commerce.Core.Features.SerializedCarts, Mediachase.Commerce" />
   </Features>

diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.catalog.config b/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.catalog.config
@@ -1,10 +1,5 @@
 <?xml version="1.0"?>
 <Catalog autoConfigure="true">
   <Connection connectionStringName="EcfSqlConnection" />
-  <Cache enabled="true" collectionTimeout="0:15:0" entryTimeout="0:15:0" nodeTimeout="0:15:0" schemaTimeout="0:15:0" />
-  <Encoding imageQualityPercentage="80" defaultFormat="jPeg" />
-  <Roles />
-  <Events>
-    <add type="Mediachase.Commerce.Catalog.Loggers.CatalogLogger, Mediachase.Commerce" />
-  </Events>
+  <Cache enabled="true" collectionTimeout="0:15:0" entryTimeout="0:15:0" nodeTimeout="0:15:0" schemaTimeout="0:15:0" /> 
 </Catalog>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.customer.config b/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.customer.config
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <Customers autoInstall="true" demoInstall="true">
   <Cache enabled="true" contactCollectionTimeout="0:1:0" contactTimeout="0:1:0" addressCollectionTimeout="0:1:0" addressTimeout="0:1:0" creditCardCollectionTimeout="0:1:0" creditCardTimeout="0:1:0" organizationCollectionTimeout="0:1:0" organizationTimeout="0:1:0" />
-  <Connection connectionStringName="EcfSqlConnection" />
-  <Roles />
+  <Connection connectionStringName="EcfSqlConnection" />  
 </Customers>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.customization.config b/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.customization.config
@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<!-- Customization Configuration -->
+<!-- This section is obsoleted since customization configuration class was obsoleted and only kept for backwards compatibility. -->
 <Customization autoInstall="true">
   <Connection connectionStringName="EcfSqlConnection" />
 </Customization>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.marketing.config b/Sources/EPiServer.Reference.Commerce.Manager/Configs/ecf.marketing.config
@@ -1,4 +1,6 @@
 <?xml version="1.0"?>
+<!-- Marketing Configuration -->
+<!-- This section is obsoleted since marketing configuration class was obsoleted and only kept for backwards compatibility. -->
 <Marketing>
   <Connection connectionStringName="EcfSqlConnection" />
   <Cache enabled="true" promotionTimeout="0:1:0" campaignTimeout="0:1:0" policyTimeout="0:1:0" segmentTimeout="0:1:0" expressionTimeout="0:1:0" />