Updating the service request form

Updates from client request.

diff --git a/Toolkit/Contacts/ServiceRequest.php b/Toolkit/Contacts/ServiceRequest.php
index eb3164e..01043c9 100755 (executable)
--- a/Toolkit/Contacts/ServiceRequest.php
+++ b/Toolkit/Contacts/ServiceRequest.php
@@ -199,56 +199,56 @@ class Toolkit_Contacts_ServiceRequest
             'name'    => 'mobile_phone',
             'display' => 'Mobile Phone'
         );
-        $e[] = array(
-            'type'    => 'email',
-            'req'     => true,
-            'name'    => 'email',
-            'display' => 'Email'
-        );
-        $e[] = array(
-            'type'    => 'email',
-            'req'     => true,
-            'name'    => 'email_rmv',
-            'display' => 'Verify Email'
-        );
-        if ($this->tableName == 'customer') {
-            $add1 = 'add1';
-            $add2 = 'add2';
-        } else {
-            $add1 = 'address';
-            $add2 = 'address2';
-        }
-        $e[] = array(
-            'type'    => 'text',
-            'req'     => true,
-            'name'    => $add1,
-            'display' => 'Address 1'
-        );
-        $e[] = array(
-            'type'    => 'text',
-            'req'     => false,
-            'name'    => $add2,
-            'display' => 'Address 2'
-        );
-        $e[] = array(
-            'type'    => 'text',
-            'req'     => true,
-            'name'    => 'city',
-            'display' => 'City'
-        );
-        $e[] = array(
-            'type'    => 'select',
-            'req'     => true,
-            'name'    => 'state',
-            'display' => 'State/Province',
-            'opts'    => $GLOBALS['states']
-        );
-        $e[] = array(
-            'type'    => 'text',
-            'req'     => true,
-            'name'    => 'zip',
-            'display' => 'ZIP/Postal Code'
-        );
+        // $e[] = array(
+        //     'type'    => 'email',
+        //     'req'     => true,
+        //     'name'    => 'email',
+        //     'display' => 'Email'
+        // );
+        // $e[] = array(
+        //     'type'    => 'email',
+        //     'req'     => true,
+        //     'name'    => 'email_rmv',
+        //     'display' => 'Verify Email'
+        // );
+        // if ($this->tableName == 'customer') {
+        //     $add1 = 'add1';
+        //     $add2 = 'add2';
+        // } else {
+        //     $add1 = 'address';
+        //     $add2 = 'address2';
+        // }
+        // $e[] = array(
+        //     'type'    => 'text',
+        //     'req'     => true,
+        //     'name'    => $add1,
+        //     'display' => 'Address 1'
+        // );
+        // $e[] = array(
+        //     'type'    => 'text',
+        //     'req'     => false,
+        //     'name'    => $add2,
+        //     'display' => 'Address 2'
+        // );
+        // $e[] = array(
+        //     'type'    => 'text',
+        //     'req'     => true,
+        //     'name'    => 'city',
+        //     'display' => 'City'
+        // );
+        // $e[] = array(
+        //     'type'    => 'select',
+        //     'req'     => true,
+        //     'name'    => 'state',
+        //     'display' => 'State/Province',
+        //     'opts'    => $GLOBALS['states']
+        // );
+        // $e[] = array(
+        //     'type'    => 'text',
+        //     'req'     => true,
+        //     'name'    => 'zip',
+        //     'display' => 'ZIP/Postal Code'
+        // );
         $e[] = array(
             'type'    => 'text',
             'req'     => true,
@@ -312,132 +312,100 @@ class Toolkit_Contacts_ServiceRequest
             'display' => 'Desired Completion Date'
         );
         $workTypes = array(
-            'Cleaning & Upkeep' => array(
+            '<center><u>Boat</u></center>' => array(
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Wash & Vacuum',
-                    'opts' => 'Wash & Vacuum'
+                    'name' => 'Basic Clean',
+                    'opts' => '<div class="service-checkbox"><b>Basic Clean</b> - Wash exterior, wipe seats / dash, and vacuum main footprint of floor. Billing at $49.00 / hr.</div>',
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Deck & Hull Wax Only',
-                    'opts' => 'Deck & Hull Wax Only'
+                    'name' => 'Detailed Clean',
+                    'opts' => '<div class="service-checkbox"><b>Detailed Clean</b> - Wash exterior, wipe complete interior of boat, clean seats (including use of mildew remover if necessary), apply 303 vinyl protectant, wash windows, and completely vacuum. Billing at $55.00 / hr.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Paint Bottom (with anti-fouling paint)',
-                    'opts' => 'Paint Bottom (with anti-fouling paint)'
+                    'name' => 'Boat Wax',
+                    'opts' => '<div class="service-checkbox"><b>Boat Wax</b> - Full exterior wax on flat surfaces - may by coupled with cleaning. Billed at $55.00 / hr.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Clear & Oil Teak',
-                    'opts' => 'Clear & Oil Teak'
+                    'name' => 'Inspection',
+                    'opts' => '<div class="service-checkbox"><b>Inspection</b> - Check (and replace as needed) lights, bilge pump, blower, fire extinguisher, horn, and dock lines. Dock lines will only be replaced if chaffed or frayed.</div>'
                 ),
-                array(
-                    'type' => 'checkbox',
-                    'req'  => false,
-                    'name' => 'Repair Navigation Lights, Blower, bilge pump, etc. (please specify below)',
-                    'opts' => 'Repair Navigation Lights, Blower, bilge pump, etc. (please specify below)'
-                ),
-                array(
-                    'type' => 'checkbox',
-                    'req'  => false,
-                    'name' => 'Check Fire Extinguisher & Replace if Necessary',
-                    'opts' => 'Check Fire Extinguisher & Replace if Necessary'
-                ),
-                array(
-                    'type' => 'checkbox',
-                    'req'  => false,
-                    'name' => 'Detail Cabin (Larger Vessels)',
-                    'opts' => 'Detail Cabin (Larger Vessels)'
-                )
             ),
-            'Engine' => array(
+            '<center><u>Engine Care</u></center>' => array(
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Basic Check (Hoses, Steering, Battery, Fuel Tanks, etc.)',
-                    'opts' => 'Basic Check (Hoses, Steering, Battery, Fuel Tanks, etc.)'
+                    'name' => 'General Check',
+                    'opts' => '<div class="service-checkbox"><b>General Check</b> - Remove boat from storage, fully charge batter (or replace if battery won\'t hold charge),
+                    inspect water / fuel hoses, inspect electrical component connections, test trim, check fluid levels (top-off if necessary),
+                    and conduct out-of-water test run. Note: This item applies only to outboards and sterndrives.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Complete Ignition Tune-Up (Cap, Rotor, Plugs & Wires - if necessary)',
-                    'opts' => 'Complete Ignition Tune-Up (Cap, Rotor, Plugs & Wires - if necessary)'
+                    'name' => 'Oil Change',
+                    'opts' => '<div class="service-checkbox"><b>Oil Change</b> - Change oil, filter, and water separator (if applicable).</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Change Engine Oil & Filter (and water separator if necessary)',
-                    'opts' => 'Change Engine Oil & Filter (and water separator if necessary)'
+                    'name' => 'Engine Tune',
+                    'opts' => '<div class="service-checkbox"><b>Engine Tune</b> - Replace cap, rotor, plugs, and wires as needed. Note: Plugs may be only replacement item on newer outboards due to absence of cap & rotor.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Extensive Test run (15 to 20 minutes)',
-                    'opts' => 'Extensive Test run (15 to 20 minutes)'
+                    'name' => 'Launch & Test',
+                    'opts' => '<div class="service-checkbox"><b>Launch & Test</b> - Launch boat, briefly test-run, and fill with gas / oil. Note: Unless instructed otherwise, gas tank will only be filled if gauge reads below 3/4.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Fuel Injection Cleaning (Applies to both outboard & sterndrive EFI motors)',
-                    'opts' => 'Fuel Injection Cleaning (Applies to both outboard & sterndrive EFI motors)',
+                    'name' => 'Fuel Injection',
+                    'opts' => '<div class="service-checkbox"><b>Fuel Injection</b> - Completely clean fuel injection system on applicable sterndrives and outboard motors.</div>',
                 ),
             ),
-            'Outdrive & Gearcase' => array(
+            '<center><u>Outdrive & Gearcase</u></center>' => array(
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Lube U-Joints',
-                    'opts' => 'Lube U-Joints'
+                    'name' => 'Water Pump',
+                    'opts' => '<div class="service-checkbox"><b>Water Pump</b> - Replacement is recommended every 2 years or 100 hours (whichever comes first).</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Change Water impellor',
-                    'opts' => 'Change Water impellor'
-                ),
-                array(
-                    'type' => 'checkbox',
-                    'req'  => false,
-                    'name' => 'Check Trim & Tilt',
-                    'opts' => 'Check Trim & Tilt'
-                ),
-                array(
-                    'type' => 'checkbox',
-                    'req'  => false,
-                    'name' => 'Check Boots',
-                    'opts' => 'Check Boots'
+                    'name' => 'General Check',
+                    'opts' => '<div class="service-checkbox"><b>General Check</b> - Inspect bellows for weather checking / holes, examine anodes (replace if necessary), and test trim and tilt.</div>'
                 ),
+            ),
+            '<center><u>Special Services</u></center><br><center>Please note that special services must be scheduled prior to our standard two-week launch request period.</center>' => array(
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Weld Skeg',
-                    'opts' => 'Weld Skeg'
+                    'name' => 'Teak Care',
+                    'opts' => '<div class="service-checkbox"><b>Teak Care</b> - Clean teak, apply formulated brightener, and oil as necessary. Billed at $55.00 / hr.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Replace Anodes',
-                    'opts' => 'Replace Anodes'
+                    'name' => 'Buff & Wax',
+                    'opts' => '<div class="service-checkbox"><b>Buff & Wax</b> - Clean exterior of boat, apply compound and buff, wash compound off, and apply wax to applicable surfaces. Billed at $55.00 / hr. Note: Typical 20\' boat requires roughly 16 hours.</div>'
                 ),
                 array(
                     'type' => 'checkbox',
                     'req'  => false,
-                    'name' => 'Replace Upper Seals',
-                    'opts' => 'Replace Upper Seals'
+                    'name' => 'Bottom Care',
+                    'opts' => '<div class="service-checkbox"><b>Bottom Care</b> - Scuff sand boat bottom and apply 1 coat of antifouling paint.</div>'
                 ),
-                array(
-                    'type' => 'checkbox',
-                    'req'  => false,
-                    'name' => 'Replace Lower Seals',
-                    'opts' => 'Replace Lower Seals'
-                )
-            )
+            ),
         );
         $this->workTypes = $workTypes;
         //var_dump($workTypes);exit;
@@ -456,7 +424,7 @@ class Toolkit_Contacts_ServiceRequest
             'type'    => 'textarea',
             'req'     => false,
             'name'    => 'comments',
-            'display' => 'Additional Issues, Comments or Directions'
+            'display' => '<center><u>Additional Notes, & Instructions</u></center> <br> <center>Include any special comments for CM staff below</center>'
         );
         $e[] = array(
             'type'    => 'CAPTCHA_Image',

diff --git a/config/server.ini b/config/server.ini
index 1d19cb4..a2eb7e6 100644 (file)
--- a/config/server.ini
+++ b/config/server.ini
@@ -184,9 +184,9 @@ database.params.host = "devdb"
 
 development = On
 
-email.owner                                 = "alicia@gaslightmedia.com"
-email.contact                               = "alicia@gaslightmedia.com"
-email.addEventForm                          = "alicia@gaslightmedia.com"
+email.owner                                 = "dev@gaslightmedia.com"
+email.contact                               = "dev@gaslightmedia.com"
+email.addEventForm                          = "dev@gaslightmedia.com"
 email.enews                                 = Off
 email.visitor_guide                         = Off
 email.applicationForm                       = Off
@@ -196,10 +196,10 @@ email.member_forgot_password_email_reply_to = Off
 email.giftcert                              = Off
 email.giftcert_from                         = Off
 email.giftcert_secure                       = Off
-email.reply_to                              = "alicia@gaslightmedia.com"
+email.reply_to                              = "dev@gaslightmedia.com"
 email.banner_reports_admin                  = Off
 email.expiring_banner_notification          = Off
-email.from_news                             = "alicia@gaslightmedia.com"
+email.from_news                             = "dev@gaslightmedia.com"
 email.from_member_news                      = Off
 
 resources.version     = "rand"

diff --git a/styles.css b/styles.css
index 0f4bad7..c01765a 100644 (file)
--- a/styles.css
+++ b/styles.css
@@ -439,7 +439,7 @@ ul#videoGallery li:hover a span.vidtitle span.play {
     background: #F5F5F5;\r
     border-radius: 3px;\r
     margin: 0 20px 20px 0;\r
-    \r
+\r
 \r
 }\r
 /* .gallery li:nth-child(4n-3) {\r
@@ -493,4 +493,10 @@ span.phototitle {
 }\r
 .gallery li {\r
     background-image: none !important;\r
-    }
\ No newline at end of file
+    }\r
+/* Contact form */\r
+.service-checkbox {\r
+    width: 95%;\r
+    float: right;\r
+    display: inline;\r
+}\r

diff --git a/templates/template.html b/templates/template.html
index 5f87f2d..301ad28 100644 (file)
--- a/templates/template.html
+++ b/templates/template.html
@@ -6,7 +6,7 @@
 <meta name="description" content="{metaTags:h}">
 <!-- css -->
         {styles:h}
-<link rel="stylesheet" href="{mediaBaseURL:h}styles.css?v=1.0.9">
+<link rel="stylesheet" href="{mediaBaseURL:h}styles.css?v=1.0.10">
 <link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro" rel="stylesheet" type="text/css">
 <link href='http://fonts.googleapis.com/css?family=Rokkitt:700' rel='stylesheet' type='text/css'>
 <link rel="stylesheet" href="{mediaBaseURL:h}superfish.css">