diff --git a/gourl_paidmembershipspro.php b/gourl_paidmembershipspro.php index 222563d..e2e6570 100644 --- a/gourl_paidmembershipspro.php +++ b/gourl_paidmembershipspro.php @@ -3,7 +3,7 @@ Plugin Name: GoUrl Paid Memberships Pro - Bitcoin Payment Gateway Addon Plugin URI: https://gourl.io/bitcoin-payments-paid-memberships-pro.html Description: Provides a GoUrl.io Bitcoin/Altcoin Payment Gateway for Paid Memberships Pro 1.8+. Direct Integration on your website, no external payment pages opens (as other payment gateways offer). Accept Bitcoin, Litecoin, Paycoin, Dogecoin, Dash, Speedcoin, Reddcoin, Potcoin, Feathercoin, Vertcoin, Vericoin, Peercoin, MonetaryUnit payments online. You will see the bitcoin/altcoin payment statistics in one common table on your website. No Chargebacks, Global, Secure. All in automatic mode. -Version: 1.1.3 +Version: 1.1.4 Author: GoUrl.io Author URI: https://gourl.io License: GPLv2 @@ -23,8 +23,11 @@ add_action( 'plugins_loaded', 'gourl_pmp_gateway_load', 20); DEFINE('GOURLPMP', "gourl-paidmembershipspro"); - - + + + + + function gourl_pmp_load_textdomain() { @@ -57,6 +60,15 @@ function gourl_pmp_gateway_load() // plugin links add_filter('plugin_action_links', array('PMProGateway_gourl', 'plugin_action_links'), 10, 2 ); + + // multiple gateway options at checkout + add_filter("pmpro_get_gateway", array('PMProGateway_gourl', 'select_gateway'), 10, 1); + add_filter("pmpro_valid_gateways", array('PMProGateway_gourl', 'valid_gateway'), 10, 1); + add_action('admin_notices', array('PMProGateway_gourl', 'admin_notice')); + add_action("pmpro_checkout_boxes", array('PMProGateway_gourl', 'checkout_boxes')); + + + /* @@ -68,7 +80,7 @@ class PMProGateway_gourl extends PMProGateway /** * 1.1 */ - public function PMProGateway_gourl($gateway = NULL) + function __construct($gateway = NULL) { $this->gateway = $gateway; return $this->gateway; @@ -93,7 +105,7 @@ public static function init() add_filter('pmpro_include_billing_address_fields', '__return_false'); add_filter('pmpro_include_payment_information_fields', '__return_false'); add_filter('pmpro_required_billing_fields', array('PMProGateway_gourl', 'pmpro_required_billing_fields')); - add_filter('pmpro_checkout_before_change_membership_level', array('PMProGateway_gourl', 'pmpro_checkout_before_change_membership_level'), 10, 2); + add_filter('pmpro_checkout_before_change_membership_level', array('PMProGateway_gourl', 'pmpro_checkout_before_change_membership_level'), 1, 2); } } @@ -352,7 +364,6 @@ public static function pmpro_required_billing_fields($fields) */ function process(&$order) { - return true; } @@ -366,94 +377,167 @@ public static function pmpro_checkout_before_change_membership_level($user_id, $ { global $pmpro_currency; - if (!$order || $order->gateway != "gourl") return true; + if(!session_id()) session_start(); + + if (!$order || $order->gateway != "gourl") + { + unset($_SESSION['gourl_pmp_orderid']); + unset($_SESSION['gourl_pmp_orderdt']); + return true; + } + $order->payment_type = __('GoUrl Bitcoin/Altcoin', GOURLPMP); + $order->gateway = "gourl"; + $order->user_id = get_current_user_id(); + $order->timestamp = current_time('timestamp'); + + if(!empty($order->TotalBillingCycles)) $order->TotalBillingCycles++; + + if(is_numeric($order->membership_level->cycle_number) && $order->membership_level->cycle_number > 0 && $order->membership_level->cycle_period && + !($order->membership_level->expiration_number && $order->membership_level->expiration_period && + strtotime("+ " . $order->membership_level->expiration_number." ".$order->membership_level->expiration_period) < strtotime("+ " . $order->membership_level->cycle_number." ".$order->membership_level->cycle_period))) + { + $order->membership_level->expiration_number = $order->membership_level->cycle_number; + $order->membership_level->expiration_period = $order->membership_level->cycle_period; + } + + + // new membership settings + + $old_startdate = current_time('timestamp'); + $old_enddate = current_time('timestamp'); + $new_startdate = $old_enddate; + + $active_levels = pmpro_getMembershipLevelsForUser($user_id); + if (is_array($active_levels)) + foreach ($active_levels as $row) + { + if ($row->id == $order->membership_level->id && $row->enddate > current_time('timestamp')) + { + if ($row->startdate > strtotime("2010-01-01")) $old_startdate = $row->startdate; + $old_enddate = $row->enddate; + if ($old_enddate > $new_startdate) $new_startdate = $old_enddate; + } + } + + // subscription start/end + $startdate = "'" . date("Y-m-d H:i:s", $old_startdate) . "'"; + $enddate = (!empty($order->membership_level->expiration_number)) ? "'" . date("Y-m-d H:i:s", strtotime("+ ".$order->membership_level->expiration_number." ".$order->membership_level->expiration_period, $old_enddate)) . "'" : "NULL"; + + $order->subscription_transaction_id = ($enddate == "NULL") ? __('NO EXPIRY', GOURLPMP) : date("d M y", $new_startdate) . " - " . date("d M y", strtotime(trim($enddate, "'"))); + + + $custom_level = array( + 'user_id' => $user_id, + 'membership_id' => $order->membership_level->id, + 'code_id' => '', + 'initial_payment' => $order->membership_level->initial_payment, + 'billing_amount' => $order->membership_level->billing_amount, + 'cycle_number' => $order->membership_level->cycle_number, + 'cycle_period' => $order->membership_level->cycle_period, + 'billing_limit' => $order->membership_level->billing_limit, + 'trial_amount' => $order->membership_level->trial_amount, + 'trial_limit' => $order->membership_level->trial_limit, + 'startdate' => $startdate, + 'enddate' => $enddate); + + + // is it initial payment ? if(!get_option(GOURL."PMPRO_INIT_".$user_id."_".$order->membership_level->id)) { - // Free - if (floatval($order->subtotal) == 0) + + if (floatval($order->subtotal) > 0) + { + $order->total = $order->subtotal; + } + // Free Trial or Free Membership + else { // Initial Free Payment - update_option(GOURL."PMPRO_INIT_".$user_id."_".$order->membership_level->id, date("m F Y")); - - $order->ProfileStartDate = date("Y-m-d") . "T0:0:0"; - $order->status = "success"; + update_option(GOURL."PMPRO_INIT_".$user_id."_".$order->membership_level->id, date("d F Y")); if (floatval($order->PaymentAmount) > 0) { // Free Trial Payment - $order->TrialBillingCycles ++; - $order->payment_transaction_id = "#FREETRIAL"; - - update_option(GOURL."PMPRO_FREE_".$user_id."_".$order->membership_level->id, date("m F Y")); - } - else - { - $order->TotalBillingCycles++; - $order->payment_transaction_id = "#FREE"; + $order->TrialBillingPeriod = $order->BillingPeriod; + $order->TrialBillingFrequency = $order->BillingFrequency; + $order->TrialBillingCycles++; + $order->TrialAmount = 0; + update_option(GOURL."PMPRO_FREE_".$user_id."_".$order->membership_level->id, date("d F Y")); } - if (is_numeric($order->membership_level->expiration_number) && $order->membership_level->expiration_number > 0 && $order->membership_level->expiration_period) $order->subscription_transaction_id = $order->membership_level->expiration_number." ".$order->membership_level->expiration_period; + $prevorder = new MemberOrder(); + $prevorder->getLastMemberOrder($user_id, apply_filters("pmpro_confirmation_order_status", array("success"))); + $prevorder->updateStatus("-success-"); + + pmpro_changeMembershipLevel($custom_level, $user_id, 'changed'); + + $order->payment_transaction_id = (floatval($order->PaymentAmount) > 0) ? "#FREETRIAL" : "#FREE"; + $order->status = "success"; + $order->saveOrder(); + + $user = (!$order->user_id) ? __('Guest', GOURLPMP) : "user".$order->user_id.""; + self::add_order_note($order->id, sprintf(__("Order Created by %s
Membership - %s
%s (%s)", GOURLPMP ), $user, $order->membership_level->name, $order->payment_transaction_id, $order->subscription_transaction_id)); - return true; - } - else - { - $order->total = $order->subtotal; } } // second, third, etc payments .... else { - - if (floatval($order->subtotal) == 0 && floatval($order->PaymentAmount) == 0) + // not allow duplicated trials + if (floatval($order->PaymentAmount) != floatval($order->subtotal)) + { + if (floatval($order->PaymentAmount) > 0) + { + $order->subtotal = $order->PaymentAmount; + $order->total = $order->PaymentAmount; + } + else $order->total = $order->subtotal; + } + else $order->total = $order->subtotal; + + + if (floatval($order->subtotal) == 0) { + $prevorder = new MemberOrder(); + $prevorder->getLastMemberOrder($user_id, apply_filters("pmpro_confirmation_order_status", array("success"))); + $prevorder->updateStatus("-success-"); + + pmpro_changeMembershipLevel($custom_level, $user_id, 'changed'); + + $order->payment_transaction_id = "#FREE"; $order->status = "success"; - $order->TotalBillingCycles++; - $order->payment_transaction_id = "#FREE"; - - if (is_numeric($order->membership_level->expiration_number) && $order->membership_level->expiration_number > 0 && $order->membership_level->expiration_period) $order->subscription_transaction_id = $order->membership_level->expiration_number." ".$order->membership_level->expiration_period; - - return true; + $order->saveOrder(); + $user = (!$order->user_id) ? __('Guest', GOURLPMP) : "user".$order->user_id.""; + self::add_order_note($order->id, sprintf(__("Order Created by %s
Membership - %s
%s (%s)", GOURLPMP ), $user, $order->membership_level->name, $order->payment_transaction_id, $order->subscription_transaction_id)); } - elseif (floatval($order->subtotal) != floatval($order->PaymentAmount)) - { - if (floatval($order->PaymentAmount) > 0) - { - $order->subtotal = $order->PaymentAmount; - $order->total = $order->PaymentAmount; - } - else $order->total = $order->subtotal; - } - else $order->total = $order->subtotal; } - - // check for previous pending orders - $morder = new MemberOrder(); - $morder->getLastMemberOrder(get_current_user_id(), apply_filters("pmpro_confirmation_order_status", array("pending"))); - - if ($morder->gateway != "gourl" || $morder->total != $order->total || $morder->membership_id != $order->membership_id || strtotime($order->ProfileStartDate) < (strtotime("now") - 24*60*60) || - (isset($order->membership_level->expiration_number) && is_numeric($order->membership_level->expiration_number) && $order->membership_level->expiration_number > 0 && $order->membership_level->expiration_period && ($order->membership_level->expiration_number." ".$order->membership_level->expiration_period) != $morder->subscription_transaction_id)) + if ($order->total > 0) { - $order->payment_type = __('GoUrl Bitcoin/Altcoin', GOURLPMP); - $order->gateway = "gourl"; - $order->user_id = get_current_user_id(); - $order->status = "pending"; - if (is_numeric($order->membership_level->expiration_number) && $order->membership_level->expiration_number > 0 && $order->membership_level->expiration_period) $order->subscription_transaction_id = $order->membership_level->expiration_number." ".$order->membership_level->expiration_period; - $order->saveOrder(); - - - $user = (!get_current_user_id()) ? __('Guest', GOURLPMP) : "user".get_current_user_id().""; - self::add_order_note($order->id, sprintf(__("Order Created by %s
Membership - %s
Awaiting Cryptocurrency Payment - %s
Invoice #%s", GOURLPMP ), $user, $order->membership_level->name.", ".$order->membership_level->expiration_number." ".$order->membership_level->expiration_period, $order->total . " " . $pmpro_currency, pmpro_url("invoice", "?invoice=" . $order->code), $order->code)); + $morder = new MemberOrder(); + $morder->getLastMemberOrder(get_current_user_id(), apply_filters("pmpro_confirmation_order_status", array("pending")), $order->membership_id, "gourl"); + + if ($morder->gateway != "gourl" || $morder->total != $order->total || $morder->membership_id != $order->membership_id || $morder->timestamp < (current_time('timestamp') - 24*60*60)) + { + $order->status = "pending"; + $order->saveOrder(); + + $user = (!get_current_user_id()) ? __('Guest', GOURLPMP) : "user".get_current_user_id().""; + self::add_order_note($order->id, sprintf(__("Order Created by %s
Membership - %s
Awaiting Cryptocurrency Payment - %s
Invoice #%s", GOURLPMP ), $user, $order->membership_level->name.", ".$order->membership_level->expiration_number." ".$order->membership_level->expiration_period, $order->total . " " . $pmpro_currency, pmpro_url("invoice", "?invoice=" . $order->code), $order->code)); + } + else $order->id = $morder->id; } + + $_SESSION['gourl_pmp_orderid'] = $order->id; + $_SESSION['gourl_pmp_orderdt'] = ($enddate == "NULL") ? __('NO EXPIRY', GOURLPMP) : date("d M Y", $new_startdate) . " - " . date("d M Y", strtotime(trim($enddate, "'"))); wp_redirect(pmpro_url("confirmation")); die(); @@ -470,27 +554,18 @@ public static function pmpro_checkout_before_change_membership_level($user_id, $ */ public static function pmpro_pages_shortcode_confirmation($content) { - global $wpdb, $current_user, $pmpro_invoice, $pmpro_currency; - - if (empty($pmpro_invoice)) - { - $morder = new MemberOrder(); - $morder->getLastMemberOrder(get_current_user_id(), apply_filters("pmpro_confirmation_order_status", array("pending", "success"))); - if (!empty($morder) && $morder->gateway == "gourl") $pmpro_invoice = $morder; - } - - if (!empty($pmpro_invoice) && $pmpro_invoice->gateway == "gourl" && isset($pmpro_invoice->total) && $pmpro_invoice->total > 0) + global $wpdb, $current_user, $pmpro_currency; + + if(!session_id()) session_start(); + + if (!isset($_SESSION['gourl_pmp_orderid'])) return $content; + + $order = new MemberOrder(); + $order->getMemberOrderByID($_SESSION['gourl_pmp_orderid']); + + if (!empty($order) && $order->gateway == "gourl" && isset($order->total) && $order->total > 0 && $order->user_id == get_current_user_id()) { - $levelName = $wpdb->get_var("SELECT name FROM $wpdb->pmpro_membership_levels WHERE id = '" . $pmpro_invoice->membership_id . "' LIMIT 1"); - - $content = ""; - - $content .= self::pmpro_gourl_cryptocoin_payment($pmpro_invoice); + $content = self::pmpro_gourl_cryptocoin_payment($order, false); } @@ -510,15 +585,38 @@ public static function pmpro_gourl_cryptocoin_payment ($order, $invoice = false) $tmp = ""; - if (!$order) + + if (!empty($order) && $order->gateway == "gourl" && isset($order->total) && $order->total > 0) + { + + $levelName = $wpdb->get_var("SELECT name FROM $wpdb->pmpro_membership_levels WHERE id = '" . $order->membership_id . "' LIMIT 1"); + + if ($invoice) $tmp .= '

' . __( 'Details', GOURLPMP ) . '

' . PHP_EOL; + + $tmp .= ""; + + if (!$invoice) $tmp .= ""; + + $tmp .= " + + "; + + if ($invoice && $order->subscription_transaction_id) $tmp .= ""; + if (!$invoice) $tmp .= ""; + + $tmp .= ""; + + $tmp .= "
".__('Account', GOURLPMP).":".$current_user->display_name." (".$current_user->user_email.")
".__('Order', GOURLPMP).":".$order->code."
".__('Amount', GOURLPMP).":".$order->total." ".$pmpro_currency."
".__('Membership Level', GOURLPMP).":".$levelName."
".__('Membership Period', GOURLPMP).":".$order->subscription_transaction_id."
".__('Membership Period', GOURLPMP).":".$_SESSION['gourl_pmp_orderdt']."
".__('Invoice Status', GOURLPMP).":---INVOICE--STATUS----
"; + } + + elseif (!$order) { $tmp .= '

' . __( 'Information', GOURLPMP ) . '

' . PHP_EOL; $tmp .= "
".sprintf(__( 'The GoUrl payment plugin was called to process a payment but could not retrieve the order details for orderID %s. Cannot continue!', GOURLPMP ), $order_id)."
"; return $tmp; } - - if ($order->gateway != "gourl") return false; + elseif ($order->gateway != "gourl") return false; // Initialize @@ -637,14 +735,25 @@ public static function pmpro_gourl_cryptocoin_payment ($order, $invoice = false) // crypto payment gateway $result = $gourl->cryptopayments ($plugin, $amount, $currency, $orderID, $period, $language, $coin, $affiliate_key, $userID, $iconwidth); - if (!$result["is_paid"]) { + if (in_array($order->status, array("pending", "cancelled"))) $tmp = str_replace("---INVOICE--STATUS----", "".__('UNPAID', GOURLPMP), $tmp).""; + else $tmp = str_replace("---INVOICE--STATUS----", "-", $tmp); + // trial used before - if ($userID != "guest" && get_option(GOURL."PMPRO_FREE_".$userID."_".$order->membership_id)) $tmp .= ($invoice?"
":"")."" . sprintf(__('Free Trial already used on %s', GOURLPMP ), get_option(GOURL."PMPRO_FREE_".$userID."_".$order->membership_id)) . "."; + if ($userID != "guest" && get_option(GOURL."PMPRO_FREE_".$userID."_".$order->membership_id) && !$invoice && $wpdb->get_var("SELECT (billing_amount-initial_payment) as dif FROM $wpdb->pmpro_membership_levels WHERE id = '" . $order->membership_id . "' LIMIT 1") > 0) + { + $tmp .= "
" . sprintf(__('Notes - You have already used your trial on %s', GOURLPMP ), get_option(GOURL."PMPRO_FREE_".$userID."_".$order->membership_id)) . "

"; + } $tmp .= '

' . __( 'Pay Now -', GOURLPMP ) . '

' . PHP_EOL; } + else + { + $tmp = str_replace("---INVOICE--STATUS----", "".__('FULLY PAID', GOURLPMP), $tmp).""; + $tmp .= '

'; + } + if ($result["error"]) $tmp .= "
".__( "Sorry, but there was an error processing your order. Please try a different payment method.", GOURLPMP )."
".$result["error"]."
"; else @@ -657,10 +766,13 @@ public static function pmpro_gourl_cryptocoin_payment ($order, $invoice = false) // payment received if ($result["is_paid"]) { + + $tmp .= "

"; + if ($invoice) $tmp .= "
" . __('Thank you for your membership.', GOURLPMP) . "
"; else - $tmp .= "
" . sprintf(__('Thank you for your membership to %s.
Your %s membership is now active.', GOURLPMP), get_bloginfo("name"), $current_user->membership_level->name) . "
"; + $tmp .= "
" . sprintf(__('Thank you for your membership to %s.
Your %s membership is now active.', GOURLPMP), get_bloginfo("name"), $current_user->membership_level->name) . "
"; } if (!$invoice) $tmp .= "

".__('View Your Membership Account', GOURLPMP)." →"; @@ -729,7 +841,7 @@ public static function pmpro_after_order_settings($order) public static function add_order_note($order_id, $notes) { $id = GOURLPMP."_".$order_id."_gourl_log"; - $dt = current_time("mysql", 0); + $dt = date("d M Y, H:i", current_time('timestamp')); $arr = get_option($id); if (!$arr) $arr = array(); @@ -776,9 +888,190 @@ public static function sel($val1, $val2) return $tmp; } - - } - // end class + + + + + // multiple gateway options at checkout + // ---------------------------------------- + + + /** + * 1.19 Use gateway which selected on checkout + */ + public static function select_gateway($gateway) + { + if(!session_id()) session_start(); + + if (isset($_POST["gateway"])) + { + $gateway = $_SESSION['gourl_pmp_gateway'] = $_POST["gateway"]; + } + else + { + if (isset($_SESSION['gourl_pmp_gateway']) && $_SESSION['gourl_pmp_gateway'] == "gourl") $gateway = $_SESSION['gourl_pmp_gateway']; + } + + return $gateway; + } + + + + /** + * 1.20 Add gourl to list valid gateways + */ + public static function valid_gateway($gateways) + { + if (array_search('gourl', $gateways) === FALSE) $gateways[] = 'gourl'; + + return $gateways; + } + + + + /** + * 1.21 Notice for admin + */ + public static function admin_notice() + { + //make sure we're on the payment settings page + if( !empty( $_REQUEST['page'] ) && $_REQUEST['page'] == 'pmpro-paymentsettings' ) + { + $tmp = '
'; + $tmp .= 'New'; + $tmp .= '

' . sprintf(__( "You can offer your customers multiple Gateway Options at PaidMembershipPro Checkout. Screenshot »
To get this facility you need to setup Gourl 'Bitcoin/Altcoins' settings on this page, click 'Save Settings' button, and then switch to another gateway (for example, Paypal, or Stripe) and keep that other gateway as a primary gateway. The GoUrl settings will be remembered 'in the background' and the two gateways will be displayed on the checkout page. If you want to use Gourl Bitcoin/Altcoin on checkout page only you should keep the Gourl Gateway as your primary gateway. If you don't want to use the Bitcoin gateway, simply disable 'GoUrl Paid Memberships Pro' addon on your plugin page.
Also you can setup Optional Free or Reduced-price Trial Period in Paid Memberships Pro with Bitcoins (screenshot).   More info on www.gourl.io", GOURLPMP ), plugins_url("/screenshot-7.png", __FILE__), plugins_url("/screenshot-6.png", __FILE__), "https://gourl.io") .'

'; + $tmp .= '
'; + echo $tmp; + } + + return true; + } + + + + /** + * 1.22 Add radio boxes on checkout page + */ + public static function checkout_boxes() + { + global $pmpro_requirebilling, $gateway, $pmpro_review; + + //if already using gourl, ignore this + $setting_gateway = get_option("pmpro_gateway"); + if($setting_gateway == "gourl") + { + echo '

' . __('Payment method', GOURLPMP) . '

'; + echo __('Bitcoin/Altcoin', GOURLPMP) . '

'; + return true; + } + + $arr = pmpro_gateways(); + $setting_gateway_name = (isset($arr["$setting_gateway"]) && $arr["$setting_gateway"]) ? $arr["$setting_gateway"] : ucwords($setting_gateway); + + $image = $setting_gateway; + if (in_array($image, array("paypalexpress", "paypal", "payflowpro", "paypalstandard"))) $image = "paypal"; + if (!in_array($image, array("authorizenet", "braintree", "check", "cybersource", "gourl", "paypal", "stripe", "twocheckout"))) $image = "creditcards"; + + //only show this if we're not reviewing and the current gateway isn't a gourl gateway + if(empty($pmpro_review)) + { + ?> +
style="display: none;"> +

-

+
+ + + checked="checked" /> + + " border="0" vspace="10" hspace="10" height="43" width="143"> + + +
+ + checked="checked" /> + + " border="0" vspace="10" hspace="10" height="43"> + +


+ +
+
+ + + + + + + membership_id, date("m F Y")); + update_option(GOURL."PMPRO_INIT_".$user_id."_".$order->membership_id, date("d F Y")); PMProGateway_gourl::add_order_note($order_id, sprintf(__("%s payment received
%s
Payment id #%s. Awaiting network confirmation...", GOURLPMP), $coinName, $amount, GOURL_ADMIN.GOURL."payments&s=payment_".$payID, $payID)); } @@ -844,19 +1137,42 @@ function gourlpmpro_gourlcallback ($user_id, $order_id, $payment_details, $box_s // Update User Membership if (!empty($order) && $order->gateway == "gourl" && in_array($order->status, array("pending", "review", "token"))) { + + $pmpro_level = $wpdb->get_row("SELECT * FROM $wpdb->pmpro_membership_levels WHERE id = '" . (int)$order->membership_id . "' LIMIT 1"); - $startdate = apply_filters("pmpro_checkout_start_date", "'" . current_time("mysql") . "'", $user_id, $pmpro_level); - if (strlen($order->subscription_transaction_id) > 3) + + if(is_numeric($pmpro_level->cycle_number) && $pmpro_level->cycle_number > 0 && $pmpro_level->cycle_period && + !($pmpro_level->expiration_number && $pmpro_level->expiration_period && + strtotime("+ " . $pmpro_level->expiration_number." ".$pmpro_level->expiration_period) < strtotime("+ " . $pmpro_level->cycle_number." ".$pmpro_level->cycle_period))) { - $enddate = "'" . date("Y-m-d", strtotime("+ " . $order->subscription_transaction_id, current_time("timestamp"))) . "'"; + $pmpro_level->expiration_number = $pmpro_level->cycle_number; + $pmpro_level->expiration_period = $pmpro_level->cycle_period; } - elseif (!empty($pmpro_level->expiration_number)) { - $enddate = "'" . date("Y-m-d", strtotime("+ " . $pmpro_level->expiration_number . " " . $pmpro_level->expiration_period, current_time("timestamp"))) . "'"; - } else { - $enddate = "NULL"; - } - + + + $old_startdate = current_time('timestamp'); + $old_enddate = current_time('timestamp'); + + $active_levels = pmpro_getMembershipLevelsForUser($user_id); + if (is_array($active_levels)) + foreach ($active_levels as $row) + { + if ($row->id == $pmpro_level->id && $row->enddate > current_time('timestamp')) + { + $old_startdate = $row->startdate; + $old_enddate = $row->enddate; + } + } + + // subscription start/end + $startdate = "'" . date("Y-m-d H:i:s", $old_startdate) . "'"; + $enddate = (!empty($pmpro_level->expiration_number)) ? "'" . date("Y-m-d H:i:s", strtotime("+ ".$pmpro_level->expiration_number." ".$pmpro_level->expiration_period, $old_enddate)) . "'" : "NULL"; + + $prevorder = new MemberOrder(); + $prevorder->getLastMemberOrder($user_id, apply_filters("pmpro_confirmation_order_status", array("success"))); + $prevorder->updateStatus("-success-"); + $custom_level = array( 'user_id' => $user_id, 'membership_id' => $pmpro_level->id, @@ -871,19 +1187,21 @@ function gourlpmpro_gourlcallback ($user_id, $order_id, $payment_details, $box_s 'startdate' => $startdate, 'enddate' => $enddate); - - if (pmpro_changeMembershipLevel($custom_level, $user_id, 'changed')) - { - $order->status = "success"; - $order->membership_id = $pmpro_level->id; - $order->payment_transaction_id = strtoupper($coinName.$payID); - $order->saveOrder(); - } + pmpro_changeMembershipLevel($custom_level, $user_id, 'changed'); + + + $order->membership_id = $pmpro_level->id; + $order->payment_transaction_id = strtoupper($coinName) . " #" . $payID; + $order->status = "success"; + $order->saveOrder(); + } - return true; + return true; } - } + + + } } \ No newline at end of file diff --git a/images/authorizenet.png b/images/authorizenet.png new file mode 100644 index 0000000..08d6639 Binary files /dev/null and b/images/authorizenet.png differ diff --git a/images/braintree.png b/images/braintree.png new file mode 100644 index 0000000..6e7a28d Binary files /dev/null and b/images/braintree.png differ diff --git a/images/check.png b/images/check.png new file mode 100644 index 0000000..9e0dbd8 Binary files /dev/null and b/images/check.png differ diff --git a/images/creditcards.png b/images/creditcards.png new file mode 100644 index 0000000..c2f61f1 Binary files /dev/null and b/images/creditcards.png differ diff --git a/images/cybersource.png b/images/cybersource.png new file mode 100644 index 0000000..733a5a9 Binary files /dev/null and b/images/cybersource.png differ diff --git a/images/gourl.png b/images/gourl.png new file mode 100644 index 0000000..761f58a Binary files /dev/null and b/images/gourl.png differ diff --git a/images/index.html b/images/index.html new file mode 100644 index 0000000..6c15c77 --- /dev/null +++ b/images/index.html @@ -0,0 +1,10 @@ + + + 403 Forbidden + + + +

Directory access is forbidden.

+ + + \ No newline at end of file diff --git a/images/new.png b/images/new.png new file mode 100644 index 0000000..531bd15 Binary files /dev/null and b/images/new.png differ diff --git a/images/paypal.png b/images/paypal.png new file mode 100644 index 0000000..37f1b82 Binary files /dev/null and b/images/paypal.png differ diff --git a/images/stripe.png b/images/stripe.png new file mode 100644 index 0000000..3968333 Binary files /dev/null and b/images/stripe.png differ diff --git a/images/twocheckout.png b/images/twocheckout.png new file mode 100644 index 0000000..625dc19 Binary files /dev/null and b/images/twocheckout.png differ diff --git a/languages/gourl-paidmembershipspro-default.po b/languages/gourl-paidmembershipspro-default.po index 2851c77..c0fe06c 100644 --- a/languages/gourl-paidmembershipspro-default.po +++ b/languages/gourl-paidmembershipspro-default.po @@ -2,15 +2,15 @@ msgid "" msgstr "" "Project-Id-Version: GoUrl Paid Memberships Pro - Bitcoin Payment Gateway " "Addon\n" -"POT-Creation-Date: 2015-12-12 14:36-0000\n" -"PO-Revision-Date: 2015-12-12 14:36-0000\n" +"POT-Creation-Date: 2017-01-28 00:00+0000\n" +"PO-Revision-Date: 2017-01-28 00:00+0000\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.7.6\n" +"X-Generator: Poedit 1.8.7\n" "X-Poedit-Basepath: ..\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;" @@ -20,31 +20,31 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: *.js\n" -#: gourl_paidmembershipspro.php:113 +#: gourl_paidmembershipspro.php:125 msgid "Settings" -msgstr "" +msgstr "Settings" -#: gourl_paidmembershipspro.php:127 +#: gourl_paidmembershipspro.php:139 msgid "GoUrl Bitcoin/Altcoins" msgstr "" -#: gourl_paidmembershipspro.php:174 gourl_paidmembershipspro.php:583 +#: gourl_paidmembershipspro.php:186 gourl_paidmembershipspro.php:681 msgid "Cryptocurrency" msgstr "" -#: gourl_paidmembershipspro.php:177 +#: gourl_paidmembershipspro.php:189 msgid "Bitcoin" msgstr "" -#: gourl_paidmembershipspro.php:195 +#: gourl_paidmembershipspro.php:207 msgid "Plugin Homepage" msgstr "" -#: gourl_paidmembershipspro.php:195 +#: gourl_paidmembershipspro.php:207 msgid "screenshots" msgstr "" -#: gourl_paidmembershipspro.php:196 +#: gourl_paidmembershipspro.php:208 msgid "Plugin on Github - 100% Free Open Source" msgstr "" @@ -53,7 +53,7 @@ msgstr "" # -------------- # English - .. Main Plugin .. # French - .. Plugin Principale .. -#: gourl_paidmembershipspro.php:202 +#: gourl_paidmembershipspro.php:214 #, php-format msgid "" "Your GoUrl Bitcoin Gateway Main Plugin version is too old. " @@ -61,23 +61,23 @@ msgid "" "version." msgstr "" -#: gourl_paidmembershipspro.php:203 gourl_paidmembershipspro.php:233 -#: gourl_paidmembershipspro.php:515 gourl_paidmembershipspro.php:567 -#: gourl_paidmembershipspro.php:576 gourl_paidmembershipspro.php:582 -#: gourl_paidmembershipspro.php:603 gourl_paidmembershipspro.php:610 -#: gourl_paidmembershipspro.php:624 +#: gourl_paidmembershipspro.php:215 gourl_paidmembershipspro.php:245 +#: gourl_paidmembershipspro.php:614 gourl_paidmembershipspro.php:665 +#: gourl_paidmembershipspro.php:674 gourl_paidmembershipspro.php:680 +#: gourl_paidmembershipspro.php:701 gourl_paidmembershipspro.php:708 +#: gourl_paidmembershipspro.php:722 msgid "Information" msgstr "" -#: gourl_paidmembershipspro.php:203 gourl_paidmembershipspro.php:233 +#: gourl_paidmembershipspro.php:215 gourl_paidmembershipspro.php:245 msgid "Main Plugin Homepage" msgstr "" -#: gourl_paidmembershipspro.php:204 gourl_paidmembershipspro.php:234 +#: gourl_paidmembershipspro.php:216 gourl_paidmembershipspro.php:246 msgid "WordPress.org Plugin Page" msgstr "" -#: gourl_paidmembershipspro.php:208 +#: gourl_paidmembershipspro.php:220 #, php-format msgid "" "Your PaidMembershipsPro version is too old. The GoUrl payment plugin " @@ -85,22 +85,22 @@ msgid "" "href='%s'>latest version." msgstr "" -#: gourl_paidmembershipspro.php:221 +#: gourl_paidmembershipspro.php:233 msgid "- Please setup -" msgstr "" -#: gourl_paidmembershipspro.php:229 +#: gourl_paidmembershipspro.php:241 msgid "Please install GoUrl Bitcoin Gateway WP Plugin" msgstr "" -#: gourl_paidmembershipspro.php:232 +#: gourl_paidmembershipspro.php:244 #, php-format msgid "" "You need to install GoUrl Bitcoin Gateway Main Plugin also. Go to - Automatic installation or Manual." msgstr "" -#: gourl_paidmembershipspro.php:238 +#: gourl_paidmembershipspro.php:250 msgid "" "Secure payments with virtual currency. What is Bitcoin?" @@ -111,12 +111,12 @@ msgstr "" # -------------- # English: Accept %s Payments ... # French: Acceptons %s les paiements ... -#: gourl_paidmembershipspro.php:239 +#: gourl_paidmembershipspro.php:251 #, php-format msgid "Accept %s payments online in PaidMembershipsPro." msgstr "" -#: gourl_paidmembershipspro.php:240 +#: gourl_paidmembershipspro.php:252 #, php-format msgid "" "If you use multiple websites online, please create separate %s" msgstr "" -#: gourl_paidmembershipspro.php:274 +#: gourl_paidmembershipspro.php:286 msgid "PaymentBox Language" msgstr "" -#: gourl_paidmembershipspro.php:278 +#: gourl_paidmembershipspro.php:290 msgid "Default Crypto Payment Box Localisation" msgstr "" -#: gourl_paidmembershipspro.php:286 +#: gourl_paidmembershipspro.php:298 msgid "Exchange Rate Multiplier" msgstr "" -#: gourl_paidmembershipspro.php:288 +#: gourl_paidmembershipspro.php:300 msgid "" "The system uses the multiplier rate with today LIVE cryptocurrency exchange " "rates (which are updated every 30 minutes) when the transaction is " @@ -161,32 +161,32 @@ msgid "" "bitcoin/altcoins. Default: 1.00" msgstr "" -#: gourl_paidmembershipspro.php:297 +#: gourl_paidmembershipspro.php:309 msgid "Icons Size" msgstr "" -#: gourl_paidmembershipspro.php:299 +#: gourl_paidmembershipspro.php:311 msgid "" "Cryptocoin icons size in 'Select Payment Method' that the customer will see " "on your checkout. Default 60px. Allowed: 30..250px" msgstr "" -#: gourl_paidmembershipspro.php:304 +#: gourl_paidmembershipspro.php:316 msgid "PaymentBox Style" msgstr "" -#: gourl_paidmembershipspro.php:305 +#: gourl_paidmembershipspro.php:317 #, php-format msgid "" "Payment Box sizes and border shadow you " "can change here »" msgstr "" -#: gourl_paidmembershipspro.php:310 +#: gourl_paidmembershipspro.php:322 msgid "Languages" msgstr "" -#: gourl_paidmembershipspro.php:311 +#: gourl_paidmembershipspro.php:323 #, php-format msgid "" "If you want to use GoUrl PaidMembershipsPro Bitcoin Gateway plugin in a " @@ -194,45 +194,67 @@ msgid "" "Translations" msgstr "" -#: gourl_paidmembershipspro.php:371 gourl_paidmembershipspro.php:446 +#: gourl_paidmembershipspro.php:390 msgid "GoUrl Bitcoin/Altcoin" msgstr "" -#: gourl_paidmembershipspro.php:454 +#: gourl_paidmembershipspro.php:429 gourl_paidmembershipspro.php:540 +msgid "NO EXPIRY" +msgstr "" + +#: gourl_paidmembershipspro.php:482 gourl_paidmembershipspro.php:516 +#: gourl_paidmembershipspro.php:533 msgid "Guest" msgstr "" -#: gourl_paidmembershipspro.php:455 +#: gourl_paidmembershipspro.php:483 gourl_paidmembershipspro.php:517 +#, php-format +msgid "Order Created by %s
Membership - %s
%s (%s)" +msgstr "" + +#: gourl_paidmembershipspro.php:534 #, php-format msgid "" "Order Created by %s
Membership - %s
Awaiting Cryptocurrency Payment " "- %s
Invoice #%s" msgstr "" -#: gourl_paidmembershipspro.php:487 +#: gourl_paidmembershipspro.php:594 +msgid "Details" +msgstr "" + +#: gourl_paidmembershipspro.php:598 msgid "Account" msgstr "" -#: gourl_paidmembershipspro.php:488 +#: gourl_paidmembershipspro.php:600 msgid "Order" msgstr "" -#: gourl_paidmembershipspro.php:489 +#: gourl_paidmembershipspro.php:601 +msgid "Amount" +msgstr "" + +#: gourl_paidmembershipspro.php:602 msgid "Membership Level" msgstr "" -#: gourl_paidmembershipspro.php:490 -msgid "Amount" +#: gourl_paidmembershipspro.php:604 gourl_paidmembershipspro.php:605 +msgid "Membership Period" +msgstr "" + +#: gourl_paidmembershipspro.php:607 +msgid "Invoice Status" msgstr "" -#: gourl_paidmembershipspro.php:516 gourl_paidmembershipspro.php:568 +#: gourl_paidmembershipspro.php:615 gourl_paidmembershipspro.php:666 #, php-format msgid "" "The GoUrl payment plugin was called to process a payment but could not " "retrieve the order details for orderID %s. Cannot continue!" msgstr "" -#: gourl_paidmembershipspro.php:577 +#: gourl_paidmembershipspro.php:675 #, php-format msgid "" "Please try a different payment method. Admin need to install and activate " @@ -240,7 +262,7 @@ msgid "" "accept Bitcoin/Altcoin Payments online." msgstr "" -#: gourl_paidmembershipspro.php:583 +#: gourl_paidmembershipspro.php:681 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try a different " @@ -248,20 +270,20 @@ msgid "" "not configured / %s not activated)" msgstr "" -#: gourl_paidmembershipspro.php:605 +#: gourl_paidmembershipspro.php:703 msgid "" "You need first to login or register on the website to make Bitcoin/Altcoin " "Payments" msgstr "" -#: gourl_paidmembershipspro.php:611 +#: gourl_paidmembershipspro.php:709 #, php-format msgid "" "This order's amount is '%s' - it cannot be paid for. Please contact us if " "you need assistance." msgstr "" -#: gourl_paidmembershipspro.php:625 +#: gourl_paidmembershipspro.php:723 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try later or use " @@ -269,55 +291,94 @@ msgid "" "Google Finance" msgstr "" -#: gourl_paidmembershipspro.php:644 +#: gourl_paidmembershipspro.php:740 +msgid "UNPAID" +msgstr "" + +#: gourl_paidmembershipspro.php:746 #, php-format -msgid "Free Trial already used on %s" +msgid "Notes - You have already used your trial on %s" msgstr "" -#: gourl_paidmembershipspro.php:646 +#: gourl_paidmembershipspro.php:749 msgid "Pay Now -" msgstr "" -#: gourl_paidmembershipspro.php:649 +#: gourl_paidmembershipspro.php:753 +msgid "FULLY PAID" +msgstr "" + +#: gourl_paidmembershipspro.php:758 msgid "" "Sorry, but there was an error processing your order. Please try a different " "payment method." msgstr "" -#: gourl_paidmembershipspro.php:661 +#: gourl_paidmembershipspro.php:773 msgid "Thank you for your membership." msgstr "" -#: gourl_paidmembershipspro.php:663 +#: gourl_paidmembershipspro.php:775 #, php-format msgid "" -"Thank you for your membership to %s.
Your %s membership is now active." +"Thank you for your membership to %s.
Your %s membership is now " +"active." msgstr "" -#: gourl_paidmembershipspro.php:666 +#: gourl_paidmembershipspro.php:778 msgid "View Your Membership Account" msgstr "" -#: gourl_paidmembershipspro.php:759 +#: gourl_paidmembershipspro.php:871 msgid "Payment Log" msgstr "" -#: gourl_paidmembershipspro.php:822 +#: gourl_paidmembershipspro.php:942 +#, php-format +msgid "" +"You can offer your customers multiple Gateway Options at " +"PaidMembershipPro Checkout. Screenshot »
To get " +"this facility you need to setup Gourl 'Bitcoin/Altcoins' settings on this " +"page, click 'Save Settings' button, and then switch to another gateway (for " +"example, Paypal, or Stripe) and keep that other gateway as a primary " +"gateway. The GoUrl settings will be remembered 'in the background' and the " +"two gateways will be displayed on the checkout page. If you want to use " +"Gourl Bitcoin/Altcoin on checkout page only you should keep the Gourl " +"Gateway as your primary gateway. If you don't want to use the Bitcoin " +"gateway, simply disable 'GoUrl Paid Memberships Pro' addon on your plugin " +"page.
Also you can setup Optional Free or Reduced-price Trial Period in " +"Paid Memberships Pro with Bitcoins (screenshot).   " +"More info on www.gourl.io" +msgstr "" + +#: gourl_paidmembershipspro.php:963 +msgid "Payment method" +msgstr "" + +#: gourl_paidmembershipspro.php:964 gourl_paidmembershipspro.php:985 +msgid "Bitcoin/Altcoin" +msgstr "" + +#: gourl_paidmembershipspro.php:980 +msgid "Choose your payment method" +msgstr "" + +#: gourl_paidmembershipspro.php:1115 msgid "Yes" msgstr "" -#: gourl_paidmembershipspro.php:822 +#: gourl_paidmembershipspro.php:1115 msgid "No" msgstr "" -#: gourl_paidmembershipspro.php:833 +#: gourl_paidmembershipspro.php:1126 #, php-format msgid "" "%s payment received
%s
Payment id #%s. " "Awaiting network confirmation..." msgstr "" -#: gourl_paidmembershipspro.php:840 +#: gourl_paidmembershipspro.php:1133 #, php-format msgid "%s Payment id #%s Confirmed" msgstr "" diff --git a/languages/gourl-paidmembershipspro-ru_RU.mo b/languages/gourl-paidmembershipspro-ru_RU.mo index b18f234..b5bc3c9 100644 Binary files a/languages/gourl-paidmembershipspro-ru_RU.mo and b/languages/gourl-paidmembershipspro-ru_RU.mo differ diff --git a/languages/gourl-paidmembershipspro-ru_RU.po b/languages/gourl-paidmembershipspro-ru_RU.po index 2eb1213..3726bea 100644 --- a/languages/gourl-paidmembershipspro-ru_RU.po +++ b/languages/gourl-paidmembershipspro-ru_RU.po @@ -2,15 +2,15 @@ msgid "" msgstr "" "Project-Id-Version: GoUrl Paid Memberships Pro - Bitcoin Payment Gateway " "Addon\n" -"POT-Creation-Date: 2015-12-12 00:00-0000\n" -"PO-Revision-Date: 2015-12-12 00:00-0000\n" +"POT-Creation-Date: 2017-01-28 00:00+0000\n" +"PO-Revision-Date: 2017-01-28 00:00+0000\n" "Last-Translator: \n" "Language-Team: \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.7.6\n" +"X-Generator: Poedit 1.8.7\n" "X-Poedit-Basepath: ..\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;" @@ -21,35 +21,35 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: *.js\n" -#: gourl_paidmembershipspro.php:113 +#: gourl_paidmembershipspro.php:125 msgid "Settings" msgstr "Настройки" -#: gourl_paidmembershipspro.php:127 +#: gourl_paidmembershipspro.php:139 msgid "GoUrl Bitcoin/Altcoins" msgstr "GoUrl Биткоин/Альткоины" -#: gourl_paidmembershipspro.php:174 gourl_paidmembershipspro.php:583 +#: gourl_paidmembershipspro.php:186 gourl_paidmembershipspro.php:681 msgid "Cryptocurrency" msgstr "Криптовалюта" -#: gourl_paidmembershipspro.php:177 +#: gourl_paidmembershipspro.php:189 msgid "Bitcoin" msgstr "Биткоин" -#: gourl_paidmembershipspro.php:195 +#: gourl_paidmembershipspro.php:207 msgid "Plugin Homepage" msgstr "Домашняя страница" -#: gourl_paidmembershipspro.php:195 +#: gourl_paidmembershipspro.php:207 msgid "screenshots" msgstr "скриншоты" -#: gourl_paidmembershipspro.php:196 +#: gourl_paidmembershipspro.php:208 msgid "Plugin on Github - 100% Free Open Source" msgstr "Плагин на Github - 100% открытый исходный код" -#: gourl_paidmembershipspro.php:202 +#: gourl_paidmembershipspro.php:214 #, php-format msgid "" "Your GoUrl Bitcoin Gateway Main Plugin version is too old. " @@ -60,23 +60,23 @@ msgstr "" "версия 1.3.3 или выше. Пожалуйста, обновите до последней " "версии." -#: gourl_paidmembershipspro.php:203 gourl_paidmembershipspro.php:233 -#: gourl_paidmembershipspro.php:515 gourl_paidmembershipspro.php:567 -#: gourl_paidmembershipspro.php:576 gourl_paidmembershipspro.php:582 -#: gourl_paidmembershipspro.php:603 gourl_paidmembershipspro.php:610 -#: gourl_paidmembershipspro.php:624 +#: gourl_paidmembershipspro.php:215 gourl_paidmembershipspro.php:245 +#: gourl_paidmembershipspro.php:614 gourl_paidmembershipspro.php:665 +#: gourl_paidmembershipspro.php:674 gourl_paidmembershipspro.php:680 +#: gourl_paidmembershipspro.php:701 gourl_paidmembershipspro.php:708 +#: gourl_paidmembershipspro.php:722 msgid "Information" msgstr "Информация" -#: gourl_paidmembershipspro.php:203 gourl_paidmembershipspro.php:233 +#: gourl_paidmembershipspro.php:215 gourl_paidmembershipspro.php:245 msgid "Main Plugin Homepage" msgstr "Страница главного плагина" -#: gourl_paidmembershipspro.php:204 gourl_paidmembershipspro.php:234 +#: gourl_paidmembershipspro.php:216 gourl_paidmembershipspro.php:246 msgid "WordPress.org Plugin Page" msgstr "Страница плагина на WordPress.org" -#: gourl_paidmembershipspro.php:208 +#: gourl_paidmembershipspro.php:220 #, php-format msgid "" "Your PaidMembershipsPro version is too old. The GoUrl payment plugin " @@ -87,15 +87,15 @@ msgstr "" "PaidMembershipsPro 1.8.4 или выше. Пожалуйста, обновите до последней версии." -#: gourl_paidmembershipspro.php:221 +#: gourl_paidmembershipspro.php:233 msgid "- Please setup -" msgstr "- Пожалуйста настройте -" -#: gourl_paidmembershipspro.php:229 +#: gourl_paidmembershipspro.php:241 msgid "Please install GoUrl Bitcoin Gateway WP Plugin" msgstr "Пожалуйста, установите основной GoUrl Биткоин Плагин для WP" -#: gourl_paidmembershipspro.php:232 +#: gourl_paidmembershipspro.php:244 #, php-format msgid "" "You need to install GoUrl Bitcoin Gateway Main Plugin also. Go to - Автоматическая установка или ручная установка." -#: gourl_paidmembershipspro.php:238 +#: gourl_paidmembershipspro.php:250 msgid "" "Secure payments with virtual currency. What is Bitcoin?" @@ -113,12 +113,12 @@ msgstr "" "Безопасные платежи с виртуальной валютой. Что такое Биткоин?" -#: gourl_paidmembershipspro.php:239 +#: gourl_paidmembershipspro.php:251 #, php-format msgid "Accept %s payments online in PaidMembershipsPro." msgstr "Принимайте %s платежи онлайн в PaidMembershipsPro." -#: gourl_paidmembershipspro.php:240 +#: gourl_paidmembershipspro.php:252 #, php-format msgid "" "If you use multiple websites online, please create separate %s" @@ -147,19 +147,19 @@ msgstr "" "По умолчанию криптомонета в Payment Box. Активированные платежи: %s" -#: gourl_paidmembershipspro.php:274 +#: gourl_paidmembershipspro.php:286 msgid "PaymentBox Language" msgstr "Язык в PaymentBox" -#: gourl_paidmembershipspro.php:278 +#: gourl_paidmembershipspro.php:290 msgid "Default Crypto Payment Box Localisation" msgstr "По умолчанию локализация в Payment Box" -#: gourl_paidmembershipspro.php:286 +#: gourl_paidmembershipspro.php:298 msgid "Exchange Rate Multiplier" msgstr "Обменный курс множитель" -#: gourl_paidmembershipspro.php:288 +#: gourl_paidmembershipspro.php:300 msgid "" "The system uses the multiplier rate with today LIVE cryptocurrency exchange " "rates (which are updated every 30 minutes) when the transaction is " @@ -174,11 +174,11 @@ msgstr "" "5% к общей стоимости в биткоинах и другой криптовалюте, 0.85 - будет " "скидка 15% при оплате в биткоинах/альткоинах. По умолчанию: 1.00" -#: gourl_paidmembershipspro.php:297 +#: gourl_paidmembershipspro.php:309 msgid "Icons Size" msgstr "Размер иконок" -#: gourl_paidmembershipspro.php:299 +#: gourl_paidmembershipspro.php:311 msgid "" "Cryptocoin icons size in 'Select Payment Method' that the customer will see " "on your checkout. Default 60px. Allowed: 30..250px" @@ -186,11 +186,11 @@ msgstr "" "Размер иконок криптомонет в поле «Выбрать способ оплаты», которое клиент " "будет видеть при оформлении заказа. По умолчанию 60px. Допускается: 30..250px" -#: gourl_paidmembershipspro.php:304 +#: gourl_paidmembershipspro.php:316 msgid "PaymentBox Style" msgstr "Стиль Payment Box" -#: gourl_paidmembershipspro.php:305 +#: gourl_paidmembershipspro.php:317 #, php-format msgid "" "Payment Box sizes and border shadow you " @@ -199,11 +199,11 @@ msgstr "" "Payment Box размеры и границы теней вы " "можете изменить здесь »" -#: gourl_paidmembershipspro.php:310 +#: gourl_paidmembershipspro.php:322 msgid "Languages" msgstr "Языки" -#: gourl_paidmembershipspro.php:311 +#: gourl_paidmembershipspro.php:323 #, php-format msgid "" "If you want to use GoUrl PaidMembershipsPro Bitcoin Gateway plugin in a " @@ -214,15 +214,25 @@ msgstr "" "другом языке, чем русский, смотрите страницу языки и переводы" -#: gourl_paidmembershipspro.php:371 gourl_paidmembershipspro.php:446 +#: gourl_paidmembershipspro.php:390 msgid "GoUrl Bitcoin/Altcoin" msgstr "GoUrl Биткоин/Альткоин" -#: gourl_paidmembershipspro.php:454 +#: gourl_paidmembershipspro.php:429 gourl_paidmembershipspro.php:540 +msgid "NO EXPIRY" +msgstr "Без истечения срока действия" + +#: gourl_paidmembershipspro.php:482 gourl_paidmembershipspro.php:516 +#: gourl_paidmembershipspro.php:533 msgid "Guest" msgstr "Гость" -#: gourl_paidmembershipspro.php:455 +#: gourl_paidmembershipspro.php:483 gourl_paidmembershipspro.php:517 +#, php-format +msgid "Order Created by %s
Membership - %s
%s (%s)" +msgstr "Заказ создан %s
Членство - %s
%s (%s)" + +#: gourl_paidmembershipspro.php:534 #, php-format msgid "" "Order Created by %s
Membership - %s
Awaiting Cryptocurrency Payment " @@ -231,23 +241,35 @@ msgstr "" "Заказ создан %s
Членство - %s
Ожидании оплаты криптовалютой - %s " "
Инвойс #%s" -#: gourl_paidmembershipspro.php:487 +#: gourl_paidmembershipspro.php:594 +msgid "Details" +msgstr "Детали платежа" + +#: gourl_paidmembershipspro.php:598 msgid "Account" msgstr "Профиль" -#: gourl_paidmembershipspro.php:488 +#: gourl_paidmembershipspro.php:600 msgid "Order" msgstr "Заказ" -#: gourl_paidmembershipspro.php:489 +#: gourl_paidmembershipspro.php:601 +msgid "Amount" +msgstr "Сумма" + +#: gourl_paidmembershipspro.php:602 msgid "Membership Level" msgstr "Уровень членства (подписки)" -#: gourl_paidmembershipspro.php:490 -msgid "Amount" -msgstr "Сумма" +#: gourl_paidmembershipspro.php:604 gourl_paidmembershipspro.php:605 +msgid "Membership Period" +msgstr "Членство" + +#: gourl_paidmembershipspro.php:607 +msgid "Invoice Status" +msgstr "Статус счета" -#: gourl_paidmembershipspro.php:516 gourl_paidmembershipspro.php:568 +#: gourl_paidmembershipspro.php:615 gourl_paidmembershipspro.php:666 #, php-format msgid "" "The GoUrl payment plugin was called to process a payment but could not " @@ -256,7 +278,7 @@ msgstr "" "Ошибка. Плагин оплаты GoUrl был вызван для обработки платежа, но не может " "получить сведения о заказе orderID %s!" -#: gourl_paidmembershipspro.php:577 +#: gourl_paidmembershipspro.php:675 #, php-format msgid "" "Please try a different payment method. Admin need to install and activate " @@ -267,7 +289,7 @@ msgstr "" "установить и активировать плагин для wordpress GoUrl Биткоин " "шлюз для Wordpress для приема платежей в криптовалюте онлайн." -#: gourl_paidmembershipspro.php:583 +#: gourl_paidmembershipspro.php:681 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try a different " @@ -278,7 +300,7 @@ msgstr "" "попробуйте другой метод оплаты или свяжитесь с нами, если вам нужна помощь " "(GoUrl Bitcoin плагин не настроен / %s не активирован)" -#: gourl_paidmembershipspro.php:605 +#: gourl_paidmembershipspro.php:703 msgid "" "You need first to login or register on the website to make Bitcoin/Altcoin " "Payments" @@ -286,7 +308,7 @@ msgstr "" "Вам нужно сначала войти в систему или зарегистрироваться на сайте чтобы " "сделать платеж а биткоинах/альткоинах" -#: gourl_paidmembershipspro.php:611 +#: gourl_paidmembershipspro.php:709 #, php-format msgid "" "This order's amount is '%s' - it cannot be paid for. Please contact us if " @@ -295,7 +317,7 @@ msgstr "" "Сумма заказа - %s не может быть оплачена. Пожалуйста, свяжитесь с нами, если " "вам нужна помощь." -#: gourl_paidmembershipspro.php:625 +#: gourl_paidmembershipspro.php:723 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try later or use " @@ -306,16 +328,24 @@ msgstr "" "попробуйте позже или используйте другой способ оплаты. Система не может " "получить курсы валют для %s/USD с Google Finance" -#: gourl_paidmembershipspro.php:644 +#: gourl_paidmembershipspro.php:740 +msgid "UNPAID" +msgstr "НЕОПЛАЧЕНО" + +#: gourl_paidmembershipspro.php:746 #, php-format -msgid "Free Trial already used on %s" -msgstr "Бесплатная пробная версия уже использована на %s" +msgid "Notes - You have already used your trial on %s" +msgstr "Примечания - вы уже использовали пробную версию на %s" -#: gourl_paidmembershipspro.php:646 +#: gourl_paidmembershipspro.php:749 msgid "Pay Now -" msgstr "Оплатить сейчас -" -#: gourl_paidmembershipspro.php:649 +#: gourl_paidmembershipspro.php:753 +msgid "FULLY PAID" +msgstr "ПОЛНОСТЬЮ ОПЛАЧЕНО" + +#: gourl_paidmembershipspro.php:758 msgid "" "Sorry, but there was an error processing your order. Please try a different " "payment method." @@ -323,35 +353,81 @@ msgstr "" "Извините, но произошла ошибка при обработке вашего заказа. Пожалуйста, " "попробуйте другой метод оплаты." -#: gourl_paidmembershipspro.php:661 +#: gourl_paidmembershipspro.php:773 msgid "Thank you for your membership." msgstr "Спасибо вам за ваше членство." -#: gourl_paidmembershipspro.php:663 +#: gourl_paidmembershipspro.php:775 #, php-format msgid "" -"Thank you for your membership to %s.
Your %s membership is now active." +"Thank you for your membership to %s.
Your %s membership is now " +"active." msgstr "" -"Благодарим за активацию вашего членства/подписки в %s.
Ваш %s активирован " -"сейчас." +"Благодарим Вас за регистрацию на сайте %s. Ваша подписка на уровень %s " +"активна." -#: gourl_paidmembershipspro.php:666 +#: gourl_paidmembershipspro.php:778 msgid "View Your Membership Account" msgstr "Просмотреть ваш аккаунт" -#: gourl_paidmembershipspro.php:759 +#: gourl_paidmembershipspro.php:871 msgid "Payment Log" msgstr "Журнал оплаты" -#: gourl_paidmembershipspro.php:822 +#: gourl_paidmembershipspro.php:942 +#, php-format +msgid "" +"You can offer your customers multiple Gateway Options at " +"PaidMembershipPro Checkout. Screenshot »
To get " +"this facility you need to setup Gourl 'Bitcoin/Altcoins' settings on this " +"page, click 'Save Settings' button, and then switch to another gateway (for " +"example, Paypal, or Stripe) and keep that other gateway as a primary " +"gateway. The GoUrl settings will be remembered 'in the background' and the " +"two gateways will be displayed on the checkout page. If you want to use " +"Gourl Bitcoin/Altcoin on checkout page only you should keep the Gourl " +"Gateway as your primary gateway. If you don't want to use the Bitcoin " +"gateway, simply disable 'GoUrl Paid Memberships Pro' addon on your plugin " +"page.
Also you can setup Optional Free or Reduced-price Trial Period in " +"Paid Memberships Pro with Bitcoins (screenshot).   " +"More info on www.gourl.io" +msgstr "" +" Вы можете предложить своим клиентам несколько платежных систем на " +"странице оплаты PaidMembershipPro. Скриншот »
" +"Чтобы использовать это, вам нужно настроить Gourl 'Bitcoin / Altcoins' на " +"этой странице, нажать кнопку \" Сохранить настройки \", а затем " +"переключиться на другой шлюз (например, Paypal или Stripe) и использовать " +"этот другой шлюз в качестве основного шлюза. Настройки GoUrl будут запомнены " +"\"в фоновом режиме\" и два шлюза будут отображаться на странице оформления " +"заказа. Если вы хотите использовать только Gourl Bitcoin / Altcoin на " +"странице оформления заказа, вы должны выбрать Gourl шлюз в качестве " +"основного шлюза. Если вы не хотите использовать шлюз GoUrl Bitcoin, просто " +"отключите \"'GoUrl Paid Memberships Pro' аддон на странице плагинов.
" +"Также вы можете предлагать пробный период - бесплатный или по льготной цене " +"в Paid Memberships Pro с биткоинами (Скриншот). Более " +"подробную информацию смотрите на www.gourl.io " +"" + +#: gourl_paidmembershipspro.php:963 +msgid "Payment method" +msgstr "Способ оплаты" + +#: gourl_paidmembershipspro.php:964 gourl_paidmembershipspro.php:985 +msgid "Bitcoin/Altcoin" +msgstr "Биткоин/альткоин" + +#: gourl_paidmembershipspro.php:980 +msgid "Choose your payment method" +msgstr "Выберите способ оплаты" + +#: gourl_paidmembershipspro.php:1115 msgid "Yes" msgstr "Да" -#: gourl_paidmembershipspro.php:822 +#: gourl_paidmembershipspro.php:1115 msgid "No" msgstr "Нет" -#: gourl_paidmembershipspro.php:833 +#: gourl_paidmembershipspro.php:1126 #, php-format msgid "" "%s payment received
%s
Payment id #%s. " @@ -360,7 +436,7 @@ msgstr "" "%s платеж получен
%s
Номер платежа #%s. " "Ожидание подтверждения сети..." -#: gourl_paidmembershipspro.php:840 +#: gourl_paidmembershipspro.php:1133 #, php-format msgid "%s Payment id #%s Confirmed" msgstr "%s платёж с номером %s Подтверждён" diff --git a/readme.md b/readme.md index 2bbe3b1..9775886 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ GoUrl Paid Memberships Pro - Bitcoin Payment Gateway Addon ----------------------------------------------------------- -Version 1.1.3 +Version 1.1.4 **Wordpress Plugin provides a Bitcoin/Altcoin Payment Gateway for Paid Memberships Pro 1.8+ or higher.** @@ -12,7 +12,7 @@ Accept Bitcoin, Litecoin, Paycoin, Dogecoin, Dash, Speedcoin, Reddcoin, Potcoin, * Plugin Page: [https://gourl.io/bitcoin-payments-paid-memberships-pro.html](https://gourl.io/bitcoin-payments-paid-memberships-pro.html) * Screenshots: [https://gourl.io/bitcoin-payments-paid-memberships-pro.html#screenshot](https://gourl.io/bitcoin-payments-paid-memberships-pro.html#screenshot) * Requires at least: Wordpress 3.5 and Paid Memberships Pro 1.8.4 -* Stable Tag: 1.1.3 +* Stable Tag: 1.1.4 * License: GNU Version 2 or Any Later Version @@ -20,6 +20,7 @@ Accept Bitcoin, Litecoin, Paycoin, Dogecoin, Dash, Speedcoin, Reddcoin, Potcoin, * 100% Free Open Source Plugin on [Github.com](https://github.com/cryptoapi/Bitcoin-Gateway-Paid-Memberships-Pro) * Provides a Cryptocurrency Payment Gateway for [Paid Memberships Pro 1.8 or higher](https://wordpress.org/plugins/paid-memberships-pro/) +* Free Trial Membership and [Bitcoin Recurring Subscription](http://gourl.io/images/pmpro/screenshot-6.png) * Accept Bitcoin and other cryptocurrency payments in Paid Memberships Pro * No Monthly Fee, Transaction Fee from 0% * Direct Integration on your website, no external payment pages opens (as other payment gateways offer) @@ -64,4 +65,13 @@ Payment Received Successfully . # ![Payment Received Successfully](https://gourl.io/images/pmpro/screenshot-3.png) - + + + +Support multiple gateways (Paypal, Stripe, etc + GoUrl Bitcoin/Altcoins) +---------------- + +. + +# ![Support multiple gateways](https://gourl.io/images/pmpro/screenshot-7.png) + diff --git a/readme.txt b/readme.txt index 602673b..d7543d4 100644 --- a/readme.txt +++ b/readme.txt @@ -5,8 +5,8 @@ Plugin URI: https://gourl.io/bitcoin-payments-paid-memberships-pro.html Author URI: https://gourl.io Tags: paidmembershipspro, pmpro, membership, paid membership, bitcoin, bitcoins, bitcoin payments, gourl, cryptocurrency, btc, litecoin, dogecoin, darkcoin, dash, speedcoin, vertcoin, reddcoin, feathercoin, vericoin, potcoin, paycoin, monetaryunit, peercoin, paid memberships pro Requires at least: 3.5 -Tested up to: 4.4 -Stable Tag: 1.1.3 +Tested up to: 4.8 +Stable Tag: 1.1.4 License: GNU Version 2 or Any Later Version License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -22,6 +22,7 @@ Wordpress Plugin for Paid Memberships Pro Features - * 100% Free Open Source Plugin on [Github.com](https://github.com/cryptoapi/Bitcoin-Gateway-Paid-Memberships-Pro) * Provides a Cryptocurrency Payment Gateway for [Paid Memberships Pro 1.8 or higher](https://wordpress.org/plugins/paid-memberships-pro/) +* Free Trial Membership and [Bitcoin Recurring Subscription](http://gourl.io/images/pmpro/screenshot-6.png) * Accept Bitcoin, Litecoin, Paycoin, Dogecoin, Dash, Speedcoin, Reddcoin, Potcoin, Feathercoin, Vertcoin, Vericoin, Peercoin, MonetaryUnit payments in Paid Memberships Pro * No Monthly Fee, Transaction Fee from 0% * Direct Integration on your website, no external payment pages opens (as other payment gateways offer) @@ -77,14 +78,19 @@ In the search field type "GoUrl Paid Memberships Pro" and click Search Plugins. 3. Bitcoin Payment for Paid Memberships Pro Received Successfully 4. Paid Memberships Pro Edit Order Page 5. Optional - You can place your membership in Bitcoins/Altcoins directly +6. Free Trial Membership and Bitcoin Recurring Subscription +7. Multiple gateways (Paypal, Stripe, etc + GoUrl Bitcoin/Altcoins) == Changelog == += 1.1.4 = +Support multiple gateways (Paypal, Stripe, etc + GoUrl Bitcoin/Altcoins) + = 1.1.3 = -Supports free trial membership +Support free trial membership = 1.1.2 = Add MonetaryUnit [MUE] cryptocurrency @@ -98,5 +104,5 @@ Localisation - You can easy change/localize any text in plugin = 1.0.0 = Initial Release - + \ No newline at end of file diff --git a/screenshot-2.png b/screenshot-2.png index 6cda809..af9307e 100644 Binary files a/screenshot-2.png and b/screenshot-2.png differ diff --git a/screenshot-3.png b/screenshot-3.png index caa1c4b..c18094d 100644 Binary files a/screenshot-3.png and b/screenshot-3.png differ diff --git a/screenshot-6.png b/screenshot-6.png new file mode 100644 index 0000000..0515ce5 Binary files /dev/null and b/screenshot-6.png differ diff --git a/screenshot-7.png b/screenshot-7.png new file mode 100644 index 0000000..16ce117 Binary files /dev/null and b/screenshot-7.png differ