Small Updates to accompany uWebshop 2.5.0.0 release

uWebshop.Starterkits.MVCStoreDemo/Views/Partials/CustomerForgotPassword.cshtml

@@ -25,20 +25,21 @@
 
 	<div class="row">
 		<div class="col-md-6">
-			<form class="form-horizontal" role="form" method="post">
-				<input type="hidden" id="requestPassword" name="requestPassword" value="true"/>
-				<div class="form-group">
-					<label for="userName" class="col-md-4 control-label">Username</label>
-					<div class="col-md-8">
-						<input type="text" class="form-control" id="userName" name="userName" value="@Customers.GetCustomerValueFromSessionOrProfile("userName")"/>
-					</div>
-				</div>
-				<div class="form-group">
-					<div class="col-md-offset-4 col-md-4">
-						<button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-refresh"></span> Request Password</button>
-					</div>
-				</div>
-			</form>
+		        @using (Html.BeginUmbracoForm("Handle", "BasketHandler", null, new {@class = "form-horizontal"}))
+		        {
+		            <input type="hidden" id="requestPassword" name="requestPassword" value="true"/>
+		            <div class="form-group">
+		                <label for="userName" class="col-md-4 control-label">Username</label>
+		                <div class="col-md-8">
+		                    <input type="text" class="form-control" id="userName" name="userName" value="@Customers.GetCustomerValueFromSessionOrProfile("userName")"/>
+		                </div>
+		            </div>
+		            <div class="form-group">
+		                <div class="col-md-offset-4 col-md-4">
+		                    <button type="submit" class="btn btn-success"><span class="glyphicon glyphicon-refresh"></span> Request Password</button>
+		                </div>
+		            </div>
+		        }
 		</div>
 	</div>
 }

uWebshop.Starterkits.MVCStoreDemo/Views/Partials/_BasketOrderLines.cshtml

@@ -13,6 +13,7 @@
 
 	if (orderlines != null)
 	{
+
 		<div class="row orderline orderline-header">
 			<div class="col-sm-6">
 				<h4>Product</h4>

uWebshop.Starterkits.MVCStoreDemo/Views/Partials/uWebshopCheckout.cshtml

@@ -14,7 +14,7 @@ uWebshop uses a default html <form> to update the basket. Keep in mind that if y
 	{
 		using (Html.BeginUmbracoForm("Handle", "BasketHandler", null, new {@class = "form-horizontal"}))
 		{
-
+            @basket.Customer.Shipping.CountryCode
 			<div class="row">
 				<div class="col-sm-6">
 

uWebshop.Starterkits.MVCStoreDemo/Views/Partials/uWebshopNavigation.cshtml

@@ -5,6 +5,9 @@ This snippet lists all the categories and products in the uWebshop Catalog
 *@
 
 @inherits Umbraco.Web.Mvc.UmbracoTemplatePage
+@using System.Linq
+@using System.Web.Security
+@using Umbraco.Web
 @using uWebshop.API
 
 @{
@@ -105,10 +108,12 @@ This snippet lists all the categories and products in the uWebshop Catalog
 
 @helper RenderContentNav()
 {
-	var rootnode = uQuery.GetRootNode();
-
-	var currentPageId = CurrentPage.Id;
-	var items = rootnode.ChildrenAsList.Where(x => x.Level != 1);
+    var contentWithStoreId = Store.GetStore().GetConnectedNodes.First();
+
+    var contentRootNode = Umbraco.TypedContent(contentWithStoreId);
+
+    var currentPageId = CurrentPage.Id;
+    var items = contentRootNode.Children;
 
 	if (items.Any())
 	{

uWebshop.Starterkits.MVCStoreDemo/package.xml

@@ -4,7 +4,7 @@
   <info>
     <package>
       <name>uWebshop MVC Demoshop</name>
-      <version>2.4.1.0</version>
+      <version>2.5.0.0</version>
       <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
       <url>http://www.uWebshop.com</url>
       <requirements>
@@ -18,11 +18,11 @@
       <website>http://www.uWebshop.com</website>
     </author>
     <readme>
-      <![CDATA[uWebshop 2.5 MVC Demoshop
+      <![CDATA[uWebshop MVC Demoshop
 	  
 	  This package installs the MVC demoshop for your uWebshop Foundation Installation.
 	  
-	  Notice: This demoshop requires the uWebshop 2.4+ Foundation to be already installed & Umbraco set to MVC mode!
+	  Notice: This demoshop requires the uWebshop 2.5+ Foundation to be already installed & Umbraco set to MVC mode!
 	]]>
     </readme>
   </info>

uWebshop.Starterkits.MVCStoreDemo/uWebshop.Starterkits.MVCStoreDemo.csproj

@@ -36,11 +36,23 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+    <Reference Include="System.Web.WebPages, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="umbraco">
+      <HintPath>..\..\Binary Dependencies umbraco7\umbraco.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Core, Version=1.0.4701.29087, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Binary Dependencies umbraco7\Umbraco.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Umbraco.Web.UI">
+      <HintPath>..\..\Binary Dependencies umbraco7\Umbraco.Web.UI.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -170,15 +182,16 @@ echo Rendering packages as version %25UWBSVER%25
 
 IF EXIST "$(ProjectDir)package\" DEL /s /f /q "$(ProjectDir)package\*.*"
 
-for /R "$(ProjectDir)Css\" %25%25f in (*.*) do copy %25%25f  "$(ProjectDir)package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\"
+XCOPY "$(ProjectDir)uWebshopDemoStarterkitInstaller.ascx" "$(ProjectDir)\package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\" /Y /R
+
+XCOPY "$(ProjectDir)package.xml" "$(ProjectDir)\package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\" /Y /R
+
+echo | for /R "$(ProjectDir)Css\" %25%25f in (*.*) do copy %25%25f  "$(ProjectDir)package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\"
 for /R "$(ProjectDir)fonts\" %25%25f in (*.*) do copy %25%25f  "$(ProjectDir)package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\"
 for /R "$(ProjectDir)Scripts\" %25%25f in (*.*) do copy %25%25f  "$(ProjectDir)package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\"
 for /R "$(ProjectDir)Views\" %25%25f in (*.*) do copy %25%25f  "$(ProjectDir)package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\"
 
-
-XCOPY "$(ProjectDir)uWebshopDemoStarterkitInstaller.ascx" "$(ProjectDir)\package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\" /Y /R
-
-XCOPY "$(ProjectDir)package.xml" "$(ProjectDir)\package\uWebshop%25UWBSVER%25.DemoStore.MVC.Package.Installer\" /Y /R</PostBuildEvent>
+</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>

uWebshop.Starterkits.StoreDemo/MacroScripts/uWebshopMiniBasket.cshtml

@@ -6,7 +6,7 @@ This snippet gives you a mini basket example to show the items in the basket and
 @using uWebshop.API
 
 @{
-
+     
 	var basket = Basket.GetBasket();
 
 	if (basket != null && basket.GrandTotal.Value > 0)

uWebshop.Starterkits.StoreDemo/MacroScripts/uWebshopNavigation.cshtml

@@ -8,6 +8,8 @@ This snippet lists all the categories and products in the uWebshop Catalog
 
 @{
 
+
+
 	<div class="navbar navbar-default navbar-static-top">
 		<div class="container">
 			<div class="navbar-header">

uWebshop.Starterkits.StoreDemo/Scripts/uWebshopStarterkit.js

@@ -59,7 +59,7 @@ $(document).ready(function() {
 				}
 			},
 			function (request) {
-				alert(request.responseText);
+
 			});
 	});