Skip to content

Commit

Permalink
Requested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@annevelden
annevelden committed Feb 1, 2024
1 parent 42dc1ce commit 9b1198f
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 98 deletions.
2 changes: 1 addition & 1 deletion upload/admin/language/de-de/extension/payment/paynl3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
$_['text_prefix'] = 'Präfix der Bestellbeschreibung';
$_['text_prefix_tooltip'] = 'Ändern Sie hier das Präfix der Bestellbeschreibung. Wenn dieses Feld leer ist, ist die Beschreibung die Bestellnummer.';

$_['text_advanced_settings'] = 'Erweiterte Einstellungen anzeigen';
$_['text_advanced_settings'] = 'Erweiterte Einstellungen';

$_['text_coc'] = 'Feld mit der Nummer der Handelskammer anzeigen';
$_['text_coc_tooltip'] = 'Wenn diese Option aktiviert ist, hat der Kunde die Möglichkeit, seine Handelskammernummer einzugeben im Checkout';
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/language/en-gb/extension/payment/paynl3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
$_['text_prefix'] = 'Order description prefix';
$_['text_prefix_tooltip'] = 'Change the order description prefix here. If left empty the order description will just be the order number.';

$_['text_advanced_settings'] = 'Show advanced settings';
$_['text_advanced_settings'] = 'Advanced settings';

$_['text_refund_processing'] = 'Refund processing';
$_['text_refund_processing_tooltip'] = 'Process refunds that are initiated in My.pay';
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/language/fr-fr/extension/payment/paynl3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
$_['text_prefix'] = 'Préfixe de description de la commande';
$_['text_prefix_tooltip'] = 'Modifiez le préfixe de description de la commande ici. Si elle est laissée vide, la description de la commande sera simplement le numéro de commande.';

$_['text_advanced_settings'] = 'Afficher les paramètres avancés';
$_['text_advanced_settings'] = 'Réglages avancés';

$_['text_coc'] = 'Afficher le champ du numéro de la Chambre de Commerce';
$_['text_coc_tooltip'] = 'Lorsqu\'il est activé, le client aura la possibilité de saisir son numéro de chambre de commerce avant de terminer la transaction.';
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/language/nl-nl/extension/payment/paynl3.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
$_['text_prefix'] = 'Order omschrijving prefix';
$_['text_prefix_tooltip'] = 'Verander de order omschrijving prefix hier. Als dit leeg is, zal de omschrijving het ordernummer zijn.';

$_['text_advanced_settings'] = 'Toon geavanceerde instellingen';
$_['text_advanced_settings'] = 'Geavanceerde instellingen';

$_['text_refund_processing'] = 'Verwerking terugbetaling';
$_['text_refund_processing_tooltip'] = 'Verwerk terugbetalingen die gestart zijn vanuit Pay.';
Expand Down
8 changes: 6 additions & 2 deletions upload/admin/view/javascript/pay.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,11 @@ jQuery(document).ready(function () {
jQuery(".advanced_settings").hide();
jQuery("#show_advanced_settings").click(function () {
jQuery(".advanced_settings").toggle();
var buttonText = $(".advanced_settings").is(":visible") ? "[-]" : "[+]";
jQuery(".advanced_button").text(buttonText);

if ($(".advanced_settings").is(":visible")) {
$("#advanced_settings_icon").removeClass("fa-chevron-down").addClass("fa-chevron-up");
} else {
$("#advanced_settings_icon").removeClass("fa-chevron-up").addClass("fa-chevron-down");
}
});
});
6 changes: 5 additions & 1 deletion upload/admin/view/stylesheet/pay.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

#show_advanced_settings{
cursor: pointer;
text-align: right;
}

.btn-advanced {
Expand All @@ -42,4 +41,9 @@

.btn-advanced:hover {
color: black;
}

#advanced_settings_icon{
margin-left: 5px;
display: inline-block;
}
184 changes: 93 additions & 91 deletions upload/admin/view/template/extension/payment/paynl3.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,110 +95,112 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2" id="show_advanced_settings"><span
class="btn btn-advanced">{{ text_advanced_settings }} <span class="advanced_button">[+]</span></span></label>
<div class="col-sm-10"></div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_general_prefix">
<span data-toggle="tooltip" title="{{ text_prefix_tooltip }}">{{ text_prefix }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_prefix" value="{{ prefix }}"/>
<div class="panel-heading" id="show_advanced_settings" style="border-top: 1px solid #dcdcdc;">
<h3 class="panel-title"><i class="fa fa-gear"></i> {{ text_advanced_settings }} <i id="advanced_settings_icon" class="fa fa-chevron-down"></i></h3>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_general_gateway">
<span data-toggle="tooltip" title="{{ text_gateway_tooltip }}">{{ text_gateway }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_gateway" value="{{ gateway }}"/>
<div class="advanced_settings">
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_general_prefix">
<span data-toggle="tooltip" title="{{ text_prefix_tooltip }}">{{ text_prefix }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_prefix" value="{{ prefix }}"/>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label"
for="payment_paynl_general_refund_processing">
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_general_gateway">
<span data-toggle="tooltip" title="{{ text_gateway_tooltip }}">{{ text_gateway }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_gateway" value="{{ gateway }}"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"
for="payment_paynl_general_refund_processing">
<span data-toggle="tooltip" title="{{ text_refund_processing_tooltip }}">
{{ text_refund_processing }}
</span></label>
<div class="col-sm-10">
<select name="payment_paynl_general_refund_processing"
id="payment_paynl_general_refund_processing" class="form-control">
{% if refund_processing %}
<option value="1" selected="selected">{{ text_enabled }}</option>
<option value="0">{{ text_disabled }}</option>
{% else %}
<option value="1">{{ text_enabled }}</option>
<option value="0" selected="selected">{{ text_disabled }}</option>
{% endif %}
</select>
<div class="col-sm-10">
<select name="payment_paynl_general_refund_processing"
id="payment_paynl_general_refund_processing" class="form-control">
{% if refund_processing %}
<option value="1" selected="selected">{{ text_enabled }}</option>
<option value="0">{{ text_disabled }}</option>
{% else %}
<option value="1">{{ text_enabled }}</option>
<option value="0" selected="selected">{{ text_disabled }}</option>
{% endif %}
</select>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_general_display_icon">
<span data-toggle="tooltip" title="{{ text_display_icon_tooltip }}">{{ text_display_icon }}</span>
</label>
<div class="col-sm-10">
<select class="form-control" name="payment_paynl_general_display_icon">
<option value="" {{ display_icon == '' ? 'selected="selected"': '' }}>{{ text_disabled }}</option>
<option value="20x20" {{ display_icon == '20x20' ? 'selected="selected"': '' }}>20 x 20</option>
<option value="25x25" {{ display_icon == '25x25' ? 'selected="selected"': '' }}>25 x 25</option>
<option value="50x50" {{ display_icon == '50x50' ? 'selected="selected"': '' }}>50 x 50</option>
<option value="75x75" {{ display_icon == '75x75' ? 'selected="selected"': '' }}>75 x 75</option>
<option value="100x100" {{ display_icon == '100x100' ? 'selected="selected"': '' }}>100 x 100</option>
</select>
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_general_display_icon">
<span data-toggle="tooltip" title="{{ text_display_icon_tooltip }}">{{ text_display_icon }}</span>
</label>
<div class="col-sm-10">
<select class="form-control" name="payment_paynl_general_display_icon">
<option value="" {{ display_icon == '' ? 'selected="selected"': '' }}>{{ text_disabled }}</option>
<option value="20x20" {{ display_icon == '20x20' ? 'selected="selected"': '' }}>20 x 20</option>
<option value="25x25" {{ display_icon == '25x25' ? 'selected="selected"': '' }}>25 x 25</option>
<option value="50x50" {{ display_icon == '50x50' ? 'selected="selected"': '' }}>50 x 50</option>
<option value="75x75" {{ display_icon == '75x75' ? 'selected="selected"': '' }}>75 x 75</option>
<option value="100x100" {{ display_icon == '100x100' ? 'selected="selected"': '' }}>100 x 100</option>
</select>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_general_icon_style">
<span data-toggle="tooltip" title="{{ text_icon_style_tooltip }}">{{ text_icon_style }}</span>
</label>
<div class="col-sm-10">
<select class="form-control" name="payment_paynl_general_icon_style">
<option value="classic" {{ icon_style == 'classic' ? 'selected="selected"': '' }}>{{ text_classic }}</option>
<option value="newest" {{ icon_style == 'newest' ? 'selected="selected"': '' }}>{{ text_newest }}</option>
</select>
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_general_icon_style">
<span data-toggle="tooltip" title="{{ text_icon_style_tooltip }}">{{ text_icon_style }}</span>
</label>
<div class="col-sm-10">
<select class="form-control" name="payment_paynl_general_icon_style">
<option value="classic" {{ icon_style == 'classic' ? 'selected="selected"': '' }}>{{ text_classic }}</option>
<option value="newest" {{ icon_style == 'newest' ? 'selected="selected"': '' }}>{{ text_newest }}</option>
</select>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_general_custom_exchange_url">
<span data-toggle="tooltip" title="{{ text_custom_exchange_url_tooltip }}">{{ text_custom_exchange_url }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_custom_exchange_url" value="{{ custom_exchange_url }}"/>
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_general_custom_exchange_url">
<span data-toggle="tooltip" title="{{ text_custom_exchange_url_tooltip }}">{{ text_custom_exchange_url }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_custom_exchange_url" value="{{ custom_exchange_url }}"/>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_general_custom_exchange_url">
<span data-toggle="tooltip" title="{{ text_logging_tooltip }}">{{ text_logging }}</span>
</label>
<div class="col-sm-10">
<select name="payment_paynl_general_logging" id="payment_paynl_general_logging" class="form-control">
{% if logging == 0 %}
<option value="1">{{ text_enabled }}</option>
<option value="0" selected="selected">{{ text_disabled }}</option>
{% else %}
<option value="1" selected="selected">{{ text_enabled }}</option>
<option value="0">{{ text_disabled }}</option>
{% endif %}
</select>
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_general_custom_exchange_url">
<span data-toggle="tooltip" title="{{ text_logging_tooltip }}">{{ text_logging }}</span>
</label>
<div class="col-sm-10">
<select name="payment_paynl_general_logging" id="payment_paynl_general_logging" class="form-control">
{% if logging == 0 %}
<option value="1">{{ text_enabled }}</option>
<option value="0" selected="selected">{{ text_disabled }}</option>
{% else %}
<option value="1" selected="selected">{{ text_enabled }}</option>
<option value="0">{{ text_disabled }}</option>
{% endif %}
</select>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<label class="col-sm-2 control-label" for="payment_paynl_logs">Download logs</label>
<div class="col-sm-10">
<div class="version">
<a id="download_logs" class="btn btn-primary" href="{{ action }}&downloadlogs=1" target="_BLANK">Download</a>
<div class="form-group">
<label class="col-sm-2 control-label" for="payment_paynl_logs">Download logs</label>
<div class="col-sm-10">
<div class="version">
<a id="download_logs" class="btn btn-primary" href="{{ action }}&downloadlogs=1" target="_BLANK">Download</a>
</div>
</div>
</div>
</div>
<div class="form-group advanced_settings">
<div class="col-sm-10 col-sm-offset-2">{{ text_current_ip }}{{ current_IP }}</div>
<label class="col-sm-2 control-label" for="payment_paynl_general_test_ip">
<span data-toggle="tooltip" title="{{ text_test_ip_tooltip }}">{{ text_test_ip }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_test_ip" value="{{ test_ip }}"/>
<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">{{ text_current_ip }}{{ current_IP }}</div>
<label class="col-sm-2 control-label" for="payment_paynl_general_test_ip">
<span data-toggle="tooltip" title="{{ text_test_ip_tooltip }}">{{ text_test_ip }}</span>
</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="payment_paynl_general_test_ip" value="{{ test_ip }}"/>
</div>
</div>
</div>
<div class="form-group">
Expand Down

0 comments on commit 9b1198f

Please sign in to comment.