WordPress.org
Get WordPress

Plugin Directory

Changeset 2286305


Ignore:
Timestamp:
04/18/2020 12:02:44 PM (6 years ago)
Author:
crmthrive
Message:

Version 1.3 released
API Key validation changes

Location:
crm-thrive
Files:
17 added
7 edited

Legend:

Unmodified
Added
Removed

  • crm-thrive/trunk/admin/class-wsl-admin.php

    r2238078 r2286305  
    120120    public function sent_to_company_callback(){
    121121        $api_obj = new Wsl_Api();
    122         $companies = $api_obj->get_companies();
     122        $company = $api_obj->get_companies();
    123123        $meta = wsl_get_settings();
    124124        include_once WSL_ADMIN_DIR.'/partials/send_to_company_field.php';

  • crm-thrive/trunk/admin/partials/send_to_company_field.php

    r2238078 r2286305  
    1 <?php if($companies->type != 'error'): ?>
     1<?php if($company->type == 'success'): ?>
    22<?php
    33global $pagenow;
     4if(!isset($meta['send_to_company'])){
     5    $meta['send_to_company'] = 0;
     6}
    47?>
    58<fieldset>
    69    <p>
    7         <select name="wsl_settings[send_to_company]">
    8             <?php
    9                 if(count($companies->data) > 0):
    10                     $company_ids = array_column(array_map('get_object_vars', $companies->data), 'id');
    11                     ?>
    12             <?php if($pagenow == 'options-general.php'): ?>
    13             <option <?php selected(!in_array($meta['send_to_company'], $company_ids),true,true) ?> value="<?php wsl_check_default_company_exists($companies->data) ?>"><?php echo get_bloginfo('name'); ?> (Created by Default)</option>
    14                 <?php else: ?>
    15             <option <?php selected(!in_array($meta['send_to_company'], $company_ids),true,true) ?> value="0">Default Plugin Settings</option>
    16                 <?php endif; ?>   
    17                 <?php
    18                     foreach($companies->data as $company):
    19                         if($company->website == site_url()){
    20                             continue;
    21                         }
    22                     ?>
    23                         <option <?php selected($meta['send_to_company'], $company->id, true); ?> value="<?php echo $company->id ?>"><?php echo $company->name; ?></option>
    24             <?php
    25                     endforeach;
    26                 else:
    27             ?>
    28                     <option value="0"><?php echo get_bloginfo('name'); ?> (Will be created by Default)</option>   
    29             <?php endif; ?>
    30         </select>
     10    <?php echo $company->data ? $company->data->name : "No Company Found";  ?>
    3111    </p>
    32     <p class="description">Select a company to send the Leads to in the CRM</p>
     12</fieldset>
     13<?php elseif($company->type == 'duplicate'): ?>
     14<fieldset>
     15    <p style="color:red">
     16        Error: This API is already attached with webiste: <?php echo $company->site_data->site_name."(".$company->site_data->site_url.")" ?>
     17    </p>
    3318</fieldset>
    3419<?php else: ?>
    3520<fieldset>
    36     <p>
    37         <select>
    38             <option value="0">Companies Not Available</option>
    39         </select>
     21    <p style="color:red">
     22        Error: No Company Found
    4023    </p>
    4124    <p class="description">Please add valid Api key to select the company from your CRM account.</p>

  • crm-thrive/trunk/includes/class-wsl-api.php

    r2238078 r2286305  
    44   
    55    public $api_url = 'https://app.crmthrive.com/public/api/';
     6
    67   
    78    private $api_key = false;
    … …  
    3738   
    3839    public function get_companies(){
    39         $url = $this->get_base_url().'user/companies';
    40         $response = $this->call($url,array(),'GET');
     40        $url = $this->get_base_url().'v2/companies/validate_api_key';
     41        $site_info = array("site_name"=>get_bloginfo(),"site_url"=>site_url());
     42        $response = $this->call($url,$site_info,'POST');
     43        // echo '<pre>';
     44        // print_r($response);
     45        // echo '</pre>';die();
     46        //wsl_update_setting('send_to_company',$data->source_id);
     47        //$prev_setting = wsl_get_settings();
     48        // echo $prev_setting['send_to_company'];
     49        if($response->type == 'duplicate' && $response->site_data->site_url){
     50            if($response->site_data->site_url == site_url()){
     51                $response->type = 'success';
     52            }
     53        }
     54        if($response->type == 'error'){
     55            $settings = array(
     56                "api_key" => "",
     57                "send_to_crm" => 1,
     58                "send_to_company" => ""
     59            );
     60            update_option('wsl_settings', $settings);
     61        }elseif($response->type == 'success'){
     62            wsl_update_setting("send_to_company",$response->data->id);
     63        }
    4164        return $response;
    4265    }

  • crm-thrive/trunk/includes/class-wsl-cf7-api.php

    r2238078 r2286305  
    139139        $url = $this->api_url;
    140140        $wsl_api = new Wsl_Api();
     141        // echo '<pre>';
     142        // print_r($this->mapped_data);
     143        // echo '</pre>';
     144        // return false;
    141145        $response = $wsl_api->call($url,$this->mapped_data);
    142146        return $response;

  • crm-thrive/trunk/includes/class-wsl-elementor-api.php

    r2242401 r2286305  
    44   
    55    public $api_url = 'https://app.crmthrive.com/public/api/lead/create';
    6    
     6
    77    public $cf7;
    88    public $submit_result;
    … …  
    3939        $result = $this->send_call();
    4040        $this->process_result($result);
    41         //echo '<pre>';
    42         //print_r($this->mapped_data);
    43         //echo '</pre>';die('--');
     41//        echo '<pre>';
     42//        print_r($this->mapped_data);
     43//        echo '</pre>';
    4444    }
    4545   

  • crm-thrive/trunk/includes/class-wsl-wpf-api.php

    r2238250 r2286305  
    125125            'field_id' => $this->submission['field_id'],
    126126            'post_url' => home_url( $wp->request ),
    127             'contact_form_id' => $this->submission['form_id'],
     127            'contact_form_id' => isset($this->submission['form_id']) ? $this->submission['form_id'] : "",
    128128            //'unit_tag' => $this->submission->get_meta( 'unit_tag' ),
    129129            'remote_ip' => $_SERVER['REMOTE_ADDR'],

  • crm-thrive/trunk/readme.txt

    r2242401 r2286305  
    3636* Support for Gravity Forms added
    3737* Support for Elementor added
     38
     39= 1.3 =
     40* Company selection removed
     41* Added various checks for validation of API key
Note: See TracChangeset for help on using the changeset viewer.