going to live

Yavsc/ApiControllers/HairCut/HairCutController.cs

@@ -88,13 +88,15 @@ namespace Yavsc.ApiControllers
         [HttpPost("createpayment/{id}")]
         public async Task<IActionResult> CreatePayment(long id)
         {
-            var apiContext = _paymentSettings.CreateAPIContext();
+            var apiContext = PayPalHelpers.CreateAPIContext();
+
             var query = await _context.HairCutQueries.Include(q => q.Client).
             Include(q => q.Client.PostalAddress).Include(q => q.Prestation).Include(q=>q.Regularisation)
             .SingleAsync(q => q.Id == id);
             if (query.PaymentId!=null)
                 return new BadRequestObjectResult(new { error = "An existing payment process already exists" });
             query.SelectedProfile = _context.BrusherProfile.Single(p => p.UserId == query.PerformerId);
+
             var payment = Request.CreatePayment("HairCutCommand",apiContext, query,  "sale", _logger);
             switch (payment.state)
             {

Yavsc/ApiControllers/PaymentApiController.cs

@@ -38,7 +38,7 @@ namespace Yavsc.ApiControllers
                   p=>p.PaypalPaymentId==paymentId)
             };
             await Task.Run( () => {
-              var apiContext = paymentSettings.CreateAPIContext();
+              var apiContext = PayPalHelpers.CreateAPIContext();
               result.FromPaypal = Payment.Get(apiContext,paymentId);
             });
 
@@ -50,7 +50,7 @@ namespace Yavsc.ApiControllers
         {
             Payment result=null;
             await Task.Run( () => {
-            var apiContext = paymentSettings.CreateAPIContext();
+            var apiContext = PayPalHelpers.CreateAPIContext();
             var payment = Payment.Get(apiContext,paymentId);
             var execution = new PaymentExecution();
             execution.payer_id = payerId;
@@ -64,7 +64,7 @@ namespace Yavsc.ApiControllers
         [HttpPost("create"),AllowAnonymous]
         public IActionResult Create()
         {
-            var apiContext = paymentSettings.CreateAPIContext();
+            var apiContext = PayPalHelpers.CreateAPIContext();
             Payment result= Request.CreatePayment("Command",apiContext,new Estimate());
             return Ok(Payment.Create(apiContext,result));
         }

Yavsc/Controllers/CommandController.cs

@@ -250,5 +250,9 @@ namespace Yavsc.Controllers
             _context.SaveChanges(User.GetUserId());
             return RedirectToAction("Index");
         }
+        public IActionResult CGV()
+        {
+            return View();
+        }
     }
 }

Yavsc/Controllers/Haircut/HairCutCommandController.cs

@@ -44,6 +44,7 @@ namespace Yavsc.Controllers
         }
         PayPalSettings payPalSettings;
 
+
         private async Task<HairCutQuery> GetQuery(long id)
         {
             return await _context.HairCutQueries
@@ -130,7 +131,7 @@ namespace Yavsc.Controllers
             {
                 return HttpNotFound();
             }
-             var context =  payPalSettings.CreateAPIContext();
+             var context =  PayPalHelpers.CreateAPIContext();
             var payment = Payment.Get(context,paymentId);
 
             var execution = new PaymentExecution{ transactions = payment.transactions,
@@ -180,6 +181,9 @@ namespace Yavsc.Controllers
             // ModelState.ClearValidationState("Client.Avatar");
             // ModelState.ClearValidationState("ClientId");
 
+            if (!model.Consent)
+                ModelState.AddModelError("Consent", "Vous devez accepter les conditions générales de vente de ce service");
+
             if (ModelState.IsValid)
                 {
                     if (model.Location!=null) {
@@ -303,7 +307,6 @@ namespace Yavsc.Controllers
         [ValidateAntiForgeryToken]
         public async Task<IActionResult> CreateHairMultiCutQuery(HairMultiCutQuery command)
         {
-
             var uid = User.GetUserId();
             var prid = command.PerformerId;
             if (string.IsNullOrWhiteSpace(uid)

Yavsc/Controllers/ManageController.cs

@@ -719,7 +719,7 @@ namespace Yavsc.Controllers
 
         public IActionResult PaymentInfo(string id)
         {
-            var context = _payPalSettings.CreateAPIContext();
+            var context = PayPalHelpers.CreateAPIContext();
             var payment = Payment.Get(context,id);
             return View (payment);
         }

Yavsc/Helpers/PayPalHelpers.cs

@@ -10,25 +10,45 @@ namespace Yavsc.Helpers
 {
     public static class PayPalHelpers
     {
-        public static  APIContext CreateAPIContext(this PayPalSettings settings)
+        private static OAuthTokenCredential payPaylCredential=null;
+        public static OAuthTokenCredential PayPaylCredential
+        {
+            get
+            {
+                if (payPaylCredential==null)
                 {
                     Dictionary<string,string> config = new Dictionary<string,string>();
-            config.Add("mode",settings.Mode);
+                    config.Add("mode",Startup.PayPalSettings.Mode);
-            config.Add("clientId",settings.ClientId);
+                    config.Add("clientId",Startup.PayPalSettings.ClientId);
-            config.Add("clientSecret",settings.Secret);
+                    config.Add("clientSecret",Startup.PayPalSettings.Secret);
-            var accessToken = new OAuthTokenCredential(config).GetAccessToken();
+                    config.Add("user",Startup.PayPalSettings.APIUserId);
+                    config.Add("SIGNATURE",Startup.PayPalSettings.APISignature);
+                    config.Add("PWD",Startup.PayPalSettings.APIPassword);
+                    payPaylCredential = new OAuthTokenCredential(config);
+                }
+                return payPaylCredential;
+            }
+        }
+
+        public static  APIContext CreateAPIContext()
+        {
+            var accessToken = PayPaylCredential.GetAccessToken();
             var apiContext = new APIContext(accessToken);
             return apiContext;
         }
+
         public class PaymentUrls {
             public string Details { get; set; }
             public string Cancel { get; set; }
+
+            public string CGV { get; set; }
         }
         public static PaymentUrls GetPaymentUrls(this HttpRequest request, string controllerName, string id )
         {
             var result =new PaymentUrls {
                 Details = request.ToAbsolute($"{controllerName}/Details/{id}") ,
-                Cancel = request.ToAbsolute($"{controllerName}/ClientCancel/{id}")
+                Cancel = request.ToAbsolute($"{controllerName}/ClientCancel/{id}"),
+                CGV = request.ToAbsolute($"{controllerName}/CGV")
                 };
             return result;
         }

Yavsc/Migrations/20170516181745_paymentConsent.cs

@@ -0,0 +1,707 @@
+using System;
+using System.Collections.Generic;
+using Microsoft.Data.Entity.Migrations;
+
+namespace Yavsc.Migrations
+{
+    public partial class paymentConsent : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
+            migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
+            migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_PerformerProfile_OwnerId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Connection_ApplicationUser_ApplicationUserId", table: "Connection");
+            migrationBuilder.DropForeignKey(name: "FK_BrusherProfile_PerformerProfile_UserId", table: "BrusherProfile");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairPrestation_PrestationId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairTaint_TaintId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation");
+            migrationBuilder.DropForeignKey(name: "FK_PaypalPayment_ApplicationUser_ExecutorId", table: "PaypalPayment");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_PostTag_Blog_PostId", table: "PostTag");
+            migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity");
+            migrationBuilder.AddColumn<bool>(
+                name: "Consent",
+                table: "RdvQuery",
+                nullable: false,
+                defaultValue: false);
+            migrationBuilder.AddColumn<bool>(
+                name: "Consent",
+                table: "HairMultiCutQuery",
+                nullable: false,
+                defaultValue: false);
+            migrationBuilder.AddColumn<bool>(
+                name: "Consent",
+                table: "HairCutQuery",
+                nullable: false,
+                defaultValue: false);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_OwnerId",
+                table: "BlackListed",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "BlogPostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_AccountBalance_ApplicationUser_UserId",
+                table: "AccountBalance",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_AccountBalance_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "AccountBalance",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandLine_Estimate_EstimateId",
+                table: "CommandLine",
+                column: "EstimateId",
+                principalTable: "Estimate",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_ApplicationUser_ClientId",
+                table: "Estimate",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_PerformerProfile_OwnerId",
+                table: "Estimate",
+                column: "OwnerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Connection_ApplicationUser_ApplicationUserId",
+                table: "Connection",
+                column: "ApplicationUserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_PerformerProfile_UserId",
+                table: "BrusherProfile",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_Activity_ActivityCode",
+                table: "HairCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_ApplicationUser_ClientId",
+                table: "HairCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_PerformerProfile_PerformerId",
+                table: "HairCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_HairPrestation_PrestationId",
+                table: "HairCutQuery",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_Activity_ActivityCode",
+                table: "HairMultiCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_ApplicationUser_ClientId",
+                table: "HairMultiCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId",
+                table: "HairMultiCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId",
+                table: "HairPrestationCollectionItem",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId",
+                table: "HairPrestationCollectionItem",
+                column: "QueryId",
+                principalTable: "HairMultiCutQuery",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaint_Color_ColorId",
+                table: "HairTaint",
+                column: "ColorId",
+                principalTable: "Color",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairPrestation_PrestationId",
+                table: "HairTaintInstance",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairTaint_TaintId",
+                table: "HairTaintInstance",
+                column: "TaintId",
+                principalTable: "HairTaint",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_Notification_NotificationId",
+                table: "DimissClicked",
+                column: "NotificationId",
+                principalTable: "Notification",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_ApplicationUser_UserId",
+                table: "DimissClicked",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Instrumentation_Instrument_InstrumentId",
+                table: "Instrumentation",
+                column: "InstrumentId",
+                principalTable: "Instrument",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaypalPayment_ApplicationUser_ExecutorId",
+                table: "PaypalPayment",
+                column: "ExecutorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_Circle_CircleId",
+                table: "CircleMember",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_ApplicationUser_MemberId",
+                table: "CircleMember",
+                column: "MemberId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PostTag_Blog_PostId",
+                table: "PostTag",
+                column: "PostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandForm_Activity_ActivityCode",
+                table: "CommandForm",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_Location_OrganizationAddressId",
+                table: "PerformerProfile",
+                column: "OrganizationAddressId",
+                principalTable: "Location",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_ApplicationUser_PerformerId",
+                table: "PerformerProfile",
+                column: "PerformerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_Activity_ActivityCode",
+                table: "RdvQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_ApplicationUser_ClientId",
+                table: "RdvQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_PerformerProfile_PerformerId",
+                table: "RdvQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_Activity_DoesCode",
+                table: "UserActivity",
+                column: "DoesCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Cascade);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_PerformerProfile_UserId",
+                table: "UserActivity",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId", table: "AspNetRoleClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId", table: "AspNetUserClaims");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId", table: "AspNetUserLogins");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_IdentityRole_RoleId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_IdentityUserRole<string>_ApplicationUser_UserId", table: "AspNetUserRoles");
+            migrationBuilder.DropForeignKey(name: "FK_BlackListed_ApplicationUser_OwnerId", table: "BlackListed");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId", table: "CircleAuthorizationToBlogPost");
+            migrationBuilder.DropForeignKey(name: "FK_AccountBalance_ApplicationUser_UserId", table: "AccountBalance");
+            migrationBuilder.DropForeignKey(name: "FK_BalanceImpact_AccountBalance_BalanceId", table: "BalanceImpact");
+            migrationBuilder.DropForeignKey(name: "FK_CommandLine_Estimate_EstimateId", table: "CommandLine");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_ApplicationUser_ClientId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Estimate_PerformerProfile_OwnerId", table: "Estimate");
+            migrationBuilder.DropForeignKey(name: "FK_Connection_ApplicationUser_ApplicationUserId", table: "Connection");
+            migrationBuilder.DropForeignKey(name: "FK_BrusherProfile_PerformerProfile_UserId", table: "BrusherProfile");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_Activity_ActivityCode", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_ApplicationUser_ClientId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_PerformerProfile_PerformerId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairCutQuery_HairPrestation_PrestationId", table: "HairCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_Activity_ActivityCode", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_ApplicationUser_ClientId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId", table: "HairMultiCutQuery");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId", table: "HairPrestationCollectionItem");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaint_Color_ColorId", table: "HairTaint");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairPrestation_PrestationId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_HairTaintInstance_HairTaint_TaintId", table: "HairTaintInstance");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_Notification_NotificationId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_DimissClicked_ApplicationUser_UserId", table: "DimissClicked");
+            migrationBuilder.DropForeignKey(name: "FK_Instrumentation_Instrument_InstrumentId", table: "Instrumentation");
+            migrationBuilder.DropForeignKey(name: "FK_PaypalPayment_ApplicationUser_ExecutorId", table: "PaypalPayment");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_Circle_CircleId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_CircleMember_ApplicationUser_MemberId", table: "CircleMember");
+            migrationBuilder.DropForeignKey(name: "FK_PostTag_Blog_PostId", table: "PostTag");
+            migrationBuilder.DropForeignKey(name: "FK_CommandForm_Activity_ActivityCode", table: "CommandForm");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_Location_OrganizationAddressId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_PerformerProfile_ApplicationUser_PerformerId", table: "PerformerProfile");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_Activity_ActivityCode", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_ApplicationUser_ClientId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_RdvQuery_PerformerProfile_PerformerId", table: "RdvQuery");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_Activity_DoesCode", table: "UserActivity");
+            migrationBuilder.DropForeignKey(name: "FK_UserActivity_PerformerProfile_UserId", table: "UserActivity");
+            migrationBuilder.DropColumn(name: "Consent", table: "RdvQuery");
+            migrationBuilder.DropColumn(name: "Consent", table: "HairMultiCutQuery");
+            migrationBuilder.DropColumn(name: "Consent", table: "HairCutQuery");
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityRoleClaim<string>_IdentityRole_RoleId",
+                table: "AspNetRoleClaims",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserClaim<string>_ApplicationUser_UserId",
+                table: "AspNetUserClaims",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserLogin<string>_ApplicationUser_UserId",
+                table: "AspNetUserLogins",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_IdentityRole_RoleId",
+                table: "AspNetUserRoles",
+                column: "RoleId",
+                principalTable: "AspNetRoles",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_IdentityUserRole<string>_ApplicationUser_UserId",
+                table: "AspNetUserRoles",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BlackListed_ApplicationUser_OwnerId",
+                table: "BlackListed",
+                column: "OwnerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Blog_BlogPostId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "BlogPostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleAuthorizationToBlogPost_Circle_CircleId",
+                table: "CircleAuthorizationToBlogPost",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_AccountBalance_ApplicationUser_UserId",
+                table: "AccountBalance",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BalanceImpact_AccountBalance_BalanceId",
+                table: "BalanceImpact",
+                column: "BalanceId",
+                principalTable: "AccountBalance",
+                principalColumn: "UserId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandLine_Estimate_EstimateId",
+                table: "CommandLine",
+                column: "EstimateId",
+                principalTable: "Estimate",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_ApplicationUser_ClientId",
+                table: "Estimate",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Estimate_PerformerProfile_OwnerId",
+                table: "Estimate",
+                column: "OwnerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Connection_ApplicationUser_ApplicationUserId",
+                table: "Connection",
+                column: "ApplicationUserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_BrusherProfile_PerformerProfile_UserId",
+                table: "BrusherProfile",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_Activity_ActivityCode",
+                table: "HairCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_ApplicationUser_ClientId",
+                table: "HairCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_PerformerProfile_PerformerId",
+                table: "HairCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairCutQuery_HairPrestation_PrestationId",
+                table: "HairCutQuery",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_Activity_ActivityCode",
+                table: "HairMultiCutQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_ApplicationUser_ClientId",
+                table: "HairMultiCutQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairMultiCutQuery_PerformerProfile_PerformerId",
+                table: "HairMultiCutQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairPrestation_PrestationId",
+                table: "HairPrestationCollectionItem",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairPrestationCollectionItem_HairMultiCutQuery_QueryId",
+                table: "HairPrestationCollectionItem",
+                column: "QueryId",
+                principalTable: "HairMultiCutQuery",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaint_Color_ColorId",
+                table: "HairTaint",
+                column: "ColorId",
+                principalTable: "Color",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairPrestation_PrestationId",
+                table: "HairTaintInstance",
+                column: "PrestationId",
+                principalTable: "HairPrestation",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_HairTaintInstance_HairTaint_TaintId",
+                table: "HairTaintInstance",
+                column: "TaintId",
+                principalTable: "HairTaint",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_Notification_NotificationId",
+                table: "DimissClicked",
+                column: "NotificationId",
+                principalTable: "Notification",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_DimissClicked_ApplicationUser_UserId",
+                table: "DimissClicked",
+                column: "UserId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_Instrumentation_Instrument_InstrumentId",
+                table: "Instrumentation",
+                column: "InstrumentId",
+                principalTable: "Instrument",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PaypalPayment_ApplicationUser_ExecutorId",
+                table: "PaypalPayment",
+                column: "ExecutorId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_Circle_CircleId",
+                table: "CircleMember",
+                column: "CircleId",
+                principalTable: "Circle",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CircleMember_ApplicationUser_MemberId",
+                table: "CircleMember",
+                column: "MemberId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PostTag_Blog_PostId",
+                table: "PostTag",
+                column: "PostId",
+                principalTable: "Blog",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommandForm_Activity_ActivityCode",
+                table: "CommandForm",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_Location_OrganizationAddressId",
+                table: "PerformerProfile",
+                column: "OrganizationAddressId",
+                principalTable: "Location",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_PerformerProfile_ApplicationUser_PerformerId",
+                table: "PerformerProfile",
+                column: "PerformerId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_Activity_ActivityCode",
+                table: "RdvQuery",
+                column: "ActivityCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_ApplicationUser_ClientId",
+                table: "RdvQuery",
+                column: "ClientId",
+                principalTable: "AspNetUsers",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_RdvQuery_PerformerProfile_PerformerId",
+                table: "RdvQuery",
+                column: "PerformerId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_Activity_DoesCode",
+                table: "UserActivity",
+                column: "DoesCode",
+                principalTable: "Activity",
+                principalColumn: "Code",
+                onDelete: ReferentialAction.Restrict);
+            migrationBuilder.AddForeignKey(
+                name: "FK_UserActivity_PerformerProfile_UserId",
+                table: "UserActivity",
+                column: "UserId",
+                principalTable: "PerformerProfile",
+                principalColumn: "PerformerId",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}

Yavsc/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -1,6 +1,8 @@
 using System;
 using Microsoft.Data.Entity;
 using Microsoft.Data.Entity.Infrastructure;
+using Microsoft.Data.Entity.Metadata;
+using Microsoft.Data.Entity.Migrations;
 using Yavsc.Models;
 
 namespace Yavsc.Migrations
@@ -539,6 +541,8 @@ namespace Yavsc.Migrations
                     b.Property<string>("ClientId")
                         .IsRequired();
 
+                    b.Property<bool>("Consent");
+
                     b.Property<DateTime>("DateCreated");
 
                     b.Property<DateTime>("DateModified");
@@ -582,6 +586,8 @@ namespace Yavsc.Migrations
                     b.Property<string>("ClientId")
                         .IsRequired();
 
+                    b.Property<bool>("Consent");
+
                     b.Property<DateTime>("DateCreated");
 
                     b.Property<DateTime>("DateModified");
@@ -1097,6 +1103,8 @@ namespace Yavsc.Migrations
                     b.Property<string>("ClientId")
                         .IsRequired();
 
+                    b.Property<bool>("Consent");
+
                     b.Property<DateTime>("DateCreated");
 
                     b.Property<DateTime>("DateModified");

Yavsc/Models/Billing/NominativeServiceCommand.cs

@@ -15,6 +15,9 @@ namespace Yavsc.Models.Billing
   {
         public abstract long Id { get; set; }
         public abstract string Description { get; set; }
+
+        [Required()]
+        public bool Consent { get; set; }
         public DateTime DateCreated
         {
             get; set;

Yavsc/Settings/PayPalSettings.cs

@@ -6,5 +6,9 @@ namespace  Yavsc
         public string Secret { get; set; }
         public string ClientId { get; set; }
 
+        // NV/SOAP Api - Signature
+        public string APIUserId { get; set; }
+        public string APIPassword { get; set; }
+        public string APISignature { get; set; }
     }
 }

Yavsc/Startup/Startup.cs

@@ -35,10 +35,10 @@ namespace Yavsc
         public static string UserBillsDirName { private set; get; }
         public static string AvatarsDirName { private set; get; }
         public static string Authority { get; private set; }
-        public static string Audience { get; private set; }
         public static string Temp { get; set; }
         public static SiteSettings SiteSetup { get; private set; }
 
+        public static PayPalSettings PayPalSettings { get; private set; }
         private static ILogger logger;
         public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
         {
@@ -239,15 +239,15 @@ namespace Yavsc
         IOptions<OAuth2AppSettings> oauth2SettingsContainer,
         RoleManager<IdentityRole> roleManager,
         IAuthorizationService authorizationService,
+        IOptions<PayPalSettings> payPalSettings,
          ILoggerFactory loggerFactory)
         {
             SiteSetup = siteSettings.Value;
             Authority = siteSettings.Value.Authority;
-            Audience = siteSettings.Value.Audience;
             Startup.UserFilesDirName =  new DirectoryInfo(siteSettings.Value.UserFiles.Blog).FullName;
             Startup.UserBillsDirName =  new DirectoryInfo(siteSettings.Value.UserFiles.Bills).FullName;
             Startup.Temp = siteSettings.Value.TempDir;
-
+            PayPalSettings = payPalSettings.Value;
             // TODO implement an installation & upgrade procedure
             // Create required directories
             foreach (string dir in new string[] { UserFilesDirName, UserBillsDirName, SiteSetup.TempDir })

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>

Yavsc/Views/HairCutCommand/CommandConfirmation.cshtml

@@ -84,6 +84,7 @@
 
         </environment>
         
+        
 <dt>@Html.DisplayNameFor(m=>m.Regularisation)</dt>
 <dd>@Html.DisplayFor(m=>m.Regularisation,new { 
     PaymentUrl = "/api/haircut/createpayment/"+Model.Id.ToString(), 

Yavsc/Views/HairCutCommand/HairCut.cshtml

@@ -224,16 +224,24 @@
                     </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>
+      </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" />
+      
+
       <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName"/>
       <environment names="Development">
       <input type="submit" class="btn btn-success btn-submit" value="@SR["Validez ce choix, et prendre rendez-vous"] avec @Model.PerformerProfile.Performer.UserName [DEV+Location+Date]"/>
       </environment>
    </div>
+   
+
     <input type="hidden" name="performerId" value="@Model.PerformerProfile.PerformerId" />
     <input type="hidden" name="activityCode" value="@ViewBag.Activity.Code" />
 </form>

Yavsc/Views/Shared/DisplayTemplates/PaypalPayment.cshtml

@@ -26,7 +26,7 @@
     paypal.Button.render({
     
         env: PAYPAL_ENV, // 'production', Optional: specify 'sandbox' environment
-    
+        commit: true,
         payment: function(resolve, reject) {
                 
             return paypal.request.post(CREATE_PAYMENT_URL)

Yavsc/appsettings.json

@@ -17,7 +17,6 @@
         "Slogan": "Yavsc!",
         "Banner": "/images/banner.jpg",
         "Authority": "http://127.0.0.1:5000/",
-        "Audience": "http://127.0.0.1:5000/",
         "Owner": {
             "Name": "[query]",
             "Address": "bigchief@company.com"

Yavsc/contrib/rsync-to-prod.sh

@@ -4,10 +4,14 @@ FSPATH=/srv/www/yavsc
 
 (
   set -e
+  ssh root@localhost service kestrel stop
   ssh root@localhost rm -rf $FSPATH/approot/src
   cd bin/output/
+  sleep 1
   rsync -ravu wwwroot approot root@localhost:$FSPATH
+  sleep 1
   ssh root@localhost sync
-  ssh root@localhost service kestrel restart
+  sleep 1
+  ssh root@localhost service kestrel start
 )
 

Yavsc/package.json

@@ -10,5 +10,9 @@
     "gulp-shell": "^0.5.2",
     "gulp-uglify": "1.2.0",
     "rimraf": "2.2.8"
+  },
+  "dependencies": {
+    "braintree-web": "^3.15.0",
+    "paypal-permissions-sdk": "^1.0.8"
   }
 }

Yavsc/project.json

@@ -136,7 +136,10 @@
     "frameworks": {
         "dnx451": {
             "frameworkAssemblies": {
-        "System.Drawing": "4.0.0.0"
+                "System.Drawing": "4.0.0.0",
+                "System.Net": "4.0.0.0",
+                "System.Xml": "4.0.0.0",
+                "System": "4.0.0.0"
             }
         }
     },

Yavsc/project.lock.json

@@ -11635,7 +11635,10 @@
       "PayPal >= 1.8.0"
     ],
     "DNX,Version=v4.5.1": [
-      "fx/System.Drawing >= 4.0.0"
+      "fx/System.Drawing >= 4.0.0",
+      "fx/System.Net >= 4.0.0",
+      "fx/System.Xml >= 4.0.0",
+      "fx/System >= 4.0.0"
     ]
   }
 }