Changeset 2235661
- Timestamp:
- 01/30/2020 08:37:43 AM (6 years ago)
- Location:
- apm-child/trunk
- Files:
-
- 1 added
- 9 edited
-
admin/apm-subscription-settings.php (modified) (1 diff)
-
admin/classes/ESP.Class.php (modified) (5 diffs)
-
admin/list-aweber.php (modified) (1 diff)
-
admin/my_income.php (modified) (5 diffs)
-
clickbank-instant-notification.php (added)
-
functions/database-function.php (modified) (4 diffs)
-
jvzoo-affiliate-commission-api.php (modified) (3 diffs)
-
mc-main.php (modified) (4 diffs)
-
optin-monster-settings.php (modified) (2 diffs)
-
readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
apm-child/trunk/admin/apm-subscription-settings.php
r2201376 r2235661 69 69 <input class="txt-apmbox" name="jv_zoo_id" type="text" id="jv_zoo_id" value="<?php echo esc_html($recordCrediantial['jv_zoo_id']);?>" size="50" /> 70 70 71 <label for="clickbank_affiliate_nickname">ClickBank Affiliate Username</label> 72 <input class="txt-apmbox" name="clickbank_affiliate_nickname" type="text" id="clickbank_affiliate_nickname" value="<?php echo esc_html($recordCrediantial['clickbank_affiliate_nickname']);?>" size="50" /> 73 71 74 <label for="email_service_provider">Email Service Provider</label> 72 75 <select name="email_service_provider" id="email_service_provider"> -
apm-child/trunk/admin/classes/ESP.Class.php
r2201376 r2235661 16 16 $jv_zoo_id = $apm_arr_request_val['jv_zoo_id']; 17 17 $email_service_provider = $apm_arr_request_val['email_service_provider']; 18 $clickbank_affiliate_nickname = $apm_arr_request_val['clickbank_affiliate_nickname']; 19 20 18 21 $current_date = date('Y-m-d G:i:s'); 19 22 $funnel_id = 0; … … 29 32 $egSql = $wpdb->prepare( 30 33 "INSERT INTO `".APM_OPTIONS_TABLE."` 31 (`first_name`,`last_name`, `email`, `jv_zoo_id`, `email_service_provider`, ` last_updated_date`)32 VALUES(%s, %s, %s, %s, %s, %s)",33 array($first_name, $last_name, $email, $jv_zoo_id, $email_service_provider, $c urrent_date));34 (`first_name`,`last_name`, `email`, `jv_zoo_id`, `email_service_provider`, `clickbank_affiliate_nickname`, `last_updated_date`) 35 VALUES(%s, %s, %s, %s, %s,%s, %s)", 36 array($first_name, $last_name, $email, $jv_zoo_id, $email_service_provider, $clickbank_affiliate_nickname, $current_date)); 34 37 35 38 $wpdb->query($egSql); … … 42 45 $option_id = $recordCrediantial['ID']; 43 46 44 $egSql = $wpdb->prepare("UPDATE `".APM_OPTIONS_TABLE."` SET `first_name` = %s, `last_name` = %s, `email` = %s, `jv_zoo_id` = %s, `email_service_provider` = %s, ` last_updated_date` = %s WHERE ID = %d LIMIT 1", array($first_name, $last_name, $email, $jv_zoo_id, $email_service_provider, $current_date, $option_id));47 $egSql = $wpdb->prepare("UPDATE `".APM_OPTIONS_TABLE."` SET `first_name` = %s, `last_name` = %s, `email` = %s, `jv_zoo_id` = %s, `email_service_provider` = %s, `clickbank_affiliate_nickname` = %s, `last_updated_date` = %s WHERE ID = %d LIMIT 1", array($first_name, $last_name, $email, $jv_zoo_id, $email_service_provider, $clickbank_affiliate_nickname, $current_date, $option_id)); 45 48 $wpdb->query($egSql); 46 49 } … … 449 452 $clickmagick_tracking_code = stripslashes($recordCrediantial['clickmagick_tracking_code']); 450 453 $email_service_provider = $recordCrediantial['email_service_provider']; 454 $clickbank_affiliate_nickname = $recordCrediantial['clickbank_affiliate_nickname']; 451 455 452 456 //--> AWeber API … … 490 494 'version' => $GLOBALS['APM_SUBSCRIPTION_VER'], 491 495 'email_service_provider' => $email_service_provider, 496 'clickbank_affiliate_nickname' => $clickbank_affiliate_nickname, 492 497 'sendeagle_api_key' => $sendeagle_api_key, 493 498 'sendeagle_company_unique_id' => $sendeagle_company_unique_id, -
apm-child/trunk/admin/list-aweber.php
r2201376 r2235661 65 65 } 66 66 67 $form['clickbank_affiliate_nickname'] = isset($_POST['clickbank_affiliate_nickname']) ? sanitize_text_field($_POST['clickbank_affiliate_nickname']) : ''; 68 67 69 68 70 if($egmail_error_found == FALSE) 69 71 { 70 $egmail_success = $_APMESP->apm_esp_add(array("first_name" => $form['first_name'], "last_name" => $form['last_name'], "email" => $form['email'], "jv_zoo_id" => $form['jv_zoo_id'], "email_service_provider" => $form['email_service_provider'] ));72 $egmail_success = $_APMESP->apm_esp_add(array("first_name" => $form['first_name'], "last_name" => $form['last_name'], "email" => $form['email'], "jv_zoo_id" => $form['jv_zoo_id'], "email_service_provider" => $form['email_service_provider'], "clickbank_affiliate_nickname" => $form['clickbank_affiliate_nickname'])); 71 73 } 72 74 -
apm-child/trunk/admin/my_income.php
r2035019 r2235661 79 79 <th scope="col">Commission Amount</th> 80 80 <th scope="col">Processed</th> 81 <th scope="col"> JVZooCaptured Date</th>81 <th scope="col">Sale Captured Date</th> 82 82 <th scope="col">ClickMagick Proceed Date</th> 83 83 </tr> … … 96 96 <th scope="col">Commission Amount</th> 97 97 <th scope="col">Processed</th> 98 <th scope="col"> JVZooCaptured Date</th>98 <th scope="col">Sale Captured Date</th> 99 99 <th scope="col">ClickMagick Proceed Date</th> 100 100 </tr> … … 118 118 119 119 $total_amount += $record->inc_ctransamount; 120 121 if($record->inc_ctransaction == 'RFND' || $record->inc_ctransaction == 'CGBK' || $record->inc_ctransaction == 'INSF') 120 121 $arr_inc_ctransaction = array("RFND", "CGBK", "INSF", "TEST_RFND"); 122 123 if (in_array($record->inc_ctransaction, $arr_inc_ctransaction)) 122 124 { 123 125 $bgColor = ' style="boarder:1px solid #F00"'; … … 125 127 $append = '-'; 126 128 127 $total_ccommission_amount -= $commision_amount;129 $total_ccommission_amount += $commision_amount; 128 130 } 129 131 else … … 151 153 <td><?php echo esc_html($record->inc_ctransaction); ?></td> 152 154 <td><?php echo esc_html($record->inc_ctranspaymentmethod); ?></td> 153 <td> $<?php echo number_format(esc_html($record->inc_ctransamount), 2, '.', ''); ?> </td>155 <td><?php echo $append; ?>$<?php echo str_replace("-", "", number_format(esc_html($record->inc_ctransamount), 2, '.', '')); ?> </td> 154 156 <td<?php echo $redColor;?><?php echo $bgColor;?>> 155 <?php if(esc_html($record->cron_status) == 'No'){ echo "Pending"; } else { ?> $<?php echo number_format($commision_amount, 2, '.', ''); }?>157 <?php if(esc_html($record->cron_status) == 'No'){ echo "Pending"; } else { ?> <?php echo $append; ?>$<?php echo str_replace("-", "", number_format($commision_amount, 2, '.', '')); }?> 156 158 </td> 157 159 <td><?php if(esc_html($record->cron_status) == 'No'){ echo "Pending"; } else { ?><?php if(esc_html($record->inc_processed) == 'Yes'){ echo "Yes"; } else { ?> <a class="Untraceable_clickmagic" href="javascript:void(0);">Untraceable</a> <? }} ?></td> -
apm-child/trunk/functions/database-function.php
r2188308 r2235661 38 38 aweber_list_id int(11), 39 39 jv_zoo_id varchar(255), 40 last_updated_date DATETIME, 41 user_email_id varchar(255), 40 last_updated_date DATETIME, 41 user_email_id varchar(255), 42 clickbank_affiliate_nickname varchar(255), 42 43 extra_field_1 varchar(255), 43 44 email_service_provider ENUM('Aweber', 'Sendeagle', 'Infusionsoft', 'GetResponse') NOT NULL DEFAULT 'Aweber', … … 87 88 cron_date DATETIME, 88 89 cron_running_status ENUM('Running', 'Executed') NOT NULL DEFAULT 'Executed', 89 cron_status ENUM('Yes', 'No') NOT NULL DEFAULT 'No' 90 cron_status ENUM('Yes', 'No') NOT NULL DEFAULT 'No', 91 inc_income_type ENUM('JvZoo', 'ClickBank') NOT NULL DEFAULT 'JvZoo' 90 92 )$charset_collate;"; 91 93 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); … … 145 147 } 146 148 149 //--> Creating page for JVZoo IPN Page if it's not exist 150 147 151 $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_name = %s LIMIT 1;", 'apm-jvzoo-ipn-listener' ) ); 148 152 … … 162 166 } 163 167 168 //--> Create page for ClickBank Instant Notification 169 170 $valid_page_found = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_status NOT IN ( 'pending', 'trash', 'future', 'auto-draft' ) AND post_name = %s LIMIT 1;", 'clickbank-instant-notification' ) ); 171 172 if ( $valid_page_found ) { 173 } else { 174 $ipn_page_data = array( 175 'post_status' => 'publish', 176 'post_type' => 'page', 177 'post_author' => 1, 178 'post_name' => 'clickbank-instant-notification', 179 'post_title' => 'Clickbank Instant Notification', 180 'post_content' => 'Do not delete this page.', 181 'post_parent' => '', 182 'comment_status' => 'closed', 183 ); 184 $ipn_page_id = wp_insert_post( $ipn_page_data ); 185 } 186 187 164 188 return true; 165 189 } -
apm-child/trunk/jvzoo-affiliate-commission-api.php
r2138159 r2235661 13 13 14 14 //--> Check staus of income before running calculation 15 //$sql_running_staus = "SELECT * FROM ".$wpdb->prefix.'cso_my_income'." WHERE cron_date > date_sub(now(), interval 60 minute) AND cron_running_status = 'Running'";16 15 17 16 $egSql = $wpdb->prepare("UPDATE `".$wpdb->prefix.'cso_my_income'."` SET `cron_running_status` = 'Executed', `cron_date` = NOW() WHERE cron_date > date_sub(now(), interval 60 minute) AND cron_running_status = 'Running'", array()); … … 21 20 22 21 //---> Delete All Duplicate Records Before Processing Transactions 23 $sql_commsission = "SELECT * FROM ".$wpdb->prefix.'cso_my_income'." WHERE cron_status = 'No' AND cron_running_status = 'Executed' AND inc_ctransreceipt <> '' GROUP BY inc_ctransreceipt";22 $sql_commsission = "SELECT * FROM ".$wpdb->prefix.'cso_my_income'." WHERE cron_status = 'No' AND cron_running_status = 'Executed' AND inc_ctransreceipt <> '' AND inc_income_type = 'JvZoo' GROUP BY inc_ctransreceipt"; 24 23 $commsission_record = $wpdb->get_results($sql_commsission, ARRAY_A); 25 24 … … 34 33 35 34 //---> Start Processing Transaction Record to Fetch Affiliate Commission Data From JVZoo 36 $sql_commsission = "SELECT * FROM ".$wpdb->prefix.'cso_my_income'." WHERE cron_status = 'No' AND cron_running_status = 'Executed' AND inc_ctransreceipt <> '' ";35 $sql_commsission = "SELECT * FROM ".$wpdb->prefix.'cso_my_income'." WHERE cron_status = 'No' AND cron_running_status = 'Executed' AND inc_ctransreceipt <> '' AND inc_income_type = 'ClickBank' "; 37 36 $commsission_record = $wpdb->get_results($sql_commsission, ARRAY_A); 38 37 -
apm-child/trunk/mc-main.php
r2201376 r2235661 9 9 Author: Nick James 10 10 E-mail: admin@nickjamesadmin.com 11 Version: 2.4. 211 Version: 2.4.3 12 12 Author URI: http://www.pluginpixie.com 13 13 */ 14 14 ini_set('display_errors',1); 15 15 global $APM_SUBSCRIPTION_VER; 16 $APM_SUBSCRIPTION_VER = "2.4. 2";16 $APM_SUBSCRIPTION_VER = "2.4.3"; 17 17 18 18 define('APM_SUBSCRIPTION_PATH', plugins_url().'/'. basename(dirname(__FILE__)).'/'); … … 30 30 include_once ('optin-monster-settings.php'); 31 31 include_once ('affiliate-jvzoo-ipn-listener.php'); 32 include_once ('clickbank-instant-notification.php'); 32 33 include_once ('jvzoo-affiliate-commission-api.php'); 33 34 include_once ('infusionsoft/InfusionsoftAPIUtil.php'); … … 108 109 $current_url = $_SERVER['REQUEST_URI']; 109 110 111 //--> Fire JVZoo IPN Page 110 112 if(strpos($current_url, 'apm-jvzoo-ipn-listner') !== false) 111 113 { … … 116 118 { 117 119 execute_jvzoo_ipn_listner(); 120 } 121 122 123 //--> Fire ClickBank INP page 124 if(strpos($current_url, 'clickbank-instant-notification') !== false) 125 { 126 execute_clickbank_instant_notification(); 118 127 } 119 128 -
apm-child/trunk/optin-monster-settings.php
r2079017 r2235661 44 44 app.setCustomVariable('account_id', '<input type="hidden" name="account_id" value="<?php echo esc_html($recordCrediantial['aweber_account_number'],'apm-child')?>" />'); 45 45 app.setCustomVariable('list_id', '<input type="hidden" name="list_id" value="<?php echo esc_html($recordCrediantial['aweber_list_id'],'apm-child')?>" />'); 46 app.setCustomVariable('clickbank_nickname', '<?php echo __($recordCrediantial['clickbank_affiliate_nickname'],'apm-child')?>'); 46 47 app.setCustomVariable('jv_zoo_id', '<?php echo __($recordCrediantial['jv_zoo_id'],'apm-child')?>'); 47 48 app.setCustomVariable('customer_email', '<input type="hidden" name="customer_email" value="<?php echo esc_html($recordCrediantial['user_email_id'],'apm-child')?>" />'); … … 75 76 76 77 fullQStr = jQuery("#FunnelReplaceUrl").attr("data"); 77 var newFunnelURL = fullQStr.replace("replace_aid", "<?php echo __($recordCrediantial['jv_zoo_id'],'apm-child')?>"); 78 jQuery("#FunnelReplaceUrl").attr("data", newFunnelURL) 78 79 if(fullQStr != '' && fullQStr == "undefined") 80 { 81 var newFunnelURL = fullQStr.replace("replace_aid", "<?php echo __($recordCrediantial['jv_zoo_id'],'apm-child')?>"); 82 jQuery("#FunnelReplaceUrl").attr("data", newFunnelURL) 83 } 79 84 80 85 -
apm-child/trunk/readme.txt
r2201376 r2235661 3 3 Tags: aweber,clickmagic,jvzoo,sendeagle,infusionsoft,getresponse,optinmonster,funnel 4 4 Requires at least: 4.0 5 Stable tag: 2. 4.25 Stable tag: 2.1.3 6 6 Requires PHP: 5.4 7 7 Tested up to: 5.3 … … 143 143 *Provided option for Clickid mapping in InfusionSoft custom field at Funnel mapping page. 144 144 *Version Update. 145 146 2.4.3 147 *ClickBank Integration. 148 *Version Update.
Note: See TracChangeset
for help on using the changeset viewer.