Final changes to the form

Adding Boat(s) and remove the service question and use both completion
date and expected arrival date.

diff --git a/Toolkit/Contacts/ServiceRequest.php b/Toolkit/Contacts/ServiceRequest.php
index 1802a4f..1eee5eb 100755 (executable)
--- a/Toolkit/Contacts/ServiceRequest.php
+++ b/Toolkit/Contacts/ServiceRequest.php
@@ -187,6 +187,12 @@ class Toolkit_Contacts_ServiceRequest
             'name'    => 'lname',
             'display' => 'Last Name'
         );
+        $e[] = array(
+            'type'    => 'text',
+            'req'     => false,
+            'name'    => 'arrival_date',
+            'display' => 'Expected Arrival Date'
+        );
         $e[] = array(
             'type'    => 'tel',
             'req'     => true,
@@ -199,6 +205,12 @@ class Toolkit_Contacts_ServiceRequest
             'name'    => 'mobile_phone',
             'display' => 'Mobile Phone'
         );
+        $e[] = array(
+            'type'    => 'tel',
+            'req'     => false,
+            'name'    => 'boats',
+            'display' => 'Boat(s)'
+        );
         // $e[] = array(
         //     'type'    => 'email',
         //     'req'     => true,
@@ -272,33 +284,27 @@ class Toolkit_Contacts_ServiceRequest
             'display' => 'Engine Type',
             'opts'    => $engTypes
         );
-        $e[] = array(
-            'type'    => 'header',
-            'name'    => 'serviceHdr_rmv',
-            'display' => 'Are you also requesting launch service?'
-        );
-        $e[] = array(
-            'type'    => 'radio',
-            'req'     => false,
-            'name'    => 'service_request',
-            'display' => '',
-            'opts'    => 'Yes',
-            'att'     => 'Yes'
-        );
-        $e[] = array(
-            'type'    => 'text',
-            'req'     => false,
-            'name'    => 'arrival_date',
-            'display' => 'Anticipated Arrival Date'
-        );
-        $e[] = array(
-            'type'    => 'radio',
-            'req'     => false,
-            'name'    => 'service_request',
-            'display' => '',
-            'opts'    => 'No',
-            'att'     => 'No'
-        );
+        // $e[] = array(
+        //     'type'    => 'header',
+        //     'name'    => 'serviceHdr_rmv',
+        //     'display' => 'Are you also requesting launch service?'
+        // );
+        // $e[] = array(
+        //     'type'    => 'radio',
+        //     'req'     => false,
+        //     'name'    => 'service_request',
+        //     'display' => '',
+        //     'opts'    => 'Yes',
+        //     'att'     => 'Yes'
+        // );
+        // $e[] = array(
+        //     'type'    => 'radio',
+        //     'req'     => false,
+        //     'name'    => 'service_request',
+        //     'display' => '',
+        //     'opts'    => 'No',
+        //     'att'     => 'No'
+        // );
         $e[] = array(
             'type'    => 'text',
             'req'     => false,