Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/555] Allow defining default currency in ACP

Browse Source 
B3P-555
This commit is contained in:
Marc Alexander
2015-06-03 12:53:21 +02:00
parent 367d5168bd
commit a5ccbb48c7
7 changed files with 114 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/modules.yml
View File

@@ -84,8 +84,10 @@ services:
class: board3\portal\modules\donation class: board3\portal\modules\donation
arguments: arguments:
- @config - @config
- @request
- @template - @template
- @user - @user
- @board3.portal.modules_helper
tags: tags:
- { name: board3.portal.module } - { name: board3.portal.module }

4
includes/modules_helper.php
View File

@@ -85,7 +85,9 @@ class modules_helper
public function generate_select_box($key, $select_ary, $selected_options) public function generate_select_box($key, $select_ary, $selected_options)
{ {
// Build options // Build options
$options = '<select id="' . $key . '" name="' . $key . '[]" multiple="multiple">'; $options = '<select id="' . $key . '" name="' . $key;
var_dump($selected_options, sizeof($selected_options));
$options .= (sizeof($selected_options) > 1) ? '[]" multiple="multiple">' : '">';
foreach ($select_ary as $id => $option) foreach ($select_ary as $id => $option)
{ {
$options .= '<option value="' . $option['value'] . '"' . ((in_array($option['value'], $selected_options)) ? ' selected="selected"' : '') . (!empty($option['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $option['title'] . '</option>'; $options .= '<option value="' . $option['value'] . '"' . ((in_array($option['value'], $selected_options)) ? ' selected="selected"' : '') . (!empty($option['disabled']) ? ' disabled="disabled" class="disabled-option"' : '') . '>' . $option['title'] . '</option>';

99
modules/donation.php
View File

@@ -44,24 +44,56 @@ class donation extends module_base
/** @var \phpbb\config\config */ /** @var \phpbb\config\config */
protected $config; protected $config;
/** @var \phpbb\request\request_interface */
protected $request;
/** @var \phpbb\template\template */ /** @var \phpbb\template\template */
protected $template; protected $template;
/** @var \phpbb\user */ /** @var \phpbb\user */
protected $user; protected $user;
/** @var \board3\portal\includes\modules_helper */
protected $helper;
/** @var array List of currencies supported in donations */
protected $currencies = array(
'AUD',
'CAD',
'CZK',
'DKK',
'HKD',
'HUF',
'NZD',
'NOK',
'PLN',
'GBP',
'SGD',
'SEK',
'CHF',
'JPY',
'USD',
'EUR',
'MXN',
'ILS',
);
/** /**
* Construct a stylechanger object * Construct a donation module object
* *
* @param \phpbb\config\config $config phpBB config * @param \phpbb\config\config $config phpBB config
* @param \phpbb\request\request_interface $request Request
* @param \phpbb\template\template $template phpBB template * @param \phpbb\template\template $template phpBB template
* @param \phpbb\user $user phpBB user object * @param \phpbb\user $user phpBB user object
* @param \board3\portal\includes\modules_helper $helper Board3 Portal modules helper
*/ */
public function __construct($config, $template, $user) public function __construct($config, $request, $template, $user, $helper)
{ {
$this->config = $config; $this->config = $config;
$this->request = $request;
$this->template = $template; $this->template = $template;
$this->user = $user; $this->user = $user;
$this->helper = $helper;
} }
/** /**
@@ -74,6 +106,8 @@ class donation extends module_base
'PAY_CUSTOM_CENTER' => (!empty($this->config['board3_pay_custom_' . $module_id])) ? $this->user->data['username_clean'] : false, 'PAY_CUSTOM_CENTER' => (!empty($this->config['board3_pay_custom_' . $module_id])) ? $this->user->data['username_clean'] : false,
)); ));
$this->build_currency_select($module_id, 'b3p_donation_currency_center');
return 'donation_center.html'; return 'donation_center.html';
} }
@@ -87,6 +121,8 @@ class donation extends module_base
'PAY_CUSTOM_SIDE' => (!empty($this->config['board3_pay_custom_' . $module_id])) ? $this->user->data['username_clean'] : false, 'PAY_CUSTOM_SIDE' => (!empty($this->config['board3_pay_custom_' . $module_id])) ? $this->user->data['username_clean'] : false,
)); ));
$this->build_currency_select($module_id, 'b3p_donation_currency_side', true);
return 'donation_side.html'; return 'donation_side.html';
} }
@@ -101,10 +137,69 @@ class donation extends module_base
'legend1' => 'ACP_PORTAL_PAYPAL_SETTINGS', 'legend1' => 'ACP_PORTAL_PAYPAL_SETTINGS',
'board3_pay_acc_' . $module_id => array('lang' => 'PORTAL_PAY_ACC', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), 'board3_pay_acc_' . $module_id => array('lang' => 'PORTAL_PAY_ACC', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true),
'board3_pay_custom_' . $module_id => array('lang' => 'PORTAL_PAY_CUSTOM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'board3_pay_custom_' . $module_id => array('lang' => 'PORTAL_PAY_CUSTOM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
'board3_pay_default_' . $module_id => array('lang' => 'PORTAL_PAY_DEFAULT', 'validate' => 'string', 'type' => 'custom', 'method' => 'select_currency', 'submit' => 'save_currency', 'explain' => true),
) )
); );
} }
/**
* Build currency select for block name
*
* @param int $module_id Module ID
* @param string $block_name Name of template block
* @param bool $short Whether short ISO titles should be used
*/
protected function build_currency_select($module_id, $block_name, $short = false)
{
foreach ($this->currencies as $currency)
{
$this->template->assign_block_vars($block_name, array(
'VALUE' => $currency,
'TITLE' => ($short) ? $currency : $this->user->lang($currency),
'SELECTED' => $currency === $this->config['board3_pay_default_' . $module_id],
));
}
}
/**
* Create select box for attachment filetype
*
* @param mixed $value Value of input
* @param string $key Key name
* @param int $module_id Module ID
*
* @return string Forum select box HTML
*/
public function select_currency($value, $key, $module_id)
{
$currencies = $selected = array();
foreach ($this->currencies as $currency)
{
$currencies[] = array(
'title' => $this->user->lang($currency),
'value' => $currency,
);
if ($currency === $this->config['board3_pay_default_' . $module_id])
{
$selected[] = $currency;
}
}
return $this->helper->generate_select_box($key, $currencies, $selected);
}
/**
* Save currency setting
*
* @param string $key
* @param int $module_id
*/
public function save_currency($key, $module_id)
{
$this->config->set($key, $this->request->variable('board3_pay_default_' . $module_id, ''));
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */

21
styles/prosilver/template/portal/modules/donation_center.html
View File

@@ -20,24 +20,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" /> <input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
<select name="currency_code" class="autowidth"> <select name="currency_code" class="autowidth">
<option value="USD">{L_USD}</option> <!-- BEGIN b3p_donation_currency_center -->
<option value="AUD">{L_AUD}</option> <option value="{b3p_donation_currency_center.VALUE"<!-- IF b3p_donation_currency_center.SELECTED --> selected="selected"<!-- ENDIF -->>{b3p_donation_currency_center.TITLE}</option>
<option value="CAD">{L_CAD}</option> <!-- END b3p_donation_currency_center -->
<option value="CZK">{L_CZK}</option>
<option value="DKK">{L_DKK}</option>
<option value="EUR" selected="selected">{L_EUR}</option>
<option value="HKD">{L_HKD}</option>
<option value="HUF">{L_HUF}</option>
<option value="NZD">{L_NZD}</option>
<option value="NOK">{L_NOK}</option>
<option value="PLN">{L_PLN}</option>
<option value="GBP">{L_GBP}</option>
<option value="SGD">{L_SGD}</option>
<option value="SEK">{L_SEK}</option>
<option value="CHF">{L_CHF}</option>
<option value="JPY">{L_JPY}</option>
<option value="MXN">{L_MXN}</option>
<option value="ILS">{L_ILS}</option>
</select> </select>
<input type="submit" name="submit" value="{L_DONATION}" class="button1" /> <input type="submit" name="submit" value="{L_DONATION}" class="button1" />
</div> </div>

19
styles/prosilver/template/portal/modules/donation_side.html
View File

@@ -14,22 +14,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<input type="text" tabindex="10" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" /> <input type="text" tabindex="10" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
<select name="currency_code" class="autowidth"> <select name="currency_code" class="autowidth">
<option value="USD">USD</option> <!-- BEGIN b3p_donation_currency_side -->
<option value="AUD">AUD</option> <option value="{b3p_donation_currency_side.VALUE"<!-- IF b3p_donation_currency_side.SELECTED --> selected="selected"<!-- ENDIF -->>{b3p_donation_currency_side.TITLE}</option>
<option value="CAD">CAD</option> <!-- END b3p_donation_currency_side -->
<option value="CZK">CZK</option>
<option value="DKK">DKK</option>
<option value="EUR" selected="selected">EUR</option>
<option value="HKD">HKD</option>
<option value="HUF">HUF</option>
<option value="NZD">NZD</option>
<option value="NOK">NOK</option>
<option value="PLN">PLN</option>
<option value="GBP">GBP</option>
<option value="SGD">SGD</option>
<option value="SEK">SEK</option>
<option value="CHF">CHF</option>
<option value="JPY">JPY</option>
</select> </select>
<input type="submit" name="submit" value="{L_DONATION}" class="button1" /> <input type="submit" name="submit" value="{L_DONATION}" class="button1" />
</div> </div>

21
styles/subsilver2/template/portal/modules/donation_center.html
View File

@@ -21,24 +21,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" /> <input type="text" tabindex="11" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
<select name="currency_code" class="autowidth"> <select name="currency_code" class="autowidth">
<option value="USD">{L_USD}</option> <!-- BEGIN b3p_donation_currency_center -->
<option value="AUD">{L_AUD}</option> <option value="{b3p_donation_currency_center.VALUE"<!-- IF b3p_donation_currency_center.SELECTED --> selected="selected"<!-- ENDIF -->>{b3p_donation_currency_center.TITLE}</option>
<option value="CAD">{L_CAD}</option> <!-- END b3p_donation_currency_center -->
<option value="CZK">{L_CZK}</option>
<option value="DKK">{L_DKK}</option>
<option value="EUR" selected="selected">{L_EUR}</option>
<option value="HKD">{L_HKD}</option>
<option value="HUF">{L_HUF}</option>
<option value="NZD">{L_NZD}</option>
<option value="NOK">{L_NOK}</option>
<option value="PLN">{L_PLN}</option>
<option value="GBP">{L_GBP}</option>
<option value="SGD">{L_SGD}</option>
<option value="SEK">{L_SEK}</option>
<option value="CHF">{L_CHF}</option>
<option value="JPY">{L_JPY}</option>
<option value="MXN">{L_MXN}</option>
<option value="ILS">{L_ILS}</option>
</select> </select>
<input type="submit" name="submit" value="{L_DONATION}" class="button1" /> <input type="submit" name="submit" value="{L_DONATION}" class="button1" />
</form> </form>

19
styles/subsilver2/template/portal/modules/donation_side.html
View File

@@ -16,22 +16,9 @@
<!-- ENDIF --> <!-- ENDIF -->
<input type="text" tabindex="10" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" /> <input type="text" tabindex="10" name="amount" size="10" maxlength="6" value="" class="inputbox autowidth" title="{L_PAY_MSG}" />
<select name="currency_code" class="autowidth"> <select name="currency_code" class="autowidth">
<option value="USD">USD</option> <!-- BEGIN b3p_donation_currency_side -->
<option value="AUD">AUD</option> <option value="{b3p_donation_currency_side.VALUE"<!-- IF b3p_donation_currency_side.SELECTED --> selected="selected"<!-- ENDIF -->>{b3p_donation_currency_side.TITLE}</option>
<option value="CAD">CAD</option> <!-- END b3p_donation_currency_side -->
<option value="CZK">CZK</option>
<option value="DKK">DKK</option>
<option value="EUR" selected="selected">EUR</option>
<option value="HKD">HKD</option>
<option value="HUF">HUF</option>
<option value="NZD">NZD</option>
<option value="NOK">NOK</option>
<option value="PLN">PLN</option>
<option value="GBP">GBP</option>
<option value="SGD">SGD</option>
<option value="SEK">SEK</option>
<option value="CHF">CHF</option>
<option value="JPY">JPY</option>
</select> </select>
<input type="submit" name="submit" value="{L_DONATION}" class="button1" /> <input type="submit" name="submit" value="{L_DONATION}" class="button1" />
</form> </form>