Merge branch 'master' of https://github.com/docusign/code-examples-csharp

Author: paigesrossi

launcher-csharp/WebForms/Examples/CreateAndEmbedFormService.cs

@@ -17,12 +17,18 @@ public static class CreateAndEmbedFormService
     {
         public static WebFormSummaryList GetForms(Client.DocuSignClient docuSignClient, string accountId)
         {
+<<<<<<< HEAD
             //ds-snippet-start:WebForms1Step3
+=======
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
             FormManagementApi formManagementApi = new FormManagementApi(docuSignClient);
             FormManagementApi.ListFormsOptions listFormsOptions = new FormManagementApi.ListFormsOptions();
             listFormsOptions.search = "Web Form Example Template";
             return formManagementApi.ListForms(accountId, listFormsOptions);
+<<<<<<< HEAD
             //ds-snippet-end:WebForms1Step3
+=======
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
         }
 
         public static void AddTemplateIdToForm(string fileLocation, string templateId)
@@ -75,11 +81,19 @@ public static List<EnvelopeTemplate> GetTemplatesByName(
             string accountId,
             string templateName)
         {
+<<<<<<< HEAD
+=======
+            //ds-snippet-start:WebForms1Step3
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
             var templatesApi = new TemplatesApi(docuSignClient);
             var listTemplateOptions = new TemplatesApi.ListTemplatesOptions();
             listTemplateOptions.searchText = templateName;
 
             EnvelopeTemplateResults templates = templatesApi.ListTemplates(accountId, listTemplateOptions);
+<<<<<<< HEAD
+=======
+            //ds-snippet-end:WebForms1Step3
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
 
             return templates.EnvelopeTemplates;
         }

launcher-csharp/WebForms/Views/CreateAndEmbedForm/Embed.cshtml

@@ -29,7 +29,11 @@ async function loadWebform() {
   var instanceToken = '@ViewBag.InstanceToken'.replace(/+/g, "+");
   const { loadDocuSign } = window.DocuSign
   const docusign = await loadDocuSign('@ViewBag.IntegrationKey');
+<<<<<<< HEAD
 
+=======
+    
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
   const webFormOptions = {
     //Used with the runtime API workflow, for private webforms this is needed to render anything
     instanceToken: instanceToken,
@@ -46,12 +50,25 @@ async function loadWebform() {
       minHeight: "1500px",
     },
     //Controls the auto resize behavior of the iframe
+<<<<<<< HEAD
     autoResizeHeight: true
+=======
+    autoResizeHeight: true,
+    //These values are passed to the iframe URL as query params
+    tracking: {
+      "tracking-field": "tracking-value",
+    },
+    //These values are passed to the iframe URL as hash params
+    hidden: {
+      "hidden-field": "hidden-value",
+    },
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
   };
 
   const webFormWidget = docusign.webforms({
     url: "@ViewBag.Url",
     options: webFormOptions,
+<<<<<<< HEAD
   });
 
   //Basic milestones in this workflow
@@ -90,6 +107,9 @@ async function loadWebform() {
     // event = { type: 'userActivity', activityType: 'click' | 'keydown' };
     console.log('debug form userActivity', event);
   });
+=======
+  })
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
 
   webFormWidget.mount("#docusign");
 }

launcher-csharp/launcher-csharp.sln

@@ -1919,7 +1919,11 @@
                            "ResultsPageText":"Go to your DocuSign account to create the Web Form. Go to 'Forms' in your developer account, select 'New,' and choose 'Upload web form.' Upload the JSON config file 'web-form-config.json' found under the demo_documents folder of this project. You will need to activate the web form before proceeding. Press Continue after doing so."
                         }
                      ],
+<<<<<<< HEAD
                      "SkipForLanguages":"java;python;node;ruby;php"
+=======
+                     "SkipForLanguages":"ruby;"
+>>>>>>> 5f36da8a1ae836a8e2e7fb3d56b089bec481c50e
                   }
                ]
             }