xml doc

web/Controllers/BasketController.cs

@@ -64,15 +64,5 @@ namespace Yavsc.ApiControllers
 			return wfmgr.GetEstimates (
 				Membership.GetUser().UserName);
 		}
-
-		/// <summary>
-		/// Order the specified bi.
-		/// </summary>
-		/// <param name="bi">Bi.</param>
-		[HttpGet]
-		public object Order (BasketImpact bi)
-		{
-			return new { c="lmk,", message="Panier impacté", impactRef=bi.ProductRef, count=bi.Count};
-		}
     }
 }

web/Controllers/FrontOfficeController.cs

@@ -13,6 +13,7 @@ using Yavsc.Model.WorkFlow;
 using WorkFlowProvider;
 using System.Web.Security;
 using System.Threading;
+using Yavsc.Model.FrontOffice;
 
 namespace Yavsc.Controllers
 {
@@ -26,6 +27,7 @@ namespace Yavsc.Controllers
 		/// The wfmgr.
 		/// </summary>
 		protected WorkFlowManager wfmgr = null;
+
 		/// <summary>
 		/// Initialize the specified requestContext.
 		/// </summary>
@@ -35,6 +37,7 @@ namespace Yavsc.Controllers
 			base.Initialize (requestContext);
 			wfmgr = new WorkFlowManager ();
 		}
+
 		/// <summary>
 		/// Index this instance.
 		/// </summary>
@@ -42,6 +45,7 @@ namespace Yavsc.Controllers
 		{
 			return View ();
 		}
+
 		/// <summary>
 		/// Estimates this instance.
 		/// </summary>
@@ -50,15 +54,16 @@ namespace Yavsc.Controllers
 		{
 			string username = Membership.GetUser ().UserName;
 
-			return View(wfmgr.GetEstimates (username));
+			return View (wfmgr.GetEstimates (username));
 		}
+
 		/// <summary>
 		/// Estimate the specified model and submit.
 		/// </summary>
 		/// <param name="model">Model.</param>
 		/// <param name="submit">Submit.</param>
 		[Authorize]
-		public ActionResult Estimate(Estimate model,string submit)
+		public ActionResult Estimate (Estimate model, string submit)
 		{
 			ViewData ["WebApiBase"] = "http://" + Request.Url.Authority + "/api";
 			ViewData ["WABASEWF"] = ViewData ["WebApiBase"] + "/WorkFlow";
@@ -80,12 +85,12 @@ namespace Yavsc.Controllers
 			} else {
 				string username = HttpContext.User.Identity.Name;
 				if (model.Id == 0) {
-					model.Responsible=username;
+					model.Responsible = username;
 					ModelState.Clear ();
 				}
 				if (ModelState.IsValid) {
 					if (username != model.Responsible
-					   && !Roles.IsUserInRole ("FrontOffice"))
+					    && !Roles.IsUserInRole ("FrontOffice"))
 						throw new UnauthorizedAccessException ("You're not allowed to modify this estimate");
 
 					if (model.Id == 0)
@@ -98,12 +103,13 @@ namespace Yavsc.Controllers
 					}
 				}
 			}
-			return View(model);
+			return View (model);
 		}
+
 		/// <summary>
 		/// Catalog this instance.
 		/// </summary>
-		[AcceptVerbs("GET")]
+		[AcceptVerbs ("GET")]
 		public ActionResult Catalog ()
 		{
 			return View (
@@ -114,12 +120,12 @@ namespace Yavsc.Controllers
 		/// <summary>
 		/// Catalog this instance.
 		/// </summary>
-		[AcceptVerbs("GET")]
+		[AcceptVerbs ("GET")]
 		public ActionResult Brand (string id)
 		{
 			Catalog c = CatalogManager.GetCatalog (Request.Url.AbsolutePath);
 			ViewData ["BrandName"] = id;
-			return View ( c.GetBrand (id) );
+			return View (c.GetBrand (id));
 		}
 
 		/// <summary>
@@ -128,7 +134,7 @@ namespace Yavsc.Controllers
 		/// <returns>The category object.</returns>
 		/// <param name="brandid">Brand id.</param>
 		/// <param name="pcid">Product category Id.</param>
-		[AcceptVerbs("GET")]
+		[AcceptVerbs ("GET")]
 		public ActionResult ProductCategory (string brandid, string pcid)
 		{
 			ViewData ["BrandId"] = brandid;
@@ -137,13 +143,14 @@ namespace Yavsc.Controllers
 				CatalogManager.GetCatalog (Request.Url.AbsolutePath).GetBrand (brandid).GetProductCategory (pcid)
 			);
 		}
+
 		/// <summary>
 		/// Product the specified id, pc and pref.
 		/// </summary>
 		/// <param name="id">Identifier.</param>
 		/// <param name="pc">Pc.</param>
 		/// <param name="pref">Preference.</param>
-		[AcceptVerbs("GET")]
+		[AcceptVerbs ("GET")]
 		public ActionResult Product (string id, string pc, string pref)
 		{
 			Product p = null;
@@ -168,62 +175,68 @@ namespace Yavsc.Controllers
 			}
 			ViewData ["ProdCatName"] = pcat.Name;
 			p = pcat.GetProduct (pref);
-			if (p.CommandForm==null)
+			if (p.CommandForm == null)
 				p.CommandForm = b.DefaultForm;
 
-			return View ((p is Service)?"Service":"Product", p);
+			return View ((p is Service) ? "Service" : "Product", p);
 		}
+
 		/// <summary>
 		/// Command this instance.
 		/// </summary>
-		public ActionResult Command()
+		public ActionResult Command ()
 		{
 			return View ();
 		}
 
+		private Basket GetBasket ()
+		{
+			if (Session ["Basket"] == null)
+				Session ["Basket"] = new Basket();
+			return Session ["Basket"] as Basket;
+		}
+
 		/// <summary>
 		/// Command the specified collection.
 		/// </summary>
 		/// <param name="collection">Collection.</param>
 		[HttpPost]
 		[Authorize]
-		public ActionResult Command(FormCollection collection)
+		public ActionResult Command (FormCollection collection)
 		{
 			try {
 				// get files from the request 
 				string fnre = "[A-Za-z0-9~\\-.]+";
 				HttpFileCollectionBase hfc = Request.Files;
 
-				foreach (String h in hfc.AllKeys)
-				{
-					if (!Regex.Match(hfc[h].FileName,fnre).Success)
-					{
+				foreach (String h in hfc.AllKeys) {
+					if (!Regex.Match (hfc [h].FileName, fnre).Success) {
 						ViewData ["Message"] = "File name refused";
-						ModelState.AddModelError(
+						ModelState.AddModelError (
 							h,
-							string.Format(
+							string.Format (
 								"The file name {0} dosn't match an acceptable file name {1}",
-								hfc[h].FileName,fnre))
-						;
-						return View(collection);
+								hfc [h].FileName, fnre));
+						return View (collection);
 					}
 				}
-				foreach (String h in hfc.AllKeys)
-				{
+				foreach (String h in hfc.AllKeys) {
 					// TODO Limit with hfc[h].ContentLength 
-					hfc[h].SaveAs(Path.Combine(FileSystemController.BaseDir,hfc[h].FileName));
+					hfc [h].SaveAs (Path.Combine (FileSystemController.BaseDir, hfc [h].FileName));
 				}
-				if (Session["Basket"]==null)
-					Session["Basket"]=new List<Commande>();
-				List<Commande> basket = Session["Basket"] as List<Commande>;
 				// Add specified product command to the basket,
-				basket.Add(Commande.Create(collection));
+				GetBasket().Add (Commande.Create (collection));
+				ViewData ["Message"] = LocalizedText.Item_added_to_basket;
 				return View (collection);
-			} catch (Exception e) 
-			{
-				ViewData ["Message"] = "Exception:"+e.Message;
+			} catch (Exception e) {
+				ViewData ["Message"] = "Exception:" + e.Message;
 				return View (collection);
 			}
 		}
+
+		ActionResult YourCommands ()
+		{
+			return View (GetBasket());
+		}
 	}
 }