files tree made better.

src/Yavsc/Views/HairCutCommand/BrusherProfileScript.cshtml

@@ -0,0 +1,29 @@
+@model BrusherProfile
+
+<script>
+var tarifs = 
+    [
+       { 
+           cut: [ @Model.WomenHalfCutPrice, @Model.WomenShortCutPrice, @Model.WomenLongCutPrice ],
+           tech: [ 
+            [@Model.HalfColorPrice, @Model.ShortColorPrice, @Model.LongColorPrice],
+            [@Model.HalfPermanentPrice, @Model.ShortPermanentPrice, @Model.LongPermanentPrice],
+            [@Model.HalfDefrisPrice, @Model.ShortDefrisPrice, @Model.LongDefrisPrice],
+            [@Model.HalfMechPrice, @Model.ShortMechPrice, @Model.LongMechPrice],
+            [@Model.HalfBalayagePrice, @Model.ShortBalayagePrice, @Model.LongBalayagePrice],
+            ],
+            brush: [@Model.HalfBrushingPrice, @Model.ShortBrushingPrice, @Model.LongBrushingPrice],
+            multicolor: [@Model.HalfMultiColorPrice, @Model.ShortMultiColorPrice, @Model.LongMultiColorPrice],
+            shampoo: @Model.ShampooPrice,
+            care: @Model.CarePrice,
+            feediscount: @Model.FlatFeeDiscount
+        },
+       { cut: [@Model.ManCutPrice], brush: [@Model.ManBrushPrice],
+            shampoo: @Model.ShampooPrice,
+            care: @Model.CarePrice },
+       { cut: [@Model.KidCutPrice] ,
+            shampoo: @Model.ShampooPrice,
+            care: @Model.CarePrice }
+    ];
+
+</script>

src/Yavsc/Views/HairCutCommand/CGV.cshtml

@@ -0,0 +1,13 @@
+@{ 
+    ViewData["Title"] = "Conditions Générales de Vente";
+}
+<h2>@ViewData["Title"]</h2>
+<markdown>
+
+Le paiement intervient à la commande, quelque soit la date d'intervention.
+Vous pouvez annuler votre commande depuis la [liste de vos commande en cours](/HairCutCommand/), 
+    
+Vous pouvez demander le remboursement d'un paiement, dans le cadre d'une réclamation sur l'execution 
+de votre commande, en nous contactant via courrier éléctronique ou postal, [que vour retrouverez sur la page de contact](/Home/Contact), votre demande sera rapidement traitée.
+
+</markdown>

src/Yavsc/Views/HairCutCommand/ClientCancel.cshtml

@@ -0,0 +1,19 @@
+@model HairCutQuery
+@section header {
+<script src="https://www.paypalobjects.com/api/checkout.js"></script>
+}
+
+@{
+    ViewData["Title"] = @SR["Annuler votre commande"];
+}
+
+<h2>@ViewData["Title"]</h2>
+
+<div>
+    <hr />
+    @Html.DisplayFor(m=>m)
+</div>
+<p>
+    <a asp-action="ClientCancelConfirm" asp-route-id="@Model.Id" class="btn btn-success">Je confirme, je veux annuler cette commande</a> |
+    <a asp-action="Index" class="btn btn-link">@SR["Back to List"]</a>
+</p>

src/Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml

@@ -0,0 +1,94 @@
+@model HairCutQuery
+@{
+    ViewData["Title"] = SR["Command confirmation"]+" "+ViewBag.Activity.Name;
+}
+@section header {
+<script src="https://www.paypalobjects.com/api/checkout.js"></script>
+}
+
+<h2>@ViewData["Title"]</h2>
+    <div class="form-horizontal">
+        <h4>@SR["Your book query"]</h4>
+        <hr />
+        <dl class="dl-horizontal">
+            <dt>
+                @SR["Votre prestataire"]
+            </dt>
+            <dd>
+                @Html.DisplayFor(m=>m.PerformerProfile)
+            </dd>
+            <dt>
+                @Html.DisplayNameFor(m=>m.Prestation)
+            </dt>
+            <dd>
+                @Html.DisplayFor(m=>m.Prestation)
+            </dd>
+            <dt>
+                @Html.DisplayNameFor(m=>m.AdditionalInfo)
+            </dt>
+            <dd>
+                @if (string.IsNullOrWhiteSpace(Model.AdditionalInfo))
+                {
+                    <span class="info">Aucune information complémentaire n'a
+                        été saisie.</span>
+                }
+                @Html.DisplayFor(m=>m.AdditionalInfo)
+            </dd>
+
+            <dt>@SR["Addition minimale"]
+            </dt>
+            <dd> <span class="price"> @ViewBag.Addition </span> <br/>
+
+     (Compter des frais supplémentaires <br/>
+    en cas de longs déplacements,<br/>
+        ou des majorations en cas de weekend et jour férie)
+            </dd>
+            <dt>Date de la prestation</dt>
+            <dd>@if (Model.EventDate == null) {
+         <p>Pas de date convenue ...</p>
+        } else {
+        <label for="EventDate">
+            @SR["Event date"]</label>
+           @Html.DisplayFor(m => m.EventDate)
+        }</dd>
+        <dt> @Html.DisplayNameFor(m => m.Location)
+        </dt>
+        <dd>@if (Model.Location == null) {
+         <p>Pas de lieu convenu ...</p> 
+         } else {
+        <label for="Location">@SR["Location"]</label>
+         @Html.DisplayFor(m => m.Location)
+        }
+        </dd>
+        <dt>@SR["Notification"]
+        </dt>
+        <dd>@if (ViewBag.GooglePayload !=null) 
+        {
+            @if (ViewBag.GooglePayload.success>0) {
+                <h4>@SR["GCM Notifications sent"]</h4>
+            }
+            else {
+                if (ViewBag.GooglePayload.failure>0)
+                    {
+                        <div class="error">@SR["EGCMBUTEMAIL"]</div>
+                    }
+                    else {
+                       <div>@SR["E-mail sent"]</div>
+                    }
+            }
+        } else {<div>@SR["E-mail sent"]</div>}
+        </dd>
+        <dt>Numéro identifiant votre commande</dt>
+        <dd>@Model.Id</dd>
+
+        <dt>@SR["La facture"]
+        </dt>
+        <dd>@await Component.InvokeAsync("Bill", "Brush", Model, OutputFormat.Html, false )
+        </dd>
+        
+        <dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt>
+        <dd> @Component.Invoke("PayPalButton", Model, "haircut", "HairCutCommand" )
+        </dd>
+     </dl>
+    
+</div>

src/Yavsc/Views/HairCutCommand/Details.cshtml

@@ -0,0 +1,19 @@
+@model HairCutQuery
+@section header {
+<script src="https://www.paypalobjects.com/api/checkout.js"></script>
+}
+
+@{
+    ViewData["Title"] = @SR["Le detail de votre commande de prestation en coiffure à domicile"];
+}
+
+<h2>@ViewData["Title"]</h2>
+
+<div>
+    <hr />
+    @Html.DisplayFor(m=>m)
+</div>
+<p>
+    <a asp-action="ClientCancel" asp-route-id="@Model.Id" class="btn btn-primary">Annuler cette commande</a> |
+    <a asp-action="Index" class="btn btn-link">@SR["Back to List"]</a>
+</p>

src/Yavsc/Views/HairCutCommand/HairCut.cshtml

@@ -0,0 +1,290 @@
+@model Yavsc.Models.Haircut.HairCutQuery 
+@{ ViewData["Title"] = $"{ViewBag.Activity.Name}: Votre commande"; } 
+@await Html.PartialAsync("BrusherProfileScript",ViewData["PerfPrefs"])
+@section header {
+<script type="text/javascript" src="~/lib/moment/moment-with-locales.min.js"></script>
+<script type="text/javascript" src="~/lib/eonasdan-bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+<link rel="stylesheet" href="~/lib/eonasdan-bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css" />
+<style>
+    #map {
+        width: 100%;
+        height: 250px;
+    }
+</style>
+} 
+
+@section scripts {
+<script>
+    var gtarif=tarifs[0];
+    var cutprice;
+    var techprice;
+    var dressprice;
+    var total;
+
+    function displayTarif(dn,price)
+    {
+        $('#'+dn).html( price+"€" );
+    }
+
+    function updateTarif () {
+        var len = $('#Prestation_Length').prop('selectedIndex');
+        var gen = $("#Prestation_Gender").prop('selectedIndex');
+        var tech = $("#Prestation_Tech").prop('selectedIndex');
+        var dress = $("#Prestation_Dressing").prop('selectedIndex');
+        var havecut = false;
+        var havetech = false;
+        total = 0;
+        if ($('#Prestation_Cut').prop('checked')) {
+            var cutprice = (gen==0) ? gtarif.cut[len] : gtarif.cut[0];
+            havecut = true;
+            total += cutprice;
+            displayTarif('CutPrice', cutprice);
+        } else displayTarif('CutPrice',0);
+        if (gen==0) {
+            if (tech>0) { 
+                var techi=tech-1;
+                var colors = $("input[name='Prestation.Taints[]']:checked");
+                var colIds=[];
+                colors.each(function(i,item){colIds.push(item.value)});
+                $('#taintIds').val(colIds);
+                var techprice = (techi>0 || colors.length<2) ? gtarif.tech[techi][len] : gtarif.multicolor[len] ; 
+                total += techprice;
+                havetech = true;
+                displayTarif('TechPrice', techprice);
+                } else displayTarif('TechPrice',0); 
+            if (dress>0) { 
+                var dressprice = gtarif.brush[dress-1];
+                total += dressprice;
+                displayTarif('DressPrice', dressprice);
+                } else displayTarif('DressPrice',0); 
+            
+        } else if (gen==1) {
+            if (dress>0) { total += gtarif.brush[0];  displayTarif('DressPrice', gtarif.brush[0]) }
+            else displayTarif('DressPrice',0); 
+        }
+        if ($('#Prestation_Shampoo').prop('checked')) {
+             total += gtarif.shampoo; 
+            displayTarif('ShampooPrice', gtarif.shampoo);
+        } else displayTarif('ShampooPrice', 0);
+        if ($('#Prestation_Cares').prop('checked')) {
+             total += gtarif.care;
+            displayTarif('CaresPrice', gtarif.care);
+        } else displayTarif('CaresPrice', 0);
+        if (havetech && havecut) {
+            total -= gtarif.feediscount;
+            $('#discount').html( "Remise au forfait coupe+technique: "+gtarif.feediscount+"€" ).removeClass('hidden');
+        } else $('#discount').addClass('hidden');
+        $('.btn-submit').prop('disabled', (total==0));
+        $('#Total').html( total.toFixed(2)+"€" );
+    }
+
+    function onTarif(tarif)
+    {
+        gtarif = tarif;
+        updateTarif();
+    }
+    // pas de coupe => technique
+    $(document).ready(function () {
+        
+        $("#Prestation_Tech").on("change", function (ev) {
+            var nv = $(this).val();
+            if (nv == 'Color' || nv == 'Mech') { $("#taintsfs").removeClass('hidden') }
+            else { $("#taintsfs").addClass('hidden') }
+        });
+        $("#Prestation_Gender").on("change", function(ev) {
+            var nv = $(this).val();
+            if(nv=='Women') {
+                onTarif(tarifs[0]);
+                $("#techfs").removeClass('hidden');
+                $("#lenfs").removeClass('hidden');
+                $('#Prestation_Cut').prop('disabled', false);
+                $('#optbrush').prop('disabled', false);
+                $('#optfold').prop('disabled', false);
+            }
+            else {
+                var cv = $('#Prestation_Dressing').val();
+                if (nv=='Man') {
+                    $('#optfold').prop('disabled', true);
+                    $('#optbrush').prop('disabled', false);
+                    onTarif(tarifs[1]); 
+                    if (cv=='Folding') { $('#Prestation_Dressing').val('Coiffage'); }
+                } 
+                if (nv=='Kid') { 
+                    onTarif(tarifs[2]);
+                    $('#optbrush').prop('disabled', true);
+                    $('#optfold').prop('disabled', true);
+                    if (cv=='Folding' || cv == 'Brushing') { $('#Prestation_Dressing').val('Coiffage'); }
+                }
+
+                $("#techfs").addClass('hidden');
+                $("#lenfs").addClass('hidden');
+                $('#Prestation_Cut').val(true);
+                $('#Prestation_Cut').prop('checked', true);
+                $('#Prestation_Cut').prop('disabled', true);
+            }
+
+            });
+            $(".imptarif").on("change", function(ev) {
+                updateTarif();
+            });
+
+            var curgen = $("#Prestation_Gender").val();
+            if (curgen=='Women') { 
+                gtarif=tarifs[0]; 
+                } else {
+                $("#techfs").addClass('hidden');
+                $("#lenfs").addClass('hidden');
+                if (curgen=='Man') { 
+                    gtarif=tarifs[1]; 
+                    } else gtarif=tarifs[2];
+                } 
+            onTarif(tarifs[0]);
+        });
+</script>
+
+}
+<em>@ViewBag.Activity.Description</em> 
+
+<h2>@ViewData["Title"]</h2>
+
+@Html.DisplayFor(m=>m.PerformerProfile)
+
+<form asp-controller="HairCutCommand" asp-action="CreateHairCutQuery" id="form">
+    <div class="form-horizontal">
+        <hr />
+        <div asp-validation-summary="ValidationSummary.All" class="text-danger"></div>
+        <div class="form-group">
+            <label asp-for="Prestation.Gender" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Prestation.Gender" asp-items="@ViewBag.Gender" class="form-control imptarif"></select>
+                <span asp-validation-for="Prestation.Gender" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group @ViewBag.TechClass" id="lenfs">
+            <label asp-for="Prestation.Length" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Prestation.Length" asp-items="@ViewBag.HairLength" class="form-control imptarif"></select>
+                <span asp-validation-for="Prestation.Length" class="text-danger"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <div class="checkbox">
+                    <input asp-for="Prestation.Cut" class="imptarif"/>
+                    <label asp-for="Prestation.Cut"></label>
+                    <span id="CutPrice" class="price"></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group @ViewBag.TechClass" id="techfs">
+            <label asp-for="Prestation.Tech" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select asp-for="Prestation.Tech" asp-items="@ViewBag.HairTechnos" class="form-control imptarif"></select>
+                <span asp-validation-for="Prestation.Tech" class="text-danger"></span>
+                <input name="taintIds" id="taintIds" type="hidden" />
+                <div class="form-group @ViewBag.ColorsClass" id="taintsfs">
+                    <label asp-for="Prestation.Taints" class="col-md-2 control-label"></label>
+                    <div class="col-md-10">
+                        @foreach (HairTaint color in ViewBag.HairTaints) {
+                        <label>
+     <input type="checkbox" value="@color.Id" name="Prestation.Taints[]" class="imptarif"/>
+     @await Html.PartialAsync("HairTaint",color)
+     </label> }
+                        <input type="hidden" asp-for="Prestation.Taints" />
+                        <span asp-validation-for="Prestation.Taints" class="text-danger"></span>
+
+                    </div>
+                </div>
+                <span id="TechPrice" class="price"></span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label asp-for="Prestation.Dressing" asp-items="@ViewBag.Dressing" class="col-md-2 control-label"></label>
+            <div class="col-md-10">
+                <select class="form-control imptarif" data-val="true" data-val-required="The Coiffage field is required." id="Prestation_Dressing" name="Prestation.Dressing">
+                    <option selected="selected" value="Coiffage">Coiffage</option>
+<option value="Brushing" id="optbrush">Brushing</option>
+<option value="Folding" id="optfold">Mise en plis</option>
+</select>
+               <span asp-validation-for="Prestation.Dressing" class="text-danger"></span>
+                <span id="DressPrice" class="price"></span>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <div class="checkbox">
+                    <input asp-for="Prestation.Shampoo" class="imptarif"/>
+                    <label asp-for="Prestation.Shampoo"></label>
+                    <span id="ShampooPrice" class="price"></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-10">
+                <div class="checkbox">
+                    <input asp-for="Prestation.Cares" class="imptarif"/>
+                    <label asp-for="Prestation.Cares"></label>
+                    <span id="CaresPrice" class="price"></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="EventDate" class="col-md-2 control-label">
+                @SR["Event date"]
+            </label>
+            <div class="col-md-10">
+                <div class="container">
+                    <div class="row">
+                        <div class='col-sm-6'>
+                            @await Component.InvokeAsync("Calendar","EventDate", Model.PerformerProfile.Performer.DedicatedGoogleCalendar)
+                            
+                        </div>
+                        <span asp-validation-for="EventDate" class="text-danger">
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <label for="Location_Address" class="col-md-2 control-label">
+            @SR["Location"]
+            </label>
+                                <input asp-for="Location.Address" type="text" name="Location_Address" id="Location_Address" class="form-control">
+                                <span asp-validation-for="Location.Address" class="text-danger" id="valloc"></span>
+                                <ul id="loccomb">
+                                </ul>
+                                <div id="map" class="map" data-val="valloc" data-addr="Location_Address" data-loccombo="loccomb" 
+                                  data-lat="Address_Latitude" data-lon="Address_Longitude" ></div>
+                      @Html.Hidden("Address.Latitude")
+                      @Html.Hidden("Address.Longitude")
+        </div>
+
+        <div class="form-group">
+                    <label asp-for="AdditionalInfo" class="col-md-2 control-label"></label>
+            <div class="col-md-offset-2 col-md-10">
+                    <textarea asp-for="AdditionalInfo" class="form-control">
+                    </textarea>
+            </div>
+        </div>
+        <div class="form-group">
+        <span id="discount" class="price"></span>
+        <span><img src="~/images/dollars.svg" style="width:2em;" /> Total : <span id="Total" class="total"></span>
+      </span><br/>
+      <label>
+      <input type="checkbox" asp-for="Consent" class="imptarif"></input> En cochant cette case, vous acceptez les
+      <a asp-action="CGV" class="btn btn-link">Conditions générales de vente</a> liées à cette commande de service.</label>
+        </div>
+      <input asp-for="ClientId" type="hidden" />
+      <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png" alt="PayPal Acceptance">
+
+      <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName"/>
+   </div>
+    @Html.HiddenFor(model=>model.Location.Latitude)
+    @Html.HiddenFor(model=>model.Location.Longitude)
+    <input type="hidden" name="performerId" value="@Model.PerformerProfile.PerformerId" />
+    <input type="hidden" name="activityCode" value="@ViewBag.Activity.Code" />
+</form>
+@{ await Html.RenderPartialAsync("_ValidationScriptsPartial"); }
+@{ await Html.RenderPartialAsync("_MapScriptsPartial"); }

src/Yavsc/Views/HairCutCommand/Index.cshtml

@@ -0,0 +1,52 @@
+@model IEnumerable<HairCutQuery>
+
+@{
+    ViewData["Title"] = "Vos commandes en coiffure à domicile";
+}
+
+<h2>@ViewData["Title"]</h2>
+
+<table class="table">
+    <tr>
+        <th>
+            @SR["DateCreated"]
+        </th>
+        <th>
+            @SR["EventDate"]
+        </th>
+        <th>
+            @SR["Location"]
+        </th>
+        <th>
+            @SR["Performer"]
+        </th>
+        <th>
+            @SR["ValidationDate"]
+        </th>
+        <th></th>
+    </tr>
+    
+@foreach (var item in Model) {
+    <tr>
+        <td>
+            @Html.DisplayFor(modelItem => item.DateCreated)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.EventDate)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.Location)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.PerformerProfile.Performer.UserName)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.ValidationDate)
+        </td>
+        <td>
+            <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a> 
+            <a asp-action="ClientCancel" asp-route-id="@item.Id" class="btn btn-primary">Annuler cette commande</a>
+        </td>
+    </tr>
+}
+</table>

src/Yavsc/Views/HairCutCommand/IndexPro.cshtml

@@ -0,0 +1,51 @@
+@model IEnumerable<HairCutQuery>
+
+@{
+    ViewData["Title"] = "Vos commandes en coiffure à domicile";
+}
+
+<h2>@ViewData["Title"]</h2>
+
+<table class="table">
+    <tr>
+        <th>
+            @SR["DateCreated"]
+        </th>
+        <th>
+            @SR["EventDate"]
+        </th>
+        <th>
+            @SR["Location"]
+        </th>
+        <th>
+            @SR["Client"]
+        </th>
+        <th>
+            @SR["ValidationDate"]
+        </th>
+        <th></th>
+    </tr>
+    
+@foreach (var item in Model) {
+    <tr>
+        <td>
+            @Html.DisplayFor(modelItem => item.DateCreated)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.EventDate)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.Location.Address)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.Client.UserName)
+        </td>
+        <td>
+            @Html.DisplayFor(modelItem => item.ValidationDate)
+        </td>
+        <td>
+            <a asp-action="Details" asp-route-id="@item.Id" class="btn btn-primary">Details</a> 
+        </td>
+    </tr>
+}
+</table>