Skip to content

Commit

Permalink
Fixed usages of btn_ language tag to the correct button_
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesallsup
jamesallsup committed Sep 12, 2015
1 parent 0b13498 commit 1ef7ba8
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 35 deletions.
6 changes: 3 additions & 3 deletions upload/admin/controller/payment/securetrading_pp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,9 @@ public function orderAction() {
$data['text_column_amount'] = $this->language->get('text_column_amount');
$data['text_column_type'] = $this->language->get('text_column_type');
$data['text_column_created'] = $this->language->get('text_column_created');
$data['btn_release'] = $this->language->get('btn_release');
$data['btn_rebate'] = $this->language->get('btn_rebate');
$data['btn_void'] = $this->language->get('btn_void');
$data['button_release'] = $this->language->get('button_release');
$data['button_rebate'] = $this->language->get('button_rebate');
$data['button_void'] = $this->language->get('button_void');
$data['text_confirm_void'] = $this->language->get('text_confirm_void');
$data['text_confirm_release'] = $this->language->get('text_confirm_release');
$data['text_confirm_rebate'] = $this->language->get('text_confirm_rebate');
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/controller/payment/securetrading_ws.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,9 @@ public function orderAction() {
$data['text_column_amount'] = $this->language->get('text_column_amount');
$data['text_column_type'] = $this->language->get('text_column_type');
$data['text_column_created'] = $this->language->get('text_column_created');
$data['btn_release'] = $this->language->get('btn_release');
$data['btn_rebate'] = $this->language->get('btn_rebate');
$data['btn_void'] = $this->language->get('btn_void');
$data['button_release'] = $this->language->get('button_release');
$data['button_rebate'] = $this->language->get('button_rebate');
$data['button_void'] = $this->language->get('button_void');
$data['text_confirm_void'] = $this->language->get('text_confirm_void');
$data['text_confirm_release'] = $this->language->get('text_confirm_release');
$data['text_confirm_rebate'] = $this->language->get('text_confirm_rebate');
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/controller/payment/worldpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@ public function orderAction() {
$data['text_column_amount'] = $this->language->get('text_column_amount');
$data['text_column_type'] = $this->language->get('text_column_type');
$data['text_column_date_added'] = $this->language->get('text_column_date_added');
$data['btn_release'] = $this->language->get('btn_release');
$data['btn_refund'] = $this->language->get('btn_refund');
$data['btn_void'] = $this->language->get('btn_void');
$data['button_release'] = $this->language->get('button_release');
$data['button_refund'] = $this->language->get('button_refund');
$data['button_void'] = $this->language->get('button_void');
$data['text_confirm_void'] = $this->language->get('text_confirm_void');
$data['text_confirm_release'] = $this->language->get('text_confirm_release');
$data['text_confirm_refund'] = $this->language->get('text_confirm_refund');
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/english/payment/bluepay_hosted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
$_['help_cron_job_url'] = 'Set a cron job to call this URL';

// Button
$_['btn_release'] = 'Release';
$_['btn_rebate'] = 'Rebate / refund';
$_['btn_void'] = 'Void';
$_['button_release'] = 'Release';
$_['button_rebate'] = 'Rebate / refund';
$_['button_void'] = 'Void';

// Error
$_['error_permission'] = 'Warning: You do not have permission to modify payment BluePay!';
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/english/payment/bluepay_redirect.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
$_['help_cron_job_url'] = 'Set a cron job to call this URL';

// Button
$_['btn_release'] = 'Release';
$_['btn_rebate'] = 'Rebate / refund';
$_['btn_void'] = 'Void';
$_['button_release'] = 'Release';
$_['button_rebate'] = 'Rebate / refund';
$_['button_void'] = 'Void';

// Error
$_['error_permission'] = 'Warning: You do not have permission to modify payment BluePay!';
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/english/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
$_['help_cron_job_url'] = 'Set a cron job to call this URL';

// Button
$_['btn_release'] = 'Release';
$_['btn_rebate'] = 'Rebate / refund';
$_['btn_void'] = 'Void';
$_['button_release'] = 'Release';
$_['button_rebate'] = 'Rebate / refund';
$_['button_void'] = 'Void';

// Error
$_['error_permission'] = 'Warning: You do not have permission to modify payment SagePay!';
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/english/payment/sagepay_server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
$_['help_cron_job_url'] = 'Set a cron job to call this URL';

// Button
$_['btn_release'] = 'Release';
$_['btn_rebate'] = 'Rebate / refund';
$_['btn_void'] = 'Void';
$_['button_release'] = 'Release';
$_['button_rebate'] = 'Rebate / refund';
$_['button_void'] = 'Void';

// Error
$_['error_permission'] = 'Warning: You do not have permission to modify payment SagePay!';
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/language/english/payment/securetrading_pp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@
$_['text_confirm_release'] = 'Are you sure you want to release the payment?';
$_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?';

$_['btn_release'] = 'Release';
$_['btn_rebate'] = 'Rebate / refund';
$_['btn_void'] = 'Reverse Authorisation';
$_['button_release'] = 'Release';
$_['button_rebate'] = 'Rebate / refund';
$_['button_void'] = 'Reverse Authorisation';
6 changes: 3 additions & 3 deletions upload/admin/language/english/payment/securetrading_ws.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,6 @@
$_['text_confirm_release'] = 'Are you sure you want to release the payment?';
$_['text_confirm_rebate'] = 'Are you sure you want to rebate the payment?';

$_['btn_release'] = 'Release';
$_['btn_rebate'] = 'Rebate / refund';
$_['btn_void'] = 'Reverse Authorisation';
$_['button_release'] = 'Release';
$_['button_rebate'] = 'Rebate / refund';
$_['button_void'] = 'Reverse Authorisation';
2 changes: 1 addition & 1 deletion upload/admin/language/english/payment/worldpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@

$_['text_confirm_refund'] = 'Are you sure you want to refund the payment?';

$_['btn_refund'] = 'Rebate / refund';
$_['button_refund'] = 'Rebate / refund';

6 changes: 3 additions & 3 deletions upload/admin/view/template/payment/securetrading_pp_order.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<span class="release_text"><?php echo $text_no; ?></span>&nbsp;&nbsp;
<?php if ($securetrading_pp_order['void_status'] == 0) { ?>
<input type="text" width="10" id="release_amount" value="<?php echo $securetrading_pp_order['total']; ?>"/>
<a class="button btn btn-primary" id="btn_release"><?php echo $btn_release; ?></a>
<a class="button btn btn-primary" id="btn_release"><?php echo $button_release; ?></a>
<span class="btn btn-primary" id="img_loading_release" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } ?>
<?php } ?>
Expand All @@ -35,7 +35,7 @@
<span class="void_text"><?php echo $text_yes; ?></span>
<?php } elseif ($securetrading_pp_order['void_status'] == 0 && $securetrading_pp_order['release_status'] != 1 && $securetrading_pp_order['rebate_status'] != 1) { ?>
<span class="void_text"><?php echo $text_no; ?></span>&nbsp;&nbsp;
<a class="button btn btn-primary" id="btn_void"><?php echo $btn_void; ?></a>
<a class="button btn btn-primary" id="btn_void"><?php echo $button_void; ?></a>
<span class="btn btn-primary" id="img_loading_void" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } else { ?>
<span class="void_text"><?php echo $text_no; ?></span>
Expand All @@ -52,7 +52,7 @@
<?php if ($securetrading_pp_order['total_released'] > 0 && $securetrading_pp_order['void_status'] == 0) { ?>
<input type="text" width="10" id="rebate_amount" />
<a class="button btn btn-primary" id="btn_rebate"><?php echo $btn_rebate; ?></a>
<a class="button btn btn-primary" id="btn_rebate"><?php echo $button_rebate; ?></a>
<span class="btn btn-primary" id="img_loading_rebate" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } ?>
<?php } ?>
Expand Down
6 changes: 3 additions & 3 deletions upload/admin/view/template/payment/securetrading_ws_order.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<span class="release_text"><?php echo $text_no; ?></span>&nbsp;&nbsp;
<?php if ($securetrading_ws_order['void_status'] == 0) { ?>
<input type="text" width="10" id="release_amount" value="<?php echo $securetrading_ws_order['total']; ?>"/>
<a class="button btn btn-primary" id="btn_release"><?php echo $btn_release; ?></a>
<a class="button btn btn-primary" id="btn_release"><?php echo $button_release; ?></a>
<span class="btn btn-primary" id="img_loading_release" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } ?>
<?php } ?>
Expand All @@ -35,7 +35,7 @@
<span class="void_text"><?php echo $text_yes; ?></span>
<?php } elseif ($securetrading_ws_order['void_status'] == 0 && $securetrading_ws_order['release_status'] != 1 && $securetrading_ws_order['rebate_status'] != 1) { ?>
<span class="void_text"><?php echo $text_no; ?></span>&nbsp;&nbsp;
<a class="button btn btn-primary" id="btn_void"><?php echo $btn_void; ?></a>
<a class="button btn btn-primary" id="btn_void"><?php echo $button_void; ?></a>
<span class="btn btn-primary" id="img_loading_void" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } else { ?>
<span class="void_text"><?php echo $text_no; ?></span>
Expand All @@ -52,7 +52,7 @@
<?php if ($securetrading_ws_order['total_released'] > 0 && $securetrading_ws_order['void_status'] == 0) { ?>
<input type="text" width="10" id="rebate_amount" />
<a class="button btn btn-primary" id="btn_rebate"><?php echo $btn_rebate; ?></a>
<a class="button btn btn-primary" id="btn_rebate"><?php echo $button_rebate; ?></a>
<span class="btn btn-primary" id="img_loading_rebate" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } ?>
<?php } ?>
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/view/template/payment/worldpay_order.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<?php if ($worldpay_order['total_released'] > 0) { ?>
<input type="text" width="10" id="refund_amount" />
<a class="button btn btn-primary" id="btn_refund"><?php echo $btn_refund; ?></a>
<a class="button btn btn-primary" id="btn_refund"><?php echo $button_refund; ?></a>
<span class="btn btn-primary" id="img_loading_refund" style="display:none;"><i class="fa fa-cog fa-spin fa-lg"></i></span>
<?php } ?>
<?php } ?>
Expand Down

0 comments on commit 1ef7ba8

Please sign in to comment.