Skip to content

Commit

Permalink
Fixed #23
Browse files Browse the repository at this point in the history
  • Loading branch information
@EsmondTan
EsmondTan committed Jul 5, 2016
1 parent 9f657ee commit 5d4753c
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 6 deletions.
15 changes: 12 additions & 3 deletions upload/application/controller/account/invoice.php
View file
Expand Up @@ -162,8 +162,11 @@ public function invoice() {
'text' => $this->currency->format($total['value'], $invoice_info['currency_code'], $invoice_info['currency_value']) 'text' => $this->currency->format($total['value'], $invoice_info['currency_code'], $invoice_info['currency_value'])
); );
} }

$pending_status = is_array($this->config->get('config_pending_status')) ? $this->config->get('config_pending_status') : array();
$overdue_status = is_array($this->config->get('config_overdue_status')) ? $this->config->get('config_overdue_status') : array();


if (in_array($invoice_info['status_id'], $this->config->get('config_pending_status')) || in_array($invoice_info['status_id'], $this->config->get('config_overdue_status'))) { if (in_array($invoice_info['status_id'], $pending_status) || in_array($invoice_info['status_id'], $overdue_status)) {
$this->data['payment_url'] = $this->url->link('account/invoice/payment', 'invoice_id=' . $invoice_info['invoice_id'], true); $this->data['payment_url'] = $this->url->link('account/invoice/payment', 'invoice_id=' . $invoice_info['invoice_id'], true);
} else { } else {
$this->data['payment_url'] = ''; $this->data['payment_url'] = '';
Expand All @@ -189,7 +192,10 @@ public function payment() {
$invoice_info = $this->model_billing_invoice->getInvoice((int)$this->request->get['invoice_id'], $this->customer->getId()); $invoice_info = $this->model_billing_invoice->getInvoice((int)$this->request->get['invoice_id'], $this->customer->getId());


if ($invoice_info) { if ($invoice_info) {
if (!(in_array($invoice_info['status_id'], $this->config->get('config_pending_status')) || in_array($invoice_info['status_id'], $this->config->get('config_overdue_status')))) { $pending_status = is_array($this->config->get('config_pending_status')) ? $this->config->get('config_pending_status') : array();
$overdue_status = is_array($this->config->get('config_overdue_status')) ? $this->config->get('config_overdue_status') : array();

if (!(in_array($invoice_info['status_id'], $pending_status) || in_array($invoice_info['status_id'], $overdue_status))) {
return new Action('error/not_found'); return new Action('error/not_found');
} }


Expand Down Expand Up @@ -420,8 +426,11 @@ public function view() {
'text' => $this->currency->format($total['value'], $invoice_info['currency_code'], $invoice_info['currency_value']) 'text' => $this->currency->format($total['value'], $invoice_info['currency_code'], $invoice_info['currency_value'])
); );
} }

$pending_status = is_array($this->config->get('config_pending_status')) ? $this->config->get('config_pending_status') : array();
$overdue_status = is_array($this->config->get('config_overdue_status')) ? $this->config->get('config_overdue_status') : array();


if (in_array($invoice_info['status_id'], $this->config->get('config_pending_status')) || in_array($invoice_info['status_id'], $this->config->get('config_overdue_status'))) { if (in_array($invoice_info['status_id'], $pending_status) || in_array($invoice_info['status_id'], $overdue_status)) {
$this->data['payment_url'] = $this->url->link('account/invoice/payment', 'invoice_id=' . $invoice_info['invoice_id'], true); $this->data['payment_url'] = $this->url->link('account/invoice/payment', 'invoice_id=' . $invoice_info['invoice_id'], true);
} else { } else {
$this->data['payment_url'] = ''; $this->data['payment_url'] = '';
Expand Down
5 changes: 4 additions & 1 deletion upload/application/extension/payment/authorizenet_aim/controller/authorizenet_aim.php
View file
Expand Up @@ -56,7 +56,10 @@ public function confirm() {
$invoice_info = $this->model_billing_invoice->getInvoice($invoice_id, $this->customer->getId()); $invoice_info = $this->model_billing_invoice->getInvoice($invoice_id, $this->customer->getId());


if ($invoice_info) { if ($invoice_info) {
if (!(in_array($invoice_info['status_id'], $this->config->get('config_pending_status')) || in_array($invoice_info['status_id'], $this->config->get('config_overdue_status')))) { $pending_status = is_array($this->config->get('config_pending_status')) ? $this->config->get('config_pending_status') : array();
$overdue_status = is_array($this->config->get('config_overdue_status')) ? $this->config->get('config_overdue_status') : array();

if (!(in_array($invoice_info['status_id'], $pending_status) || in_array($invoice_info['status_id'], $overdue_status))) {
$json['redirect'] = $this->url->link('account/invoice/invoice', 'invoice_id=' . $invoice_id, true); $json['redirect'] = $this->url->link('account/invoice/invoice', 'invoice_id=' . $invoice_id, true);
} }


Expand Down
5 changes: 4 additions & 1 deletion upload/application/extension/payment/bank_transfer/controller/bank_transfer.php
View file
Expand Up @@ -40,7 +40,10 @@ public function confirm() {
$invoice_info = $this->model_billing_invoice->getInvoice($invoice_id, $this->customer->getId()); $invoice_info = $this->model_billing_invoice->getInvoice($invoice_id, $this->customer->getId());


if ($invoice_info) { if ($invoice_info) {
if (!(in_array($invoice_info['status_id'], $this->config->get('config_pending_status')) || in_array($invoice_info['status_id'], $this->config->get('config_overdue_status')))) { $pending_status = is_array($this->config->get('config_pending_status')) ? $this->config->get('config_pending_status') : array();
$overdue_status = is_array($this->config->get('config_overdue_status')) ? $this->config->get('config_overdue_status') : array();

if (!(in_array($invoice_info['status_id'], $pending_status) || in_array($invoice_info['status_id'], $overdue_status))) {
return new Action('error/not_found'); return new Action('error/not_found');
} }


Expand Down
5 changes: 4 additions & 1 deletion upload/application/extension/payment/cheque/controller/cheque.php
View file
Expand Up @@ -42,7 +42,10 @@ public function confirm() {
$invoice_info = $this->model_billing_invoice->getInvoice($invoice_id, $this->customer->getId()); $invoice_info = $this->model_billing_invoice->getInvoice($invoice_id, $this->customer->getId());


if ($invoice_info) { if ($invoice_info) {
if (!(in_array($invoice_info['status_id'], $this->config->get('config_pending_status')) || in_array($invoice_info['status_id'], $this->config->get('config_overdue_status')))) { $pending_status = is_array($this->config->get('config_pending_status')) ? $this->config->get('config_pending_status') : array();
$overdue_status = is_array($this->config->get('config_overdue_status')) ? $this->config->get('config_overdue_status') : array();

if (!(in_array($invoice_info['status_id'], $pending_status) || in_array($invoice_info['status_id'], $overdue_status))) {
return new Action('error/not_found'); return new Action('error/not_found');
} }


Expand Down

0 comments on commit 5d4753c

Please sign in to comment.