diff options
| author | Lukas Winkler <github@lw1.at> | 2018-12-31 06:57:07 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-12-31 06:57:07 +0300 |
| commit | c856333a05efa2c23df93ee582bfd31223594501 (patch) | |
| tree | 4d38e4ca99f8b8450fccae708882350aaad17d5d | |
| parent | cf4f5c5503b8bc82d2827111f1f0306334775a3a (diff) | |
fix donate widget (#13901)
* fix donate widget
* remove whitespace between image and text
| -rw-r--r-- | plugins/CoreHome/Controller.php | 15 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_donate.twig | 9 |
2 files changed, 16 insertions, 8 deletions
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php index 1231ba7992..37fd63cc75 100644 --- a/plugins/CoreHome/Controller.php +++ b/plugins/CoreHome/Controller.php @@ -277,8 +277,21 @@ class Controller extends \Piwik\Plugin\Controller unset($parameters[$name]); } } + $paypalParameters = [ + "cmd" => "_s-xclick" + ]; + if (empty($parameters["onetime"]) || $parameters["onetime"] != "true") { + $paypalParameters["hosted_button_id"] = "DVKLY73RS7JTE"; + $paypalParameters["currency_code"] = "USD"; + $paypalParameters["on0"] = "Piwik Supporter"; + if (!empty($parameters["os0"])) { + $paypalParameters["os0"] = $parameters["os0"]; + } + } else { + $paypalParameters["hosted_button_id"] = "RPL23NJURMTFA"; + } - $url = "https://www.paypal.com/cgi-bin/webscr?" . Url::getQueryStringFromParameters($parameters); + $url = "https://www.paypal.com/cgi-bin/webscr?" . Url::getQueryStringFromParameters($paypalParameters); Url::redirectToUrl($url); exit; diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index 43e99dc324..99e713ec82 100644 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -14,16 +14,11 @@ <div class="donate-form-instructions">({{ 'CoreHome_DonateFormInstructions'|translate }})</div> <form action="index.php?module=CoreHome&action=redirectToPaypal&idSite=1" method="post" target="_blank"> - <input type="hidden" name="cmd" value="_s-xclick"/> - <input type="hidden" name="hosted_button_id" value="DVKLY73RS7JTE"/> - <input type="hidden" name="currency_code" value="USD"/> - <input type="hidden" name="on0" value="Matomo Supporter"/> - <div class="piwik-donate-slider"> <div class="slider-range"> <div class="slider-position"></div> </div> - <div style="display:inline-block;"> + <div style="display:inline-block;float:right;"> <div class="slider-donate-amount">$30/{{ 'Intl_Year_Short'|translate }}</div> <img class="slider-smiley-face" width="40" height="40" src="plugins/Morpheus/images/smileyprog_1.png"/> @@ -36,7 +31,7 @@ <input type="image" src="plugins/Morpheus/images/paypal_subscribe.png" border="0" name="submit" title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/> <a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> - <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82" + <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&onetime=true" rel="noreferrer noopener" target="_blank" class="donate-one-time">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> </div> |