fixed merge conflicts

Author: annahileta

launcher-csharp/eSignature/Examples/CFRPart11EmbeddedSending.cs

@@ -51,18 +51,15 @@ public static bool IsCfrPart11Account(string accessToken, string basePath, strin
         public static string EmbeddedSigning(string signerEmail, string signerName, string accessToken, string basePath, string accountId, string countryAreaCode, string phoneNumber, string docPdf, string redirectUrl)
         {
             // Construct your API headers
-            // Step 2 start
+            //ds-snippet-start:eSign41Step2
             var docuSignClient = new DocuSignClient(basePath);
             docuSignClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
 
-            // Step 2 end
-
-            // Step 3 start
             var accountsApi = new AccountsApi(docuSignClient);
             AccountIdentityVerificationResponse response = accountsApi.GetAccountIdentityVerification(accountId);
             var phoneAuthWorkflow = response.IdentityVerification.FirstOrDefault(x => x.DefaultName == "SMS for access & signatures");
+            //ds-snippet-end:eSign41Step2
 
-            // Step 3 end
             if (phoneAuthWorkflow == null)
             {
                 throw new ApiException(0, "IDENTITY_WORKFLOW_INVALID_ID");
@@ -71,7 +68,7 @@ public static string EmbeddedSigning(string signerEmail, string signerName, stri
             string workflowId = phoneAuthWorkflow.WorkflowId;
 
             // Construct your envelope JSON body
-            // Step 4 start
+            //ds-snippet-start:eSign41Step3
             EnvelopeDefinition env = new EnvelopeDefinition()
             {
                 EnvelopeIdStamping = "true",
@@ -144,23 +141,27 @@ public static string EmbeddedSigning(string signerEmail, string signerName, stri
             Recipients recipients = new Recipients();
             recipients.Signers = new List<Signer> { signer1 };
             env.Recipients = recipients;
-
-            // Step 4 end
+            //ds-snippet-end:eSign41Step3
 
             // Call the eSignature REST API
-            // Step 5 start
+            //ds-snippet-start:eSign41Step4
             EnvelopesApi envelopesApi = new EnvelopesApi(docuSignClient);
             EnvelopeSummary results = envelopesApi.CreateEnvelope(accountId, env);
+            //ds-snippet-end:eSign41Step4
 
-            // Step 5 end
-            RecipientViewRequest viewRequest = MakeRecipientViewRequest(signerEmail, signerName, redirectUrl, ClientUserId);
+            //ds-snippet-start:eSign41Step5
+            RecipientViewRequest viewRequest = MakeRecipientViewRequest(signerEmail, signerName, redirectUrl, _clientUserId);
+            //ds-snippet-end:eSign41Step5
 
             // call the CreateRecipientView API
+            //ds-snippet-start:eSign41Step6
             ViewUrl results1 = envelopesApi.CreateRecipientView(accountId, results.EnvelopeId, viewRequest);
+            //ds-snippet-end:eSign41Step6
 
             return results1.Url;
         }
 
+        //ds-snippet-start:eSign41Step5
         private static RecipientViewRequest MakeRecipientViewRequest(string signerEmail, string signerName, string returnUrl, string signerClientId, string pingUrl = null)
         {
             // Data for this method
@@ -206,5 +207,6 @@ private static RecipientViewRequest MakeRecipientViewRequest(string signerEmail,
 
             return viewRequest;
         }
+        //ds-snippet-end:eSign41Step5
     }
 }

launcher-csharp/eSignature/Examples/ResponsiveSigning.cs

@@ -75,6 +75,66 @@ private static EnvelopeDefinition MakeEnvelope(
             string ccName,
             string signerClientId)
         {
+            int price1 = 5;
+            int price2 = 150;
+
+            FormulaTab formulaTab1 = new FormulaTab
+            {
+                Font = "helvetica",
+                FontSize = "size11",
+                FontColor = "black",
+                AnchorString = "/l1e/",
+                AnchorYOffset = "-8",
+                AnchorUnits = "pixels",
+                AnchorXOffset = "105",
+                TabLabel = "l1e",
+                Formula = $"[l1q] * {price1}",
+                RoundDecimalPlaces = "0",
+                Required = "true",
+                Locked = "true",
+                DisableAutoSize = "false",
+            };
+
+            FormulaTab formulaTab2 = new FormulaTab
+            {
+                Font = "helvetica",
+                FontSize = "size11",
+                FontColor = "black",
+                AnchorString = "/l2e/",
+                AnchorYOffset = "-8",
+                AnchorUnits = "pixels",
+                AnchorXOffset = "105",
+                TabLabel = "l2e",
+                Formula = $"[l2q] * {price2}",
+                RoundDecimalPlaces = "0",
+                Required = "true",
+                Locked = "true",
+                DisableAutoSize = "false",
+            };
+
+            FormulaTab formulaTab3 = new FormulaTab
+            {
+                Font = "helvetica",
+                FontSize = "size11",
+                FontColor = "black",
+                AnchorString = "/l3t/",
+                AnchorYOffset = "-8",
+                AnchorUnits = "pixels",
+                AnchorXOffset = "105",
+                TabLabel = "l3t",
+                Formula = "[l1e] + [l2e]",
+                RoundDecimalPlaces = "0",
+                Required = "true",
+                Locked = "true",
+                DisableAutoSize = "false",
+                Bold = "true",
+            };
+
+            Tabs tabs = new Tabs
+            {
+                FormulaTabs = new List<FormulaTab> { formulaTab1, formulaTab2, formulaTab3 },
+            };
+
             Signer signer = new Signer
             {
                 Email = signerEmail,
@@ -83,6 +143,7 @@ private static EnvelopeDefinition MakeEnvelope(
                 RecipientId = "1",
                 RoutingOrder = "1",
                 RoleName = "Signer",
+                Tabs = tabs,
             };
 
             CarbonCopy cc = new CarbonCopy
@@ -100,8 +161,8 @@ private static EnvelopeDefinition MakeEnvelope(
                     .Replace("{ccName}", ccName)
                     .Replace("{ccEmail}", ccEmail)
                     .Replace("/sn1/", "<ds-signature data-ds-role=\"Signer\"/>")
-                    .Replace("/l1q/", " <input data-ds-type=\"number\"/>")
-                    .Replace("/l2q/", " <input data-ds-type=\"number\"/>");
+                    .Replace("/l1q/", " <input data-ds-type=\"number\" name=\"l1q\"/>")
+                    .Replace("/l2q/", " <input data-ds-type=\"number\" name=\"l2q\"/>");
 
             return new EnvelopeDefinition()
             {

launcher-csharp/order_form.html

@@ -33,7 +33,7 @@ <h4>Ordered by {signerName}</h4>
             <tr>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">Harmonica</td>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">
-                    <span style="color:white;">/l1q/</span>
+                    <span style="color:black;">/l1q/</span>
                 </td>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">$5</td>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">
@@ -43,7 +43,7 @@ <h4>Ordered by {signerName}</h4>
             <tr>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">Xylophone</td>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">
-                    <span style="color:white;">/l2q/</span>
+                    <span style="color:black;">/l2q/</span>
                 </td>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">$150</td>
                 <td style="padding: 9px 8px 0;border-bottom: 1px solid #667;">