WP User Frontend – Membership, Profile, Registration &amp; Post

Version Description

Release Info

Developer	tareq1988
Plugin	WP User Frontend – Membership, Profile, Registration & Post Submission Plugin for WordPress
Version	2.6.1
Comparing to
See all releases

Code changes from version 2.6.0 to 2.6.1

Files changed (18) hide show

admin/class-admin-subscription.php +3 -2
admin/html/form-settings-payment.php +0 -1
admin/settings-options.php +0 -11
assets/css/frontend-forms.css +2 -1
assets/less/frontend-forms.less +2 -1
class/frontend-account.php +3 -21
class/frontend-form-post.php +1 -6
class/payment.php +4 -4
class/subscription.php +63 -288
includes/class-user-subscription.php +255 -4
includes/upgrades/upgrade-2.1.9.php +1 -1
languages/wpuf.pot +170 -192
lib/gateway/paypal.php +2 -3
readme.txt +7 -1
templates/account.php +1 -1
templates/dashboard/billing-address.php +0 -107
wpuf-functions.php +1 -14
wpuf.php +2 -2

admin/class-admin-subscription.php CHANGED Viewed

	@@ -118,7 +118,7 @@ class WPUF_Admin_Subscription {
118	}
119	$user_pack['expire'] = isset( $_POST['expire'] ) ? wpuf_date2mysql( $_POST['expire'] ) : $user_pack['expire'];
120	}
121	- ~~WPUF_Subscription::update_user_subscription_meta~~( $user_id, $user_pack );
122	} else {
123	if ( $pack_id == '-1' ) {
124	return;
	@@ -472,7 +472,8 @@ class WPUF_Admin_Subscription {
472	if ( ! current_user_can( 'edit_users' ) ) {
473	return;
474	}
475	- if ( ~~wpuf_get_option( 'charge_posting', 'wpuf_payment'~~ ) ~~!= 'yes' ) {~~

476	return;
477	}
478	$userdata = get_userdata( $profileuser->ID ); //wp 3.3 fix


118	}
119	$user_pack['expire'] = isset( $_POST['expire'] ) ? wpuf_date2mysql( $_POST['expire'] ) : $user_pack['expire'];
120	}
121	+ wpuf_get_user( $user_id )->subscription()->update_meta( $user_pack );
122	} else {
123	if ( $pack_id == '-1' ) {
124	return;

472	if ( ! current_user_can( 'edit_users' ) ) {
473	return;
474	}
475	+ $current_user = wpuf_get_user();
476	+ if ( !$current_user->subscription()->current_pack_id() ) {
477	return;
478	}
479	$userdata = get_userdata( $profileuser->ID ); //wp 3.3 fix

admin/html/form-settings-payment.php CHANGED Viewed

	@@ -6,7 +6,6 @@ $form_settings = wpuf_get_form_settings( $post->ID );
6	$payment_options = isset( $form_settings['payment_options'] ) ? $form_settings['payment_options'] : 'false';
7	$enable_pay_per_post = isset( $form_settings['enable_pay_per_post'] ) ? $form_settings['enable_pay_per_post'] : 'false';
8	$force_pack_purchase = isset( $form_settings['force_pack_purchase'] ) ? $form_settings['force_pack_purchase'] : 'false';
9	- $subscription_disabled = isset( $form_settings['subscription_disabled'] ) ? $form_settings['subscription_disabled'] : '';
10
11	$pay_per_post_cost = isset( $form_settings['pay_per_post_cost'] ) ? $form_settings['pay_per_post_cost'] : 2;
12	$fallback_ppp_enable = isset( $form_settings['fallback_ppp_enable'] ) ? $form_settings['fallback_ppp_enable'] : 'false';


6	$payment_options = isset( $form_settings['payment_options'] ) ? $form_settings['payment_options'] : 'false';
7	$enable_pay_per_post = isset( $form_settings['enable_pay_per_post'] ) ? $form_settings['enable_pay_per_post'] : 'false';
8	$force_pack_purchase = isset( $form_settings['force_pack_purchase'] ) ? $form_settings['force_pack_purchase'] : 'false';

9
10	$pay_per_post_cost = isset( $form_settings['pay_per_post_cost'] ) ? $form_settings['pay_per_post_cost'] : 2;
11	$fallback_ppp_enable = isset( $form_settings['fallback_ppp_enable'] ) ? $form_settings['fallback_ppp_enable'] : 'false';

admin/settings-options.php CHANGED Viewed

@@ -276,17 +276,6 @@ function wpuf_settings_fields() {
                             'desc'  => __( 'Registration time redirect to subscription page', 'wpuf' ),
                             'type'  => 'checkbox',
                         ),
-            -
                        // array(
-            -
                        //     'name'    => 'edit_billing_address',
-            -
                        //     'label'   => __( 'Billing Address', 'wpuf-pro' ),
-            -
                        //     'desc'    => __( 'Show Billing Address option in dashboard', 'wpuf' ),
-            -
                        //     'type'    => 'select',
-            -
                        //     'default' => 'no',
-            -
                        //     'options' => array(
-            -
                        //         'yes' => __( 'Yes', 'wpuf' ),
-            -
                        //         'no'  => __( 'No', 'wpuf' )
-            -
                        //     )
-            -
                        // ),
                         array(
                             'name'    => 'currency',
                             'label'   => __( 'Currency', 'wpuf' ),

                             'desc'  => __( 'Registration time redirect to subscription page', 'wpuf' ),
                             'type'  => 'checkbox',
                         ),
                         array(
                             'name'    => 'currency',
                             'label'   => __( 'Currency', 'wpuf' ),

assets/css/frontend-forms.css CHANGED Viewed

	@@ -673,9 +673,10 @@ ul.wpuf_packs {
673	.entry-content ul.wpuf_packs > li,
674	ul.wpuf_packs > li {
675	background: #fff;


676	border: 1px solid #DDD;
677	border-radius: 5px 5px 5px 5px;
678	- float: left;
679	list-style: none outside none;
680	margin: 5px 25px 25px 0;
681	position: relative;


673	.entry-content ul.wpuf_packs > li,
674	ul.wpuf_packs > li {
675	background: #fff;
676	+ display: inline-block;
677	+ vertical-align: top;
678	border: 1px solid #DDD;
679	border-radius: 5px 5px 5px 5px;

680	list-style: none outside none;
681	margin: 5px 25px 25px 0;
682	position: relative;

assets/less/frontend-forms.less CHANGED Viewed

	@@ -795,9 +795,10 @@ ul.wpuf_packs {
795
796	> li {
797	background: #fff;


798	border: 1px solid #DDD;
799	border-radius: 5px 5px 5px 5px;
800	- float: left;
801	list-style: none outside none;
802	margin: 5px 25px 25px 0;
803	position: relative;


795
796	> li {
797	background: #fff;
798	+ display: inline-block;
799	+ vertical-align: top;
800	border: 1px solid #DDD;
801	border-radius: 5px 5px 5px 5px;

802	list-style: none outside none;
803	margin: 5px 25px 25px 0;
804	position: relative;

class/frontend-account.php CHANGED Viewed

	@@ -18,7 +18,6 @@ class WPUF_Frontend_Account {
18	add_action( 'wpuf_account_content_subscription', array( $this, 'subscription_section' ), 10, 2 );
19	add_action( 'wpuf_account_content_edit-profile', array( $this, 'edit_profile_section' ), 10, 2 );
20	add_action( 'wp_ajax_wpuf_account_update_profile', array( $this, 'update_profile' ) );
21	- add_action( 'wpuf_account_content_billing_address', array( $this, 'billing_address_section' ), 10, 2 );
22	}
23
24	/**
	@@ -109,9 +108,9 @@ class WPUF_Frontend_Account {
109	// if ( wpuf_get_option( 'charge_posting', 'wpuf_payment' ) != 'yes' \|\| ! is_user_logged_in() ) {
110	// return;
111	// }
112	- $~~form~~ = ~~new WPUF_Form~~( ~~$form_id~~ );
113	- ~~$payment_options = $form->is_charging_enabled();~~
114	- if ( !$~~payment_options~~ ) {
115	return;
116	}
117
	@@ -172,23 +171,6 @@ class WPUF_Frontend_Account {
172	);
173	}
174
175	- /**
176	- * Display the billing address
177	- *
178	- * @param array $sections
179	- * @param string $current_section
180	- *
181	- * @since 2.6
182	- *
183	- * @return void
184	- */
185	- public function billing_address_section( $sections, $current_section ) {
186	- wpuf_load_template(
187	- "dashboard/billing-address.php",
188	- array( 'sections' => $sections, 'current_section' => $current_section )
189	- );
190	- }
191	-
192	/**
193	* Update profile via Ajax
194	*


18	add_action( 'wpuf_account_content_subscription', array( $this, 'subscription_section' ), 10, 2 );
19	add_action( 'wpuf_account_content_edit-profile', array( $this, 'edit_profile_section' ), 10, 2 );
20	add_action( 'wp_ajax_wpuf_account_update_profile', array( $this, 'update_profile' ) );

21	}
22
23	/**

108	// if ( wpuf_get_option( 'charge_posting', 'wpuf_payment' ) != 'yes' \|\| ! is_user_logged_in() ) {
109	// return;
110	// }
111	+ $current_user = wpuf_get_user();
112	+
113	+ if ( !$current_user->subscription()->current_pack_id() ) {
114	return;
115	}
116

171	);
172	}
173

















174	/**
175	* Update profile via Ajax
176	*

class/frontend-form-post.php CHANGED Viewed

	@@ -54,7 +54,6 @@ class WPUF_Frontend_Form_Post extends WPUF_Render_Form {
54
55	$form = new WPUF_Form( $id );
56	$form_settings = $form->get_settings( $id );
57	- $subscription_disabled = isset( $form_settings['subscription_disabled'] ) ? $form_settings['subscription_disabled'] : '';
58	$info = '';
59	$user_can_post = 'yes';
60	$current_user = wpuf_get_user();
	@@ -64,7 +63,7 @@ class WPUF_Frontend_Form_Post extends WPUF_Render_Form {
64	$info = sprintf( __( 'Sorry. Guest Posting is not enabled for this form.', 'wpuf' ));
65	}
66
67	- if ( $form->is_charging_enabled() && ~~$subscription_disabled != 'yes'~~) {
68	$pay_per_post = $form->is_enabled_pay_per_post();
69	$pay_per_post_cost = (int) $form->get_pay_per_post_cost();
70	$force_pack = $form->is_enabled_force_pack();
	@@ -135,10 +134,6 @@ class WPUF_Frontend_Form_Post extends WPUF_Render_Form {
135	}
136	}
137
138	- if ( $subscription_disabled == 'yes' ) {
139	- $user_can_post = 'yes';
140	- }
141	-
142	$info = apply_filters( 'wpuf_addpost_notice', $info, $id, $form_settings );
143	$user_can_post = apply_filters( 'wpuf_can_post', $user_can_post, $id, $form_settings );
144


54
55	$form = new WPUF_Form( $id );
56	$form_settings = $form->get_settings( $id );

57	$info = '';
58	$user_can_post = 'yes';
59	$current_user = wpuf_get_user();

63	$info = sprintf( __( 'Sorry. Guest Posting is not enabled for this form.', 'wpuf' ));
64	}
65
66	+ if ( $form->is_charging_enabled() ) {
67	$pay_per_post = $form->is_enabled_pay_per_post();
68	$pay_per_post_cost = (int) $form->get_pay_per_post_cost();
69	$force_pack = $form->is_enabled_force_pack();

134	}
135	}
136




137	$info = apply_filters( 'wpuf_addpost_notice', $info, $id, $form_settings );
138	$user_can_post = apply_filters( 'wpuf_can_post', $user_can_post, $id, $form_settings );
139

class/payment.php CHANGED Viewed

	@@ -109,11 +109,11 @@ class WPUF_Payment {
109	if ( $pack_id && $is_free ) {
110
111	$wpuf_subscription = WPUF_Subscription::init();

112
113	- if ( ! ~~WPUF_Subscription::has_used_free_pack(~~ $~~current_user~~->~~ID,~~ $pack_id) ) {
114	-
115	- $~~wpuf_subscription~~->~~new_subscription~~( $current_user->ID, $pack_id, ~~null, false, 'free'~~ );
116	- WPUF_Subscription::add_used_free_pack( $current_user->ID, $pack_id );
117
118	$message = apply_filters( 'wpuf_fp_activated_msg', __( 'Your free package has been activated. Enjoy!' ), 'wpuf' );
119	} else {


109	if ( $pack_id && $is_free ) {
110
111	$wpuf_subscription = WPUF_Subscription::init();
112	+ $wpuf_user = new WPUF_User( $current_user->ID );
113
114	+ if ( ! $wpuf_user->subscription()->used_free_pack( $pack_id ) ) {
115	+ wpuf_get_user( $current_user->ID )->subscription()->add_pack( $pack_id, null, false, 'free' );
116	+ $wpuf_user->subscription()->add_free_pack( $current_user->ID, $pack_id );

117
118	$message = apply_filters( 'wpuf_fp_activated_msg', __( 'Your free package has been activated. Enjoy!' ), 'wpuf' );
119	} else {

class/subscription.php CHANGED Viewed

@@ -183,8 +183,8 @@ class WPUF_Subscription {
                     $billing_amount = ( $pack->meta_value['billing_amount'] >= 0 && !empty( $pack->meta_value['billing_amount'] ) ) ? $pack->meta_value['billing_amount'] : false;
                     if ( $billing_amount === false ) {
-            -
                        $this->new_subscription( $user_id, $pack_id, null, false, 'free' );
-            -
                        self::add_used_free_pack( $user_id, $pack_id );
                     } else {
                         $pay_page = intval( wpuf_get_option( 'payment_page', 'wpuf_payment' ) );
                         $redirect = add_query_arg( array( 'action' => 'wpuf_pay', 'type' => 'pack', 'pack_id' => (int) $pack_id ), get_permalink( $pay_page ) );
@@ -465,9 +465,6 @@ class WPUF_Subscription {
+                    }
                     if ( $charging_enabled == 'yes' ) {
-            -
                        if ( isset ( $form_settings['subscription_disabled'] ) && $form_settings['subscription_disabled'] == 'yes'  ) {
-            -
                            return $postdata;
-            -
                        }
                         $postdata['post_status'] = 'pending';
+                    }
@@ -482,10 +479,7 @@ class WPUF_Subscription {
                  * @param int $post_id
                  */
                 function monitor_new_post( $post_id, $form_id, $form_settings ) {
-            -
                    // // check form if subscription is disabled
-            -
                    // if ( isset( $form_settings['subscription_disabled'] ) && $form_settings['subscription_disabled'] == 'yes' ) {
-            -
                    //     return;
-            -
                    // }
                     global $wpdb, $userdata;
                     // bail out if charging is not enabled
@@ -611,7 +605,7 @@ class WPUF_Subscription {
                     } else if ( $info['pack_id'] ) {
                         $profile_id = isset( $info['profile_id'] ) ? $info['profile_id'] : null;
-            -
                        $this->new_subscription( $info['user_id'], $info['pack_id'], $profile_id, $recurring, $info['status'] );
+                    }
+                }
@@ -625,66 +619,23 @@ class WPUF_Subscription {
                  * @param int $pack_id subscription pack id
                  */
                 public function new_subscription( $user_id, $pack_id, $profile_id = null, $recurring, $status = null ) {
-            -
                    global $wpdb;
-            -
                    $subscription = $this->get_subscription( $pack_id );
-            -
                    if ( $user_id && $subscription ) {
-            -
-            -
                        $user_meta = array(
-            -
                            'pack_id' => $pack_id,
-            -
                            'posts'   => $subscription->meta_value['post_type_name'],
-            -
                            'status'  => $status
-            -
                        );
-            -
-            -
                        if ( $recurring ) {
-            -
                            $totla_date =  date( 'd-m-Y', strtotime('+' . $subscription->meta_value['billing_cycle_number'] . $subscription->meta_value['cycle_period'] . 's') );
-            -
                            $user_meta['expire']     = '';
-            -
                            $user_meta['profile_id'] = $profile_id;
-            -
                            $user_meta['recurring']  = 'yes';
-            -
                        } else {
-            -
-            -
                            $period_type            = $subscription->meta_value['expiration_period'];
-            -
                            $period_number          = $subscription->meta_value['expiration_number'];
-            -
                            $date                   = date( 'd-m-Y', strtotime('+' . $period_number . $period_type . 's') );
-            -
                            $expired                = ( empty( $period_number ) || ( $period_number == 0 ) ) ? 'unlimited' : wpuf_date2mysql( $date );
-            -
                            $user_meta['expire']    = $expired;
-            -
                            $user_meta['recurring'] = 'no';
-            -
                        }
-            -
                        $user_meta = apply_filters( 'wpuf_new_subscription', $user_meta, $user_id, $pack_id, $recurring );
-            -
-            -
                        if ( $subscription->_enable_post_expiration ) {
-            -
                            $user_meta['_enable_post_expiration']    = $subscription->_enable_post_expiration;
-            -
                            $user_meta['_post_expiration_time']      = $subscription->_post_expiration_time;
-            -
                            $user_meta['_expired_post_status']       = $subscription->_expired_post_status;
-            -
                            $user_meta['_enable_mail_after_expired'] = $subscription->_enable_mail_after_expired;
-            -
                            $user_meta['_post_expiration_message']   = $subscription->_post_expiration_message;
-            -
                        }
-            -
-            -
                        $this->update_user_subscription_meta( $user_id, $user_meta );
-            -
-            -
                        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "wpuf_transaction
-            -
                        WHERE user_id = %d AND pack_id = %d LIMIT 1", $user_id, $pack_id );
-            -
-            -
                        $result = $wpdb->get_row( $sql );
-            -
                        $user_info = get_userdata( $user_id );
-            -
                        $table_data = array(
-            -
                            'user_id'               => $user_id,
-            -
                            'name'                  => $user_info->display_name,
-            -
                            'subscribtion_id'       => $pack_id,
-            -
                            'subscribtion_status'   => $status,
-            -
                            'gateway'               => is_null( $result->payment_type ) ? 'bank' : $result->payment_type,
-            -
                            'transaction_id'        => is_null( $result->transaction_id ) ? 'NA' : $result->transaction_id,
-            -
                            'starts_from'           => date( 'd-m-Y' ),
-            -
                            'expire'                => $user_meta['expire'] == '' ? 'recurring' : $user_meta['expire'],
-            -
                        );
-            -
-            -
                        $wpdb->insert( $wpdb->prefix . 'wpuf_subscribers', $table_data );
-            -
                    }
+                }
                 public static function update_user_subscription_meta( $user_id, $user_meta ) {
-            -
                    update_user_meta( $user_id, '_wpuf_subscription_pack', $user_meta );
+                }
                 public static function post_by_orderid( $order_id ) {
@@ -745,112 +696,9 @@ class WPUF_Subscription {
                  * @global type $userdata
                  */
                 function subscription_info() {
-            -
                    // if ( wpuf_get_option( 'charge_posting', 'wpuf_payment' ) != 'yes' || !is_user_logged_in() ) {
-            -
                    //     return;
-            -
                    // }
-            -
                    $form             = new WPUF_Form( $form_id );
-            -
                    $payment_options  = $form->is_charging_enabled();
-            -
                    if ( !$payment_options || !is_user_logged_in() ) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    global $userdata;
-            -
-            -
                    ob_start();
-            -
-            -
                    $userdata = get_userdata( $userdata->ID ); //wp 3.3 fix
-            -
-            -
                    $user_sub = self::get_user_pack( $userdata->ID );
-            -
                    if ( !isset( $user_sub['pack_id'] ) ) {
-            -
                        return;
-            -
                    }
-            -
-            -
                    $pack = $this->get_subscription( $user_sub['pack_id'] );
-            -
-            -
                    $details_meta = $this->get_details_meta_value();
-            -
-            -
                    $billing_amount = ( intval( $pack->meta_value['billing_amount'] ) > 0 ) ? $details_meta['symbol'] . $pack->meta_value['billing_amount'] : __( 'Free', 'wpuf' );
-            -
                    if ( $pack->meta_value['recurring_pay'] == 'yes' ) {
-            -
                        $recurring_des = sprintf( 'For each %s %s', $pack->meta_value['billing_cycle_number'], $pack->meta_value['cycle_period'], $pack->meta_value['trial_duration_type'] );
-            -
                        $recurring_des .= !empty( $pack->meta_value['billing_limit'] ) ? sprintf( ', for %s installments', $pack->meta_value['billing_limit'] ) : '';
-            -
                        $recurring_des = $recurring_des;
-            -
                    } else {
-            -
                        $recurring_des = '';
-            -
                    }
-            -
-            -
                    ?>
-            -
                    <div class="wpuf_sub_info">
-            -
                        <h3><?php _e( 'Subscription Details', 'wpuf' ); ?></h3>
-            -
                        <div class="wpuf-text">
-            -
                            <div><strong><?php _e( 'Subcription Name: ','wpuf' ); ?></strong><?php echo $pack->post_title; ?></div>
-            -
                            <div>
-            -
                                <strong><?php _e( 'Package & billing details: ', 'wpuf'); ?></strong>
-            -
-            -
                                <div class="wpuf-pricing-wrap">
-            -
                                    <div class="wpuf-sub-amount">
-            -
                                        <?php echo $billing_amount; ?>
-            -
                                        <?php echo $recurring_des; ?>
-            -
                                    </div>
-            -
                                </div>
-            -
-            -
                            </div>
-            -
                            <div>
-            -
                                <strong><?php _e( 'Remaining post: ', 'wpuf'); ?></strong>
-            -
                                <?php
-            -
                                foreach ($user_sub['posts'] as $key => $value) {
-            -
                                    $value = intval( $value );
-            -
-            -
                                    if ( $value === 0 ) {
-            -
                                        continue;
-            -
                                    }
-            -
-            -
                                    $post_type_obj = get_post_type_object( $key );
-            -
                                    if ( ! $post_type_obj ) {
-            -
                                        continue;
-            -
                                    }
-            -
                                    $value = ( $value == '-1' ) ? __( 'Unlimited', 'wpuf' ) : $value;
-            -
                                    ?>
-            -
                                    <div><?php echo $post_type_obj->labels->name . ': ' . $value; ?></div>
-            -
                                    <?php
-            -
                                }
-            -
                                ?>
-            -
                            </div>
-            -
                            <?php
-            -
                            if ( $user_sub['recurring'] != 'yes' ) {
-            -
                                if ( !empty( $user_sub['expire'] ) ) {
-            -
-            -
                                    $expire =  ( $user_sub['expire'] == 'unlimited' ) ? ucfirst( 'unlimited' ) : wpuf_date2mysql( $user_sub['expire'] );
-            -
-            -
                                    ?>
-            -
                                    <div class="wpuf-expire">
-            -
                                        <strong><?php echo _e( 'Expire date:', 'wpuf' ); ?></strong> <?php echo wpuf_get_date( $expire ); ?>
-            -
                                    </div>
-            -
                                    <?php
-            -
                                }
-            -
-            -
                            } ?>
-            -
                        </div>
-            -
                        <?php
-            -
                        if ( $user_sub['recurring'] == 'yes' ) {
-            -
                            $payment_page = get_permalink( wpuf_get_option( 'payment_page', 'wpuf_payment' ) );
-            -
                            ?>
-            -
                            <form action="" method="post">
-            -
                                <?php wp_nonce_field( '_wpnonce', 'wpuf_payment_cancel' ); ?>
-            -
                                <input type="hidden" name="user_id" value="<?php echo $userdata->ID; ?>">
-            -
                                <input type="hidden" name="action" value="wpuf_cancel_pay">
-            -
                                <input type="hidden" name="gateway" value="paypal">
-            -
                                <input type="submit" name="wpuf_payment_cancel_submit" value="cancel">
-            -
                            </form>
-            -
                            <?php $subscription_page = wpuf_get_option( 'subscription_page','wpuf_payment' ); ?>
-            -
                            <a href="<?php echo get_permalink( $subscription_page ); ?>"><? _e( 'Change', 'wpuf'); ?></a>
-            -
                            <?php
-            -
                        }
-            -
                    echo '</div>';
-            -
-            -
                    $content = ob_get_clean();
-            -
-            -
                    return apply_filters( 'wpuf_sub_info', $content, $userdata, $user_sub, $pack );
+                }
@@ -862,17 +710,19 @@ class WPUF_Subscription {
                     $cost_per_post = isset( $form_settings['pay_per_post_cost'] ) ? $form_settings['pay_per_post_cost'] : 0;
                     $defaults = array(
-            -
                        'include' => 'any',
                         'exclude' => '',
-            -
                        'order'   => 'ASC',
                         'orderby' => ''
                     );
                     $arranged = array();
                     $args     = wp_parse_args( $atts, $defaults );
-            -
                    if ( 'any' != $args['include'] ) {
-            -
                        $args['orderby'] = $args['post__in'];
+                    }
                     $packs = $this->get_subscriptions( $args );
@@ -921,14 +771,28 @@ class WPUF_Subscription {
                     if ( $packs ) {
                         echo '<ul class="wpuf_packs">';
-            -
                        foreach ($packs as $pack) {
-            -
                            $class = 'wpuf-pack-' . $pack->ID;
-            -
                            ?>
-            -
                            <li class="<?php echo $class; ?>">
-            -
                            <?php $this->pack_details( $pack, $details_meta, isset( $current_pack['pack_id'] ) ? $current_pack['pack_id'] : '' ); ?>
-            -
                            </li>
-            -
                            <?php
-            -
+                        }
                         echo '</ul>';
+                    }
@@ -1027,13 +891,12 @@ class WPUF_Subscription {
                  * Show a info message when posting if payment is enabled
                  */
                 function add_post_info( $form_id, $form_settings ) {
-            -
                    $subscription_disabled = isset( $form_settings['subscription_disabled'] ) ? $form_settings['subscription_disabled'] : '';
-            -
                    if ( $subscription_disabled == 'yes' ) {
-            -
                        $user_can_post = 'yes';
-            -
                    }
-            -
-            -
                    if ( self::has_user_error( $form_settings ) && !$subscription_disabled ) {
                         ?>
                         <div class="wpuf-info">
                             <?php
@@ -1077,11 +940,6 @@ class WPUF_Subscription {
                 function force_pack_notice( $text, $id, $form_settings ) {
-            -
                    $subscription_disabled = isset( $form_settings['subscription_disabled'] ) ? $form_settings['subscription_disabled'] : '';
-            -
                    if ( $subscription_disabled ) {
-            -
                        $text = '';
-            -
                    }
-            -
                     $form = new WPUF_Form( $id );
                     $force_pack = $form->is_enabled_force_pack();
@@ -1101,17 +959,10 @@ class WPUF_Subscription {
                     $force_pack   = $form->is_enabled_force_pack();
                     $pay_per_post = $form->is_enabled_pay_per_post();
                     $current_user = wpuf_get_user();
-            -
                    $subscription_disabled = isset( $form_settings['subscription_disabled'] ) ? $form_settings['subscription_disabled'] : '';
-            -
-            -
                    if ( $subscription_disabled == 'yes' ) {
-            -
                        return 'yes';
-            -
                    }
                     if ( is_user_logged_in() ) {
-            -
                        $is_user_postlock =  get_user_meta( get_current_user_id(), 'wpuf_postlock', true );
-            -
-            -
                        if ( $is_user_postlock == 'yes' ) {
                             return 'no';
                         } else {
                             if ( !$form->is_charging_enabled() ) {
@@ -1133,7 +984,7 @@ class WPUF_Subscription {
+                    }
                     if ( !is_user_logged_in() && $form_settings['guest_post'] == 'true' ) {
-            -
                        if ( $form->is_charging_enabled() && $subscription_disabled != 'yes' ) {
                             if ( $force_pack ) {
                                 return 'no';
+                            }
@@ -1159,57 +1010,10 @@ class WPUF_Subscription {
                  * @return bool
                  */
                 public static function has_user_error( $form_settings = null ) {
-            -
                    global $userdata;
-            -
-            -
                    $user_id = isset( $userdata->ID ) ? $userdata->ID : '';
-            -
                    // bail out if charging is not enabled
-            -
                    if ( wpuf_get_option( 'charge_posting', 'wpuf_payment' ) != 'yes' ) {
-            -
                        return false;
-            -
                    }
-            -
-            -
                    // check form if subscription is disabled
-            -
                    if ( isset( $form_settings['subscription_disabled'] ) && $form_settings['subscription_disabled'] == 'yes' ) {
-            -
                        return false;
-            -
                    }
-            -
-            -
                    $user_sub_meta  = self::get_user_pack( $user_id );
-            -
                    $form_post_type = isset( $form_settings['post_type'] ) ? $form_settings['post_type'] : 'post';
-            -
                    $post_count     = isset( $user_sub_meta['posts'][$form_post_type] ) ? $user_sub_meta['posts'][$form_post_type] : 0;
-            -
                    if ( isset( $user_sub_meta['recurring'] ) && $user_sub_meta['recurring'] == 'yes' ) {
-            -
                        // user has recurring subscription
-            -
                        if ( $post_count > 0 || $post_count == '-1' ) {
-            -
                            return false;
-            -
                        } else {
-            -
                            return true;
-            -
                        }
-            -
-            -
                    } else {
-            -
                        $expire = isset( $user_sub_meta['expire'] ) ? $user_sub_meta['expire'] : 0;
-            -
-            -
                        if ( strtolower( $expire ) == 'unlimited' || empty( $expire ) ) {
-            -
                            $expire_status = false;
-            -
                        } else if ( ( strtotime( date( 'Y-m-d', strtotime( $expire ) ) ) >= strtotime( date( 'Y-m-d', time() ) ) ) && ( $post_count > 0  || $post_count == '-1' ) ) {
-            -
                            $expire_status = false;
-            -
                        } else {
-            -
                            $expire_status = true;
-            -
                        }
-            -
-            -
-            -
-            -
                        if ( $post_count > 0 || $post_count == '-1' ) {
-            -
                            $post_count_status = false;
-            -
                        } else {
-            -
                            $post_count_status = true;
-            -
                        }
-            -
-            -
                        if ( $expire_status || $post_count_status ) {
-            -
                            return true;
-            -
                        }
-            -
                    }
-            -
-            -
                    return false;
+                }
                 /**
@@ -1222,17 +1026,9 @@ class WPUF_Subscription {
                  * @return boolean
                  */
                 public static function has_used_free_pack( $user_id, $pack_id ) {
-            -
                    $has_used = get_user_meta( $user_id, 'wpuf_fp_used', true );
-            -
-            -
                    if ( $has_used == '' ) {
-            -
                        return false;
-            -
                    }
-            -
                    if ( is_array( $has_used ) && isset( $has_used[$pack_id] ) ) {
-            -
                        return true;
-            -
                    }
-            -
-            -
                    return false;
+                }
                 /**
@@ -1243,12 +1039,10 @@ class WPUF_Subscription {
                  * @param int $user_id
                  * @param int $pack_id
                  */
-            -
                public static function add_used_free_pack( $user_id, $pack_id ) {
-            -
                    $has_used = get_user_meta( $user_id, 'wpuf_fp_used', true );
-            -
                    $has_used = is_array( $has_used ) ? $has_used : array();
-            -
                    $has_used[$pack_id] = $pack_id;
-            -
                    update_user_meta( $user_id, 'wpuf_fp_used', $has_used );
+                }
                 function packdropdown( $packs, $selected = '' ) {
@@ -1272,28 +1066,9 @@ class WPUF_Subscription {
                  * @param $form_vars
                  */
                 public function reset_user_subscription_data( $post_id, $form_id, $form_settings, $form_vars ) {
-            -
                    global $userdata;
-            -
-            -
                    //update_user_meta( 1, 'test_data', $user_wpuf_subscription_pack );
-            -
-            -
                    $sub_info  = self::get_user_pack( $userdata->ID );
-            -
                    $post_type = isset( $form_settings['post_type'] ) ? $form_settings['post_type'] : 'post';
-            -
                    $count     = isset( $sub_info['posts'][$post_type] ) ? intval( $sub_info['posts'][$post_type] ) : 0;
-            -
-            -
-            -
                    // decrease the post count, if not umlimited
-            -
                    $wpuf_post_status = get_post_meta( $post_id , 'wpuf_post_status' , true );
-            -
-            -
                    if ( $wpuf_post_status != 'published' && $wpuf_post_status != 'new_draft' ) {
-            -
-            -
                        if ( $count > 0 ) {
-            -
                            $sub_info['posts'][$post_type] = $count - 1;
-            -
                            $this->update_user_subscription_meta( $userdata->ID, $sub_info );
-            -
                        }
-            -
-            -
                        update_post_meta( $post_id , 'wpuf_post_status' , 'new_draft' );
-            -
                    }
+                }
@@ -1310,4 +1085,4 @@ class WPUF_Subscription {
                     return get_post_meta( $post_id, '_wpuf_payment_status', true);
+                }
-            -
            }


183	$billing_amount = ( $pack->meta_value['billing_amount'] >= 0 && !empty( $pack->meta_value['billing_amount'] ) ) ? $pack->meta_value['billing_amount'] : false;
184
185	if ( $billing_amount === false ) {
186	+ wpuf_get_user( $user_id )->subscription()->add_pack( $pack_id, null, false, 'free' );
187	+ wpuf_get_user( $user_id )->subscription()->add_free_pack( $pack_id );
188	} else {
189	$pay_page = intval( wpuf_get_option( 'payment_page', 'wpuf_payment' ) );
190	$redirect = add_query_arg( array( 'action' => 'wpuf_pay', 'type' => 'pack', 'pack_id' => (int) $pack_id ), get_permalink( $pay_page ) );

465	}
466
467	if ( $charging_enabled == 'yes' ) {



468	$postdata['post_status'] = 'pending';
469	}
470

479	* @param int $post_id
480	*/
481	function monitor_new_post( $post_id, $form_id, $form_settings ) {
482	+



483	global $wpdb, $userdata;
484
485	// bail out if charging is not enabled

605	} else if ( $info['pack_id'] ) {
606
607	$profile_id = isset( $info['profile_id'] ) ? $info['profile_id'] : null;
608	+ wpuf_get_user( $info['user_id'] )->subscription()->add_pack( $info['pack_id'], $profile_id, $recurring, $info['status'] );
609
610	}
611	}

619	* @param int $pack_id subscription pack id
620	*/
621	public function new_subscription( $user_id, $pack_id, $profile_id = null, $recurring, $status = null ) {
622	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user( $user_id )->subscription()->add_pack( $pack_id, $profile_id = null, $recurring, $status = null );' );























623
624	+ wpuf_get_user( $user_id )->subscription()->add_pack( $pack_id, $profile_id = null, $recurring, $status = null );





























625	}
626
627	+ /**
628	+ * update user meta
629	+ *
630	+ * if data = 0, means 'unlimited'
631	+ *
632	+ * @param int $user_id
633	+ * @param array $data
634	+ */
635	public static function update_user_subscription_meta( $user_id, $user_meta ) {
636	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user( $user_id )->subscription()->update_meta( $user_meta );' );
637
638	+ wpuf_get_user( $user_id )->subscription()->update_meta( $user_meta );
639	}
640
641	public static function post_by_orderid( $order_id ) {

696	* @global type $userdata
697	*/
698	function subscription_info() {
699	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user()->subscription()->pack_info( $form_id );' );
700
701	+ wpuf_get_user()->subscription()->pack_info( $form_id );








































































































702	}
703
704

710	$cost_per_post = isset( $form_settings['pay_per_post_cost'] ) ? $form_settings['pay_per_post_cost'] : 0;
711
712	$defaults = array(
713	+ 'include' => '',
714	'exclude' => '',
715	+ 'order' => '',
716	'orderby' => ''
717	);
718
719	$arranged = array();
720	$args = wp_parse_args( $atts, $defaults );
721
722	+ if ( $args['include'] != "" ) {
723	+ $pack_order = explode(',', $args['include']);
724	+ } else {
725	+ $args['order'] = isset( $args['order'] ) ? $args['order'] : 'ASC';
726	}
727
728	$packs = $this->get_subscriptions( $args );

771
772	if ( $packs ) {
773	echo '<ul class="wpuf_packs">';
774	+ if ( isset($args['include']) && $args['include'] != "" ) {
775	+ for ( $i = 0; $i < count( $pack_order ); $i++ ) {
776	+ foreach ($packs as $pack) {
777	+ if ( (int) $pack->ID == $pack_order[$i] ) {
778	+ $class = 'wpuf-pack-' . $pack->ID;
779	+ ?>
780	+ <li class="<?php echo $class; ?>">
781	+ <?php $this->pack_details( $pack, $details_meta, isset( $current_pack['pack_id'] ) ? $current_pack['pack_id'] : '' ); ?>
782	+ </li>
783	+ <?php
784	+ }
785	+ }
786	+ }
787	+ } else {
788	+ foreach ($packs as $pack) {
789	+ $class = 'wpuf-pack-' . $pack->ID;
790	+ ?>
791	+ <li class="<?php echo $class; ?>">
792	+ <?php $this->pack_details( $pack, $details_meta, isset( $current_pack['pack_id'] ) ? $current_pack['pack_id'] : '' ); ?>
793	+ </li>
794	+ <?php
795	+ }
796	}
797	echo '</ul>';
798	}

891	* Show a info message when posting if payment is enabled
892	*/
893	function add_post_info( $form_id, $form_settings ) {
894	+ $form = new WPUF_Form( $form_id );
895	+ $pay_per_post = $form->is_enabled_pay_per_post();
896	+ $pay_per_post_cost = (int) $form->get_pay_per_post_cost();
897	+ $force_pack = $form->is_enabled_force_pack();
898
899	+ if ( self::has_user_error( $form_settings ) \|\| ( $pay_per_post && !$force_pack ) ) {




900	?>
901	<div class="wpuf-info">
902	<?php

940
941	function force_pack_notice( $text, $id, $form_settings ) {
942





943	$form = new WPUF_Form( $id );
944
945	$force_pack = $form->is_enabled_force_pack();

959	$force_pack = $form->is_enabled_force_pack();
960	$pay_per_post = $form->is_enabled_pay_per_post();
961	$current_user = wpuf_get_user();





962
963	if ( is_user_logged_in() ) {
964
965	+ if ( wpuf_get_user()->post_locked() ) {


966	return 'no';
967	} else {
968	if ( !$form->is_charging_enabled() ) {

984	}
985
986	if ( !is_user_logged_in() && $form_settings['guest_post'] == 'true' ) {
987	+ if ( $form->is_charging_enabled() ) {
988	if ( $force_pack ) {
989	return 'no';
990	}

1010	* @return bool
1011	*/
1012	public static function has_user_error( $form_settings = null ) {
















1013
1014	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user()->subscription()->has_error( $form_settings = null );' );
1015
1016	+ wpuf_get_user()->subscription()->has_error( $form_settings = null );































1017	}
1018
1019	/**

1026	* @return boolean
1027	*/
1028	public static function has_used_free_pack( $user_id, $pack_id ) {
1029	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user( $user_id )->subscription()->used_free_pack( $pack_id );' );




1030
1031	+ wpuf_get_user( $user_id )->subscription()->used_free_pack( $pack_id );




1032	}
1033
1034	/**

1039	* @param int $user_id
1040	* @param int $pack_id
1041	*/
1042	+ public static function add_free_pack( $user_id, $pack_id ) {
1043	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user( $user_id )->subscription()->add_free_pack( $pack_id );' );

1044
1045	+ wpuf_get_user( $user_id )->subscription()->add_free_pack( $pack_id );

1046	}
1047
1048	function packdropdown( $packs, $selected = '' ) {

1066	* @param $form_vars
1067	*/
1068	public function reset_user_subscription_data( $post_id, $form_id, $form_settings, $form_vars ) {
1069	+ // _deprecated_function( __FUNCTION__, '2.6.0', 'wpuf_get_user()->subscription()->reset_subscription_data( $post_id, $form_id, $form_settings, $form_vars );' );
1070
1071	+ wpuf_get_user()->subscription()->reset_subscription_data( $post_id, $form_id, $form_settings, $form_vars );




















1072
1073	}
1074

1085	return get_post_meta( $post_id, '_wpuf_payment_status', true);
1086	}
1087
1088	+ }

includes/class-user-subscription.php CHANGED Viewed

@@ -116,7 +116,7 @@ class WPUF_User_Subscription {
                     if ( isset( $this->pack['posts'] ) && isset( $this->pack['posts'][ $post_type ] ) ) {
                         $count = (int) $this->pack['posts'][ $post_type ];
-            -
                        if ( $count > 0 ) {
                             return true;
+                        }
+                    }
@@ -135,6 +135,15 @@ class WPUF_User_Subscription {
                     return $pack_id == $this->current_pack_id();
+                }
                 /**
                  * Returns the current pack ID used by the user
+                 *
@@ -155,8 +164,63 @@ class WPUF_User_Subscription {
+                 *
                  * @param integer $pack_id
                  */
-            -
                public function add_pack( $pack_id ) {
+                }
                 /**
@@ -201,11 +265,198 @@ class WPUF_User_Subscription {
+                 *
                  * @param int $pack_id
                  */
-            -
                public function add_free_pack( $user_id, $pack_id ) {
                     $has_used = get_user_meta( $this->user->id, 'wpuf_fp_used', true );
                     $has_used = is_array( $has_used ) ? $has_used : array();
                     $has_used[$pack_id] = $pack_id;
-            -
                    update_user_meta( $user_id, 'wpuf_fp_used', $has_used );
+                }
+            }


116	if ( isset( $this->pack['posts'] ) && isset( $this->pack['posts'][ $post_type ] ) ) {
117	$count = (int) $this->pack['posts'][ $post_type ];
118
119	+ if ( $count > 0 \|\| $count === -1 ) {
120	return true;
121	}
122	}

135	return $pack_id == $this->current_pack_id();
136	}
137
138	+ /**
139	+ * update user meta
140	+ *
141	+ * @return string
142	+ */
143	+ public function update_meta( $user_meta, $key = '_wpuf_subscription_pack' ) {
144	+ update_user_meta( $this->user->id, $key, $user_meta );
145	+ }
146	+
147	/**
148	* Returns the current pack ID used by the user
149	*

164	*
165	* @param integer $pack_id
166	*/
167	+ public function add_pack( $pack_id, $profile_id = null, $recurring, $status = null ) {
168	+ global $wpdb;
169	+ $subscription = WPUF_Subscription::init()->get_subscription( $pack_id );
170	+ if ( $this->user->id && $subscription ) {
171	+
172	+ $user_meta = array(
173	+ 'pack_id' => $pack_id,
174	+ 'posts' => $subscription->meta_value['post_type_name'],
175	+ 'status' => $status
176	+ );
177	+
178	+ // $recurring = get_post_meta( $pack_id, '_recurring_pay', true );
179	+
180	+ if ( $recurring ) {
181	+ $totla_date = date( 'd-m-Y', strtotime('+' . $subscription->meta_value['billing_cycle_number'] . $subscription->meta_value['cycle_period'] . 's') );
182	+ $user_meta['expire'] = '';
183	+ $user_meta['profile_id'] = $profile_id;
184	+ $user_meta['recurring'] = 'yes';
185	+ } else {
186	+
187	+ $period_type = $subscription->meta_value['expiration_period'];
188	+ $period_number = $subscription->meta_value['expiration_number'];
189	+ $date = date( 'd-m-Y', strtotime('+' . $period_number . $period_type . 's') );
190	+ $expired = ( empty( $period_number ) \|\| ( $period_number == 0 ) ) ? 'unlimited' : wpuf_date2mysql( $date );
191	+ $user_meta['expire'] = $expired;
192	+ $user_meta['recurring'] = 'no';
193	+ }
194	+
195	+ $user_meta = apply_filters( 'wpuf_new_subscription', $user_meta, $this->user->id, $pack_id, $recurring );
196	+
197	+ if ( $subscription->_enable_post_expiration ) {
198	+ $user_meta['_enable_post_expiration'] = $subscription->_enable_post_expiration;
199	+ $user_meta['_post_expiration_time'] = $subscription->_post_expiration_time;
200	+ $user_meta['_expired_post_status'] = $subscription->_expired_post_status;
201	+ $user_meta['_enable_mail_after_expired'] = $subscription->_enable_mail_after_expired;
202	+ $user_meta['_post_expiration_message'] = $subscription->_post_expiration_message;
203	+ }
204
205	+ $this->update_meta( $user_meta );
206	+
207	+ $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "wpuf_transaction
208	+ WHERE user_id = %d AND pack_id = %d LIMIT 1", $this->user->id, $pack_id );
209	+
210	+ $result = $wpdb->get_row( $sql );
211	+ $table_data = array(
212	+ 'user_id' => $this->user->id,
213	+ 'name' => $this->user->display_name,
214	+ 'subscribtion_id' => $pack_id,
215	+ 'subscribtion_status' => $status,
216	+ 'gateway' => isset( $result->payment_type ) ? 'bank' : $result->payment_type,
217	+ 'transaction_id' => isset( $result->transaction_id ) ? 'NA' : $result->transaction_id,
218	+ 'starts_from' => date( 'd-m-Y' ),
219	+ 'expire' => $user_meta['expire'] == '' ? 'recurring' : $user_meta['expire'],
220	+ );
221	+
222	+ $wpdb->insert( $wpdb->prefix . 'wpuf_subscribers', $table_data );
223	+ }
224	}
225
226	/**

265	*
266	* @param int $pack_id
267	*/
268	+ public function add_free_pack( $pack_id ) {
269	$has_used = get_user_meta( $this->user->id, 'wpuf_fp_used', true );
270	$has_used = is_array( $has_used ) ? $has_used : array();
271
272	$has_used[$pack_id] = $pack_id;
273	+ update_meta( $has_used, 'wpuf_fp_used' );
274	+ }
275	+
276	+ public function pack_info( $form_id ) {
277	+
278	+ $form = new WPUF_Form( $form_id );
279	+ $payment_options = $form->is_charging_enabled();
280	+ if ( !$payment_options \|\| !is_user_logged_in() ) {
281	+ return;
282	+ }
283	+
284	+ ob_start();
285	+
286	+ if ( $this->current_pack_id() ) {
287	+ return;
288	+ }
289	+
290	+ $pack = WPUF_Subscription::get_subscription( $this->current_pack_id() );
291	+
292	+ $details_meta = WPUF_Subscription::init()->get_details_meta_value();
293	+
294	+ $billing_amount = ( intval( $pack->meta_value['billing_amount'] ) > 0 ) ? $details_meta['symbol'] . $pack->meta_value['billing_amount'] : __( 'Free', 'wpuf' );
295	+ if ( $pack->meta_value['recurring_pay'] == 'yes' ) {
296	+ $recurring_des = sprintf( 'For each %s %s', $pack->meta_value['billing_cycle_number'], $pack->meta_value['cycle_period'], $pack->meta_value['trial_duration_type'] );
297	+ $recurring_des .= !empty( $pack->meta_value['billing_limit'] ) ? sprintf( ', for %s installments', $pack->meta_value['billing_limit'] ) : '';
298	+ $recurring_des = $recurring_des;
299	+ } else {
300	+ $recurring_des = '';
301	+ }
302	+
303	+ ?>
304	+ <div class="wpuf_sub_info">
305	+ <h3><?php _e( 'Subscription Details', 'wpuf' ); ?></h3>
306	+ <div class="wpuf-text">
307	+ <div><strong><?php _e( 'Subcription Name: ','wpuf' ); ?></strong><?php echo $pack->post_title; ?></div>
308	+ <div>
309	+ <strong><?php _e( 'Package & billing details: ', 'wpuf'); ?></strong>
310	+
311	+ <div class="wpuf-pricing-wrap">
312	+ <div class="wpuf-sub-amount">
313	+ <?php echo $billing_amount; ?>
314	+ <?php echo $recurring_des; ?>
315	+ </div>
316	+ </div>
317	+
318	+ </div>
319	+ <div>
320	+ <strong><?php _e( 'Remaining post: ', 'wpuf'); ?></strong>
321	+ <?php
322	+ foreach ($this->pack['posts'] as $key => $value) {
323	+ $value = intval( $value );
324	+
325	+ if ( $value === 0 ) {
326	+ continue;
327	+ }
328	+
329	+ $post_type_obj = get_post_type_object( $key );
330	+ if ( ! $post_type_obj ) {
331	+ continue;
332	+ }
333	+ $value = ( $value == '-1' ) ? __( 'Unlimited', 'wpuf' ) : $value;
334	+ ?>
335	+ <div><?php echo $post_type_obj->labels->name . ': ' . $value; ?></div>
336	+ <?php
337	+ }
338	+ ?>
339	+ </div>
340	+ <?php
341	+ if ( $this->pack['recurring'] != 'yes' ) {
342	+ if ( !empty( $this->pack['expire'] ) ) {
343	+
344	+ $expire = ( $this->pack['expire'] == 'unlimited' ) ? ucfirst( 'unlimited' ) : wpuf_date2mysql( $this->pack['expire'] );
345	+
346	+ ?>
347	+ <div class="wpuf-expire">
348	+ <strong><?php echo _e( 'Expire date:', 'wpuf' ); ?></strong> <?php echo wpuf_get_date( $expire ); ?>
349	+ </div>
350	+ <?php
351	+ }
352	+
353	+ } ?>
354	+ </div>
355	+ <?php
356	+ if ( $this->pack['recurring'] == 'yes' ) {
357	+ $payment_page = get_permalink( wpuf_get_option( 'payment_page', 'wpuf_payment' ) );
358	+ ?>
359	+ <form action="" method="post">
360	+ <?php wp_nonce_field( '_wpnonce', 'wpuf_payment_cancel' ); ?>
361	+ <input type="hidden" name="user_id" value="<?php echo $this->user->id; ?>">
362	+ <input type="hidden" name="action" value="wpuf_cancel_pay">
363	+ <input type="hidden" name="gateway" value="paypal">
364	+ <input type="submit" name="wpuf_payment_cancel_submit" value="cancel">
365	+ </form>
366	+ <?php $subscription_page = wpuf_get_option( 'subscription_page','wpuf_payment' ); ?>
367	+ <a href="<?php echo get_permalink( $subscription_page ); ?>"><? _e( 'Change', 'wpuf'); ?></a>
368	+ <?php
369	+ }
370	+ echo '</div>';
371	+
372	+ $content = ob_get_clean();
373	+
374	+ return apply_filters( 'wpuf_sub_info', $content, $this->user, $this->pack, $pack );
375	+ }
376	+
377	+ /**
378	+ * Reset the post count of a subscription of a user
379	+ *
380	+ * @since 2.3.11
381	+ *
382	+ * @param $post_id
383	+ * @param $form_id
384	+ * @param $form_settings
385	+ * @param $form_vars
386	+ */
387	+ public function reset_subscription_data( $post_id, $form_id, $form_settings, $form_vars ) {
388	+
389	+ global $userdata;
390	+
391	+ $sub_info = $this->pack;
392	+ $post_type = isset( $form_settings['post_type'] ) ? $form_settings['post_type'] : 'post';
393	+ $count = isset( $sub_info['posts'][$post_type] ) ? intval( $sub_info['posts'][$post_type] ) : 0;
394	+
395	+
396	+ // decrease the post count, if not umlimited
397	+ $wpuf_post_status = get_post_meta( $post_id , 'wpuf_post_status' , true );
398	+
399	+ if ( $wpuf_post_status != 'published' && $wpuf_post_status != 'new_draft' ) {
400	+
401	+ if ( $count > 0 ) {
402	+ $sub_info['posts'][$post_type] = $count - 1;
403	+ $this->update_meta( $sub_info );
404	+ }
405	+
406	+ update_post_meta( $post_id , 'wpuf_post_status' , 'new_draft' );
407	+ }
408	+
409	+ }
410	+
411	+ /**
412	+ * Checks against the user, if he is valid for posting new post
413	+ *
414	+ * @global object $userdata
415	+ * @return bool
416	+ */
417	+ public function has_error( $form_settings = null ) {
418	+
419	+ if ( !$this->current_pack_id() ) {
420	+ return false;
421	+ }
422	+
423	+ $user_sub_meta = $this->pack;
424	+ $form_post_type = isset( $form_settings['post_type'] ) ? $form_settings['post_type'] : 'post';
425	+ $post_count = isset( $user_sub_meta['posts'][$form_post_type] ) ? $user_sub_meta['posts'][$form_post_type] : 0;
426	+
427	+ if ( isset( $user_sub_meta['recurring'] ) && $user_sub_meta['recurring'] == 'yes' ) {
428	+
429	+ // user has recurring subscription
430	+ if ( $post_count > 0 \|\| $post_count == '-1' ) {
431	+ return false;
432	+ } else {
433	+ return true;
434	+ }
435	+
436	+ } else {
437	+ $expire = isset( $user_sub_meta['expire'] ) ? $user_sub_meta['expire'] : 0;
438	+
439	+ if ( strtolower( $expire ) == 'unlimited' \|\| empty( $expire ) ) {
440	+ $expire_status = false;
441	+ } else if ( ( strtotime( date( 'Y-m-d', strtotime( $expire ) ) ) >= strtotime( date( 'Y-m-d', time() ) ) ) && ( $post_count > 0 \|\| $post_count == '-1' ) ) {
442	+ $expire_status = false;
443	+ } else {
444	+ $expire_status = true;
445	+ }
446	+
447	+
448	+
449	+ if ( $post_count > 0 \|\| $post_count == '-1' ) {
450	+ $post_count_status = false;
451	+ } else {
452	+ $post_count_status = true;
453	+ }
454	+
455	+ if ( $expire_status \|\| $post_count_status ) {
456	+ return true;
457	+ }
458	+ }
459	+
460	+ return false;
461	}
462	}

includes/upgrades/upgrade-2.1.9.php CHANGED Viewed

	@@ -76,7 +76,7 @@ function wpuf_upgrade_2_1_9_subscription() {
76	'post_type_name' => $post_type
77	);
78
79	- ~~WPUF_Subscription::init~~()->~~update_user_subscription_meta~~( $~~post_ID, $~~post );
80	}
81	}
82


76	'post_type_name' => $post_type
77	);
78
79	+ wpuf_get_user( $post_ID )->subscription()->update_meta( $post );
80	}
81	}
82

languages/wpuf.pot CHANGED Viewed

	@@ -2,10 +2,10 @@
2	# This file is distributed under the GPL2 or later.
3	msgid ""
4	msgstr ""
5	- "Project-Id-Version: WP User Frontend 2.6.0\n"
6	"Report-Msgid-Bugs-To: "
7	"https://wedevs.com/support/forum/plugin-support/wp-user-frontend/\n"
8	- "POT-Creation-Date: 2017-11-06 13:35:24+00:00\n"
9	"MIME-Version: 1.0\n"
10	"Content-Type: text/plain; charset=utf-8\n"
11	"Content-Transfer-Encoding: 8bit\n"
	@@ -110,9 +110,9 @@ msgid "Subscription pack draft updated."
110	msgstr ""
111
112	#: admin/class-admin-subscription.php:161
113	- #: admin/class-admin-subscription.php:~~493~~ class/frontend-account.php:~~135~~
114	- #: class/subscription.php:~~773~~ class/subscription.php:~~976~~
115	- #: class/subscription.php:~~989~~
116	msgid "Free"
117	msgstr ""
118
	@@ -232,7 +232,7 @@ msgid "Enable Post Expiration"
232	msgstr ""
233
234	#: admin/class-admin-subscription.php:375
235	- #: admin/class-admin-subscription.php:~~572~~ includes/free/form-element.php:65
236	msgid "Post Expiration Time"
237	msgstr ""
238
	@@ -256,63 +256,67 @@ msgstr ""
256	msgid "Year(s)"
257	msgstr ""
258
259	- #: admin/class-admin-subscription.php:~~485~~ includes/free/edit-profile.php:281
260	msgid "WPUF Subscription"
261	msgstr ""
262
263	- #: admin/class-admin-subscription.php:~~505 class/subscription.php:784~~

264	#: templates/dashboard/subscription.php:2
265	msgid "Subscription Details"
266	msgstr ""
267
268	- #: admin/class-admin-subscription.php:~~509~~
269	msgid "This user is using recurring subscription pack"
270	msgstr ""
271
272	- #: admin/class-admin-subscription.php:~~514 class/subscription.php:786~~

273	#: templates/dashboard/subscription.php:4
274	msgid "Subcription Name: "
275	msgstr ""
276
277	- #: admin/class-admin-subscription.php:~~516~~
278	msgid "Package billing details: "
279	msgstr ""
280
281	- #: admin/class-admin-subscription.php:~~525 class/subscription.php:799~~

282	#: templates/dashboard/subscription.php:10
283	msgid "Remaining post: "
284	msgstr ""
285
286	- #: admin/class-admin-subscription.php:~~547 class/subscription.php:827~~

287	#: templates/dashboard/subscription.php:41
288	msgid "Expire date:"
289	msgstr ""
290
291	- #: admin/class-admin-subscription.php:~~561~~
292	msgid "Post Expiration Enabled"
293	msgstr ""
294
295	- #: admin/class-admin-subscription.php:~~601~~
296	msgid "Assign Package"
297	msgstr ""
298
299	- #: admin/class-admin-subscription.php:~~604~~
300	msgid "Show Package"
301	msgstr ""
302
303	- #: admin/class-admin-subscription.php:~~607~~ includes/free/edit-profile.php:285
304	msgid "Pack:"
305	msgstr ""
306
307	- #: admin/class-admin-subscription.php:~~610~~
308	msgid "--Select--"
309	msgstr ""
310
311	- #: admin/class-admin-subscription.php:~~619~~
312	msgid "Delete Package"
313	msgstr ""
314
315	- #: admin/class-admin-subscription.php:~~667~~
316	msgid "Learn more about <a href=\"%s\" target=\"_blank\">Subscription</a>"
317	msgstr ""
318
	@@ -564,7 +568,7 @@ msgid "OK"
564	msgstr ""
565
566	#: admin/form-builder/class-wpuf-admin-form-builder.php:325
567	- #: class/payment.php:168 class/subscription.php:~~917~~
568	#: includes/class-list-table-subscribers.php:156
569	#: templates/dashboard/subscription.php:62
570	msgid "Cancel"
	@@ -1304,67 +1308,67 @@ msgstr ""
1304	msgid "Where the labels of the form should display"
1305	msgstr ""
1306
1307	- #: admin/html/form-settings-payment.php:21
1308	msgid "Payment Options"
1309	msgstr ""
1310
1311	- #: admin/html/form-settings-payment.php:26
1312	msgid "Enable Payments"
1313	msgstr ""
1314
1315	- #: admin/html/form-settings-payment.php:28
1316	msgid "Check to enable Payments for this form."
1317	msgstr ""
1318
1319	- #: admin/html/form-settings-payment.php:33
1320	msgid "Force Pack"
1321	msgstr ""
1322
1323	- #: admin/html/form-settings-payment.php:38
1324	msgid "Force subscription pack"
1325	msgstr ""
1326
1327	- #: admin/html/form-settings-payment.php:40
1328	msgid "Force users to purchase and use subscription pack."
1329	msgstr ""
1330
1331	- #: admin/html/form-settings-payment.php:45
1332	msgid "Fallback to pay per post"
1333	msgstr ""
1334
1335	- #: admin/html/form-settings-payment.php:50
1336	msgid "Fallback pay per post charging"
1337	msgstr ""
1338
1339	- #: admin/html/form-settings-payment.php:52
1340	msgid "Fallback to pay per post charging if pack limit exceeds"
1341	msgstr ""
1342
1343	- #: admin/html/form-settings-payment.php:57
1344	msgid "Fallback cost"
1345	msgstr ""
1346
1347	- #: admin/html/form-settings-payment.php:62
1348	msgid "Cost of pay per post after a subscription pack limit is reached."
1349	msgstr ""
1350
1351	- #: admin/html/form-settings-payment.php:67
1352	msgid "Pay per Post"
1353	msgstr ""
1354
1355	- #: admin/html/form-settings-payment.php:72
1356	msgid "Enable Pay per Post"
1357	msgstr ""
1358
1359	- #: admin/html/form-settings-payment.php:74
1360	msgid "Charge users for posting"
1361	msgstr ""
1362
1363	- #: admin/html/form-settings-payment.php:79
1364	msgid "Cost Settings"
1365	msgstr ""
1366
1367	- #: admin/html/form-settings-payment.php:84
1368	msgid "Amount to be charged per post"
1369	msgstr ""
1370
	@@ -2179,111 +2183,111 @@ msgstr ""
2179	msgid "Registration time redirect to subscription page"
2180	msgstr ""
2181
2182	- #: admin/settings-options.php:~~292~~
2183	msgid "Currency"
2184	msgstr ""
2185
2186	- #: admin/settings-options.php:~~299~~
2187	msgid "Currency Position"
2188	msgstr ""
2189
2190	- #: admin/settings-options.php:~~303~~
2191	msgid "Left"
2192	msgstr ""
2193
2194	- #: admin/settings-options.php:~~304~~
2195	msgid "Right"
2196	msgstr ""
2197
2198	- #: admin/settings-options.php:~~305~~
2199	msgid "Left with space"
2200	msgstr ""
2201
2202	- #: admin/settings-options.php:~~306~~
2203	msgid "Right with space"
2204	msgstr ""
2205
2206	- #: admin/settings-options.php:~~311~~
2207	msgid "Thousand Separator"
2208	msgstr ""
2209
2210	- #: admin/settings-options.php:~~312~~
2211	msgid "This sets the thousand separator of displayed prices."
2212	msgstr ""
2213
2214	- #: admin/settings-options.php:~~320~~
2215	msgid "Decimal Separator"
2216	msgstr ""
2217
2218	- #: admin/settings-options.php:~~321~~
2219	msgid "This sets the decimal separator of displayed prices."
2220	msgstr ""
2221
2222	- #: admin/settings-options.php:~~328~~
2223	msgid "Number of Decimals"
2224	msgstr ""
2225
2226	- #: admin/settings-options.php:~~329~~
2227	msgid "This sets the number of decimal points shown in displayed prices."
2228	msgstr ""
2229
2230	- #: admin/settings-options.php:~~339~~
2231	msgid "Enable demo/sandbox mode"
2232	msgstr ""
2233
2234	- #: admin/settings-options.php:~~340~~
2235	msgid "When sandbox mode is active, all payment gateway will be used in demo mode"
2236	msgstr ""
2237
2238	- #: admin/settings-options.php:~~346~~
2239	msgid "Payment Page"
2240	msgstr ""
2241
2242	- #: admin/settings-options.php:~~347~~
2243	msgid "This page will be used to process payment options"
2244	msgstr ""
2245
2246	- #: admin/settings-options.php:~~353~~
2247	msgid "Payment Success Page"
2248	msgstr ""
2249
2250	- #: admin/settings-options.php:~~354~~ lib/gateway/bank.php:37
2251	msgid "After payment users will be redirected here"
2252	msgstr ""
2253
2254	- #: admin/settings-options.php:~~360~~
2255	msgid "Payment Gateways"
2256	msgstr ""
2257
2258	- #: admin/settings-options.php:~~361~~
2259	msgid "Active payment gateways"
2260	msgstr ""
2261
2262	- #: admin/settings-options.php:~~369~~
2263	msgid "Guest Email Subject"
2264	msgstr ""
2265
2266	- #: admin/settings-options.php:~~370~~
2267	msgid "This sets the subject of the emails sent to guest users"
2268	msgstr ""
2269
2270	- #: admin/settings-options.php:~~376~~
2271	msgid "Guest Email Body"
2272	msgstr ""
2273
2274	- #: admin/settings-options.php:~~377~~
2275	msgid ""
2276	"This sets the body of the emails sent to guest users. Please DON'T edit the "
2277	"'{activation_link}' part"
2278	msgstr ""
2279
2280	- #: admin/settings-options.php:~~400~~
2281	msgid ""
2282	"Select profile/registration forms for user roles. These forms will be used "
2283	"to populate extra edit profile fields in backend."
2284	msgstr ""
2285
2286	- #: admin/settings-options.php:~~411~~
2287	msgid " - select - "
2288	msgstr ""
2289
	@@ -2404,55 +2408,55 @@ msgstr ""
2404	msgid "Word limit reached"
2405	msgstr ""
2406
2407	- #: class/frontend-account.php:~~124~~
2408	msgid "<p>You've not subscribed any package yet.</p>"
2409	msgstr ""
2410
2411	- #: class/frontend-account.php:~~126~~
2412	msgid "<p>You've subscribed to the following package.</p>"
2413	msgstr ""
2414
2415	- #: class/frontend-account.php:~~201~~ class/subscription.php:75
2416	msgid "Nonce failure"
2417	msgstr ""
2418
2419	- #: class/frontend-account.php:~~215~~
2420	msgid "First Name is a required field."
2421	msgstr ""
2422
2423	- #: class/frontend-account.php:~~219~~
2424	msgid "Last Name is a required field."
2425	msgstr ""
2426
2427	- #: class/frontend-account.php:~~223~~
2428	msgid "Email is a required field."
2429	msgstr ""
2430
2431	- #: class/frontend-account.php:~~234~~
2432	msgid "Please provide a valid email address."
2433	msgstr ""
2434
2435	- #: class/frontend-account.php:~~236~~
2436	msgid "This email address is already registered."
2437	msgstr ""
2438
2439	- #: class/frontend-account.php:~~242~~
2440	msgid "Please fill out all password fields."
2441	msgstr ""
2442
2443	- #: class/frontend-account.php:~~245~~
2444	msgid "Please enter your current password."
2445	msgstr ""
2446
2447	- #: class/frontend-account.php:~~248~~
2448	msgid "Please re-enter your password."
2449	msgstr ""
2450
2451	- #: class/frontend-account.php:~~251~~
2452	msgid "New passwords do not match."
2453	msgstr ""
2454
2455	- #: class/frontend-account.php:~~254~~ class/frontend-account.php:~~265~~
2456	msgid "Your current password is incorrect."
2457	msgstr ""
2458
	@@ -2472,44 +2476,44 @@ msgstr ""
2472	msgid "You are not the post author. Cheeting huh!"
2473	msgstr ""
2474
2475	- #: class/frontend-form-post.php:64 class/frontend-form-post.php:~~125~~
2476	msgid "Sorry. Guest Posting is not enabled for this form."
2477	msgstr ""
2478
2479	- #: class/frontend-form-post.php:85 class/frontend-form-post.php:~~120~~
2480	- #: class/frontend-form-post.php:~~127~~
2481	msgid "Payment type not selected for this form. Please contact admin."
2482	msgstr ""
2483
2484	- #: class/frontend-form-post.php:~~177~~
2485	msgid "You are not logged in"
2486	msgstr ""
2487
2488	- #: class/frontend-form-post.php:~~185~~ class/frontend-form-post.php:~~196~~
2489	msgid "Invalid post"
2490	msgstr ""
2491
2492	- #: class/frontend-form-post.php:~~190~~
2493	msgid "Post Editing is disabled"
2494	msgstr ""
2495
2496	- #: class/frontend-form-post.php:~~201~~
2497	msgid "You are not allowed to edit"
2498	msgstr ""
2499
2500	- #: class/frontend-form-post.php:~~213~~
2501	msgid "I don't know how to edit this post, I don't have the form ID"
2502	msgstr ""
2503
2504	- #: class/frontend-form-post.php:~~219~~
2505	msgid "You can't edit a post while in pending mode."
2506	msgstr ""
2507
2508	- #: class/frontend-form-post.php:~~289~~
2509	msgid "Invalid email address."
2510	msgstr ""
2511
2512	- #: class/frontend-form-post.php:~~298~~
2513	msgid ""
2514	"You already have an account in our site. Please login to continue.\n"
2515	"\n"
	@@ -2518,11 +2522,11 @@ msgid ""
2518	"Click 'Cancel' to stay at this page."
2519	msgstr ""
2520
2521	- #: class/frontend-form-post.php:~~703~~
2522	msgid "Something went wrong"
2523	msgstr ""
2524
2525	- #: class/frontend-form-post.php:~~1060~~
2526	msgid "Email successfully verified. Please Login."
2527	msgstr ""
2528
	@@ -2668,55 +2672,47 @@ msgstr ""
2668	msgid "Billing Details"
2669	msgstr ""
2670
2671	- #: class/subscription.php:~~788 templates/dashboard/subscription.php:6~~
2672	- msgid "Package & billing details: "
2673	- msgstr ""
2674	-
2675	- #: class/subscription.php:812 templates/dashboard/subscription.php:24
2676	- msgid "Unlimited"
2677	- msgstr ""
2678	-
2679	- #: class/subscription.php:885
2680	msgid "Payment is complete"
2681	msgstr ""
2682
2683	- #: class/subscription.php:~~885~~
2684	msgid "Congratulations, your payment has been completed!"
2685	msgstr ""
2686
2687	- #: class/subscription.php:~~889~~ class/subscription.php:~~893~~
2688	msgid "Please buy a subscription pack to post"
2689	msgstr ""
2690
2691	- #: class/subscription.php:~~907~~
2692	msgid "<p><i>You have a subscription pack activated. </i></p>"
2693	msgstr ""
2694
2695	- #: class/subscription.php:~~911~~
2696	msgid "<p><i>To cancel the pack, press the following cancel button</i></p>"
2697	msgstr ""
2698
2699	- #: class/subscription.php:~~957~~
2700	msgid "Every"
2701	msgstr ""
2702
2703	- #: class/subscription.php:~~961~~
2704	msgid "One time payment"
2705	msgstr ""
2706
2707	- #: class/subscription.php:~~973~~
2708	msgid "Sign Up"
2709	msgstr ""
2710
2711	- #: class/subscription.php:~~978~~
2712	msgid "Buy Now"
2713	msgstr ""
2714
2715	- #: class/subscription.php:~~1042~~
2716	msgid "There is a <strong>%s</strong> charge to add a new post."
2717	msgstr ""
2718
2719	- #: class/subscription.php:~~1092~~
2720	msgid "You must <a href=\"%s\">purchase a pack</a> before posting"
2721	msgstr ""
2722
	@@ -2827,6 +2823,16 @@ msgstr ""
2827	msgid "The subscription has been expired."
2828	msgstr ""
2829










2830	#: includes/free/admin/form-builder/class-wpuf-form-builder-field-settings-free.php:46
2831	#: includes/free/form-element.php:471
2832	msgid "Conditional Logic"
	@@ -3475,54 +3481,26 @@ msgstr ""
3475	msgid "Subscription %s at %s"
3476	msgstr ""
3477
3478	- #: lib/gateway/paypal.php:92
3479	msgid "PayPal Email"
3480	msgstr ""
3481
3482	- #: lib/gateway/paypal.php:97
3483	msgid "PayPal Instruction"
3484	msgstr ""
3485
3486	- #: lib/gateway/paypal.php:~~104~~
3487	msgid "PayPal API username"
3488	msgstr ""
3489
3490	- #: lib/gateway/paypal.php:~~108~~
3491	msgid "PayPal API password"
3492	msgstr ""
3493
3494	- #: lib/gateway/paypal.php:~~112~~
3495	msgid "PayPal API signature"
3496	msgstr ""
3497
3498	- #: templates/dashboard/billing-address.php:38
3499	- msgid "Address Line 1 "
3500	- msgstr ""
3501	-
3502	- #: templates/dashboard/billing-address.php:45
3503	- msgid "Address Line 2 "
3504	- msgstr ""
3505	-
3506	- #: templates/dashboard/billing-address.php:52
3507	- msgid "City"
3508	- msgstr ""
3509	-
3510	- #: templates/dashboard/billing-address.php:59
3511	- msgid "State "
3512	- msgstr ""
3513	-
3514	- #: templates/dashboard/billing-address.php:69
3515	- msgid "Zip Code "
3516	- msgstr ""
3517	-
3518	- #: templates/dashboard/billing-address.php:74
3519	- msgid "Country "
3520	- msgstr ""
3521	-
3522	- #: templates/dashboard/billing-address.php:98
3523	- msgid "Update Billing Address"
3524	- msgstr ""
3525	-
3526	#: templates/dashboard/dashboard.php:5
3527	msgid "Hello %1$s, (not %1$s? <a href=\"%2$s\">Sign out</a>)"
3528	msgstr ""
	@@ -3718,207 +3696,207 @@ msgstr ""
3718	msgid "Edit Profile"
3719	msgstr ""
3720
3721	- #: wpuf-functions.php:~~1533~~
3722	msgid "United Arab Emirates Dirham"
3723	msgstr ""
3724
3725	- #: wpuf-functions.php:~~1534~~
3726	msgid "Australian Dollars"
3727	msgstr ""
3728
3729	- #: wpuf-functions.php:~~1535~~
3730	msgid "Argentine Peso"
3731	msgstr ""
3732
3733	- #: wpuf-functions.php:~~1536~~
3734	msgid "Bangladeshi Taka"
3735	msgstr ""
3736
3737	- #: wpuf-functions.php:~~1537~~
3738	msgid "Brazilian Real"
3739	msgstr ""
3740
3741	- #: wpuf-functions.php:~~1538~~
3742	msgid "Bulgarian Lev"
3743	msgstr ""
3744
3745	- #: wpuf-functions.php:~~1539~~
3746	msgid "Canadian Dollars"
3747	msgstr ""
3748
3749	- #: wpuf-functions.php:~~1540~~
3750	msgid "Chilean Peso"
3751	msgstr ""
3752
3753	- #: wpuf-functions.php:~~1541~~
3754	msgid "Chinese Yuan"
3755	msgstr ""
3756
3757	- #: wpuf-functions.php:~~1542~~
3758	msgid "Colombian Peso"
3759	msgstr ""
3760
3761	- #: wpuf-functions.php:~~1543~~
3762	msgid "Czech Koruna"
3763	msgstr ""
3764
3765	- #: wpuf-functions.php:~~1544~~
3766	msgid "Danish Krone"
3767	msgstr ""
3768
3769	- #: wpuf-functions.php:~~1545~~
3770	msgid "Dominican Peso"
3771	msgstr ""
3772
3773	- #: wpuf-functions.php:~~1546~~
3774	msgid "Algerian Dinar"
3775	msgstr ""
3776
3777	- #: wpuf-functions.php:~~1547~~
3778	msgid "Euros"
3779	msgstr ""
3780
3781	- #: wpuf-functions.php:~~1548~~
3782	msgid "Hong Kong Dollar"
3783	msgstr ""
3784
3785	- #: wpuf-functions.php:~~1549~~
3786	msgid "Croatia kuna"
3787	msgstr ""
3788
3789	- #: wpuf-functions.php:~~1550~~
3790	msgid "Hungarian Forint"
3791	msgstr ""
3792
3793	- #: wpuf-functions.php:~~1551~~
3794	msgid "Icelandic krona"
3795	msgstr ""
3796
3797	- #: wpuf-functions.php:~~1552~~
3798	msgid "Indonesia Rupiah"
3799	msgstr ""
3800
3801	- #: wpuf-functions.php:~~1553~~
3802	msgid "Indian Rupee"
3803	msgstr ""
3804
3805	- #: wpuf-functions.php:~~1554~~
3806	msgid "Nepali Rupee"
3807	msgstr ""
3808
3809	- #: wpuf-functions.php:~~1555~~
3810	msgid "Israeli Shekel"
3811	msgstr ""
3812
3813	- #: wpuf-functions.php:~~1556~~
3814	msgid "Japanese Yen"
3815	msgstr ""
3816
3817	- #: wpuf-functions.php:~~1557~~
3818	msgid "Lao Kip"
3819	msgstr ""
3820
3821	- #: wpuf-functions.php:~~1558~~
3822	msgid "South Korean Won"
3823	msgstr ""
3824
3825	- #: wpuf-functions.php:~~1559~~
3826	msgid "Malaysian Ringgits"
3827	msgstr ""
3828
3829	- #: wpuf-functions.php:~~1560~~
3830	msgid "Mexican Peso"
3831	msgstr ""
3832
3833	- #: wpuf-functions.php:~~1561~~
3834	msgid "Nigerian Naira"
3835	msgstr ""
3836
3837	- #: wpuf-functions.php:~~1562~~
3838	msgid "Norwegian Krone"
3839	msgstr ""
3840
3841	- #: wpuf-functions.php:~~1563~~
3842	msgid "New Zealand Dollar"
3843	msgstr ""
3844
3845	- #: wpuf-functions.php:~~1564~~
3846	msgid "Omani Rial"
3847	msgstr ""
3848
3849	- #: wpuf-functions.php:~~1565~~
3850	msgid "Iranian Rial"
3851	msgstr ""
3852
3853	- #: wpuf-functions.php:~~1566~~
3854	msgid "Pakistani Rupee"
3855	msgstr ""
3856
3857	- #: wpuf-functions.php:~~1567~~
3858	msgid "Paraguayan Guaraní"
3859	msgstr ""
3860
3861	- #: wpuf-functions.php:~~1568~~
3862	msgid "Philippine Pesos"
3863	msgstr ""
3864
3865	- #: wpuf-functions.php:~~1569~~
3866	msgid "Polish Zloty"
3867	msgstr ""
3868
3869	- #: wpuf-functions.php:~~1570~~
3870	msgid "Pounds Sterling"
3871	msgstr ""
3872
3873	- #: wpuf-functions.php:~~1571~~
3874	msgid "Romanian Leu"
3875	msgstr ""
3876
3877	- #: wpuf-functions.php:~~1572~~
3878	msgid "Russian Ruble"
3879	msgstr ""
3880
3881	- #: wpuf-functions.php:~~1573~~
3882	msgid "Saudi Riyal"
3883	msgstr ""
3884
3885	- #: wpuf-functions.php:~~1574~~
3886	msgid "Singapore Dollar"
3887	msgstr ""
3888
3889	- #: wpuf-functions.php:~~1575~~
3890	msgid "South African rand"
3891	msgstr ""
3892
3893	- #: wpuf-functions.php:~~1576~~
3894	msgid "Swedish Krona"
3895	msgstr ""
3896
3897	- #: wpuf-functions.php:~~1577~~
3898	msgid "Swiss Franc"
3899	msgstr ""
3900
3901	- #: wpuf-functions.php:~~1578~~
3902	msgid "Taiwan New Dollars"
3903	msgstr ""
3904
3905	- #: wpuf-functions.php:~~1579~~
3906	msgid "Thai Baht"
3907	msgstr ""
3908
3909	- #: wpuf-functions.php:~~1580~~
3910	msgid "Turkish Lira"
3911	msgstr ""
3912
3913	- #: wpuf-functions.php:~~1581~~
3914	msgid "US Dollar"
3915	msgstr ""
3916
3917	- #: wpuf-functions.php:~~1582~~
3918	msgid "Vietnamese Dong"
3919	msgstr ""
3920
3921	- #: wpuf-functions.php:~~1583~~
3922	msgid "Egyptian Pound"
3923	msgstr ""
3924


2	# This file is distributed under the GPL2 or later.
3	msgid ""
4	msgstr ""
5	+ "Project-Id-Version: WP User Frontend 2.6.1\n"
6	"Report-Msgid-Bugs-To: "
7	"https://wedevs.com/support/forum/plugin-support/wp-user-frontend/\n"
8	+ "POT-Creation-Date: 2017-11-08 12:34:23+00:00\n"
9	"MIME-Version: 1.0\n"
10	"Content-Type: text/plain; charset=utf-8\n"
11	"Content-Transfer-Encoding: 8bit\n"

110	msgstr ""
111
112	#: admin/class-admin-subscription.php:161
113	+ #: admin/class-admin-subscription.php:494 class/frontend-account.php:134
114	+ #: class/subscription.php:840 class/subscription.php:853
115	+ #: includes/class-user-subscription.php:294
116	msgid "Free"
117	msgstr ""
118

232	msgstr ""
233
234	#: admin/class-admin-subscription.php:375
235	+ #: admin/class-admin-subscription.php:573 includes/free/form-element.php:65
236	msgid "Post Expiration Time"
237	msgstr ""
238

256	msgid "Year(s)"
257	msgstr ""
258
259	+ #: admin/class-admin-subscription.php:486 includes/free/edit-profile.php:281
260	msgid "WPUF Subscription"
261	msgstr ""
262
263	+ #: admin/class-admin-subscription.php:506
264	+ #: includes/class-user-subscription.php:305
265	#: templates/dashboard/subscription.php:2
266	msgid "Subscription Details"
267	msgstr ""
268
269	+ #: admin/class-admin-subscription.php:510
270	msgid "This user is using recurring subscription pack"
271	msgstr ""
272
273	+ #: admin/class-admin-subscription.php:515
274	+ #: includes/class-user-subscription.php:307
275	#: templates/dashboard/subscription.php:4
276	msgid "Subcription Name: "
277	msgstr ""
278
279	+ #: admin/class-admin-subscription.php:517
280	msgid "Package billing details: "
281	msgstr ""
282
283	+ #: admin/class-admin-subscription.php:526
284	+ #: includes/class-user-subscription.php:320
285	#: templates/dashboard/subscription.php:10
286	msgid "Remaining post: "
287	msgstr ""
288
289	+ #: admin/class-admin-subscription.php:548
290	+ #: includes/class-user-subscription.php:348
291	#: templates/dashboard/subscription.php:41
292	msgid "Expire date:"
293	msgstr ""
294
295	+ #: admin/class-admin-subscription.php:562
296	msgid "Post Expiration Enabled"
297	msgstr ""
298
299	+ #: admin/class-admin-subscription.php:602
300	msgid "Assign Package"
301	msgstr ""
302
303	+ #: admin/class-admin-subscription.php:605
304	msgid "Show Package"
305	msgstr ""
306
307	+ #: admin/class-admin-subscription.php:608 includes/free/edit-profile.php:285
308	msgid "Pack:"
309	msgstr ""
310
311	+ #: admin/class-admin-subscription.php:611
312	msgid "--Select--"
313	msgstr ""
314
315	+ #: admin/class-admin-subscription.php:620
316	msgid "Delete Package"
317	msgstr ""
318
319	+ #: admin/class-admin-subscription.php:668
320	msgid "Learn more about <a href=\"%s\" target=\"_blank\">Subscription</a>"
321	msgstr ""
322

568	msgstr ""
569
570	#: admin/form-builder/class-wpuf-admin-form-builder.php:325
571	+ #: class/payment.php:168 class/subscription.php:767
572	#: includes/class-list-table-subscribers.php:156
573	#: templates/dashboard/subscription.php:62
574	msgid "Cancel"

1308	msgid "Where the labels of the form should display"
1309	msgstr ""
1310
1311	+ #: admin/html/form-settings-payment.php:20
1312	msgid "Payment Options"
1313	msgstr ""
1314
1315	+ #: admin/html/form-settings-payment.php:25
1316	msgid "Enable Payments"
1317	msgstr ""
1318
1319	+ #: admin/html/form-settings-payment.php:27
1320	msgid "Check to enable Payments for this form."
1321	msgstr ""
1322
1323	+ #: admin/html/form-settings-payment.php:32
1324	msgid "Force Pack"
1325	msgstr ""
1326
1327	+ #: admin/html/form-settings-payment.php:37
1328	msgid "Force subscription pack"
1329	msgstr ""
1330
1331	+ #: admin/html/form-settings-payment.php:39
1332	msgid "Force users to purchase and use subscription pack."
1333	msgstr ""
1334
1335	+ #: admin/html/form-settings-payment.php:44
1336	msgid "Fallback to pay per post"
1337	msgstr ""
1338
1339	+ #: admin/html/form-settings-payment.php:49
1340	msgid "Fallback pay per post charging"
1341	msgstr ""
1342
1343	+ #: admin/html/form-settings-payment.php:51
1344	msgid "Fallback to pay per post charging if pack limit exceeds"
1345	msgstr ""
1346
1347	+ #: admin/html/form-settings-payment.php:56
1348	msgid "Fallback cost"
1349	msgstr ""
1350
1351	+ #: admin/html/form-settings-payment.php:61
1352	msgid "Cost of pay per post after a subscription pack limit is reached."
1353	msgstr ""
1354
1355	+ #: admin/html/form-settings-payment.php:66
1356	msgid "Pay per Post"
1357	msgstr ""
1358
1359	+ #: admin/html/form-settings-payment.php:71
1360	msgid "Enable Pay per Post"
1361	msgstr ""
1362
1363	+ #: admin/html/form-settings-payment.php:73
1364	msgid "Charge users for posting"
1365	msgstr ""
1366
1367	+ #: admin/html/form-settings-payment.php:78
1368	msgid "Cost Settings"
1369	msgstr ""
1370
1371	+ #: admin/html/form-settings-payment.php:83
1372	msgid "Amount to be charged per post"
1373	msgstr ""
1374

2183	msgid "Registration time redirect to subscription page"
2184	msgstr ""
2185
2186	+ #: admin/settings-options.php:281
2187	msgid "Currency"
2188	msgstr ""
2189
2190	+ #: admin/settings-options.php:288
2191	msgid "Currency Position"
2192	msgstr ""
2193
2194	+ #: admin/settings-options.php:292
2195	msgid "Left"
2196	msgstr ""
2197
2198	+ #: admin/settings-options.php:293
2199	msgid "Right"
2200	msgstr ""
2201
2202	+ #: admin/settings-options.php:294
2203	msgid "Left with space"
2204	msgstr ""
2205
2206	+ #: admin/settings-options.php:295
2207	msgid "Right with space"
2208	msgstr ""
2209
2210	+ #: admin/settings-options.php:300
2211	msgid "Thousand Separator"
2212	msgstr ""
2213
2214	+ #: admin/settings-options.php:301
2215	msgid "This sets the thousand separator of displayed prices."
2216	msgstr ""
2217
2218	+ #: admin/settings-options.php:309
2219	msgid "Decimal Separator"
2220	msgstr ""
2221
2222	+ #: admin/settings-options.php:310
2223	msgid "This sets the decimal separator of displayed prices."
2224	msgstr ""
2225
2226	+ #: admin/settings-options.php:317
2227	msgid "Number of Decimals"
2228	msgstr ""
2229
2230	+ #: admin/settings-options.php:318
2231	msgid "This sets the number of decimal points shown in displayed prices."
2232	msgstr ""
2233
2234	+ #: admin/settings-options.php:328
2235	msgid "Enable demo/sandbox mode"
2236	msgstr ""
2237
2238	+ #: admin/settings-options.php:329
2239	msgid "When sandbox mode is active, all payment gateway will be used in demo mode"
2240	msgstr ""
2241
2242	+ #: admin/settings-options.php:335
2243	msgid "Payment Page"
2244	msgstr ""
2245
2246	+ #: admin/settings-options.php:336
2247	msgid "This page will be used to process payment options"
2248	msgstr ""
2249
2250	+ #: admin/settings-options.php:342
2251	msgid "Payment Success Page"
2252	msgstr ""
2253
2254	+ #: admin/settings-options.php:343 lib/gateway/bank.php:37
2255	msgid "After payment users will be redirected here"
2256	msgstr ""
2257
2258	+ #: admin/settings-options.php:349
2259	msgid "Payment Gateways"
2260	msgstr ""
2261
2262	+ #: admin/settings-options.php:350
2263	msgid "Active payment gateways"
2264	msgstr ""
2265
2266	+ #: admin/settings-options.php:358
2267	msgid "Guest Email Subject"
2268	msgstr ""
2269
2270	+ #: admin/settings-options.php:359
2271	msgid "This sets the subject of the emails sent to guest users"
2272	msgstr ""
2273
2274	+ #: admin/settings-options.php:365
2275	msgid "Guest Email Body"
2276	msgstr ""
2277
2278	+ #: admin/settings-options.php:366
2279	msgid ""
2280	"This sets the body of the emails sent to guest users. Please DON'T edit the "
2281	"'{activation_link}' part"
2282	msgstr ""
2283
2284	+ #: admin/settings-options.php:389
2285	msgid ""
2286	"Select profile/registration forms for user roles. These forms will be used "
2287	"to populate extra edit profile fields in backend."
2288	msgstr ""
2289
2290	+ #: admin/settings-options.php:400
2291	msgid " - select - "
2292	msgstr ""
2293

2408	msgid "Word limit reached"
2409	msgstr ""
2410
2411	+ #: class/frontend-account.php:123
2412	msgid "<p>You've not subscribed any package yet.</p>"
2413	msgstr ""
2414
2415	+ #: class/frontend-account.php:125
2416	msgid "<p>You've subscribed to the following package.</p>"
2417	msgstr ""
2418
2419	+ #: class/frontend-account.php:183 class/subscription.php:75
2420	msgid "Nonce failure"
2421	msgstr ""
2422
2423	+ #: class/frontend-account.php:197
2424	msgid "First Name is a required field."
2425	msgstr ""
2426
2427	+ #: class/frontend-account.php:201
2428	msgid "Last Name is a required field."
2429	msgstr ""
2430
2431	+ #: class/frontend-account.php:205
2432	msgid "Email is a required field."
2433	msgstr ""
2434
2435	+ #: class/frontend-account.php:216
2436	msgid "Please provide a valid email address."
2437	msgstr ""
2438
2439	+ #: class/frontend-account.php:218
2440	msgid "This email address is already registered."
2441	msgstr ""
2442
2443	+ #: class/frontend-account.php:224
2444	msgid "Please fill out all password fields."
2445	msgstr ""
2446
2447	+ #: class/frontend-account.php:227
2448	msgid "Please enter your current password."
2449	msgstr ""
2450
2451	+ #: class/frontend-account.php:230
2452	msgid "Please re-enter your password."
2453	msgstr ""
2454
2455	+ #: class/frontend-account.php:233
2456	msgid "New passwords do not match."
2457	msgstr ""
2458
2459	+ #: class/frontend-account.php:236 class/frontend-account.php:247
2460	msgid "Your current password is incorrect."
2461	msgstr ""
2462

2476	msgid "You are not the post author. Cheeting huh!"
2477	msgstr ""
2478
2479	+ #: class/frontend-form-post.php:63 class/frontend-form-post.php:124
2480	msgid "Sorry. Guest Posting is not enabled for this form."
2481	msgstr ""
2482
2483	+ #: class/frontend-form-post.php:84 class/frontend-form-post.php:119
2484	+ #: class/frontend-form-post.php:126
2485	msgid "Payment type not selected for this form. Please contact admin."
2486	msgstr ""
2487
2488	+ #: class/frontend-form-post.php:172
2489	msgid "You are not logged in"
2490	msgstr ""
2491
2492	+ #: class/frontend-form-post.php:180 class/frontend-form-post.php:191
2493	msgid "Invalid post"
2494	msgstr ""
2495
2496	+ #: class/frontend-form-post.php:185
2497	msgid "Post Editing is disabled"
2498	msgstr ""
2499
2500	+ #: class/frontend-form-post.php:196
2501	msgid "You are not allowed to edit"
2502	msgstr ""
2503
2504	+ #: class/frontend-form-post.php:208
2505	msgid "I don't know how to edit this post, I don't have the form ID"
2506	msgstr ""
2507
2508	+ #: class/frontend-form-post.php:214
2509	msgid "You can't edit a post while in pending mode."
2510	msgstr ""
2511
2512	+ #: class/frontend-form-post.php:284
2513	msgid "Invalid email address."
2514	msgstr ""
2515
2516	+ #: class/frontend-form-post.php:293
2517	msgid ""
2518	"You already have an account in our site. Please login to continue.\n"
2519	"\n"

2522	"Click 'Cancel' to stay at this page."
2523	msgstr ""
2524
2525	+ #: class/frontend-form-post.php:698
2526	msgid "Something went wrong"
2527	msgstr ""
2528
2529	+ #: class/frontend-form-post.php:1055
2530	msgid "Email successfully verified. Please Login."
2531	msgstr ""
2532

2672	msgid "Billing Details"
2673	msgstr ""
2674
2675	+ #: class/subscription.php:735








2676	msgid "Payment is complete"
2677	msgstr ""
2678
2679	+ #: class/subscription.php:735
2680	msgid "Congratulations, your payment has been completed!"
2681	msgstr ""
2682
2683	+ #: class/subscription.php:739 class/subscription.php:743
2684	msgid "Please buy a subscription pack to post"
2685	msgstr ""
2686
2687	+ #: class/subscription.php:757
2688	msgid "<p><i>You have a subscription pack activated. </i></p>"
2689	msgstr ""
2690
2691	+ #: class/subscription.php:761
2692	msgid "<p><i>To cancel the pack, press the following cancel button</i></p>"
2693	msgstr ""
2694
2695	+ #: class/subscription.php:821
2696	msgid "Every"
2697	msgstr ""
2698
2699	+ #: class/subscription.php:825
2700	msgid "One time payment"
2701	msgstr ""
2702
2703	+ #: class/subscription.php:837
2704	msgid "Sign Up"
2705	msgstr ""
2706
2707	+ #: class/subscription.php:842
2708	msgid "Buy Now"
2709	msgstr ""
2710
2711	+ #: class/subscription.php:905
2712	msgid "There is a <strong>%s</strong> charge to add a new post."
2713	msgstr ""
2714
2715	+ #: class/subscription.php:950
2716	msgid "You must <a href=\"%s\">purchase a pack</a> before posting"
2717	msgstr ""
2718

2823	msgid "The subscription has been expired."
2824	msgstr ""
2825
2826	+ #: includes/class-user-subscription.php:309
2827	+ #: templates/dashboard/subscription.php:6
2828	+ msgid "Package & billing details: "
2829	+ msgstr ""
2830	+
2831	+ #: includes/class-user-subscription.php:333
2832	+ #: templates/dashboard/subscription.php:24
2833	+ msgid "Unlimited"
2834	+ msgstr ""
2835	+
2836	#: includes/free/admin/form-builder/class-wpuf-form-builder-field-settings-free.php:46
2837	#: includes/free/form-element.php:471
2838	msgid "Conditional Logic"

3481	msgid "Subscription %s at %s"
3482	msgstr ""
3483
3484	+ #: lib/gateway/paypal.php:91
3485	msgid "PayPal Email"
3486	msgstr ""
3487
3488	+ #: lib/gateway/paypal.php:96
3489	msgid "PayPal Instruction"
3490	msgstr ""
3491
3492	+ #: lib/gateway/paypal.php:103
3493	msgid "PayPal API username"
3494	msgstr ""
3495
3496	+ #: lib/gateway/paypal.php:107
3497	msgid "PayPal API password"
3498	msgstr ""
3499
3500	+ #: lib/gateway/paypal.php:111
3501	msgid "PayPal API signature"
3502	msgstr ""
3503




























3504	#: templates/dashboard/dashboard.php:5
3505	msgid "Hello %1$s, (not %1$s? <a href=\"%2$s\">Sign out</a>)"
3506	msgstr ""

3696	msgid "Edit Profile"
3697	msgstr ""
3698
3699	+ #: wpuf-functions.php:1525
3700	msgid "United Arab Emirates Dirham"
3701	msgstr ""
3702
3703	+ #: wpuf-functions.php:1526
3704	msgid "Australian Dollars"
3705	msgstr ""
3706
3707	+ #: wpuf-functions.php:1527
3708	msgid "Argentine Peso"
3709	msgstr ""
3710
3711	+ #: wpuf-functions.php:1528
3712	msgid "Bangladeshi Taka"
3713	msgstr ""
3714
3715	+ #: wpuf-functions.php:1529
3716	msgid "Brazilian Real"
3717	msgstr ""
3718
3719	+ #: wpuf-functions.php:1530
3720	msgid "Bulgarian Lev"
3721	msgstr ""
3722
3723	+ #: wpuf-functions.php:1531
3724	msgid "Canadian Dollars"
3725	msgstr ""
3726
3727	+ #: wpuf-functions.php:1532
3728	msgid "Chilean Peso"
3729	msgstr ""
3730
3731	+ #: wpuf-functions.php:1533
3732	msgid "Chinese Yuan"
3733	msgstr ""
3734
3735	+ #: wpuf-functions.php:1534
3736	msgid "Colombian Peso"
3737	msgstr ""
3738
3739	+ #: wpuf-functions.php:1535
3740	msgid "Czech Koruna"
3741	msgstr ""
3742
3743	+ #: wpuf-functions.php:1536
3744	msgid "Danish Krone"
3745	msgstr ""
3746
3747	+ #: wpuf-functions.php:1537
3748	msgid "Dominican Peso"
3749	msgstr ""
3750
3751	+ #: wpuf-functions.php:1538
3752	msgid "Algerian Dinar"
3753	msgstr ""
3754
3755	+ #: wpuf-functions.php:1539
3756	msgid "Euros"
3757	msgstr ""
3758
3759	+ #: wpuf-functions.php:1540
3760	msgid "Hong Kong Dollar"
3761	msgstr ""
3762
3763	+ #: wpuf-functions.php:1541
3764	msgid "Croatia kuna"
3765	msgstr ""
3766
3767	+ #: wpuf-functions.php:1542
3768	msgid "Hungarian Forint"
3769	msgstr ""
3770
3771	+ #: wpuf-functions.php:1543
3772	msgid "Icelandic krona"
3773	msgstr ""
3774
3775	+ #: wpuf-functions.php:1544
3776	msgid "Indonesia Rupiah"
3777	msgstr ""
3778
3779	+ #: wpuf-functions.php:1545
3780	msgid "Indian Rupee"
3781	msgstr ""
3782
3783	+ #: wpuf-functions.php:1546
3784	msgid "Nepali Rupee"
3785	msgstr ""
3786
3787	+ #: wpuf-functions.php:1547
3788	msgid "Israeli Shekel"
3789	msgstr ""
3790
3791	+ #: wpuf-functions.php:1548
3792	msgid "Japanese Yen"
3793	msgstr ""
3794
3795	+ #: wpuf-functions.php:1549
3796	msgid "Lao Kip"
3797	msgstr ""
3798
3799	+ #: wpuf-functions.php:1550
3800	msgid "South Korean Won"
3801	msgstr ""
3802
3803	+ #: wpuf-functions.php:1551
3804	msgid "Malaysian Ringgits"
3805	msgstr ""
3806
3807	+ #: wpuf-functions.php:1552
3808	msgid "Mexican Peso"
3809	msgstr ""
3810
3811	+ #: wpuf-functions.php:1553
3812	msgid "Nigerian Naira"
3813	msgstr ""
3814
3815	+ #: wpuf-functions.php:1554
3816	msgid "Norwegian Krone"
3817	msgstr ""
3818
3819	+ #: wpuf-functions.php:1555
3820	msgid "New Zealand Dollar"
3821	msgstr ""
3822
3823	+ #: wpuf-functions.php:1556
3824	msgid "Omani Rial"
3825	msgstr ""
3826
3827	+ #: wpuf-functions.php:1557
3828	msgid "Iranian Rial"
3829	msgstr ""
3830
3831	+ #: wpuf-functions.php:1558
3832	msgid "Pakistani Rupee"
3833	msgstr ""
3834
3835	+ #: wpuf-functions.php:1559
3836	msgid "Paraguayan Guaraní"
3837	msgstr ""
3838
3839	+ #: wpuf-functions.php:1560
3840	msgid "Philippine Pesos"
3841	msgstr ""
3842
3843	+ #: wpuf-functions.php:1561
3844	msgid "Polish Zloty"
3845	msgstr ""
3846
3847	+ #: wpuf-functions.php:1562
3848	msgid "Pounds Sterling"
3849	msgstr ""
3850
3851	+ #: wpuf-functions.php:1563
3852	msgid "Romanian Leu"
3853	msgstr ""
3854
3855	+ #: wpuf-functions.php:1564
3856	msgid "Russian Ruble"
3857	msgstr ""
3858
3859	+ #: wpuf-functions.php:1565
3860	msgid "Saudi Riyal"
3861	msgstr ""
3862
3863	+ #: wpuf-functions.php:1566
3864	msgid "Singapore Dollar"
3865	msgstr ""
3866
3867	+ #: wpuf-functions.php:1567
3868	msgid "South African rand"
3869	msgstr ""
3870
3871	+ #: wpuf-functions.php:1568
3872	msgid "Swedish Krona"
3873	msgstr ""
3874
3875	+ #: wpuf-functions.php:1569
3876	msgid "Swiss Franc"
3877	msgstr ""
3878
3879	+ #: wpuf-functions.php:1570
3880	msgid "Taiwan New Dollars"
3881	msgstr ""
3882
3883	+ #: wpuf-functions.php:1571
3884	msgid "Thai Baht"
3885	msgstr ""
3886
3887	+ #: wpuf-functions.php:1572
3888	msgid "Turkish Lira"
3889	msgstr ""
3890
3891	+ #: wpuf-functions.php:1573
3892	msgid "US Dollar"
3893	msgstr ""
3894
3895	+ #: wpuf-functions.php:1574
3896	msgid "Vietnamese Dong"
3897	msgstr ""
3898
3899	+ #: wpuf-functions.php:1575
3900	msgid "Egyptian Pound"
3901	msgstr ""
3902

lib/gateway/paypal.php CHANGED Viewed

	@@ -27,7 +27,7 @@ class WPUF_Paypal {
27
28	public function subscription_cancel( $user_id ) {
29	$sub_meta = 'cancel';
30	- ~~WPUF_Subscription::init~~()->~~update_user_subscription_meta~~( $~~user_id, $~~sub_meta );
31	}
32
33	/**
	@@ -75,7 +75,6 @@ class WPUF_Paypal {
75
76	if ( strtolower( $parsed_response['ACK'] ) == 'success' ) {
77	$this->subscription_cancel( $user_id );
78	- //WPUF_Subscription::init()->update_user_subscription_meta( $user_id, $sub_info );
79	}
80	}
81
	@@ -144,7 +143,7 @@ class WPUF_Paypal {
144	}
145
146	if ( $billing_amount == 0 ) {
147	- ~~WPUF_Subscription::init~~()->~~new_subscription~~( $~~user_id, $~~data['item_number'], $profile_id = null, false,'free' );
148	wp_redirect( $return_url );
149	exit();
150	}


27
28	public function subscription_cancel( $user_id ) {
29	$sub_meta = 'cancel';
30	+ wpuf_get_user( $user_id )->subscription()->update_meta( $sub_meta );
31	}
32
33	/**

75
76	if ( strtolower( $parsed_response['ACK'] ) == 'success' ) {
77	$this->subscription_cancel( $user_id );

78	}
79	}
80

143	}
144
145	if ( $billing_amount == 0 ) {
146	+ wpuf_get_user( $user_id )->subscription()->add_pack( $data['item_number'], $profile_id = null, false,'free' );
147	wp_redirect( $return_url );
148	exit();
149	}

readme.txt CHANGED Viewed

	@@ -5,7 +5,7 @@ Tags: Forms, registration, profile-builder, login, membership
5	Requires at least: 4.0
6	Tested up to: 4.8.1
7	Requires PHP: 5.4
8	- Stable tag: 2.6.0
9	License: GPLv2
10	License URI: https://www.gnu.org/licenses/gpl-2.0.html
11
	@@ -170,6 +170,12 @@ redirected to the edit page with that post id. Then you'll see the edit post for
170
171	== Changelog ==
172






173	= v2.6.0 (6 November, 2017) =
174
175	* New: When configuring payment settings from wp-admin → User Frontend → Settings → Payments, the payment options were applicable for all post forms with the same behavior. Admin could not configure payment option for each post form individually. In this version, the payment configuration option for individual form has been added. Now the admin can configure payment from wp-admin → User Frontend → Post Forms → Add/Edit a form → Navigate Payment Settings located under Settings tab.


5	Requires at least: 4.0
6	Tested up to: 4.8.1
7	Requires PHP: 5.4
8	+ Stable tag: 2.6.1
9	License: GPLv2
10	License URI: https://www.gnu.org/licenses/gpl-2.0.html
11

170
171	== Changelog ==
172
173	+ = v2.6.1 (8 November, 2017) =
174	+
175	+ * Fix: Fixed subscription pack frontend display issue. A small bug was introduced that was preventing displaying the subscription packs correctly.
176	+ * Fix: Fix for packs with unlimited post. We had a small mistake in pack post counting and unlimited subscription plan was discarded. This version fixes the issue.
177	+
178	+
179	= v2.6.0 (6 November, 2017) =
180
181	* New: When configuring payment settings from wp-admin → User Frontend → Settings → Payments, the payment options were applicable for all post forms with the same behavior. Admin could not configure payment option for each post form individually. In this version, the payment configuration option for individual form has been added. Now the admin can configure payment from wp-admin → User Frontend → Post Forms → Add/Edit a form → Navigate Payment Settings located under Settings tab.

templates/account.php CHANGED Viewed

	@@ -4,7 +4,7 @@
4	<?php
5	if ( is_user_logged_in() ) {
6	foreach ( $sections as $section ) {
7	- if ( 'subscription' ~~===~~ $section['slug'] && wpuf_get_option( '~~show_subscription~~', 'wpuf_payment' ) != 'yes' ) {
8	continue;
9	}
10	echo sprintf(


4	<?php
5	if ( is_user_logged_in() ) {
6	foreach ( $sections as $section ) {
7	+ if ( 'subscription' == $section['slug'] && wpuf_get_option( 'show_subscriptions', 'wpuf_payment' ) != 'yes' ) {
8	continue;
9	}
10	echo sprintf(

templates/dashboard/billing-address.php DELETED Viewed

@@ -1,107 +0,0 @@
-            -
            <?php
-            -
-            -
            global $current_user;
-            -
-            -
            $address_fields     = array();
-            -
-            -
            if ( isset( $_POST['add_line_1'] )
-            -
                && isset( $_POST['city'] )
-            -
                && isset( $_POST['state'] )
-            -
                && isset( $_POST['zip_code'] )
-            -
                && isset( $_POST['country'] ) ) {
-            -
                 $address_fields = array(
-            -
                    'add_line_1'    => $_POST['add_line_1'],
-            -
                    'add_line_2'    => $_POST['add_line_2'],
-            -
                    'city'          => $_POST['city'],
-            -
                    'state'         => $_POST['state'],
-            -
                    'zip_code'      => $_POST['zip_code'],
-            -
                    'country'       => $_POST['country']
-            -
                );
-            -
                update_user_meta( $current_user->ID, 'address_fields', $address_fields );
-            -
            } else {
-            -
                if ( metadata_exists( 'user', $current_user->ID, 'address_fields') ) {
-            -
                    $address_fields = get_user_meta( $current_user->ID, 'address_fields', false );
-            -
                    $address_fields = $address_fields[0];
-            -
                } else {
-            -
                    $address_fields = array_fill_keys(
-            -
                        array( 'add_line_1', 'add_line_2', 'city', 'state', 'zip_code', 'country' ), '' );
-            -
                }
-            -
            }
-            -
            ?>
-            -
-            -
            <form class="wpuf-form form-label-above" action="" method="post">
-            -
                <div class="wpuf-fields">
-            -
-            -
                    <ul class="wpuf-form form-label-above">
-            -
-            -
                        <li>
-            -
                            <div class="wpuf-label"><?php _e( 'Address Line 1 ', 'wpuf' ); ?><span class="required">*</span></div>
-            -
                            <div class="wpuf-fields">
-            -
                                <input type="text" class="input" name="add_line_1" id="add_line_1" value="<?php echo $address_fields['add_line_1']; ?>" />
-            -
                            </div>
-            -
                        </li>
-            -
-            -
                        <li>
-            -
                            <div class="wpuf-label"><?php _e( 'Address Line 2 ', 'wpuf' ); ?><span class="required">*</span></div>
-            -
                            <div class="wpuf-fields">
-            -
                                <input type="text" class="input" name="add_line_2" id="add_line_2" value="<?php echo $address_fields['add_line_2']; ?>" />
-            -
                            </div>
-            -
                        </li>
-            -
-            -
                        <li>
-            -
                            <div class="wpuf-label"><?php _e( 'City', 'wpuf' ); ?> <span class="required">*</span></div>
-            -
                            <div class="wpuf-fields">
-            -
                                <input type="text" class="input" name="city" id="city" value="<?php echo $address_fields['city']; ?>" />
-            -
                            </div>
-            -
                        </li>
-            -
-            -
                        <li>
-            -
                            <div class="wpuf-label"><?php _e('State ', 'wpuf' ); ?> <span class="required">*</span></div>
-            -
                            <div class="wpuf-fields">
-            -
                                <input type="text" class="input" name="state" id="state" value="<?php echo $address_fields['state']; ?>" />
-            -
                            </div>
-            -
                        </li>
-            -
-            -
                        <li>
-            -
                            <div class="wpuf-fields">
-            -
                                <div class="wpuf-name-field-wrap format-first-last">
-            -
                                    <div class="wpuf-name-field-first-name">
-            -
                                        <label class="wpuf-fields wpuf-label"><?php _e( 'Zip Code ', 'wpuf' ); ?></label>
-            -
                                        <input type="number" class="input" name="zip_code" id="zip_code" value="<?php echo $address_fields['zip_code']; ?>" />
-            -
                                    </div>
-            -
-            -
                                    <div class="wpuf-name-field-last-name">
-            -
                                        <label class="wpuf-fields wpuf-label"><?php _e('Country ', 'wpuf' ); ?></label>
-            -
                                        <div class="wpuf-fields">
-            -
                                            <?php
-            -
                                            $countries = wpuf_get_countries() ;
-            -
                                            ?>
-            -
                                            <select name="country" id="country">
-            -
                                                <?php
-            -
                                                foreach ( $countries as $country ) {
-            -
                                                    if ( $country['name'] == $address_fields['country'] ) { ?>
-            -
                                                        <option selected value="<?php echo $country['name']; ?>" selected ><?php echo $country['name']; ?></option>
-            -
                                                    <?php } else { ?>
-            -
                                                        <option value="<?php echo $country['name']; ?>"><?php echo $country['name']; ?></option>
-            -
                                                    <?php }
-            -
                                                } ?>
-            -
                                            </select>
-            -
-            -
                                        </div>
-            -
                                    </div>
-            -
                                </div>
-            -
                            </div>
-            -
                        </li>
-            -
-            -
-            -
                        <li class="wpuf-submit">
-            -
                            <input type="submit"  name="update_billing_address" id="wpuf-account-update-billing_address" value="<?php _e( 'Update Billing Address', 'wpuf' ); ?>" />
-            -
                        </li>
-            -
                    </ul>
-            -
-            -
                <div class="clear"></div>
-            -
-            -
                </div>
-            -
-            -
-            -
            </form>

wpuf-functions.php CHANGED Viewed

	@@ -1421,14 +1421,6 @@ function wpuf_get_account_sections() {
1421	array( 'slug' => 'subscription', 'label' => __( 'Subscription', 'wpuf' ) ),
1422	);
1423
1424	- // if ( wpuf_get_option( 'edit_billing_address', 'wpuf_payment') == 'yes') {
1425	- // $address_section = array(
1426	- // array( 'slug' => 'billing_address', 'label' => __( 'Billing Address', 'wpuf-pro' ) ),
1427	- // );
1428	-
1429	- // $account_sections = array_merge( $account_sections, $address_section );
1430	- // }
1431	-
1432	return apply_filters( 'wpuf_account_sections', $account_sections );
1433	}
1434
	@@ -2099,15 +2091,10 @@ function wpuf_get_draft_post_status( $form_settings ) {
2099
2100	if ( $charging_enabled && ! isset( $_POST['post_id'] ) ) {
2101	if ( !empty( $user_wpuf_subscription_pack ) ) {
2102	- if ( ~~isset~~ ( ~~$form_settings['subscription_disabled']~~ ) ~~&& $form_settings['subscription_disabled'] == 'yes'~~ ) {
2103	- $post_status = 'pending';
2104	- } elseif ( isset( $user_wpuf_subscription_pack['expire'] ) && strtotime( $user_wpuf_subscription_pack['expire'] ) <= time() ) {
2105	$post_status = 'pending';
2106	}
2107	}
2108	- else {
2109	- $post_status = 'pending';
2110	- }
2111	}
2112	return $post_status;
2113	}


1421	array( 'slug' => 'subscription', 'label' => __( 'Subscription', 'wpuf' ) ),
1422	);
1423








1424	return apply_filters( 'wpuf_account_sections', $account_sections );
1425	}
1426

2091
2092	if ( $charging_enabled && ! isset( $_POST['post_id'] ) ) {
2093	if ( !empty( $user_wpuf_subscription_pack ) ) {
2094	+ if ( $current_user->subscription()->expired() ) {


2095	$post_status = 'pending';
2096	}
2097	}



2098	}
2099	return $post_status;
2100	}

wpuf.php CHANGED Viewed

	@@ -4,7 +4,7 @@ Plugin Name: WP User Frontend
4	Plugin URI: https://wordpress.org/plugins/wp-user-frontend/
5	Description: Create, edit, delete, manages your post, pages or custom post types from frontend. Create registration forms, frontend profile and more...
6	Author: Tareq Hasan
7	- Version: 2.6.0
8	Author URI: https://tareq.co
9	License: GPL2 or later
10	License URI: https://www.gnu.org/licenses/gpl-2.0.html
	@@ -12,7 +12,7 @@ Text Domain: wpuf
12	Domain Path: /languages
13	*/
14
15	- define( 'WPUF_VERSION', '2.6.0' );
16	define( 'WPUF_FILE', __FILE__ );
17	define( 'WPUF_ROOT', dirname( __FILE__ ) );
18	define( 'WPUF_ROOT_URI', plugins_url( '', __FILE__ ) );


4	Plugin URI: https://wordpress.org/plugins/wp-user-frontend/
5	Description: Create, edit, delete, manages your post, pages or custom post types from frontend. Create registration forms, frontend profile and more...
6	Author: Tareq Hasan
7	+ Version: 2.6.1
8	Author URI: https://tareq.co
9	License: GPL2 or later
10	License URI: https://www.gnu.org/licenses/gpl-2.0.html

12	Domain Path: /languages
13	*/
14
15	+ define( 'WPUF_VERSION', '2.6.1' );
16	define( 'WPUF_FILE', __FILE__ );
17	define( 'WPUF_ROOT', dirname( __FILE__ ) );
18	define( 'WPUF_ROOT_URI', plugins_url( '', __FILE__ ) );

WP User Frontend – Membership, Profile, Registration & Post Submission Plugin for WordPress - Version 2.6.1

Version Description

Release Info

Code changes from version 2.6.0 to 2.6.1