diff --git a/gourl_paidmembershipspro.php b/gourl_paidmembershipspro.php index 32bd050..222563d 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.2 +Version: 1.1.3 Author: GoUrl.io Author URI: https://gourl.io License: GPLv2 @@ -51,6 +51,9 @@ function gourl_pmp_gateway_load() // custom confirmation page add_filter('pmpro_pages_shortcode_confirmation', array('PMProGateway_gourl', 'pmpro_pages_shortcode_confirmation'), 20, 1); + // custom invoice + add_filter('pmpro_invoice_bullets_bottom', array('PMProGateway_gourl', 'pmpro_invoice_bullets_bottom'), 20, 1); + // plugin links add_filter('plugin_action_links', array('PMProGateway_gourl', 'plugin_action_links'), 10, 2 ); @@ -314,6 +317,7 @@ public static function pmpro_payment_option_fields($options, $gateway) return; } + /** @@ -339,32 +343,116 @@ public static function pmpro_required_billing_fields($fields) return $fields; } + - + + /** + * 1.10 Process checkout. + * + */ + function process(&$order) + { + + return true; + } + + + + /** - * 1.10 Redirect to bitcoin/altcoin payment page + * 1.11 Redirect to bitcoin/altcoin payment page */ public static function pmpro_checkout_before_change_membership_level($user_id, $order) { + global $pmpro_currency; + if (!$order || $order->gateway != "gourl") return true; + + $order->payment_type = __('GoUrl Bitcoin/Altcoin', GOURLPMP); + + // is it initial payment ? + if(!get_option(GOURL."PMPRO_INIT_".$user_id."_".$order->membership_level->id)) + { + // Free + if (floatval($order->subtotal) == 0) + { + // 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"; + + 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"; + } + + 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; + } + else + { + $order->total = $order->subtotal; + } + } + + // second, third, etc payments .... + else + { + if (floatval($order->subtotal) == 0 && floatval($order->PaymentAmount) == 0) + { + $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; + + } + 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->subtotal != $order->subtotal || $morder->membership_id != $order->membership_id || strtotime($order->ProfileStartDate) < (strtotime("now") - 48*60*60) || - (isset($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 ($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)) { $order->payment_type = __('GoUrl Bitcoin/Altcoin', GOURLPMP); $order->gateway = "gourl"; $order->user_id = get_current_user_id(); $order->status = "pending"; - if ($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; + 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
Awaiting Cryptocurrency Payment ...', GOURLPMP ), $user)); + 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)); } wp_redirect(pmpro_url("confirmation")); @@ -374,9 +462,10 @@ public static function pmpro_checkout_before_change_membership_level($user_id, $ } + /** - * 1.11 Custom confirmation page + * 1.12 Custom confirmation page * */ public static function pmpro_pages_shortcode_confirmation($content) @@ -410,14 +499,27 @@ public static function pmpro_pages_shortcode_confirmation($content) } + + /** - * 1.12. GoUrl Payment Box - */ - public static function pmpro_gourl_cryptocoin_payment ($order) + * 1.13. GoUrl Payment Box + */ + public static function pmpro_gourl_cryptocoin_payment ($order, $invoice = false) { global $gourl, $pmpro_currency, $current_user, $wpdb; $tmp = ""; + + if (!$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; + // Initialize // ------------------------ @@ -460,12 +562,12 @@ public static function pmpro_gourl_cryptocoin_payment ($order) // Security // ------------- - if (!$order_id || !$order) + if (!$order_id) { $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)."
"; } - elseif ($order->gateway != "gourl" || ($order_user_id && $order_user_id != get_current_user_id())) + elseif ($order_user_id && $order_user_id != get_current_user_id() && !current_user_can('manage_options')) { return false; } @@ -534,8 +636,15 @@ public static function pmpro_gourl_cryptocoin_payment ($order) { // crypto payment gateway $result = $gourl->cryptopayments ($plugin, $amount, $currency, $orderID, $period, $language, $coin, $affiliate_key, $userID, $iconwidth); - - if (!$result["is_paid"]) $tmp .= '

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

' . PHP_EOL; + + + if (!$result["is_paid"]) + { + // 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)) . "."; + + $tmp .= '

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

' . PHP_EOL; + } if ($result["error"]) $tmp .= "
".__( "Sorry, but there was an error processing your order. Please try a different payment method.", GOURLPMP )."
".$result["error"]."
"; else @@ -543,11 +652,18 @@ public static function pmpro_gourl_cryptocoin_payment ($order) // display payment box or successful payment result $tmp .= $result["html_payment_box"]; - // payment received - if ($result["is_paid"]) - { - $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 .= "

".__('View Your Membership Account', GOURLPMP)." →"; + if ($order_user_id == get_current_user_id()) + { + // payment received + if ($result["is_paid"]) + { + 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) . "
"; + } + + if (!$invoice) $tmp .= "

".__('View Your Membership Account', GOURLPMP)." →"; } } } @@ -558,26 +674,30 @@ public static function pmpro_gourl_cryptocoin_payment ($order) return $tmp; } + - - - + /** - * 1.13 Process checkout. + * 1.14 Custom invoice * */ - function process(&$order) + public static function pmpro_invoice_bullets_bottom($order) { - + if (empty($order) || $order->gateway != "gourl" || $order->total == 0) return true; + + + echo self::pmpro_gourl_cryptocoin_payment($order, true); + + return true; } + - - + /** - * 1.14 Show payment log on order details page + * 1.15 Show payment log on order details page */ public static function pmpro_after_order_settings($order) { @@ -600,9 +720,11 @@ public static function pmpro_after_order_settings($order) return true; } + + /** - * 1.15 Save payment log + * 1.16 Save payment log */ public static function add_order_note($order_id, $notes) { @@ -617,9 +739,11 @@ public static function add_order_note($order_id, $notes) return true; } + + /** - * 1.16 Display payment log + * 1.17 Display payment log */ public static function display_order_notes() { @@ -640,9 +764,11 @@ public static function display_order_notes() return $tmp; } + + /** - * 1.17 + * 1.18 */ public static function sel($val1, $val2) { @@ -695,26 +821,28 @@ function gourlpmpro_gourlcallback ($user_id, $order_id, $payment_details, $box_s $trID = $payment_details["tx"]; $confirmed = ($payment_details["is_confirmed"]) ? __('Yes', GOURLPMP) : __('No', GOURLPMP); - + + $order = new MemberOrder(); + $order->getMemberOrderByID($order_id); + + // New Payment Received if ($box_status == "cryptobox_newrecord") { - 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)); + update_option(GOURL."PMPRO_INIT_".$user_id."_".$order->membership_id, date("m 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)); } // Existing Payment confirmed (6+ confirmations) if ($payment_details["is_confirmed"]) { - PMProGateway_gourl::add_order_note($order_id, sprintf(__("%s Payment id %s Confirmed", GOURLPMP), $coinName, GOURL_ADMIN.GOURL."payments&s=payment_".$payID, $payID)); + PMProGateway_gourl::add_order_note($order_id, sprintf(__("%s Payment id #%s Confirmed", GOURLPMP), $coinName, GOURL_ADMIN.GOURL."payments&s=payment_".$payID, $payID)); } // Update User Membership - $order = new MemberOrder(); - $order->getMemberOrderByID($order_id); - - if (!empty($order) && $order->gateway == "gourl" && $order->status != "success") + 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"); @@ -747,16 +875,15 @@ function gourlpmpro_gourlcallback ($user_id, $order_id, $payment_details, $box_s if (pmpro_changeMembershipLevel($custom_level, $user_id, 'changed')) { $order->status = "success"; - $order->subscription_transaction_id = ""; $order->membership_id = $pmpro_level->id; - $order->payment_transaction_id = $coinName." #".$payID; + $order->payment_transaction_id = strtoupper($coinName.$payID); $order->saveOrder(); } } - return true; + return true; } - } + } } - \ No newline at end of file + \ No newline at end of file diff --git a/languages/gourl-paidmembershipspro-default.po b/languages/gourl-paidmembershipspro-default.po index 9b9fff0..2851c77 100644 --- a/languages/gourl-paidmembershipspro-default.po +++ b/languages/gourl-paidmembershipspro-default.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: GoUrl Paid Memberships Pro - Bitcoin Payment Gateway " "Addon\n" -"POT-Creation-Date: 2015-07-08 16:20-0000\n" -"PO-Revision-Date: 2015-07-08 16:20-0000\n" +"POT-Creation-Date: 2015-12-12 14:36-0000\n" +"PO-Revision-Date: 2015-12-12 14:36-0000\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -20,31 +20,31 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: *.js\n" -#: gourl_paidmembershipspro.php:110 +#: gourl_paidmembershipspro.php:113 msgid "Settings" msgstr "" -#: gourl_paidmembershipspro.php:124 +#: gourl_paidmembershipspro.php:127 msgid "GoUrl Bitcoin/Altcoins" msgstr "" -#: gourl_paidmembershipspro.php:171 gourl_paidmembershipspro.php:481 +#: gourl_paidmembershipspro.php:174 gourl_paidmembershipspro.php:583 msgid "Cryptocurrency" msgstr "" -#: gourl_paidmembershipspro.php:174 +#: gourl_paidmembershipspro.php:177 msgid "Bitcoin" msgstr "" -#: gourl_paidmembershipspro.php:192 +#: gourl_paidmembershipspro.php:195 msgid "Plugin Homepage" msgstr "" -#: gourl_paidmembershipspro.php:192 +#: gourl_paidmembershipspro.php:195 msgid "screenshots" msgstr "" -#: gourl_paidmembershipspro.php:193 +#: gourl_paidmembershipspro.php:196 msgid "Plugin on Github - 100% Free Open Source" msgstr "" @@ -53,7 +53,7 @@ msgstr "" # -------------- # English - .. Main Plugin .. # French - .. Plugin Principale .. -#: gourl_paidmembershipspro.php:199 +#: gourl_paidmembershipspro.php:202 #, php-format msgid "" "Your GoUrl Bitcoin Gateway Main Plugin version is too old. " @@ -61,22 +61,23 @@ msgid "" "version." msgstr "" -#: gourl_paidmembershipspro.php:200 gourl_paidmembershipspro.php:230 -#: gourl_paidmembershipspro.php:465 gourl_paidmembershipspro.php:474 -#: gourl_paidmembershipspro.php:480 gourl_paidmembershipspro.php:501 -#: gourl_paidmembershipspro.php:508 gourl_paidmembershipspro.php:522 +#: 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 msgid "Information" msgstr "" -#: gourl_paidmembershipspro.php:200 gourl_paidmembershipspro.php:230 +#: gourl_paidmembershipspro.php:203 gourl_paidmembershipspro.php:233 msgid "Main Plugin Homepage" msgstr "" -#: gourl_paidmembershipspro.php:201 gourl_paidmembershipspro.php:231 +#: gourl_paidmembershipspro.php:204 gourl_paidmembershipspro.php:234 msgid "WordPress.org Plugin Page" msgstr "" -#: gourl_paidmembershipspro.php:205 +#: gourl_paidmembershipspro.php:208 #, php-format msgid "" "Your PaidMembershipsPro version is too old. The GoUrl payment plugin " @@ -84,22 +85,22 @@ msgid "" "href='%s'>latest version." msgstr "" -#: gourl_paidmembershipspro.php:218 +#: gourl_paidmembershipspro.php:221 msgid "- Please setup -" msgstr "" -#: gourl_paidmembershipspro.php:226 +#: gourl_paidmembershipspro.php:229 msgid "Please install GoUrl Bitcoin Gateway WP Plugin" msgstr "" -#: gourl_paidmembershipspro.php:229 +#: gourl_paidmembershipspro.php:232 #, php-format msgid "" "You need to install GoUrl Bitcoin Gateway Main Plugin also. Go to - Automatic installation or Manual." msgstr "" -#: gourl_paidmembershipspro.php:235 +#: gourl_paidmembershipspro.php:238 msgid "" "Secure payments with virtual currency. What is Bitcoin?" @@ -110,12 +111,12 @@ msgstr "" # -------------- # English: Accept %s Payments ... # French: Acceptons %s les paiements ... -#: gourl_paidmembershipspro.php:236 +#: gourl_paidmembershipspro.php:239 #, php-format msgid "Accept %s payments online in PaidMembershipsPro." msgstr "" -#: gourl_paidmembershipspro.php:237 +#: gourl_paidmembershipspro.php:240 #, php-format msgid "" "If you use multiple websites online, please create separate %s" msgstr "" -#: gourl_paidmembershipspro.php:271 +#: gourl_paidmembershipspro.php:274 msgid "PaymentBox Language" msgstr "" -#: gourl_paidmembershipspro.php:275 +#: gourl_paidmembershipspro.php:278 msgid "Default Crypto Payment Box Localisation" msgstr "" -#: gourl_paidmembershipspro.php:283 +#: gourl_paidmembershipspro.php:286 msgid "Exchange Rate Multiplier" msgstr "" -#: gourl_paidmembershipspro.php:285 +#: gourl_paidmembershipspro.php:288 msgid "" "The system uses the multiplier rate with today LIVE cryptocurrency exchange " "rates (which are updated every 30 minutes) when the transaction is " @@ -160,32 +161,32 @@ msgid "" "bitcoin/altcoins. Default: 1.00" msgstr "" -#: gourl_paidmembershipspro.php:294 +#: gourl_paidmembershipspro.php:297 msgid "Icons Size" msgstr "" -#: gourl_paidmembershipspro.php:296 +#: gourl_paidmembershipspro.php:299 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:301 +#: gourl_paidmembershipspro.php:304 msgid "PaymentBox Style" msgstr "" -#: gourl_paidmembershipspro.php:302 +#: gourl_paidmembershipspro.php:305 #, php-format msgid "" "Payment Box sizes and border shadow you " "can change here »" msgstr "" -#: gourl_paidmembershipspro.php:307 +#: gourl_paidmembershipspro.php:310 msgid "Languages" msgstr "" -#: gourl_paidmembershipspro.php:308 +#: gourl_paidmembershipspro.php:311 #, php-format msgid "" "If you want to use GoUrl PaidMembershipsPro Bitcoin Gateway plugin in a " @@ -193,43 +194,45 @@ msgid "" "Translations" msgstr "" -#: gourl_paidmembershipspro.php:358 +#: gourl_paidmembershipspro.php:371 gourl_paidmembershipspro.php:446 msgid "GoUrl Bitcoin/Altcoin" msgstr "" -#: gourl_paidmembershipspro.php:365 +#: gourl_paidmembershipspro.php:454 msgid "Guest" msgstr "" -#: gourl_paidmembershipspro.php:367 +#: gourl_paidmembershipspro.php:455 #, php-format -msgid "Order Created by %s
Awaiting Cryptocurrency Payment ..." +msgid "" +"Order Created by %s
Membership - %s
Awaiting Cryptocurrency Payment " +"- %s
Invoice
#%s" msgstr "" -#: gourl_paidmembershipspro.php:398 +#: gourl_paidmembershipspro.php:487 msgid "Account" msgstr "" -#: gourl_paidmembershipspro.php:399 +#: gourl_paidmembershipspro.php:488 msgid "Order" msgstr "" -#: gourl_paidmembershipspro.php:400 +#: gourl_paidmembershipspro.php:489 msgid "Membership Level" msgstr "" -#: gourl_paidmembershipspro.php:401 +#: gourl_paidmembershipspro.php:490 msgid "Amount" msgstr "" -#: gourl_paidmembershipspro.php:466 +#: gourl_paidmembershipspro.php:516 gourl_paidmembershipspro.php:568 #, 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:475 +#: gourl_paidmembershipspro.php:577 #, php-format msgid "" "Please try a different payment method. Admin need to install and activate " @@ -237,7 +240,7 @@ msgid "" "accept Bitcoin/Altcoin Payments online." msgstr "" -#: gourl_paidmembershipspro.php:481 +#: gourl_paidmembershipspro.php:583 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try a different " @@ -245,20 +248,20 @@ msgid "" "not configured / %s not activated)" msgstr "" -#: gourl_paidmembershipspro.php:503 +#: gourl_paidmembershipspro.php:605 msgid "" "You need first to login or register on the website to make Bitcoin/Altcoin " "Payments" msgstr "" -#: gourl_paidmembershipspro.php:509 +#: gourl_paidmembershipspro.php:611 #, 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:523 +#: gourl_paidmembershipspro.php:625 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try later or use " @@ -266,46 +269,55 @@ msgid "" "Google Finance" msgstr "" -#: gourl_paidmembershipspro.php:538 +#: gourl_paidmembershipspro.php:644 +#, php-format +msgid "Free Trial already used on %s" +msgstr "" + +#: gourl_paidmembershipspro.php:646 msgid "Pay Now -" msgstr "" -#: gourl_paidmembershipspro.php:540 +#: gourl_paidmembershipspro.php:649 msgid "" "Sorry, but there was an error processing your order. Please try a different " "payment method." msgstr "" -#: gourl_paidmembershipspro.php:549 +#: gourl_paidmembershipspro.php:661 +msgid "Thank you for your membership." +msgstr "" + +#: gourl_paidmembershipspro.php:663 #, php-format msgid "" "Thank you for your membership to %s.
Your %s membership is now active." msgstr "" -#: gourl_paidmembershipspro.php:550 +#: gourl_paidmembershipspro.php:666 msgid "View Your Membership Account" msgstr "" -#: gourl_paidmembershipspro.php:635 +#: gourl_paidmembershipspro.php:759 msgid "Payment Log" msgstr "" -#: gourl_paidmembershipspro.php:696 +#: gourl_paidmembershipspro.php:822 msgid "Yes" msgstr "" -#: gourl_paidmembershipspro.php:696 +#: gourl_paidmembershipspro.php:822 msgid "No" msgstr "" -#: gourl_paidmembershipspro.php:702 +#: gourl_paidmembershipspro.php:833 #, php-format msgid "" -"%s payment received
%s
Payment id %s. Awaiting " -"network confirmation..." +"%s payment received
%s
Payment id #%s. " +"Awaiting network confirmation..." msgstr "" -#: gourl_paidmembershipspro.php:709 +#: gourl_paidmembershipspro.php:840 #, php-format -msgid "%s Payment id %s Confirmed" +msgid "%s Payment id #%s Confirmed" msgstr "" diff --git a/languages/gourl-paidmembershipspro-ru_RU.mo b/languages/gourl-paidmembershipspro-ru_RU.mo index 8dc9149..b18f234 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 452d0a7..2eb1213 100644 --- a/languages/gourl-paidmembershipspro-ru_RU.po +++ b/languages/gourl-paidmembershipspro-ru_RU.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: GoUrl Paid Memberships Pro - Bitcoin Payment Gateway " "Addon\n" -"POT-Creation-Date: 2015-07-08 16:20-0000\n" -"PO-Revision-Date: 2015-07-08 16:20-0000\n" +"POT-Creation-Date: 2015-12-12 00:00-0000\n" +"PO-Revision-Date: 2015-12-12 00:00-0000\n" "Last-Translator: \n" "Language-Team: \n" "Language: ru\n" @@ -21,35 +21,35 @@ msgstr "" "X-Poedit-SearchPath-0: .\n" "X-Poedit-SearchPathExcluded-0: *.js\n" -#: gourl_paidmembershipspro.php:110 +#: gourl_paidmembershipspro.php:113 msgid "Settings" msgstr "Настройки" -#: gourl_paidmembershipspro.php:124 +#: gourl_paidmembershipspro.php:127 msgid "GoUrl Bitcoin/Altcoins" msgstr "GoUrl Биткоин/Альткоины" -#: gourl_paidmembershipspro.php:171 gourl_paidmembershipspro.php:481 +#: gourl_paidmembershipspro.php:174 gourl_paidmembershipspro.php:583 msgid "Cryptocurrency" msgstr "Криптовалюта" -#: gourl_paidmembershipspro.php:174 +#: gourl_paidmembershipspro.php:177 msgid "Bitcoin" msgstr "Биткоин" -#: gourl_paidmembershipspro.php:192 +#: gourl_paidmembershipspro.php:195 msgid "Plugin Homepage" msgstr "Домашняя страница" -#: gourl_paidmembershipspro.php:192 +#: gourl_paidmembershipspro.php:195 msgid "screenshots" msgstr "скриншоты" -#: gourl_paidmembershipspro.php:193 +#: gourl_paidmembershipspro.php:196 msgid "Plugin on Github - 100% Free Open Source" msgstr "Плагин на Github - 100% открытый исходный код" -#: gourl_paidmembershipspro.php:199 +#: gourl_paidmembershipspro.php:202 #, php-format msgid "" "Your GoUrl Bitcoin Gateway Main Plugin version is too old. " @@ -60,22 +60,23 @@ msgstr "" "версия 1.3.3 или выше. Пожалуйста, обновите до последней " "версии." -#: gourl_paidmembershipspro.php:200 gourl_paidmembershipspro.php:230 -#: gourl_paidmembershipspro.php:465 gourl_paidmembershipspro.php:474 -#: gourl_paidmembershipspro.php:480 gourl_paidmembershipspro.php:501 -#: gourl_paidmembershipspro.php:508 gourl_paidmembershipspro.php:522 +#: 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 msgid "Information" msgstr "Информация" -#: gourl_paidmembershipspro.php:200 gourl_paidmembershipspro.php:230 +#: gourl_paidmembershipspro.php:203 gourl_paidmembershipspro.php:233 msgid "Main Plugin Homepage" msgstr "Страница главного плагина" -#: gourl_paidmembershipspro.php:201 gourl_paidmembershipspro.php:231 +#: gourl_paidmembershipspro.php:204 gourl_paidmembershipspro.php:234 msgid "WordPress.org Plugin Page" msgstr "Страница плагина на WordPress.org" -#: gourl_paidmembershipspro.php:205 +#: gourl_paidmembershipspro.php:208 #, php-format msgid "" "Your PaidMembershipsPro version is too old. The GoUrl payment plugin " @@ -86,15 +87,15 @@ msgstr "" "PaidMembershipsPro 1.8.4 или выше. Пожалуйста, обновите до последней версии." -#: gourl_paidmembershipspro.php:218 +#: gourl_paidmembershipspro.php:221 msgid "- Please setup -" msgstr "- Пожалуйста настройте -" -#: gourl_paidmembershipspro.php:226 +#: gourl_paidmembershipspro.php:229 msgid "Please install GoUrl Bitcoin Gateway WP Plugin" msgstr "Пожалуйста, установите основной GoUrl Биткоин Плагин для WP" -#: gourl_paidmembershipspro.php:229 +#: gourl_paidmembershipspro.php:232 #, php-format msgid "" "You need to install GoUrl Bitcoin Gateway Main Plugin also. Go to - Автоматическая установка или ручная установка." -#: gourl_paidmembershipspro.php:235 +#: gourl_paidmembershipspro.php:238 msgid "" "Secure payments with virtual currency. What is Bitcoin?" @@ -112,12 +113,12 @@ msgstr "" "Безопасные платежи с виртуальной валютой. Что такое Биткоин?" -#: gourl_paidmembershipspro.php:236 +#: gourl_paidmembershipspro.php:239 #, php-format msgid "Accept %s payments online in PaidMembershipsPro." msgstr "Принимайте %s платежи онлайн в PaidMembershipsPro." -#: gourl_paidmembershipspro.php:237 +#: gourl_paidmembershipspro.php:240 #, php-format msgid "" "If you use multiple websites online, please create separate %s" @@ -146,19 +147,19 @@ msgstr "" "По умолчанию криптомонета в Payment Box. Активированные платежи: %s" -#: gourl_paidmembershipspro.php:271 +#: gourl_paidmembershipspro.php:274 msgid "PaymentBox Language" msgstr "Язык в PaymentBox" -#: gourl_paidmembershipspro.php:275 +#: gourl_paidmembershipspro.php:278 msgid "Default Crypto Payment Box Localisation" msgstr "По умолчанию локализация в Payment Box" -#: gourl_paidmembershipspro.php:283 +#: gourl_paidmembershipspro.php:286 msgid "Exchange Rate Multiplier" msgstr "Обменный курс множитель" -#: gourl_paidmembershipspro.php:285 +#: gourl_paidmembershipspro.php:288 msgid "" "The system uses the multiplier rate with today LIVE cryptocurrency exchange " "rates (which are updated every 30 minutes) when the transaction is " @@ -173,11 +174,11 @@ msgstr "" "5% к общей стоимости в биткоинах и другой криптовалюте, 0.85 - будет " "скидка 15% при оплате в биткоинах/альткоинах. По умолчанию: 1.00" -#: gourl_paidmembershipspro.php:294 +#: gourl_paidmembershipspro.php:297 msgid "Icons Size" msgstr "Размер иконок" -#: gourl_paidmembershipspro.php:296 +#: gourl_paidmembershipspro.php:299 msgid "" "Cryptocoin icons size in 'Select Payment Method' that the customer will see " "on your checkout. Default 60px. Allowed: 30..250px" @@ -185,11 +186,11 @@ msgstr "" "Размер иконок криптомонет в поле «Выбрать способ оплаты», которое клиент " "будет видеть при оформлении заказа. По умолчанию 60px. Допускается: 30..250px" -#: gourl_paidmembershipspro.php:301 +#: gourl_paidmembershipspro.php:304 msgid "PaymentBox Style" msgstr "Стиль Payment Box" -#: gourl_paidmembershipspro.php:302 +#: gourl_paidmembershipspro.php:305 #, php-format msgid "" "Payment Box sizes and border shadow you " @@ -198,11 +199,11 @@ msgstr "" "Payment Box размеры и границы теней вы " "можете изменить здесь »" -#: gourl_paidmembershipspro.php:307 +#: gourl_paidmembershipspro.php:310 msgid "Languages" msgstr "Языки" -#: gourl_paidmembershipspro.php:308 +#: gourl_paidmembershipspro.php:311 #, php-format msgid "" "If you want to use GoUrl PaidMembershipsPro Bitcoin Gateway plugin in a " @@ -213,36 +214,40 @@ msgstr "" "другом языке, чем русский, смотрите страницу языки и переводы" -#: gourl_paidmembershipspro.php:358 +#: gourl_paidmembershipspro.php:371 gourl_paidmembershipspro.php:446 msgid "GoUrl Bitcoin/Altcoin" msgstr "GoUrl Биткоин/Альткоин" -#: gourl_paidmembershipspro.php:365 +#: gourl_paidmembershipspro.php:454 msgid "Guest" msgstr "Гость" -#: gourl_paidmembershipspro.php:367 +#: gourl_paidmembershipspro.php:455 #, php-format -msgid "Order Created by %s
Awaiting Cryptocurrency Payment ..." -msgstr "Заказ создан %s
Ожидание оплаты криптовалютой ..." +msgid "" +"Order Created by %s
Membership - %s
Awaiting Cryptocurrency Payment " +"- %s
Invoice
#%s" +msgstr "" +"Заказ создан %s
Членство - %s
Ожидании оплаты криптовалютой - %s " +"
Инвойс #%s" -#: gourl_paidmembershipspro.php:398 +#: gourl_paidmembershipspro.php:487 msgid "Account" msgstr "Профиль" -#: gourl_paidmembershipspro.php:399 +#: gourl_paidmembershipspro.php:488 msgid "Order" msgstr "Заказ" -#: gourl_paidmembershipspro.php:400 +#: gourl_paidmembershipspro.php:489 msgid "Membership Level" msgstr "Уровень членства (подписки)" -#: gourl_paidmembershipspro.php:401 +#: gourl_paidmembershipspro.php:490 msgid "Amount" msgstr "Сумма" -#: gourl_paidmembershipspro.php:466 +#: gourl_paidmembershipspro.php:516 gourl_paidmembershipspro.php:568 #, php-format msgid "" "The GoUrl payment plugin was called to process a payment but could not " @@ -251,7 +256,7 @@ msgstr "" "Ошибка. Плагин оплаты GoUrl был вызван для обработки платежа, но не может " "получить сведения о заказе orderID %s!" -#: gourl_paidmembershipspro.php:475 +#: gourl_paidmembershipspro.php:577 #, php-format msgid "" "Please try a different payment method. Admin need to install and activate " @@ -262,7 +267,7 @@ msgstr "" "установить и активировать плагин для wordpress GoUrl Биткоин " "шлюз для Wordpress для приема платежей в криптовалюте онлайн." -#: gourl_paidmembershipspro.php:481 +#: gourl_paidmembershipspro.php:583 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try a different " @@ -273,7 +278,7 @@ msgstr "" "попробуйте другой метод оплаты или свяжитесь с нами, если вам нужна помощь " "(GoUrl Bitcoin плагин не настроен / %s не активирован)" -#: gourl_paidmembershipspro.php:503 +#: gourl_paidmembershipspro.php:605 msgid "" "You need first to login or register on the website to make Bitcoin/Altcoin " "Payments" @@ -281,7 +286,7 @@ msgstr "" "Вам нужно сначала войти в систему или зарегистрироваться на сайте чтобы " "сделать платеж а биткоинах/альткоинах" -#: gourl_paidmembershipspro.php:509 +#: gourl_paidmembershipspro.php:611 #, php-format msgid "" "This order's amount is '%s' - it cannot be paid for. Please contact us if " @@ -290,7 +295,7 @@ msgstr "" "Сумма заказа - %s не может быть оплачена. Пожалуйста, свяжитесь с нами, если " "вам нужна помощь." -#: gourl_paidmembershipspro.php:523 +#: gourl_paidmembershipspro.php:625 #, php-format msgid "" "Sorry, but there was an error processing your order. Please try later or use " @@ -301,11 +306,16 @@ msgstr "" "попробуйте позже или используйте другой способ оплаты. Система не может " "получить курсы валют для %s/USD с Google Finance" -#: gourl_paidmembershipspro.php:538 +#: gourl_paidmembershipspro.php:644 +#, php-format +msgid "Free Trial already used on %s" +msgstr "Бесплатная пробная версия уже использована на %s" + +#: gourl_paidmembershipspro.php:646 msgid "Pay Now -" msgstr "Оплатить сейчас -" -#: gourl_paidmembershipspro.php:540 +#: gourl_paidmembershipspro.php:649 msgid "" "Sorry, but there was an error processing your order. Please try a different " "payment method." @@ -313,7 +323,11 @@ msgstr "" "Извините, но произошла ошибка при обработке вашего заказа. Пожалуйста, " "попробуйте другой метод оплаты." -#: gourl_paidmembershipspro.php:549 +#: gourl_paidmembershipspro.php:661 +msgid "Thank you for your membership." +msgstr "Спасибо вам за ваше членство." + +#: gourl_paidmembershipspro.php:663 #, php-format msgid "" "Thank you for your membership to %s.
Your %s membership is now active." @@ -321,69 +335,32 @@ msgstr "" "Благодарим за активацию вашего членства/подписки в %s.
Ваш %s активирован " "сейчас." -#: gourl_paidmembershipspro.php:550 +#: gourl_paidmembershipspro.php:666 msgid "View Your Membership Account" msgstr "Просмотреть ваш аккаунт" -#: gourl_paidmembershipspro.php:635 +#: gourl_paidmembershipspro.php:759 msgid "Payment Log" msgstr "Журнал оплаты" -#: gourl_paidmembershipspro.php:696 +#: gourl_paidmembershipspro.php:822 msgid "Yes" msgstr "Да" -#: gourl_paidmembershipspro.php:696 +#: gourl_paidmembershipspro.php:822 msgid "No" msgstr "Нет" -#: gourl_paidmembershipspro.php:702 +#: gourl_paidmembershipspro.php:833 #, php-format msgid "" -"%s payment received
%s
Payment id %s. Awaiting " -"network confirmation..." +"%s payment received
%s
Payment id #%s. " +"Awaiting network confirmation..." msgstr "" -"%s платеж получен
%s
Номер платежа %s. " -"Ожидание подтверждения сети ..." +"%s платеж получен
%s
Номер платежа #%s. " +"Ожидание подтверждения сети..." -#: gourl_paidmembershipspro.php:709 +#: gourl_paidmembershipspro.php:840 #, php-format -msgid "%s Payment id %s Confirmed" -msgstr "%s Платёж с номером %s Подтверждён" - -#~ msgid "" -#~ "Sorry, but there was an error processing your order. Please try a " -#~ "different payment method or contact us if you need assistance. (GoUrl " -#~ "Bitcoin Plugin not configured - %s not activated)" -#~ msgstr "" -#~ "Извините, но произошла ошибка при обработке вашего заказа. Пожалуйста, " -#~ "попробуйте другой метод оплаты или свяжитесь с нами, если вам нужна " -#~ "помощь (GoUrl Bitcoin плагин не настроен / %s не активирован)." - -#~ msgid "" -#~ "The system uses the multiplier rate with today LIVE cryptocurrency " -#~ "exchange rates (which are updated every 30 minutes) when the transaction " -#~ "is calculating from a fiat currency (e.g. USD, EUR, etc) to %s.
Example: 1.05 - will add an extra 5%% to the total price in " -#~ "bitcoin/altcoins, 0.85 - will be a 15%% discount for the price in " -#~ "bitcoin/altcoins. Default: 1.00" -#~ msgstr "" -#~ "Система использует множитель вместе с текущим обменным курсом " -#~ "криптовалюты (курс обновляется каждые 30 минут) при конвертации суммы " -#~ "оплаты (USD, EUR, и т.д.) в криптовалюту.
Пример: 1.05 - будет " -#~ "добавлять дополнительно 5% к общей стоимости в биткоинах и другой " -#~ "криптовалюте, 0.85 - будет скидка 15% при оплате в биткоинах/" -#~ "альткоинах. По умолчанию: 1.00" - -#~ msgid "" -#~ "If you use multiple stores/sites online, please create separate GoUrl Payment Box (with unique payment box " -#~ "public/private keys) for each of your stores/websites. Do not use the " -#~ "same GoUrl Payment Box with the same public/private keys on your " -#~ "different websites/stores." -#~ msgstr "" -#~ "Если вы используете несколько магазинов/сайтов в интернете, пожалуйста " -#~ "создавайте отдельные GoUrl Payment Box " -#~ "(с уникальными payment box ключами) для каждого из ваших магазинов или " -#~ "веб-сайтов. Не используйте одни и те же GoUrl Payment Box Public/Private " -#~ "Keys на различных веб-сайтах." +msgid "%s Payment id #%s Confirmed" +msgstr "%s платёж с номером %s Подтверждён" diff --git a/readme.md b/readme.md index 1127e3c..2bbe3b1 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ GoUrl Paid Memberships Pro - Bitcoin Payment Gateway Addon ----------------------------------------------------------- -Version 1.1.2 +Version 1.1.3 **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.2 +* Stable Tag: 1.1.3 * License: GNU Version 2 or Any Later Version diff --git a/readme.txt b/readme.txt index 9f5601c..602673b 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.3 -Stable Tag: 1.1.2 +Tested up to: 4.4 +Stable Tag: 1.1.3 License: GNU Version 2 or Any Later Version License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -83,6 +83,9 @@ In the search field type "GoUrl Paid Memberships Pro" and click Search Plugins. == Changelog == += 1.1.3 = +Supports free trial membership + = 1.1.2 = Add MonetaryUnit [MUE] cryptocurrency @@ -95,5 +98,5 @@ Localisation - You can easy change/localize any text in plugin = 1.0.0 = Initial Release - + \ No newline at end of file