WordPress.org
Get WordPress

Plugin Directory

Changeset 2483419


Ignore:
Timestamp:
03/01/2021 09:55:08 AM (5 years ago)
Author:
nellalink
Message:

Update to 1.1.8 fixes External Transfer API

Location:
rimplenet/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • rimplenet/trunk/README.txt

    r2483194 r2483419  
    55Requires at least: 3.0.1
    66Tested up to: 5.6.2
    7 Stable tag: 1.1.6
     7Stable tag: 1.1.8
    88Requires PHP: 5.6
    99License: GPLv2 or later
    … …  
    8181== Changelog ==
    8282
    83 = 1.1.7 =
     83= 1.1.8 =
    8484* Withdrawal Pagination & Bug Fixes
    8585= 1.1.6 =
    … …  
    111111
    112112== Upgrade Notice ==
    113 = 1.1.7 =
     113= 1.1.8 =
    114114* Withdrawal Pagination & Bug Fixes
    115115= 1.1.6 =

  • rimplenet/trunk/includes/class-referrals.php

    r2428998 r2483419  
    1414if (in_array('woocommerce/woocommerce.php', apply_filters('active_plugins', get_option('active_plugins')))){
    1515    //When
    16     add_action( 'woocommerce_register_form', array($this,'rimplenet_woocommerce_referrals_register_fields'), 20 ); 
    17     add_action( 'woocommerce_register_post', array($this,'rimplenet_validate_woocommerce_referrals_register_fields'), 10, 3 );
    18     add_action( 'woocommerce_created_customer', array($this,'rimplenet_save_woocommerce_referrals_register_fields') );
     16  add_action( 'woocommerce_register_form', array($this,'rimplenet_woocommerce_referrals_register_fields'), 20 ); 
     17  add_action( 'woocommerce_register_post', array($this,'rimplenet_validate_woocommerce_referrals_register_fields'), 10, 3 );
     18  add_action( 'woocommerce_created_customer', array($this,'rimplenet_save_woocommerce_referrals_register_fields') );
    1919 
    2020}
    … …  
    5151       
    5252        $rules_exec_customers = get_user_meta($user_referrer->ID, 'rimplenet_referrals_rules_executed_on_woo_orders_from_user');//get
     53        if(is_array($rules_exec_customers)){
    5354        $current_order_user_count = array_count_values($rules_exec_customers)[$customer_user->ID];
     55        }
    5456        $referrals_rules_completed_executed_users = get_user_meta($user_referrer->ID, 'completed_rimplenet_referred_rules_instance_on_woo_orders_from_user');//get
    55        
     57       
     58       if(is_array($referrals_rules_completed_executed_users)){
    5659        if(!in_array($user_id, $referrals_rules_completed_executed_users)AND $exec_status!='yes' AND isset($user_referrer->ID) AND $user_referrer->ID!=false){
    5760            $rules = $rimplenet_rules_to_user_when_their_downline_makes_woo_order;
    … …  
    7275            }
    7376          }
    74            
    75         }
    76        
     77         }
     78        }
    7779      }
    7880     }
    … …  
    120122
    121123function rimplenet_woocommerce_referrals_register_fields(){
    122    
    123     $rimplenet_referrer_sponsor = sanitize_text_field($_COOKIE['rimplenet_referrer_sponsor']);
    124  
    125     woocommerce_form_field(
    126         'rimplenet_referrer_sponsor',
    127         array(
    128             'type'        => 'text',
    129             'default' => $rimplenet_referrer_sponsor,
    130             'placeholder' => $rimplenet_referrer_sponsor,
    131             'required'    => false, // just adds an "*"
    132             'label'       => 'My Referrer Sponsor'
    133         ),
    134         ( isset($rimplenet_referrer_sponsor) ? $rimplenet_referrer_sponsor : '' )
    135     );
    136  
    137 }
    138    
    139    
     124 
     125  $rimplenet_referrer_sponsor = sanitize_text_field($_COOKIE['rimplenet_referrer_sponsor']);
     126 
     127  woocommerce_form_field(
     128    'rimplenet_referrer_sponsor',
     129    array(
     130      'type'        => 'text',
     131      'default' => $rimplenet_referrer_sponsor,
     132      'placeholder' => $rimplenet_referrer_sponsor,
     133      'required'    => false, // just adds an "*"
     134      'label'       => 'My Referrer Sponsor'
     135    ),
     136    ( isset($rimplenet_referrer_sponsor) ? $rimplenet_referrer_sponsor : '' )
     137  );
     138 
     139}
     140 
     141 
    140142
    141143 
    142144function rimplenet_validate_woocommerce_referrals_register_fields( $username, $email, $errors ) {
    143     $user = sanitize_text_field($_POST['rimplenet_referrer_sponsor']);
    144 
    145    
    146     $user_by_name = get_user_by('login',$user);
    147     $user_by_id = get_user_by('ID',$user);
    148  
    149     if ( !empty( $_POST['rimplenet_referrer_sponsor'] ) ) {
    150 
    151 
    152        if ( empty($user_by_id->ID) AND empty($user_by_name->ID)) {
    153 
    154         $errors->add( 'rimplenet_referrer_sponsor', 'The Username or User ID provided in the Referral Field does not exist, input another user or leave field empty' );
    155 
    156         }
    157 
    158 
    159     }
    160    
     145  $user = sanitize_text_field($_POST['rimplenet_referrer_sponsor']);
     146
     147 
     148  $user_by_name = get_user_by('login',$user);
     149  $user_by_id = get_user_by('ID',$user);
     150 
     151  if ( !empty( $_POST['rimplenet_referrer_sponsor'] ) ) {
     152
     153
     154     if ( empty($user_by_id->ID) AND empty($user_by_name->ID)) {
     155
     156    $errors->add( 'rimplenet_referrer_sponsor', 'The Username or User ID provided in the Referral Field does not exist, input another user or leave field empty' );
     157
     158    }
     159
     160
     161  }
     162 
    161163 
    162164}
    163165/**
    164     * Function below checks if the Ref field is set
    165     *
    166     * @since    1.0.0
    167      */
     166  * Function below checks if the Ref field is set
     167  *
     168  * @since    1.0.0
     169   */
    168170function rimplenet_save_woocommerce_referrals_register_fields( $customer_id ){
    169171 
    170172if ( isset( $_POST['rimplenet_referrer_sponsor'] ) ) {
    171173
    172     $up_user = get_user_by('login', sanitize_text_field($_POST['rimplenet_referrer_sponsor']));
    173     if (empty($up_user->ID)) {
    174       $up_user = get_user_by('ID',sanitize_text_field($_POST['rimplenet_referrer_sponsor']));
    175     }
    176    
    177     if (!empty($up_user->ID)) {
    178       update_user_meta( $customer_id, 'rimplenet_referrer_sponsor', $up_user->ID) ;
    179     }
    180    
    181    
     174  $up_user = get_user_by('login', sanitize_text_field($_POST['rimplenet_referrer_sponsor']));
     175  if (empty($up_user->ID)) {
     176    $up_user = get_user_by('ID',sanitize_text_field($_POST['rimplenet_referrer_sponsor']));
     177  }
     178 
     179  if (!empty($up_user->ID)) {
     180    update_user_meta( $customer_id, 'rimplenet_referrer_sponsor', $up_user->ID) ;
     181  }
     182 
     183 
    182184  }
    183185 

  • rimplenet/trunk/includes/class-wallets.php

    r2483194 r2483419  
    124124
    125125
    126 function withdraw_wallet_bal($user_id, $amount_to_withdraw, $wallet_id, $address_to, $note=''){
     126function withdraw_wallet_bal($user_id, $amount_to_withdraw, $wallet_id, $address_to, $note='WITHDRAWAL'){
    127127       
    128128       
    … …  
    183183     wp_reset_postdata();
    184184    return $wdr_info;
     185
     186}
     187
     188
     189function transfer_wallet_bal_external($transfer_from_user, $amount_to_transfer, $wallet_id, $transfer_to_destination, $note='EXTERNAL TRANSFER'){
     190   
     191       $user_transfer_bal = $this->get_withdrawable_wallet_bal($transfer_from_user, $wallet_id);
     192       $user_non_transfer_bal = $this->get_nonwithdrawable_wallet_bal($transfer_from_user, $wallet_id);
     193     
     194        $walllets = $this->getWallets();
     195        $dec = $walllets[$wallet_id]['decimal'];
     196        $symbol = $walllets[$wallet_id]['symbol'];
     197        $name = $walllets[$wallet_id]['name'];
     198        $balance = $symbol.number_format($balance,$dec);
     199     
     200     
     201     if(!is_user_logged_in()) {
     202        $transfer_info = 'Please Login to use this Feature';
     203      }
     204      elseif(empty($transfer_from_user) OR empty($amount_to_transfer) OR empty($wallet_id)) {
     205        $transfer_info = 'One or more compulsory field is empty';
     206      }
     207      elseif($amount_to_transfer>$user_transfer_bal) {
     208        $transfer_info = 'Amount to transfer - <strong>['.$symbol.number_format($amount_to_transfer,$dec).']</strong> is larger than the amount in your mature wallet, input amount not more than the balance in your <strong>( '.$name.' mature wallet - ['.$symbol.number_format($user_transfer_bal,$dec).'] ),</strong> the balance in your <strong>( '.$name.' immature wallet  - ['. $symbol.number_format($user_non_transfer_bal,$dec).'] )</strong>  cannot be transferred until maturity';
     209      }
     210      elseif($amount_to_transfer<$min_transfer_amt) {
     211        $transfer_info = 'Requested amount ['.$amount_to_transfer.'] is below minimum transfer amount, input amount not less than '.$min_transfer_amt;
     212      }
     213      else{ // all is good, make transfer
     214       
     215        //transfer funds to user
     216       
     217          $amount_to_transfer_to_user = apply_filters('rimplenet_amount_to_transfer', $amount_to_transfer, $wallet_id, $transfer_to_user_id);
     218         
     219          $amount_to_debit_in_transfer = $amount_to_transfer_to_user * -1;
     220          $txn_transfer_id = $this->add_user_mature_funds_to_wallet($transfer_from_user, $amount_to_debit_in_transfer, $wallet_id,$note);
     221         
     222         $transfer_info = $txn_transfer_id;
     223         if (is_int($txn_transfer_id)) {
     224           
     225          $modified_title = 'TRANSFER ~ '.get_the_title( $txn_transfer_id);
     226           $args =
     227              array(
     228              'ID'    =>  $txn_transfer_id,
     229              'post_title'   => $modified_title,
     230              'post_status'   =>  'publish',
     231               'meta_input' => array(
     232                'transfer_address_from'=>$user_id,
     233                'note'=>$note,
     234                )
     235              );
     236             wp_set_object_terms($txn_transfer_id, 'TRANSFER', 'rimplenettransaction_type', true);
     237             wp_set_object_terms($txn_transfer_id, 'EXTERNAL TRANSFER', 'rimplenettransaction_type', true);
     238             wp_update_post($args);
     239
     240         
     241         }
     242         
     243    }
     244       
     245     wp_reset_postdata();
     246     return $transfer_info;
    185247
    186248}

  • rimplenet/trunk/includes/layouts/rimplenet-investment-form.php

    r2483194 r2483419  
    226226                           }
    227227                         ?>
    228                         <option value="<?php echo $wallet_id_op; ?>" selected> <?php echo $disp_info; ?> </option>
     228                        <option value="<?php echo $wallet_id_op; ?>" <?php echo $disp_info; ?> </option>
    229229                    <?php
    230230                         }

  • rimplenet/trunk/includes/page-templates/rimplenet-investment-form-template.php

    r2449227 r2483419  
     1<?php
     2   if(!is_user_logged_in()) {
     3?>
     4  <center>
     5   <div class="alert alert-danger alert-dismissible fade show" role="alert">
     6          <strong> ERROR: </strong> Please Login or Register to Procced
     7          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
     8            <span aria-hidden="true">&times;</span>
     9          </button>
     10   </div>
     11  </center>
     12<?php
     13     return ;
     14   }
     15?>
    116<?php
    217//Included from shortcode in includes/class-investments.php
    … …  
    171186                           }
    172187                         ?>
    173                         <option value="<?php echo $wallet_id_op; ?>" selected> <?php echo $disp_info; ?> </option>
     188                        <option value="<?php echo $wallet_id_op; ?>" > <?php echo $disp_info; ?> </option>
    174189                    <?php
    175190                         }

  • rimplenet/trunk/public/layouts/design-wallet-from-shortcode.php

    r2483194 r2483419  
    9595        $rimplenet_withdrawal_destination_submitted  = $_POST["rimplenet_withdrawal_destination"];
    9696        $rimplenet_withdrawal_note_submitted  = $_POST["rimplenet_withdrawal_note"];
    97        
    98         $note = ' WITHDRAWAL - '.$rimplenet_withdrawal_note_submitted;
     97        if(!empty($rimplenet_withdrawal_note_submitted)){
     98          $note = ' WITHDRAWAL - '.$rimplenet_withdrawal_note_submitted;
     99        }
    99100        $user_id = $current_user->ID;
    100101       

  • rimplenet/trunk/rimplenet.php

    r2483194 r2483419  
    1717 * Plugin URI:        https://rimplenet.com
    1818 * Description:       Rimplenet E-Banking | E-Wallets  | Investments Plugin | MLM | Matrix Tree | Referral Manager | FinTech
    19  * Version:           1.1.7
     19 * Version:           1.1.8
    2020 * Author:            Nellalink
    2121 * Author URI:        https://rimplenet.com
Note: See TracChangeset for help on using the changeset viewer.