From f5950c180d1c54748f3573ec6369b7ca0c8a1079 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Fri, 14 Jun 2024 18:14:13 +0000
Subject: [PATCH] fix bugs

---
 Admin/Install/WarehouseManagement.php | 13 +++++++------
 Controller/CliController.php          |  9 ++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Admin/Install/WarehouseManagement.php b/Admin/Install/WarehouseManagement.php
index 64a6a04..3ce7cc9 100755
--- a/Admin/Install/WarehouseManagement.php
+++ b/Admin/Install/WarehouseManagement.php
@@ -57,12 +57,13 @@ class WarehouseManagement
             throw new \Exception('Couldn\'t parse mapper');
         }
 
-        $mapper = \str_replace([
-            '// @Module WarehouseManagement ',
-            '/* @Module WarehouseManagement ',
-            ' @Module WarehouseManagement */',
-            ], '', $mapper);
-        \file_put_contents(__DIR__ . '/../../Models/BillMapper.php', $mapper);
+        // @todo removed until modular mapper extension is implemented
+        // $mapper = \str_replace([
+        //     '// @Module WarehouseManagement ',
+        //     '/* @Module WarehouseManagement ',
+        //     ' @Module WarehouseManagement */',
+        //     ], '', $mapper);
+        // \file_put_contents(__DIR__ . '/../../Models/BillMapper.php', $mapper);
 
         Autoloader::invalidate(__DIR__ . '/../../Models/BillMapper.php');
     }
diff --git a/Controller/CliController.php b/Controller/CliController.php
index 9b9635b..e3d6468 100755
--- a/Controller/CliController.php
+++ b/Controller/CliController.php
@@ -20,6 +20,8 @@ use Modules\Billing\Models\BillMapper;
 use Modules\Billing\Models\BillTypeMapper;
 use Modules\Billing\Models\InvoiceRecognition;
 use Modules\Billing\Models\NullBillType;
+use Modules\Billing\Models\Price\PriceMapper;
+use Modules\ItemManagement\Models\Item;
 use Modules\ItemManagement\Models\NullItem;
 use Modules\Payment\Models\PaymentType;
 use Modules\SupplierManagement\Models\NullSupplier;
@@ -126,7 +128,7 @@ final class CliController extends Controller
             ->where('attributes/type/name', ['bill_match_pattern', 'bill_date_format'], 'IN')
             ->executeGetArray();
 
-        $bill->supplier = this->matchSupplier($content, $suppliers);
+        $bill->supplier = $this->matchSupplier($content, $suppliers);
 
         if ($bill->supplier->id !== 0) {
             $bill->billTo      = $bill->supplier->account->name1;
@@ -251,8 +253,9 @@ final class CliController extends Controller
                             ->with('item')
                             ->with('item/l11n')
                             ->where('supplier', $bill->supplier->id)
+                            ->executeGetArray();
 
-                        $item = $this->matchItem($content, $items);
+                        $item = $this->matchItem($content, $possibleItems);
                     }
 
                     if ($item->id !== 0) {
@@ -542,7 +545,7 @@ final class CliController extends Controller
 
         // name1 + name2
         foreach ($items as $item) {
-            if (\stripos($content, $item->getL11n('name1')->content) !== false 
+            if (\stripos($content, $item->getL11n('name1')->content) !== false
                 && \stripos($content, $item->getL11n('name2')->content) !== false
             ) {
                 return $item;