From 41115fae769713f8093e6dd43676b0186c407211 Mon Sep 17 00:00:00 2001
From: packeta <github@zasilkovna.cz>
Date: Mon, 20 Jul 2020 16:31:51 +0200
Subject: [PATCH] fix - list of orders

---
 README.md                                          | 4 ++--
 admin/controller/extension/shipping/zasilkovna.php | 6 +++---
 catalog/model/extension/shipping/zasilkovna.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 793518d..76c725a 100644
--- a/README.md
+++ b/README.md
@@ -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.
@@ -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.
diff --git a/admin/controller/extension/shipping/zasilkovna.php b/admin/controller/extension/shipping/zasilkovna.php
index 1087293..f3e77a4 100644
--- a/admin/controller/extension/shipping/zasilkovna.php
+++ b/admin/controller/extension/shipping/zasilkovna.php
@@ -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']);
@@ -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'],
diff --git a/catalog/model/extension/shipping/zasilkovna.php b/catalog/model/extension/shipping/zasilkovna.php
index 18212e6..6efda57 100644
--- a/catalog/model/extension/shipping/zasilkovna.php
+++ b/catalog/model/extension/shipping/zasilkovna.php
@@ -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';