Skip to content

Commit

Permalink
fix - list of orders
Browse files Browse the repository at this point in the history
  • Loading branch information
packeta-user committed Jul 20, 2020
1 parent d00e3ce commit 41115fa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Module for Opencart 3

## Download link
[Download version 2.0.2](https://github.com/Zasilkovna/opencart3/archive/v2.0.2.zip)
[Download version 2.0.3](https://github.com/Zasilkovna/opencart3/archive/v2.0.3.zip)

### Installation
1. Copy the **admin** and **catalog** directories from the archive to the root directory of your opencart store.
Expand Down Expand Up @@ -59,7 +59,7 @@ Orders**. Here you can export the marked orders to a csv file, which you then up
# Modul pro Opencart 3

### Stažení modulu
[Aktuální verze 2.0.2](https://github.com/Zasilkovna/opencart3/archive/v2.0.2.zip)
[Aktuální verze 2.0.3](https://github.com/Zasilkovna/opencart3/archive/v2.0.3.zip)

## Instalace
1. Adresáře **admin** a **catalog** z archivu nakopírujte do kořenového adresáře vašeho obchodu opencart.
Expand Down
6 changes: 3 additions & 3 deletions admin/controller/extension/shipping/zasilkovna.php
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,8 @@ public function orders() {
$orderStatusDescriptions[$orderStatusItem['order_status_id']] = $orderStatusItem['name'];
}

// load list of payment method considered as "cash on delivery"
$codPaymentMethod = $this->config->get('shipping_zasilkovna_cash_on_delivery_methods');
// load list of payment methods considered as "cash on delivery"
$codPaymentMethods = (array)$this->config->get('shipping_zasilkovna_cash_on_delivery_methods');

// load count of orders and list of orders for current page
$orderCount = $this->model_extension_shipping_zasilkovna_orders->getOrdersCount($paramData['filterData']);
Expand All @@ -623,7 +623,7 @@ public function orders() {
'customer' => $order['customer'],
'order_status' => $orderStatusDescriptions[$order['order_status_id']],
'total' => $this->currency->format($order['total'], $order['currency_code'], $order['currency_value']),
'is_cod' => (in_array($order['payment_code'], $codPaymentMethod)),
'is_cod' => in_array($order['payment_code'], $codPaymentMethods),
'date_added' => date($this->language->get('date_format_short'), strtotime($order['date_added'])),
'branch_id' => $order['branch_id'],
'branch_name' => $order['branch_name'],
Expand Down
2 changes: 1 addition & 1 deletion catalog/model/extension/shipping/zasilkovna.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
class ModelExtensionShippingZasilkovna extends Model {
/** @var string identification of e-shop module version */
const APP_IDENTITY = 'opencart-3.0-packeta-2.0.2 ';
const APP_IDENTITY = 'opencart-3.0-packeta-2.0.3 ';

/** @var string internal ID of branch */
const KEY_BRANCH_ID = 'zasilkovna_branch_id';
Expand Down

0 comments on commit 41115fa

Please sign in to comment.