WordPress.org
Get WordPress

Plugin Directory

Changeset 2852353


Ignore:
Timestamp:
01/21/2023 05:41:33 PM (3 years ago)
Author:
the ank
Message:

Version 3.1 released

Location:
woozap/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • woozap/trunk/assets/admin/css/wpflyleads.css

    r2583059 r2852353  
    3434  padding: 15px 0;
    3535}
     36
     37.wpflyleads-table tr th {
     38  width: 48% !important;
     39}

  • woozap/trunk/assets/admin/js/wpflyleads.js

    r2583059 r2852353  
    1  jQuery(document).ready(function($){
     1jQuery(document).ready(function ($) {
    22  var body = $(document).find('body').find('.wpflyleads');
    3   var wpflyleads_get_all_status=body.find('.wpflyleads_get_all_status');
    4   var wpflyleads_setting_form= body.find("#wpflyleads_setting_form");
    5   var wpflyleads_custom_url_column=body.find("#wpflyleads_custom_url_column");
    6   var url_count= body.find("#wpflyleads_connection_url_count");
    7   var wpflyleads_plus=body.find("#wpflyleads_plus");
    8   var wpflyleads_plus_status_field=body.find("#wpflyleads_plus_status_field");
    9   var wpflyleads_custom_status_field=body.find("#wpflyleads_custom_status_field");
    10   var wc_all_status=wpflyleads_ajax.get_status;
    11   var get_saved_status=wpflyleads_ajax.get_all_status_array;
    12   var saved_array_length=get_saved_status.length;
     3  var wpflyleads_get_all_status = body.find('.wpflyleads_get_all_status');
     4  var wpflyleads_setting_form = body.find("#wpflyleads_setting_form");
     5  var wpflyleads_custom_url_column = body.find("#wpflyleads_custom_url_column");
     6  var url_count = body.find("#wpflyleads_connection_url_count");
     7  var wpflyleads_plus = body.find("#wpflyleads_plus");
     8  var wpflyleads_plus_status_field = body.find("#wpflyleads_plus_status_field");
     9  var wpflyleads_custom_status_field = body.find("#wpflyleads_custom_status_field");
     10  var wc_all_status = wpflyleads_ajax.get_status;
     11
     12  console.log(wc_all_status);
     13  var get_saved_status = wpflyleads_ajax.get_all_status_array;
     14  var saved_array_length = get_saved_status.length;
    1315
    1416  //var get_checkbox_value=wpflyleads_ajax.get_checkbox_value;
    15   var wpflyleads_connection_name_select=body.find("#wpflyleads_connection_name_select");
    16   var i=1;
    17  
     17  var wpflyleads_connection_name_select = body.find("#wpflyleads_connection_name_select");
     18  var i = 1;
     19
    1820  wpflyleads_get_all_status.select2();
    1921  wpflyleads_connection_name_select.select2();
    2022
    21  
    22   body.on('click','#wpflyleads_plus_status_field',function(event){
     23
     24  body.on('click', '#wpflyleads_plus_status_field', function (event) {
    2325    event.preventDefault();
    24    
    25    i++;
    26    console.log('Add more status'+i);
    27    if (i>1) {
    28      
    29            wpflyleads_custom_status_field.after("<tr class='wpflyleads_custom_status_field' id ='wpflyleads_custom_status_field"+i+"'><td><strong>From</strong>&nbsp;&nbsp;&nbsp;<select style='width:50%;' class='wpflyleads_get_all_status' id='wpflyleads_get_from_status"+i+"' name='wpflyleads_get_from_status[]' ><option value='0' disabled selected hidden >Select a status</option>"+wc_all_status+"</select></td><td><strong>To</strong>&nbsp;&nbsp;&nbsp;<select style='width:50%;' class='wpflyleads_get_all_status' id='wpflyleads_get_to_status"+i+"' name='wpflyleads_get_to_status[]' > <option value= '0' disabled selected hidden >Select a status</option>"+wc_all_status+"</select><button style='height:27px; width:46px;margin-left:28px;' id='"+i+"' class='wpflyleads_remove_status '>x</button></td><td></td></tr>");
    30              $("#wpflyleads_get_from_status"+i+"").select2();
    31              $("#wpflyleads_get_to_status"+i+"").select2();
    32     } 
     26
     27    i++;
     28    console.log('Add more status' + i);
     29    if (i > 1) {
     30
     31      wpflyleads_custom_status_field.after("<tr class='wpflyleads_custom_status_field' id ='wpflyleads_custom_status_field" + i + "'><td><strong>From</strong>&nbsp;&nbsp;&nbsp;<select style='width:50%;' class='wpflyleads_get_all_status' id='wpflyleads_get_from_status" + i + "' name='wpflyleads_get_from_status[]' ><option value='0' disabled selected hidden >Select a status</option>" + wc_all_status + "</select></td><td><strong>To</strong>&nbsp;&nbsp;&nbsp;<select style='width:50%;' class='wpflyleads_get_all_status' id='wpflyleads_get_to_status" + i + "' name='wpflyleads_get_to_status[]' > <option value= '0' disabled selected hidden >Select a status</option>" + wc_all_status + "</select><button style='height:27px; width:46px;margin-left:28px;' id='" + i + "' class='wpflyleads_remove_status '>x</button></td><td></td></tr>");
     32      $("#wpflyleads_get_from_status" + i + "").select2();
     33      $("#wpflyleads_get_to_status" + i + "").select2();
     34    }
    3335  });
    34    
    35    
    36   body.on('click','.wpflyleads_remove_status',function(event){
    37         event.preventDefault();
    38         var button_id=$(this).attr("id");
    39         $("#wpflyleads_custom_status_field"+button_id+"").remove();
    4036
    41  });
    42  
    43   wpflyleads_plus.on('click',function(event){
    44   event.preventDefault();
    45    i++;
    46    if (i>1) {
    4737
    48            wpflyleads_custom_url_column.after("<tr id='wpflyleads_custom_url_column"+i+"'><th class='wpflyleads-connection' ><div class='wpflyleads-connection-name'><label>Name</label><input  style='' type='text' name='connection_url_name[]' class='connection_url_name' id='connection_url_name"+i+"' value='' placeholder='Url name'></div><div class='wpflyleads-connection-name'><label>Name</label><input style='' type='text' name='connection_url_slug[]' class='connection_url_slug'  id='connection_url_slug"+i+"' value='' placeholder='Url slug'></div><div class='wpflyleads-connection-server'><label>Server</label><select name='connection_url_server[]' class='connection_url_server'  id='connection_url_server"+i+"' value='' placeholder='Url Server'>"+wpflyleads_ajax.get_servers+"</select></div></th><td><input style='min-width:500px' type='text' class='wpflyleads_connection_url_cls' name='wpflyleads_connection_url[]' id='wpflyleads_connection_url"+i+"' value=''></td><td><button style='height:27px; width:46px; margin-left:146px;' id='"+i+"' class='wz_remove_field '>x</button></td></tr>");
    49          
    50     }   
    51 });
    52    $(document).on('click','.wz_remove_field',function(event){
    53           event.preventDefault();
    54           var button_id=$(this).attr("id");
     38  body.on('click', '.wpflyleads_remove_status', function (event) {
     39    event.preventDefault();
     40    var button_id = $(this).attr("id");
     41    $("#wpflyleads_custom_status_field" + button_id + "").remove();
    5542
    56           $("#wpflyleads_custom_url_column"+button_id+"").remove();
     43  });
    5744
    58  });
     45  wpflyleads_plus.on('click', function (event) {
     46    event.preventDefault();
     47    i++;
     48    if (i > 1) {
     49
     50      wpflyleads_custom_url_column.after("<tr id='wpflyleads_custom_url_column" + i + "'><th class='wpflyleads-connection' ><div class='wpflyleads-connection-name'><label>Name</label><input  style='' type='text' name='connection_url_name[]' class='connection_url_name' id='connection_url_name" + i + "' value='' placeholder='Url name'></div><div class='wpflyleads-connection-name'><label>Name</label><input style='' type='text' name='connection_url_slug[]' class='connection_url_slug'  id='connection_url_slug" + i + "' value='' placeholder='Url slug'></div><div class='wpflyleads-connection-server'><label>Server</label><select name='connection_url_server[]' class='connection_url_server'  id='connection_url_server" + i + "' value='' placeholder='Url Server'>" + wpflyleads_ajax.get_servers + "</select></div></th><td><input style='min-width:500px' type='text' class='wpflyleads_connection_url_cls' name='wpflyleads_connection_url[]' id='wpflyleads_connection_url" + i + "' value=''></td><td><button style='height:27px; width:46px; margin-left:146px;' id='" + i + "' class='wz_remove_field '>x</button></td></tr>");
     51
     52    }
     53  });
     54  $(document).on('click', '.wz_remove_field', function (event) {
     55    event.preventDefault();
     56    var button_id = $(this).attr("id");
     57
     58    $("#wpflyleads_custom_url_column" + button_id + "").remove();
     59
     60  });
    5961});
    6062
    6163jq2 = jQuery.noConflict();
    62 jq2(function( $ ) {
     64jq2(function ($) {
    6365
    64    
    65   var wpflyleads_setting_form= $('#wpflyleads_setting_form');
     66
     67  var wpflyleads_setting_form = $('#wpflyleads_setting_form');
    6668  var wpflyleads_url_field = $('.wpflyleads_connection_url_cls');
    6769  var wpflyleads_sp_click = $('.wpflyleads_sp_click');
    6870  var wpflyleads_url_field_parent = wpflyleads_url_field.parent();
    6971
    70  
    7172
    72   if(wpflyleads_sp_click.length > 0){
    73     wpflyleads_sp_click.click(function(event){
     73
     74  if (wpflyleads_sp_click.length > 0) {
     75    wpflyleads_sp_click.click(function (event) {
    7476      event.preventDefault();
    7577      $(this).parent().find('#wpflyleads_sp').toggle();
    7678    });
    7779  }
    78  
    79   if(wpflyleads_url_field.length > 0){
     80
     81  if (wpflyleads_url_field.length > 0) {
    8082
    8183
    82   $(document).on('click','#wpflyleads_trigger_btn',function(event){
    83     event.preventDefault();
    84  
    85     var btn = $(this);
    86     var url = btn.parents('tr').find('.wpflyleads_connection_url_cls');
    87     var wpflyleads_url = url.val();
    88     var server = btn.parents('tr').find('.wpflyleads-connection').find('.wpflyleads-connection-server select option:checked').val();
    89    
    90     if(wpflyleads_url.length <= 0){
    91         alert('Please enter a valid url before apply trigger.');
    92         return false;
    93     }
    94    
    95    
    96     var params ={
    97         'action' : 'trigger_wpflyleads_ajax',
    98       'api_url': wpflyleads_url,
    99       'api_server': server
    100     };
    101     $.post(wpflyleads_ajax.ajaxurl,params,function(res){
    102         if(res == 'success'){
    103             alert('Trigged successfully !');
    104         }else{
    105             alert('Error while execution , please try again !');
    106         }
    107     });
    108   });
     84    $(document).on('click', '#wpflyleads_trigger_btn', function (event) {
     85      event.preventDefault();
     86
     87      var btn = $(this);
     88      var url = btn.parents('tr').find('.wpflyleads_connection_url_cls');
     89      var wpflyleads_url = url.val();
     90      var server = btn.parents('tr').find('.wpflyleads-connection').find('.wpflyleads-connection-server select option:checked').val();
     91
     92      if (wpflyleads_url.length <= 0) {
     93        alert('Please enter a valid url before apply trigger.');
     94        return false;
     95      }
     96
     97
     98      var params = {
     99        'action': 'trigger_wpflyleads_ajax',
     100        'api_url': wpflyleads_url,
     101        'api_server': server
     102      };
     103      $.post(wpflyleads_ajax.ajaxurl, params, function (res) {
     104        if (res == 'success') {
     105          alert('Trigged successfully !');
     106        } else {
     107          alert('Error while execution , please try again !');
     108        }
     109      });
     110    });
    109111  }//if exist
    110112
    111 $(document).on('click','#wpflyleads_connection_list_trigger_btn',function(event){
     113  $(document).on('click', '#wpflyleads_connection_list_trigger_btn', function (event) {
    112114    event.preventDefault();
    113  
    114     var connection_name = $("#wpflyleads_connection_name_select").val();
    115     var current_order_id=$("#wpflyleads_connection_name_select").attr("current_order_id");
    116115
    117     if(connection_name == null){
     116    var connection_name = $("#wpflyleads_connection_name_select").val();
     117    var current_order_id = $("#wpflyleads_connection_name_select").attr("current_order_id");
     118
     119    if (connection_name == null) {
    118120      return false;
    119121    }
    120     if (current_order_id<=0) {
     122    if (current_order_id <= 0) {
    121123      return false;
    122124    }
    123    
    124    
    125     var params ={
    126       'action' : 'trigger_zapname_list_wpflyleads_ajax',
    127       'connection_name' : connection_name,
    128       'current_order_id':current_order_id
    129     };
    130     $.post(wpflyleads_ajax.ajaxurl,params,function(res){
    131 
    132       if(res == 'success'){
    133        
    134          $("#wpflyleads_connection_status_messages").html("");
    135          $("#wpflyleads_connection_status_messages").append("Trigged successfully");
    136          $("#wpflyleads_connection_status_messages").css('color','green').show().delay(3000).fadeOut();
    137          
    138125
    139126
    140        
    141       }else{
    142          $("#wpflyleads_connection_status_messages").html("");
    143          $("#wpflyleads_connection_status_messages").append("Error while execution , please try again !");
    144          $("#wpflyleads_connection_status_messages").css('color','red').show().delay(3000).fadeOut();
    145          
     127    var params = {
     128      'action': 'trigger_zapname_list_wpflyleads_ajax',
     129      'connection_name': connection_name,
     130      'current_order_id': current_order_id
     131    };
     132    $.post(wpflyleads_ajax.ajaxurl, params, function (res) {
     133
     134      if (res == 'success') {
     135
     136        $("#wpflyleads_connection_status_messages").html("");
     137        $("#wpflyleads_connection_status_messages").append("Trigged successfully");
     138        $("#wpflyleads_connection_status_messages").css('color', 'green').show().delay(3000).fadeOut();
     139
     140
     141
     142
     143      } else {
     144        $("#wpflyleads_connection_status_messages").html("");
     145        $("#wpflyleads_connection_status_messages").append("Error while execution , please try again !");
     146        $("#wpflyleads_connection_status_messages").css('color', 'red').show().delay(3000).fadeOut();
     147
    146148      }
    147149    });
    148150  });
    149  
     151
    150152
    151153});

  • woozap/trunk/init.php

    r2583059 r2852353  
    11<?php
    22/**
    3  * @package WPFlyLeads
    4  * @version 3.0
     3 * @package WP AVCL Automation Helper (formerly WPFlyLeads)
     4 * @version 3.1
    55 */
    66/*
    7 Plugin Name: WPFlyLeads (Fly your leads to Zapier & Integromat)
    8 Description: WPFlyLeads (Fly your WooCommerce leads to Zapier & Integromat) allows admin to send leads from WooCommerce, Contact Form 7 to Zapier and Integromat (using webhook) to thousands of other platforms.
     7Plugin Name: WP AVCL Automation Helper (formerly WPFlyLeads)
     8Description: WP AVCL Automation Helper sends orders and leads from WooCommerce, Contact Form 7 to zapier (zapier webhook is premium) and Integromat (using webhook) to thousands of other platforms.
    99Author: Ankur Vishwakarma & Ankit Vishwakarma
    1010Author URI: https://ankurvishwakarma.com
    11 Version: 3.0
     11Version: 3.1
    1212Author Email : ankurvishwakarma54@yahoo.com
    1313Domain : wpflyleads
    … …  
    5050
    5151function __construct(){
    52 $this->wpflyleads_version='2.5';
     52$this->wpflyleads_version='3.1';
    5353$this->wpflyleads_urlpath=plugin_dir_url( __FILE__ );
    5454$this->wpflyleads_dirpath=plugin_dir_path(__FILE__);
    … …  
    9898
    9999function load_backend_js_css_files($hook){
     100
     101   
     102   
    100103    $current_screen = get_current_screen();
    101104    $post_type = $current_screen->post_type;
     105
     106
     107    if('woocommerce_page_wpflyleads-settings' !== $hook && 'shop_order' !== $post_type){
     108        return;
     109    }
     110   
     111   
    102112    $wc_get_status=(function_exists('wc_get_order_statuses') ? wc_get_order_statuses() : array());
    103     $get_status=array();
     113    $get_status='';
    104114    $get_all_status_array=get_option('wpflyleads_all_status');
    105115   
     116   
     117   
    106118    foreach ($wc_get_status as $key => $value) {
    107          $get_status[]="<option value=".$key.">".$wc_get_status[$key]."</option>";   
     119         $get_status.="<option value=".$key.">".$value."</option>";   
    108120    }
    109121
     122    // echo '<pre>';  print_r($get_status);  die;
     123   
    110124wp_enqueue_style( 'dashicons' );   
    111125wp_enqueue_style( 'wpflyleads-select2-css', $this->wpflyleads_urlpath . 'assets/admin/css/select2.min.css'  );
    … …  
    117131    'get_status'=>$get_status,
    118132    'get_all_status_array'=>$get_all_status_array,
    119     'get_servers' => wpflyleads_get_servers('')
     133    'get_servers' => wpflyleads_get_servers()
    120134     
    121135    ) );
    … …  
    125139
    126140function wpflyleads_setup(){
    127     if (session_status() == PHP_SESSION_NONE) {
     141    /* if (session_status() == PHP_SESSION_NONE) { //disabled
    128142    session_start();
    129     }
     143    } */
    130144    wpflyleads_update_options_prefix('woozap','wpflyleads'); //from,to
    131145    $this->wpflyleads_capabilities();

  • woozap/trunk/readme.txt

    r2583071 r2852353  
    1 === WPFlyLeads (Fly your leads to Zapier & Integromat) ===
     1=== WP AVCL Automation Helper (formerly WPFlyLeads)===
    22Contributors: the-ank,ankitv
    33Donate link: http://paypal.me/ankurvishwakarma786
    4 Tags: WooCommerce, Zapier, Integromat, Contact Form 7, Orders transfer, Leads Transfer, Automation
     4Tags: WooCommerce, Zapier, Integromat, Make, Contact Form 7, Orders transfer, Leads Transfer, Automation
    55Requires at least: 5.5
    66Requires PHP: 5.5
    7 Tested up to: 5.8
    8 Stable tag: 3.0
     7Tested up to: 6.1.1
     8Stable tag: 3.1
    99License: GPLv2 or later
    1010
    11 WPFlyLeads (Fly your WooCommerce leads to Zapier & Integromat) allows admin to send leads from WooCommerce, Contact Form 7 to zapier and Integromat (using webhook) to thousands of other platforms.
    1211
    1312== Description ==
    1413
    15 WPFlyLeads (Fly your WooCommerce leads to Zapier & Integromat) allows admin to send leads from WooCommerce, Contact Form 7 to Zapier and Integromat (using webhook) to thousands of other platforms.
     14WP AVCL Automation Helper sends orders and leads from WooCommerce, Contact Form 7 to zapier (zapier webhook is premium) and Integromat (using webhook) to thousands of other platforms.
    1615
    17 == New Features ==
     16== Latest Version 3.1 ==
     171. Bug Fixes
     182. Security Updates
     193. UI Improvements
    1820
    19 Note: Please visit the settings page to update settings after you have switched from 2.2 to 2.5 or later version.
    20 Note: To use the Zapier webhook, you need to have Zapier premium membership as its Webhook Zap has been paid.
     21== Notice ==
     22
     23Note: Please visit the settings page to update settings after you have switched from 2.2 to 2.5 or a later version.
     24
     25Note: To use the Zapier webhook, you must have a Zapier premium membership.
    2126
    22271. Supports new server Integromat along with Zapier to send WooCommerce Orders via webhook.
    23 2. Supports Contact Form 7 with a new Tab "Wp Fly Leads Settings" in each form to set up a connection and send leads to Zapier and Integormat.
    24 3. Moved wpflyleads settings underneath WooCommerce > WP Fly Leads Settings. Also, applied fixes, corrections on the functionality of this page.
     282. Supports Contact Form 7 with a new Tab, "WP AVCL Automation Helper Settings," in each form to set up a connection and send leads to Zapier and Integormat.
     293. Moved WP AVCL Automation Helper settings underneath WooCommerce as submenu. Also, We applied fixes and corrections to the functionality of this page.
    2530
    26 == Addons ==
    27 We are working on addons to integrated WPFlyLeads with other popular plugins like Gravity Forms, AffiliateWP, Memberpress etc. and platforms like ActiveCampaign, Hubspot etc. to provide you a hassle-free process.
    2831
    29 ==Would like to appreciate our work?==
    30 If you would like to support this plugin , kindly <a href="http://paypal.me/ankurvishwakarma786">Donate </a> to this plugin here .
     32== Thank You ==
    3133
    32 == Suggestions ==
    33 Please let us know the improvements you think need to have in this plugin and more features and bugs you are facing. We will try our best of best to make it work asap.
     34Thank You for using this plugin, and We appreciate support tickets for improvements. Please let us know the modifications you need in this plugin and the more features and bugs you face. Please let us know if anyone is interested in applying for a contribution.
    3435
    3536== Installation ==
    … …  
    7273= 2.1 =
    7374* Bug Fixing & Functionality Improvements.
    74 * A new option WPFlyLeads Zapier Url Count allows more than one connection under WooCommerce > Settings > General Tab > Woozap Zapier Url {number}.
     75* A new option WP AVCL Automation Helper Zapier Url Count allows more than one connection under WooCommerce > Settings > General Tab > Woozap Zapier Url {number}.
    7576* In order table added a new column called "Woozap Trigger Summary" that will help admin to see if API triggered or not.
    7677* Supports custom products and checkout fields to send to Zapier.
    … …  
    8485= 2.3 =
    8586* Bug fixing and functionality improvements.
    86 * Separate WPFlyLeads settings page with brand new options and many new features.
     87* Separate WP AVCL Automation Helper settings page with brand new options and many new features.
    8788* Let admin choose when the connection should be triggered on a specific date or specific status change (For WooCommerce Orders).
    8889* Manual option in each WooCommerce order edit page to send the order to Zapier.
    … …  
    9394= 2.5 =
    9495* Bug fixing: Not working when switching from v2.2 to v2.3 or 2.4
     96
     97= 3.0 =
     98* Bug and Security Fixes
     99* New and Better UI
     100* Supports new server Integromat along with Zapier to send WooCommerce Orders via webhook.
     101* Supports Contact Form 7 with a new Tab, "Wp Fly Leads Settings," in each form to set up a connection and send leads to Zapier and Integormat.
     102* Moved WP AVCL Automation Helper settings underneath WooCommerce > WP Fly Leads Settings. Also, I applied fixes and corrections to the functionality of this page.
     103

  • woozap/trunk/woo-controller.php

    r2583059 r2852353  
    455455                if ($i > 1)
    456456                {
    457                     $wpflyleads_form_html .= "<button style='height:27px; width:46px; margin-left:146px;' id='" . $i . "' class='wz_remove_field '>x</button>";
     457                    $wpflyleads_form_html .= "<button style='height:27px;width:46px;margin-left: 159px;vertical-align: bottom;' id='" . $i . "' class='wz_remove_field '>x</button>";
    458458                }
    459459                if($value[0]){
    … …  
    489489            {
    490490
    491                 $wpflyleads_form_html .= " <option value=" . esc_attr($key) . ">" . esc_html($all_status[$key]) . "</option>";
     491                $wpflyleads_form_html .= " <option value=" . esc_attr($key) . ">" . esc_html($value) . "</option>";
    492492            }
    493493            $wpflyleads_form_html .= "</select>
    … …  
    501501            {
    502502
    503                 $wpflyleads_form_html .= "<option value=" . esc_attr($key) . ">" . esc_html($all_status[$key]) . "</option>";
     503                $wpflyleads_form_html .= "<option value=" . esc_attr($key) . ">" . esc_html($value) . "</option>";
    504504            }
    505505            $wpflyleads_form_html .= "</select>
    … …  
    528528                $second_value = $st_values[1];
    529529
     530                //echo $first_value.'//'.$second_value.'<br>';
    530531                $wpflyleads_form_html .= "<tr id ='wpflyleads_custom_status_field" . $i . "'>
    531532
    532533                <td><strong>" . __('From', 'wpflyleads') . "</strong>&nbsp;&nbsp;
    533534                <select style='width:50%;' class='wpflyleads_get_all_status' name='wpflyleads_get_from_status[]' >";
    534                 $wpflyleads_form_html .= "<option value='" . esc_attr($first_value) . "'>" . esc_html($first_value) . "</option>";
     535                $wpflyleads_form_html .= "<option value='" . esc_attr($first_value) . "'>" . esc_html($all_status[$first_value]) . "</option>";
    535536                foreach ($all_status as $key => $value)
    536537                {
    … …  
    541542                    if (!empty($key))
    542543                    {
    543                         $wpflyleads_form_html .= "<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
     544                        $wpflyleads_form_html .= "<option value='" . esc_attr($key) . "'>" . esc_html($value) . "</option>";
    544545                    }
    545546                }
    … …  
    549550                <td><strong>" . __('To', 'wpflyleads') . "</strong>&nbsp;&nbsp;
    550551                <select style='width:50%;' class='wpflyleads_get_all_status' name='wpflyleads_get_to_status[]' > ";
    551                 $wpflyleads_form_html .= "<option value='" . esc_attr($second_value) . "'  >" . esc_html($second_value) . "</option>";
     552                $wpflyleads_form_html .= "<option value='" . esc_attr($second_value) . "'  >" . esc_html($all_status[$second_value]) . "</option>";
    552553                foreach ($all_status as $key => $value)
    553554                {
    … …  
    558559                    if (!empty($key))
    559560                    {
    560                         $wpflyleads_form_html .= "<option value='" . esc_attr($key) . "'>" . esc_html($key) . "</option>";
     561                        $wpflyleads_form_html .= "<option value='" . esc_attr($key) . "'>" . esc_html($value) . "</option>";
    561562                    }
    562563                }
    … …  
    574575        }
    575576        $wpflyleads_form_html .= "<tr id='wpflyleads_custom_status_field'></tr>";
    576         /* $wpflyleads_form_html .= "
    577         <tr>
    578         <th>
    579         <label for=Date>" . __('Set date', 'wpflyleads') . "</label>
    580         <input style='margin-left:14px; height:28px;' type='date' name='date' value='" . esc_attr( $date ) . "'><br>
    581         <em style='font-size:12px;'>" . __('(If the date is set, it will send orders to zapier from this date. So, previous orders from this date will no longer send to zapier.)', 'wpflyleads') . "</em>
    582         </th>
    583         <td>
    584         </td>
    585         <td>
    586         </td>
    587         </tr>
    588         <tr>"; */
     577       
    589578       
    590579        $wpflyleads_form_html .= "
Note: See TracChangeset for help on using the changeset viewer.