WordPress.org
Get WordPress

Plugin Directory

Changeset 1691792


Ignore:
Timestamp:
07/06/2017 11:17:35 AM (9 years ago)
Author:
jobprogress
Message:

Change Fields validation as Web APP

Location:
contractor-contact-form-website-to-workflow-tool
Files:
46 added
10 edited

Legend:

Unmodified
Added
Removed

  • contractor-contact-form-website-to-workflow-tool/trunk/class.customer-data-map.php

    r1502815 r1691792  
    4343        $job = $this->map_job_input();
    4444        $data['job'] = json_encode($job, true);
     45       
    4546        if($this->input['referred_by_id'] === 'other') {
    4647            $data['referred_by_note'] = $this->input['referred_by_note'];
    4748            $data['referred_by_type'] = 'other';
    48         } else {
     49       
     50        } else if(!empty($this->input['referred_by_id'])
     51            && $this->input['referred_by_id'] != 'other'
     52            && $this->input['referred_by_id'] > 0) {
    4953            $data['referred_by_type'] = 'referral';
    5054            $data['referred_by_id'] = $this->input['referred_by_id'];
    5155        }
     56
    5257        return $data;
    5358    }

  • contractor-contact-form-website-to-workflow-tool/trunk/class.customer-validator.php

    r1502815 r1691792  
    4141        }
    4242
    43         if(!ine($_POST, 'email')) {
    44             $error->add('email', 'Please enter the email');
    45             $has_error = true;
    46         }
     43        // if(!ine($_POST, 'email')) {
     44        // $error->add('email', 'Please enter the email');
     45        // $has_error = true;
     46        // }
    4747
    4848        if(ine($_POST, 'email') && ! filter_var(sanitize_text_field($_POST['email']), FILTER_VALIDATE_EMAIL)){
    … …  
    6161        }
    6262
    63         if(ine($_POST, 'address')) {
    64             $address = $_POST['address'];
    65             if(!ine($address, 'address')) {
    66                 $error->add('address', 'Please enter the address.');
    67                 $has_error = true;
    68             }
    69             if(!ine($address, 'city')) {
    70                 $error->add('city', 'Please enter the city.');
    71                 $has_error = true;
    72             }
    73             if(!ine($address, 'zip')) {
    74                 $error->add('zip', 'Please enter the zip code.');   
    75                 $has_error = true;
    76             }
    77             if(!ine($address, 'country_id')) {
    78                 $error->add('country_id', 'Please select the country.');
    79                 $has_error = true;
    80             }
    81             if(!ine($address, 'state_id')) {
    82                 $error->add('state_id', 'Please select the state.');
    83                 $has_error = true;
    84             }
    85         } else {
    86             $error->add('address', 'Please enter the address.');
    87             $error->add('city', 'Please enter the city.');
    88             $error->add('zip', 'Please enter the zip code.');   
    89             $error->add('country_id', 'Please select the country.');
    90             $error->add('state_id', 'Please select the state.');
    91             $has_error = true;
    92         }
     63        // if(ine($_POST, 'address')) {
     64        // $address = $_POST['address'];
     65        // if(!ine($address, 'address')) {
     66        //      $error->add('address', 'Please enter the address.');
     67        //      $has_error = true;
     68        // }
     69        // if(!ine($address, 'city')) {
     70        //      $error->add('city', 'Please enter the city.');
     71        //      $has_error = true;
     72        // }
     73        // if(!ine($address, 'zip')) {
     74        //      $error->add('zip', 'Please enter the zip code.');   
     75        //      $has_error = true;
     76        // }
     77        // if(!ine($address, 'country_id')) {
     78        //      $error->add('country_id', 'Please select the country.');
     79        //      $has_error = true;
     80        // }
     81        // if(!ine($address, 'state_id')) {
     82        //      $error->add('state_id', 'Please select the state.');
     83        //      $has_error = true;
     84        // }
     85        // } else {
     86        // $error->add('address', 'Please enter the address.');
     87        // $error->add('city', 'Please enter the city.');
     88        // $error->add('zip', 'Please enter the zip code.');   
     89        // $error->add('country_id', 'Please select the country.');
     90        // $error->add('state_id', 'Please select the state.');
     91        // $has_error = true;
     92        // }
    9393
    9494        if(ine($_POST, 'job')) {
    … …  
    112112        }
    113113
    114         if(!ine($_POST, 'referred_by_id')) {
    115             $error->add('referred_by_id', 'Please select the referred by.');
    116             $has_error = true;
    117         }
     114        // if(!ine($_POST, 'referred_by_id')) {
     115        // $error->add('referred_by_id', 'Please select the referred by.');
     116        // $has_error = true;
     117        // }
    118118
    119119        if(ine($_POST, 'referred_by_id')

  • contractor-contact-form-website-to-workflow-tool/trunk/class.jp-request.php

    r1448321 r1691792  
    3232            'body'        => $body,
    3333        );
     34
    3435        $response =  wp_remote_post($url, $args);
    3536        $response_body = wp_remote_retrieve_body($response);

  • contractor-contact-form-website-to-workflow-tool/trunk/class.scheduler.php

    r1502815 r1691792  
    126126        $input['referred_by_type'] = $customer->referred_by_type;
    127127        $input['referred_by_note'] = $customer->referred_by_note;
    128         if(!empty($customer->contact)) {
    129             $input['customer_contacts'] = json_decode($customer->contact, true);
    130         }   
     128        if(!empty($customer->contact) && ($customer->is_commercial) ) {
     129            $contacts = json_decode($customer->contact, true);
     130            foreach ($contacts as $contact) {
     131                if(ine($contact, 'first_name') && ine($contact, 'last_name')) {
     132                    $input['customer_contacts'][0]['first_name']  = $contact['first_name'];
     133                    $input['customer_contacts'][0]['last_name']   = $contact['last_name'];
     134                }
     135            }
     136        }
     137
    131138        return $input;
    132139    }

  • contractor-contact-form-website-to-workflow-tool/trunk/css/style.css

    r1502815 r1691792  
    380380    }
    381381}
     382.customer-page .additional-val{
     383    position: absolute;
     384    right: 0;
     385    top: 0;
     386}

  • contractor-contact-form-website-to-workflow-tool/trunk/customer-form-page.php

    r1502815 r1691792  
    8383            </select>
    8484            <input type="text" class="phones  mask-select phone-number-field" name="phones[0][number]" placeholder="Phone" required/>
    85             <input type="text" maxlength= "8" class="extension-field number" name="phones[0][ext]" placeholder="Extension"/>
     85            <input type="text" maxlength= "12" class="extension-field" name="phones[0][ext]" placeholder="Extension"/>
    8686        </div>
    8787        <?php
    … …  
    9292
    9393    <div class="form-group additional-emails">
    94         <label>Email <span class="required-sign">*</span></label>
    95         <span>
    96             <input type="text" placeholder="Email" name="email" required />
     94        <label>Email <!-- <span class="required-sign">*</span> --></label>
     95        <span>
     96            <input type="text" placeholder="Email" name="email"/>
    9797            <?php echo $this->get_error_wrapper('email'); ?>
    9898        </span>
    … …  
    104104
    105105    <div class="form-group">
    106         <label>Address <span class="required-sign">*</span></label>
    107         <span>
    108             <input type="text" placeholder="Address" name="address[address]" required/>
     106        <label>Address <!-- <span class="required-sign">*</span> --></label>
     107        <span>
     108            <input type="text" placeholder="Address" name="address[address]" />
    109109            <?php echo $this->get_error_wrapper('address'); ?>
    110110        </span>
    … …  
    117117    </div>
    118118    <div class="form-group col-5 address-field-col">
    119         <label>City <span class="required-sign">*</span></label>
    120         <span>
    121             <input type="text" placeholder="city" name="address[city]" required/>
     119        <label>City <!-- <span class="required-sign">*</span> --></label>
     120        <span>
     121            <input type="text" placeholder="city" name="address[city]" />
    122122            <?php echo $this->get_error_wrapper('city'); ?>
    123123        </span>
    124124    </div>
    125125    <div class="form-group col-5">
    126         <label class="state">State <span class="required-sign">*</span></label>
     126        <label class="state">State <!-- <span class="required-sign">*</span> --></label>
    127127        <span>
    128128            <select
    129129                placeholder="Select States"
    130                 name="address[state_id]" id="address-state" class="select2" required>
     130                name="address[state_id]" id="address-state" class="select2">
    131131                <?php foreach ($states as $key => $state) : ?>
    132132                <option value="<?php echo $state['id'] .'_'.$state['name']; ?>"><?php echo $state['name']; ?></option>
    … …  
    137137    </div>
    138138    <div class="form-group col-5 address-field-col">
    139         <label>zip <span class="required-sign">*</span></label>
    140         <span>
    141             <input type="text" class="number" placeholder="zip" name="address[zip]" maxLength="5" required/>
     139        <label>zip <!-- <span class="required-sign">*</span> --></label>
     140        <span>
     141            <input type="text" class="number" placeholder="zip" name="address[zip]" maxLength="5" />
    142142            <?php echo $this->get_error_wrapper('zip'); ?>
    143143        </span>
    144144    </div>
    145145    <div class="form-group col-5">
    146         <label class="country">Country <span class="required-sign">*</span></label>
    147         <span>
    148             <select name="address[country_id]" id="address-country" class="select2" required>
     146        <label class="country">Country <!-- <span class="required-sign">*</span> --></label>
     147        <span>
     148            <select name="address[country_id]" id="address-country" class="select2" >
    149149                <?php foreach ($countries as $key => $country) : ?>
    150150                <option value="<?php echo $country['id'] .'_'.$country['name']; ?>"><?php echo $country['name']; ?></option>
    … …  
    210210</div>
    211211    <div class="form-group">
    212         <label>Referred By <span class="required-sign">*</span></label>
    213         <span>
    214             <select name="referred_by_id" class="jp-referral" required>
     212        <label>Referred By </label>
     213        <span>
     214            <select name="referred_by_id" class="jp-referral">
    215215                <option></option>
    216216                <?php if($referrals): ?>

  • contractor-contact-form-website-to-workflow-tool/trunk/customer-template.php

    r1448321 r1691792  
    3131            </span>  -->
    3232        <input type="text"  placeholder="(xxx) xxx-xxxx" name="phones[{{ index }}][number]" class="phones mask-select phone-number-field" aria-required="true" required />
    33         <input type="text" placeholder="Extension" name="phones[{{ index }}][ext]" class="extension-field number" maxlength="8" aria-required="true">
     33        <input type="text" placeholder="Extension" name="phones[{{ index }}][ext]" class="extension-field" maxlength="12" aria-required="true">
    3434        </div>
    3535        <?php echo $this->get_error_wrapper('phones.{{ index }}.number'); ?>

  • contractor-contact-form-website-to-workflow-tool/trunk/jobprogress.php

    r1635945 r1691792  
    44Description: This useful plugin is a website to workflow tool that allows contractors to drive leads directly from their own website form inquiries directly into their JobProgress workcenters.  JobProgress is  a Cloud based Business Management Platform for Home Improvement Contractors. With this useful plugin, you can drive customers directly from your website into your JobProgress workflow stages and begin to populate both customer and job related leads and prospects for immediate and mistake free follow-up.  This is an automated Customer Relationship Management tool which will save you time and minimize mistakes. For more information about JobProgress, please visit our website.
    55Plugin URI: http://example.com
    6 Version: 1.0.2
     6Version: 1.0
    77Author: JobProgress
    88Author URI: http://www.jobprogress.com/

  • contractor-contact-form-website-to-workflow-tool/trunk/js/custom.js

    r1502815 r1691792  
    44        setTimeout(function() {
    55            $('#jp-message').slideUp(800);
    6             console.log('Work');
    76        }, 4000);
    87    });
    … …  
    2322                'required': true
    2423            },
    25             'email':{
    26                 email: true
    27             },
     24            'contact[0][last_name]': {
     25                required: function(element){
     26                        return $("input[name='contact[0][first_name]']").val()!="" && $('input[name="jp_customer_type2"]').is(':checked');
     27                    }
     28            },
     29            'contact[0][first_name]': {
     30                required: function(element){
     31                        return $("input[name='contact[0][last_name]']").val()!="" && $('input[name="jp_customer_type2"]').is(':checked') ;
     32                    }
     33            },
     34            // 'email':{
     35            //  email: true
     36            // },
    2837            'captcha': {
    2938                required: true,
    3039                remote:  plugin_dir_url+"process.php"
    3140            },
    32             'address[country_id]':  {
    33                 required: true
    34             }
     41            // 'address[country_id]':  {
     42            // required: true
     43            // }
    3544        },
    3645        messages: {
    … …  
    7382    }).on('change', function (e) {
    7483        var input = $(this).parent().find('.extension-field');
    75         if (e.currentTarget.value == "cell") {
    76             input.val(null);
    77             input.attr('disabled', true);
    78         } else {
    79             input.attr('disabled', false); 
    80         }
     84//      if (e.currentTarget.value == "cell") {
     85//          input.val(null);
     86//          input.attr('disabled', true);
     87//      } else {
     88//          input.attr('disabled', false); 
     89//      }
    8190    });
    8291
    … …  
    8594    }).on('change', function (e) {
    8695        var input = $(this).parent().find('.extension-field');
    87         if (e.currentTarget.value == "cell") {
    88             input.attr('disabled', true);
    89         } else {
    90             input.attr('disabled', false); 
    91         }
     96//      if (e.currentTarget.value == "cell") {
     97//          input.attr('disabled', true);
     98//      } else {
     99//          input.attr('disabled', false); 
     100//      }
    92101
    93102        if($.inArray('24', $(this).val()) > -1 ) {
    … …  
    169178        }).on('change', function (e) {
    170179            var input = $(this).parent().find('.extension-field');
    171             if (e.currentTarget.value == "cell") {
    172                 input.val(null);
    173                 input.attr('disabled', true);
    174             } else {
    175                 input.attr('disabled', false); 
    176             }
     180//          if (e.currentTarget.value == "cell") {
     181//              input.val(null);
     182//              input.attr('disabled', true);
     183//          } else {
     184//              input.attr('disabled', false);
     185//          }
    177186        });
    178187

  • contractor-contact-form-website-to-workflow-tool/trunk/readme.txt

    r1502819 r1691792  
    44Requires at least: 3.0.1
    55Tested up to: 4.5.3
    6 Stable tag: 1.0.2
     6Stable tag: 1.0.3
    77Tags: customer-manager
    88License: GPLv2 or later
    … …  
    2020
    2121
     22
    2223== Changelog ==
     24= 1.0.3 =
     251. Change Fields validation as Web APP
     26
    2327= 1.0.2 =
    24  1. Made Email Mandatory
    25  2. Add New Field Refferd By
    26  3. Add Captcha For Security Reason
    27  4. Made Address Mandatory
     281. Made Email Mandatory
     292. Add New Field Refferd By
     303. Add Captcha For Security Reason
     314. Made Address Mandatory
    2832
    2933= 1.0.1 =
Note: See TracChangeset for help on using the changeset viewer.