From a67a9eabc9551fa6475643d3a7498b56bcdaf215 Mon Sep 17 00:00:00 2001
From: Paul Schneider <paul@pschneider.fr>
Date: Mon, 24 Jul 2017 17:45:50 +0200
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9senter=20la=20facture=20=C3=A0=20sa=20g?=
 =?UTF-8?q?=C3=A9n=C3=A9ration?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Billing/NominativeServiceCommand.cs       |  3 ++-
 Yavsc/Startup/Startup.Workflow.cs             | 17 +++++++++---
 Yavsc/ViewComponents/BillViewComponent.cs     | 10 ++++---
 .../Shared/Components/Bill/Default.cshtml     | 26 +++++++++++++++++--
 4 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/Yavsc/Models/Billing/NominativeServiceCommand.cs b/Yavsc/Models/Billing/NominativeServiceCommand.cs
index 02608c5f..112f041e 100644
--- a/Yavsc/Models/Billing/NominativeServiceCommand.cs
+++ b/Yavsc/Models/Billing/NominativeServiceCommand.cs
@@ -88,7 +88,8 @@ namespace Yavsc.Models.Billing
         {
             string type = GetType().Name;
             string ack = GetIsAcquitted() ? "-ack" : null;
-            return $"facture-{ActivityCode}-{type}-{Id}{ack}";
+            var bcode = Startup.BillingMap[type];
+            return $"facture-{bcode}-{Id}{ack}";
         }
 
         public string PaymentId { get; set; }
diff --git a/Yavsc/Startup/Startup.Workflow.cs b/Yavsc/Startup/Startup.Workflow.cs
index 90b0c383..68208498 100644
--- a/Yavsc/Startup/Startup.Workflow.cs
+++ b/Yavsc/Startup/Startup.Workflow.cs
@@ -10,6 +10,9 @@ namespace Yavsc
     using Microsoft.Data.Entity;
     using Models;
     using Yavsc.Billing;
+    using Yavsc.Models.Haircut;
+    using Yavsc.Models.Workflow;
+
     public partial class Startup
     {
         /// <summary>
@@ -22,6 +25,8 @@ namespace Yavsc
         public static Dictionary<string,Func<ApplicationDbContext,long,IBillable>> Billing =
         new Dictionary<string,Func<ApplicationDbContext,long,IBillable>> ();
 
+        public static Dictionary<string,string> BillingMap =
+          new Dictionary<string,string>();
         /// <summary>
         /// Lists available command forms.
         /// This is hard coded.
@@ -71,7 +76,7 @@ mais n'implemente pas l'interface IQueryable<ISpecializationSettings>
                 }
             }
 
-            Billing.Add("Brush", new Func<ApplicationDbContext,long,IBillable>
+            RegisterBilling<HairCutQuery>("Brush", new Func<ApplicationDbContext,long,IBillable>
             ( ( db, id) => 
             {
               var query = db.HairCutQueries.Include(q=>q.Prestation).Include(q=>q.Regularisation).Single(q=>q.Id == id)  ; 
@@ -79,15 +84,21 @@ mais n'implemente pas l'interface IQueryable<ISpecializationSettings>
               return query;
             })) ;
 
-            Billing.Add("MBrush",new Func<ApplicationDbContext,long,IBillable>
+            RegisterBilling<HairMultiCutQuery>("MBrush",new Func<ApplicationDbContext,long,IBillable>
             ( (db, id) =>  db.HairMultiCutQueries.Include(q=>q.Regularisation).Single(q=>q.Id == id)));
-            Billing.Add("Rdv", new Func<ApplicationDbContext,long,IBillable>
+            RegisterBilling<RdvQuery>("Rdv", new Func<ApplicationDbContext,long,IBillable>
             ( (db, id) =>  db.RdvQueries.Include(q=>q.Regularisation).Single(q=>q.Id == id)));
         }
         public static System.Reflection.Assembly OnYavscResourceResolve(object sender, ResolveEventArgs ev)
         {
             return AppDomain.CurrentDomain.GetAssemblies()[0];
         }
+
+        public static void RegisterBilling<T>(string code, Func<ApplicationDbContext,long,IBillable> getter) where T : IBillable
+        {
+            Billing.Add(code,getter) ;
+            BillingMap.Add(typeof(T).Name,code);
+        }
     }
 
 }
diff --git a/Yavsc/ViewComponents/BillViewComponent.cs b/Yavsc/ViewComponents/BillViewComponent.cs
index d82fa237..068e8cfa 100644
--- a/Yavsc/ViewComponents/BillViewComponent.cs
+++ b/Yavsc/ViewComponents/BillViewComponent.cs
@@ -76,13 +76,17 @@ namespace Yavsc.ViewComponents
                     }
                     ViewComponentContext.ViewContext.Writer = oldWriter;
                     
-                    return this.View("Bill_pdf", 
-                        new PdfGenerationViewModel{ 
+                    var genrtrData = new PdfGenerationViewModel{ 
                             Temp = Startup.Temp,
                             TeXSource = tex, 
                             DestDir = Startup.UserBillsDirName,
                             BaseFileName = billable.GetFileBaseName()
-                        } );
+                        };
+                    if (genrtrData.GenerateEstimatePdf()) {
+                        return Json(new { Generated = genrtrData.BaseFileName+".pdf" });
+                    } else {
+                        return Json(new { Error = genrtrData.GenerationErrorMessage } );
+                    }
             }
             ViewBag.BillFileInfo =  billable.GetBillInfo();
             return View("Default",billable);
diff --git a/Yavsc/Views/Shared/Components/Bill/Default.cshtml b/Yavsc/Views/Shared/Components/Bill/Default.cshtml
index 26222c75..2d0a67f7 100644
--- a/Yavsc/Views/Shared/Components/Bill/Default.cshtml
+++ b/Yavsc/Views/Shared/Components/Bill/Default.cshtml
@@ -4,8 +4,30 @@
 @if (ViewBag.BillFileInfo.Exists) {
 <a class="btn btn-link" href="~/api/bill/facture-@(ViewBag.BillingCode)-@(Model.Id).pdf" >La facture au format Pdf</a>
 } else {
-<form action="~/api/bill/genpdf/@ViewBag.BillingCode/@Model.Id" method="POST">
-    <input class="btn btn-default" type="submit" value="Générer la facture au format Pdf"/>
+<script>
+var onGenerate = function () {
+    var _btn = this;
+    $.post('/api/bill/genpdf/@ViewBag.BillingCode/@Model.Id')
+    .done(function(data){
+        var res = JSON.parse(data);
+        window.location.href = '/api/bill/' + res.Generated;
+        _btn.disabled = true;
+    })
+    .fail(function( jqXHR, textStatus, errorThrown ) {
+        $('#billgenerr').html('<em>La génération a échoué</em><p>'+textStatus+'</p>')
+    })
+};
+
+$(document).ready(function(){$('#btnGen').on('click',onGenerate)})
+
+</script>
+<div id="billgen">
+<form action= method="POST">
+    <input id="btnGen" class="btn btn-default" type="button" onclick="onGenerate" value="Générer la facture au format Pdf" />
+
+<div id="billgenerr" class="error">
+</div>
 </form>
+</div>
 }
 </div>