From d8decf221b29781b36e8da7f1689c95cca397017 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 5 Mar 2014 12:58:08 +0100 Subject: [PATCH 1/4] [UPDATE] minimum manual payout --- public/include/config/global.inc.dist.php | 7 +++++++ public/include/pages/account/edit.inc.php | 2 ++ public/include/smarty_globals.inc.php | 1 + public/templates/mpos/account/edit/default.tpl | 7 ++++++- 4 files changed, 16 insertions(+), 1 deletion(-) mode change 100644 => 100755 public/include/config/global.inc.dist.php mode change 100644 => 100755 public/include/pages/account/edit.inc.php mode change 100644 => 100755 public/include/smarty_globals.inc.php mode change 100644 => 100755 public/templates/mpos/account/edit/default.tpl diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php old mode 100644 new mode 100755 index 06e67c82c..634bf0216 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -77,6 +77,13 @@ $config['ap_threshold']['min'] = 1; $config['ap_threshold']['max'] = 250; +/** + * Minimum manual Payout Threshold + * Minimum manual payout amount + * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-automatic-payout-thresholds + **/ +$config['mp_threshold'] = 1; + /** * Donation thresholds * Minimum donation amount in percent diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php old mode 100644 new mode 100755 index cde09a777..ba0fb4a08 --- a/public/include/pages/account/edit.inc.php +++ b/public/include/pages/account/edit.inc.php @@ -96,6 +96,8 @@ case 'cashOut': if ($setting->getValue('disable_payouts') == 1 || $setting->getValue('disable_manual_payouts') == 1) { $_SESSION['POPUP'][] = array('CONTENT' => 'Manual payouts are disabled.', 'TYPE' => 'info'); + } else if ($aBalance['confirmed'] < $config['mp_threshold']) { + $_SESSION['POPUP'][] = array('CONTENT' => 'Payout must be greater or equal than .', 'TYPE' => 'info'); } else if (!$user->getCoinAddress($_SESSION['USERDATA']['id'])) { $_SESSION['POPUP'][] = array('CONTENT' => 'You have no payout address set.', 'TYPE' => 'errormsg'); } else { diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php old mode 100644 new mode 100755 index 61d350f46..8b7bd71ee --- a/public/include/smarty_globals.inc.php +++ b/public/include/smarty_globals.inc.php @@ -88,6 +88,7 @@ 'txfee_manual' => $config['txfee_manual'], 'txfee_auto' => $config['txfee_auto'], 'payout_system' => $config['payout_system'], + 'mp_threshold' => $config['mp_threshold'], 'ap_threshold' => array( 'min' => $config['ap_threshold']['min'], 'max' => $config['ap_threshold']['max'] diff --git a/public/templates/mpos/account/edit/default.tpl b/public/templates/mpos/account/edit/default.tpl old mode 100644 new mode 100755 index 4b7053f53..de6c9ca57 --- a/public/templates/mpos/account/edit/default.tpl +++ b/public/templates/mpos/account/edit/default.tpl @@ -89,6 +89,9 @@

Please note: a {if $GLOBAL.config.txfee_manual > 0.00001}{$GLOBAL.config.txfee_manual}{else}{$GLOBAL.config.txfee_manual|number_format:"8"}{/if} {$GLOBAL.config.currency} transaction will apply when processing "On-Demand" manual payments

+

+ Minimum Cashout: {$GLOBAL.config.mp_threshold + $GLOBAL.config.txfee_manual} {$GLOBAL.config.currency} +

{nocache}{/nocache} @@ -109,7 +112,9 @@ {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.withdraw} - {if $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1} + {if ($GLOBAL.userdata.balance.confirmed|escape + $GLOBAL.config.txfee_manual) < ($GLOBAL.config.mp_threshold + $GLOBAL.config.txfee_manual)} + + {elseif $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1} {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 1 || $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 0} From 22bc32ca0851864014c8f7e003385eab5a5b8d51 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 5 Mar 2014 13:03:42 +0100 Subject: [PATCH 2/4] [UPDATE] changed wiki url --- public/include/config/global.inc.dist.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php index 634bf0216..2da7464ec 100755 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -80,7 +80,7 @@ /** * Minimum manual Payout Threshold * Minimum manual payout amount - * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-automatic-payout-thresholds + * https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-manual-payout-threshold **/ $config['mp_threshold'] = 1; From 75945eb5b0eea90376a9cf0c021ee4e0f42e9886 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 5 Mar 2014 13:26:02 +0100 Subject: [PATCH 3/4] [FIX] added minimum payout to notification message --- public/include/pages/account/edit.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php index ba0fb4a08..39c24b1c6 100755 --- a/public/include/pages/account/edit.inc.php +++ b/public/include/pages/account/edit.inc.php @@ -97,7 +97,7 @@ if ($setting->getValue('disable_payouts') == 1 || $setting->getValue('disable_manual_payouts') == 1) { $_SESSION['POPUP'][] = array('CONTENT' => 'Manual payouts are disabled.', 'TYPE' => 'info'); } else if ($aBalance['confirmed'] < $config['mp_threshold']) { - $_SESSION['POPUP'][] = array('CONTENT' => 'Payout must be greater or equal than .', 'TYPE' => 'info'); + $_SESSION['POPUP'][] = array('CONTENT' => 'Payout must be greater or equal than ' . $config['mp_threshold'] . '.', 'TYPE' => 'info'); } else if (!$user->getCoinAddress($_SESSION['USERDATA']['id'])) { $_SESSION['POPUP'][] = array('CONTENT' => 'You have no payout address set.', 'TYPE' => 'errormsg'); } else { From e03010b56eb47cfbdb1c4a83816fdcab20423c6c Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 5 Mar 2014 13:27:45 +0100 Subject: [PATCH 4/4] [FIX] removed calc --- public/templates/mpos/account/edit/default.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/templates/mpos/account/edit/default.tpl b/public/templates/mpos/account/edit/default.tpl index de6c9ca57..0f6e48b48 100755 --- a/public/templates/mpos/account/edit/default.tpl +++ b/public/templates/mpos/account/edit/default.tpl @@ -90,7 +90,7 @@ Please note: a {if $GLOBAL.config.txfee_manual > 0.00001}{$GLOBAL.config.txfee_manual}{else}{$GLOBAL.config.txfee_manual|number_format:"8"}{/if} {$GLOBAL.config.currency} transaction will apply when processing "On-Demand" manual payments

- Minimum Cashout: {$GLOBAL.config.mp_threshold + $GLOBAL.config.txfee_manual} {$GLOBAL.config.currency} + Minimum Cashout: {$GLOBAL.config.mp_threshold} {$GLOBAL.config.currency}

@@ -112,7 +112,7 @@ {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.withdraw} - {if ($GLOBAL.userdata.balance.confirmed|escape + $GLOBAL.config.txfee_manual) < ($GLOBAL.config.mp_threshold + $GLOBAL.config.txfee_manual)} + {if $GLOBAL.userdata.balance.confirmed|escape < $GLOBAL.config.mp_threshold} {elseif $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1}