Skip to content

Commit

Permalink
changed the method name ijn payment gateways from action to order
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielkerr
danielkerr committed Jun 29, 2015
1 parent 52431de commit e9ea283
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 30 deletions.
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/amazon_checkout.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public function addSubmission() {
$this->model_payment_amazon_checkout->addReportSubmission($this->request->get['order_id'], $this->request->get['submission_id']);
}

public function action() {
public function order() {
$this->load->model('sale/order');
$this->load->model('payment/amazon_checkout');
$this->language->load('sale/order');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/amazon_login_pay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ public function uninstall() {
$this->model_extension_event->deleteEvent('amazon_history_capture');
}

public function action() {
public function order() {

if ($this->config->get('amazon_login_pay_status')) {

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/bluepay_hosted.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public function uninstall() {
$this->model_payment_bluepay_hosted->uninstall();
}

public function action() {
public function order() {
if ($this->config->get('bluepay_hosted_status')) {
$this->load->model('payment/bluepay_hosted');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/bluepay_redirect.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public function uninstall() {
$this->model_payment_bluepay_redirect->uninstall();
}

public function action() {
public function order() {
if ($this->config->get('bluepay_redirect_status')) {
$this->load->model('payment/bluepay_redirect');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/firstdata.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public function uninstall() {
$this->model_payment_firstdata->uninstall();
}

public function action() {
public function order() {
if ($this->config->get('firstdata_status')) {
$this->load->model('payment/firstdata');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/firstdata_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public function uninstall() {
$this->model_payment_firstdata_remote->uninstall();
}

public function action() {
public function order() {
if ($this->config->get('firstdata_remote_status')) {
$this->load->model('payment/firstdata_remote');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/g2apay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ public function index() {
$this->response->setOutput($this->load->view('payment/g2apay.tpl', $data));
}

public function action() {
public function order() {

if ($this->config->get('g2apay_status')) {

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/globalpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public function install() {
$this->model_payment_globalpay->install();
}

public function action() {
public function order() {
if ($this->config->get('globalpay_status')) {
$this->load->model('payment/globalpay');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/globalpay_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function install() {
$this->model_payment_globalpay_remote->install();
}

public function action() {
public function order() {
if ($this->config->get('globalpay_remote_status')) {
$this->load->model('payment/globalpay_remote');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/pp_express.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,7 +885,7 @@ public function uninstall() {
$this->model_payment_pp_express->uninstall();
}

public function action() {
public function order() {
if ($this->config->get('pp_express_status')) {
$this->load->model('payment/pp_express');
$this->load->language('payment/pp_express_order');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/pp_payflow_iframe.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ public function void() {
$this->response->setOutput(json_encode($json));
}

public function action() {
public function order() {
$this->load->model('payment/pp_payflow_iframe');
$this->load->language('payment/pp_payflow_iframe');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/pp_pro_iframe.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,7 @@ public function void() {
$this->response->setOutput(json_encode($json));
}

public function action() {
public function order() {
$this->load->model('payment/pp_pro_iframe');
$this->load->language('payment/pp_pro_iframe');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/realex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public function install() {
$this->model_payment_realex->install();
}

public function action() {
public function order() {
if ($this->config->get('realex_status')) {
$this->load->model('payment/realex');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/realex_remote.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function install() {
$this->model_payment_realex_remote->install();
}

public function action() {
public function order() {
if ($this->config->get('realex_remote_status')) {
$this->load->model('payment/realex_remote');

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/sagepay_direct.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public function uninstall() {
$this->model_payment_sagepay_direct->uninstall();
}

public function action() {
public function order() {

if ($this->config->get('sagepay_direct_status')) {

Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/sagepay_server.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ public function uninstall() {
$this->model_payment_sagepay_server->uninstall();
}

public function action() {
public function order() {

if ($this->config->get('sagepay_server_status')) {
$this->load->model('payment/sagepay_server');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/securetrading_pp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ public function uninstall() {
$this->model_payment_securetrading_pp->uninstall();
}

public function action() {
public function order() {

if ($this->config->get('securetrading_pp_status')) {
$this->load->model('payment/securetrading_pp');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/securetrading_ws.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public function showTransactions() {
$this->response->setOutput($this->render());
}

public function action() {
public function order() {

if ($this->config->get('securetrading_ws_status')) {
$this->load->model('payment/securetrading_ws');
Expand Down
2 changes: 1 addition & 1 deletion upload/admin/controller/payment/worldpay.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public function uninstall() {
$this->model_payment_worldpay->uninstall();
}

public function action() {
public function order() {

if ($this->config->get('worldpay_status')) {

Expand Down
29 changes: 18 additions & 11 deletions upload/admin/view/template/sale/order_info.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
<?php if ($invoice_no) { ?>
<i class="fa fa-shopping-cart fa-fw"></i> <?php echo $invoice_no; ?><br />
<?php } else { ?>
<i class="fa fa-shopping-cart fa-fw"></i> <button id="button-invoice" class="btn btn-success btn-xs"><i class="fa fa-cog"></i> <?php echo $button_generate; ?></button>
<i class="fa fa-shopping-cart fa-fw"></i>
<button id="button-invoice" class="btn btn-success btn-xs"><i class="fa fa-cog"></i> <?php echo $button_generate; ?></button>
<br />
<?php } ?>
<br />
Expand Down Expand Up @@ -193,8 +194,8 @@
</div>
</div>
<div class="tab-pane" id="tab-additional">
<?php if ($account_custom_fields) { ?>
<table class="table table-bordered">
<?php if ($account_custom_fields) { ?>
<thead>
<tr>
<td colspan="2"><?php echo $text_account_custom_field; ?></td>
Expand All @@ -203,13 +204,15 @@
<tbody>
<?php foreach ($account_custom_fields as $custom_field) { ?>
<tr>
<td><?php echo $custom_field['name']; ?>:</td>
<td><?php echo $custom_field['name']; ?></td>
<td><?php echo $custom_field['value']; ?></td>
</tr>
<?php } ?>
</tbody>
<?php } ?>
<?php if ($payment_custom_fields) { ?>
</table>
<?php } ?>
<?php if ($payment_custom_fields) { ?>
<table class="table table-bordered">
<thead>
<tr>
<td colspan="2"><?php echo $text_payment_custom_field; ?></td>
Expand All @@ -218,13 +221,15 @@
<tbody>
<?php foreach ($payment_custom_fields as $custom_field) { ?>
<tr>
<td><?php echo $custom_field['name']; ?>:</td>
<td><?php echo $custom_field['name']; ?></td>
<td><?php echo $custom_field['value']; ?></td>
</tr>
<?php } ?>
</tbody>
<?php } ?>
<?php if ($shipping_method && $shipping_custom_fields) { ?>
</table>
<?php } ?>
<?php if ($shipping_method && $shipping_custom_fields) { ?>
<table class="table table-bordered">
<thead>
<tr>
<td colspan="2"><?php echo $text_shipping_custom_field; ?></td>
Expand All @@ -233,17 +238,19 @@
<tbody>
<?php foreach ($shipping_custom_fields as $custom_field) { ?>
<tr>
<td><?php echo $custom_field['name']; ?>:</td>
<td><?php echo $custom_field['name']; ?></td>
<td><?php echo $custom_field['value']; ?></td>
</tr>
<?php } ?>
</tbody>
<?php } ?>
</table>
<?php } ?>
<table class="table table-bordered">
<thead>
<tr>
<td colspan="2"><?php echo $text_browser; ?></td>
</tr>
</thead>
</thead>
<tbody>
<tr>
<td><?php echo $text_ip; ?></td>
Expand Down

0 comments on commit e9ea283

Please sign in to comment.