Skip to content
This repository was archived by the owner on Jan 25, 2024. It is now read-only.

Commit 430ead1

Browse files
committed
Release 1.0.9
1 parent 48ba757 commit 430ead1

File tree

159 files changed

+2959
-920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+2959
-920
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ This repository contains the OpenCart wallee payment module that enables the sh
1111

1212
## Documentation
1313

14-
* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.8/docs/en/documentation.html)
14+
* [English](https://plugin-documentation.wallee.com/wallee-payment/opencart-2.0/1.0.9/docs/en/documentation.html)
1515

1616
## License
1717

18-
Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.8/LICENSE) for more information.
18+
Please see the [license file](https://github.com/wallee-payment/opencart-2.0/blob/1.0.9/LICENSE) for more information.

docs/en/documentation.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2>Documentation</h2> </div>
2121
</a>
2222
</li>
2323
<li>
24-
<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.8/">
24+
<a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.9/">
2525
Source
2626
</a>
2727
</li>
@@ -48,7 +48,7 @@ <h1>
4848
<div class="olist arabic">
4949
<ol class="arabic">
5050
<li>
51-
<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.8/">Download</a> the extension.</p>
51+
<p><a href="https://github.com/wallee-payment/opencart-2.0/releases/tag/1.0.9/">Download</a> the extension.</p>
5252
</li>
5353
<li>
5454
<p>Extract the files and upload the content of the <code>Upload</code> directory into the root directory of your store using FTP/SSH.</p>

screenshots/alerts.png

-107 KB
Binary file not shown.

screenshots/application_user.png

-68.8 KB
Binary file not shown.

screenshots/download.png

-52.9 KB
Binary file not shown.

screenshots/refund.png

-22.8 KB
Binary file not shown.

screenshots/settings.png

-59.8 KB
Binary file not shown.

screenshots/transaction.png

-78.9 KB
Binary file not shown.

upload/admin/model/extension/wallee/alert.php

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,25 @@ public function getAlertsTitle(){
1818

1919
public function getAlerts(){
2020
if ($this->alerts == null) {
21-
$this->load->language('payment/wallee');
22-
$this->alerts = array();
23-
$alert_entities = \Wallee\Entity\Alert::loadAll($this->registry);
21+
try {
22+
$this->load->language('payment/wallee');
23+
$this->alerts = array();
24+
$alert_entities = \Wallee\Entity\Alert::loadAll($this->registry);
2425

25-
foreach ($alert_entities as $alert_entity) {
26-
$this->alerts[] = array(
27-
'url' => $this->createUrl($alert_entity->getRoute(),
28-
array(
29-
\WalleeVersionHelper::TOKEN => $this->session->data[\WalleeVersionHelper::TOKEN]
30-
)),
31-
'text' => $this->language->get($alert_entity->getKey()),
32-
'level' => $alert_entity->getLevel(),
33-
'count' => $alert_entity->getCount()
34-
);
26+
foreach ($alert_entities as $alert_entity) {
27+
$this->alerts[] = array(
28+
'url' => $this->createUrl($alert_entity->getRoute(),
29+
array(
30+
\WalleeVersionHelper::TOKEN => $this->session->data[\WalleeVersionHelper::TOKEN]
31+
)),
32+
'text' => $this->language->get($alert_entity->getKey()),
33+
'level' => $alert_entity->getLevel(),
34+
'count' => $alert_entity->getCount()
35+
);
36+
}
37+
}
38+
catch(\Exception $e) {
39+
// We ignore errors here otherwise we might not be albe to display the admin backend UI.
3540
}
3641
}
3742
return $this->alerts;
@@ -44,4 +49,4 @@ public function getAlertCount(){
4449
}
4550
return $count;
4651
}
47-
}
52+
}

upload/catalog/language/english/payment/wallee.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
$_['error_default'] = 'This action is not permitted.';
1111
$_['error_order_edit'] = 'The wallee transaction is in a state in which the line items may no longer be changed.';
1212
$_['error_not_pending'] = 'Transaction exists and is not in state pending.';
13+
$_['error_confirmation'] = 'The transaction could not be confirmed. Please check to see if any payment has been made from your account, and retry if no charge has taken place.';
1314

1415
// Order overview / download buttons
1516
$_['button_invoice'] = 'Invoice';

0 commit comments

Comments
 (0)