strip quotes, fix image transparency, format price and amount

src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs

@@ -98,7 +98,7 @@
 
         static CatalogBrand CreateCatalogBrand(string brand)
         {
-            brand = brand.Trim();
+            brand = brand.Trim('"').Trim();
 
             if (String.IsNullOrEmpty(brand))
             {
@@ -153,6 +153,8 @@
 
         static CatalogType CreateCatalogType(string type)
         {
+            type = type.Trim('"').Trim();
+
             if (String.IsNullOrEmpty(type))
             {
                 throw new Exception("catalog Type Name is empty");
@@ -215,19 +217,19 @@
                 throw new Exception($"column count '{column.Count()}' not the same as headers count'{headers.Count()}'");
             }
 
-            string catalogTypeName = column[Array.IndexOf(headers, "catalogtypename")].Trim();
+            string catalogTypeName = column[Array.IndexOf(headers, "catalogtypename")].Trim('"').Trim();
             if (!catalogTypeIdLookup.ContainsKey(catalogTypeName))
             {
                 throw new Exception($"type={catalogTypeName} does not exist in catalogTypes");
             }
 
-            string catalogBrandName = column[Array.IndexOf(headers, "catalogbrandname")].Trim();
+            string catalogBrandName = column[Array.IndexOf(headers, "catalogbrandname")].Trim('"').Trim();
             if (!catalogBrandIdLookup.ContainsKey(catalogBrandName))
             {
                 throw new Exception($"type={catalogTypeName} does not exist in catalogTypes");
             }
 
-            string priceString = column[Array.IndexOf(headers, "price")];
+            string priceString = column[Array.IndexOf(headers, "price")].Trim('"').Trim();
             if (!Decimal.TryParse(priceString, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out Decimal price))
             {
                 throw new Exception($"price={priceString}is not a valid decimal number");
@@ -237,16 +239,16 @@
             {
                 CatalogTypeId = catalogTypeIdLookup[catalogTypeName],
                 CatalogBrandId = catalogBrandIdLookup[catalogBrandName],
-                Description = column[Array.IndexOf(headers, "description")],
+                Description = column[Array.IndexOf(headers, "description")].Trim('"').Trim(),
-                Name = column[Array.IndexOf(headers, "name")],
+                Name = column[Array.IndexOf(headers, "name")].Trim('"').Trim(),
                 Price = price,
-                PictureUri = column[Array.IndexOf(headers, "pictureuri")],
+                PictureUri = column[Array.IndexOf(headers, "pictureuri")].Trim('"').Trim(),
             };
 
             int availableStockIndex = Array.IndexOf(headers, "availablestock");
             if (availableStockIndex != -1)
             {
-                string availableStockString = column[availableStockIndex];
+                string availableStockString = column[availableStockIndex].Trim('"').Trim();
                 if (!String.IsNullOrEmpty(availableStockString))
                 {
                     if ( int.TryParse(availableStockString, out int availableStock))
@@ -263,7 +265,7 @@
             int restockThresholdIndex = Array.IndexOf(headers, "restockthreshold");
             if (restockThresholdIndex != -1)
             {
-                string restockThresholdString = column[restockThresholdIndex];
+                string restockThresholdString = column[restockThresholdIndex].Trim('"').Trim();
                 if (!String.IsNullOrEmpty(restockThresholdString))
                 {
                     if (int.TryParse(restockThresholdString, out int restockThreshold))
@@ -280,7 +282,7 @@
             int maxStockThresholdIndex = Array.IndexOf(headers, "maxstockthreshold");
             if (maxStockThresholdIndex != -1)
             {
-                string maxStockThresholdString = column[maxStockThresholdIndex];
+                string maxStockThresholdString = column[maxStockThresholdIndex].Trim('"').Trim();
                 if (!String.IsNullOrEmpty(maxStockThresholdString))
                 {
                     if (int.TryParse(maxStockThresholdString, out int maxStockThreshold))
@@ -297,7 +299,7 @@
             int onReorderIndex = Array.IndexOf(headers, "onreorder");
             if (onReorderIndex != -1)
             {
-                string onReorderString = column[onReorderIndex];
+                string onReorderString = column[onReorderIndex].Trim('"').Trim();
                 if (!String.IsNullOrEmpty(onReorderString))
                 {
                     if (bool.TryParse(onReorderString, out bool onReorder))

src/Web/WebMVC/Setup/override.css

@@ -1,6 +1,3 @@
 .esh-catalog-button {
-    background-color: #FF001b;
+    background-color: #83D01B; /* to override the style of this button ie. to make it red, use background-color: #FF001b; */
-    border: 2px;
-    color: #fff;
-    cursor: pointer;
 }

src/Web/WebMVC/Views/Order/Detail.cshtml

@@ -68,9 +68,9 @@
                         <img class="esh-orders_detail-image" src="@item.PictureUrl">
                     </section>
                     <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-4">@item.ProductName</section>
-                    <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ @Math.Round(item.UnitPrice, 2)</section>
+                    <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ @item.UnitPrice.ToString("N2")</section>
                     <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">@item.Units</section>
-                    <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2)</section>
+                    <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
                 </article>
             }
         </section>

src/Web/WebMVC/Views/Order/_OrderItems.cshtml

@@ -20,14 +20,14 @@
                 <input type="hidden" value="@item.ProductName" name=@("orderitems[" + i + "].ProductName") />
             </section>
             <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">
-                $ @item.UnitPrice
+                $ @item.UnitPrice.ToString("N2")
                 <input type="hidden" value="@item.UnitPrice" name=@("orderitems[" + i + "].UnitPrice") />
             </section>
             <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">
                 @item.Units
                 <input type="hidden" value="@item.Units" name=@("orderitems[" + i + "].Units") />
             </section>
-            <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2)</section>
+            <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-2">$ @Math.Round(item.Units * item.UnitPrice, 2).ToString("N2")</section>
         </article>
     }
 </section>
@@ -41,7 +41,7 @@
     <article class="esh-orders_new-items row">
         <section class="esh-orders_new-item col-xs-9"></section>
         <section class="esh-orders_new-item esh-orders_new-item--mark col-xs-2">
-            $ @Model.Total
+            $ @Model.Total.ToString("N2")
             <input type="hidden" value="@Model.Total" name="Total"/>
         </section>
     </article>

src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml

@@ -23,12 +23,12 @@
                     <img class="esh-basket-image" src="@item.PictureUrl" />
                 </section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-3">@item.ProductName</section>
-                <section class="esh-basket-item esh-basket-item--middle col-xs-2">$ @item.UnitPrice</section>
+                <section class="esh-basket-item esh-basket-item--middle col-xs-2">$ @item.UnitPrice.ToString("N2")</section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-2">
                     <input type="hidden" name="@("quantities[" + i +"].Key")" value="@item.Id" />
                     <input type="number" class="esh-basket-input" min="1" name="@("quantities[" + i +"].Value")" value="@item.Quantity" />
                 </section>
-                <section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ @Math.Round(item.Quantity * item.UnitPrice, 2)</section>
+                <section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ @Math.Round(item.Quantity * item.UnitPrice, 2).ToString("N2")</section>
             </div>
             <div class="row">
 

src/Web/WebMVC/wwwroot/css/override.css

@@ -1,6 +1,3 @@
 .esh-catalog-button {
-    background-color: #FF001b;
+    background-color: #83D01B; /* to override the style of this button ie. to make it red, use background-color: #FF001b; */
-    border: 2px;
-    color: #fff;
-    cursor: pointer;
 }

src/Web/WebSPA/Client/modules/basket/basket.component.html

@@ -17,7 +17,7 @@
                     <img class="esh-basket-image" src="{{item.pictureUrl}}" />
                 </section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-3">{{item.productName}}</section>
-                <section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice}}</section>
+                <section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice | number:'.2-2'}}</section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-2">
                     <input class="esh-basket-input"
                            type="number"
@@ -25,7 +25,7 @@
                            [(ngModel)]="item.quantity"
                            (change)="itemQuantityChanged(item)" />
                 </section>
-                <section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ {{item.unitPrice * item.quantity}}</section>
+                <section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ {{(item.unitPrice * item.quantity) | number:'.2-2'}}</section>
             </article>
             <br/>
             <div class="esh-basket-items-margin-left1 row">
@@ -42,7 +42,7 @@
 
         <article class="esh-basket-items row">
             <section class="esh-basket-item col-xs-9"></section>
-            <section class="esh-basket-item esh-basket-item--mark col-xs-2">$ {{totalPrice}}</section>
+            <section class="esh-basket-item esh-basket-item--mark col-xs-2">$ {{totalPrice | number:'.2-2'}}</section>
         </article>
 
         <article class="esh-basket-items row">

src/Web/WebSPA/Client/modules/catalog/catalog.component.html

@@ -37,7 +37,7 @@
                     <span>{{item.name}}</span>
                 </div>
                 <div class="esh-catalog-price">
-                    <span>{{item.price}}</span>
+                    <span>{{item.price | number:'.2-2'}}</span>
                 </div>
             </div>
         </div>

src/Web/WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html

@@ -57,9 +57,9 @@
                     <img class="esh-orders_detail-image" src="{{item.pictureurl}}">
                 </section>
                 <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-4">{{item.productname}}</section>
-                <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ {{item.unitprice}}</section>
+                <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">$ {{item.unitprice | number:'.2-2'}}</section>
                 <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-1">{{item.units}}</section>
-                <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ {{item.units * item.unitprice}}</section>
+                <section class="esh-orders_detail-item esh-orders_detail-item--middle col-xs-2">$ {{(item.units * item.unitprice) | number:'.2-2'}}</section>
             </article>
         </section>
 
@@ -71,7 +71,7 @@
 
             <article class="esh-orders_detail-items row">
                 <section class="esh-orders_detail-item col-xs-9"></section>
-                <section class="esh-orders_detail-item esh-orders_detail-item--mark col-xs-2">$ {{order.total}}</section>
+                <section class="esh-orders_detail-item esh-orders_detail-item--mark col-xs-2">$ {{order.total | number:'.2-2'}}</section>
             </article>
         </section>
     </div>

src/Web/WebSPA/Client/modules/orders/orders-new/orders-new.component.html

@@ -86,9 +86,9 @@
                     <img class="esh-orders_new-image" src="{{item.pictureurl}}">
                 </section>
                 <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-4">{{item.productname}}</section>
-                <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">$ {{item.unitprice}}</section>
+                <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">$ {{item.unitprice | number:'.2-2'}}</section>
                 <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-1">{{item.units}}</section>
-                <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-2">$ {{item.units * item.unitprice}}</section>
+                <section class="esh-orders_new-item esh-orders_new-item--middle col-xs-2">$ {{(item.units * item.unitprice) | number:'.2-2'}}</section>
             </article>
         </section>
 
@@ -100,7 +100,7 @@
 
             <article class="esh-orders_new-items row">
                 <section class="esh-orders_new-item col-xs-9"></section>
-                <section class="esh-orders_new-item esh-orders_new-item--mark col-xs-2">$ {{order.total}}</section>
+                <section class="esh-orders_new-item esh-orders_new-item--mark col-xs-2">$ {{order.total | number:'.2-2'}}</section>
             </article>
         </section>
         <section class="esh-orders_new-section">