From b6bcc5ce00cdd4165eae5dcfacf29006deb80e25 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 19 Sep 2021 19:50:14 +0200
Subject: [PATCH] september update 1

---
 Admin/Install/Media.php       |  2 +-
 Admin/Routes/Web/Backend.php  | 14 +++++++++++++-
 Models/PurchaseBillMapper.php |  6 ++----
 Models/SalesBillMapper.php    |  6 ++----
 Models/StockBillMapper.php    |  6 ++----
 5 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php
index 5df269c..db19cdd 100755
--- a/Admin/Install/Media.php
+++ b/Admin/Install/Media.php
@@ -45,6 +45,6 @@ class Media
         $defaultTemplate = \reset($media['upload'][0]);
 
         $setting = new Setting();
-        SettingMapper::create($setting->with(0, 'default_template', (string) $defaultTemplate->getId(), 'Billing'));
+        SettingMapper::create($setting->with(0, 'default_template', (string) $defaultTemplate->getId(), '\\d+', 'Billing'));
     }
 }
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 7003696..53a9bb0 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -1,4 +1,16 @@
-<?php declare(strict_types=1);
+<?php
+/**
+ * Orange Management
+ *
+ * PHP Version 8.0
+ *
+ * @package   Modules
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 1.0
+ * @version   1.0.0
+ * @link      https://orange-management.org
+ */
+declare(strict_types=1);
 
 use Modules\Billing\Controller\BackendController;
 use Modules\Billing\Models\PermissionState;
diff --git a/Models/PurchaseBillMapper.php b/Models/PurchaseBillMapper.php
index ff8c8ed..495979c 100755
--- a/Models/PurchaseBillMapper.php
+++ b/Models/PurchaseBillMapper.php
@@ -42,7 +42,6 @@ final class PurchaseBillMapper extends BillMapper
         mixed $pivot,
         string $column = null,
         int $limit = 50,
-        string $order = 'ASC',
         int $relations = RelationType::ALL,
         int $depth = 3,
         Builder $query = null
@@ -51,14 +50,13 @@ final class PurchaseBillMapper extends BillMapper
         $query = self::getQuery(null, [], $relations, $depth);
         $query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::PURCHASE);
 
-        return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+        return self::getBeforePivot($pivot, $column, $limit, $relations, $depth, $query);
     }
 
     public static function getPurchaseAfterPivot(
         mixed $pivot,
         string $column = null,
         int $limit = 50,
-        string $order = 'ASC',
         int $relations = RelationType::ALL,
         int $depth = 3,
         Builder $query = null
@@ -67,7 +65,7 @@ final class PurchaseBillMapper extends BillMapper
         $query = self::getQuery(null, [], $relations, $depth);
         $query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::PURCHASE);
 
-        return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+        return self::getAfterPivot($pivot, $column, $limit, $relations, $depth, $query);
     }
 
     public static function getPurchaseByItemId(int $id, \DateTime $start, \DateTime $end) : Money
diff --git a/Models/SalesBillMapper.php b/Models/SalesBillMapper.php
index 7992d87..a00ca12 100755
--- a/Models/SalesBillMapper.php
+++ b/Models/SalesBillMapper.php
@@ -42,7 +42,6 @@ final class SalesBillMapper extends BillMapper
         mixed $pivot,
         string $column = null,
         int $limit = 50,
-        string $order = 'ASC',
         int $relations = RelationType::ALL,
         int $depth = 3,
         Builder $query = null
@@ -51,14 +50,13 @@ final class SalesBillMapper extends BillMapper
         $query = self::getQuery(null, [], $relations, $depth);
         $query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::SALES);
 
-        return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+        return self::getBeforePivot($pivot, $column, $limit, $relations, $depth, $query);
     }
 
     public static function getSalesAfterPivot(
         mixed $pivot,
         string $column = null,
         int $limit = 50,
-        string $order = 'ASC',
         int $relations = RelationType::ALL,
         int $depth = 3,
         Builder $query = null
@@ -67,7 +65,7 @@ final class SalesBillMapper extends BillMapper
         $query = self::getQuery(null, [], $relations, $depth);
         $query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::SALES);
 
-        return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+        return self::getAfterPivot($pivot, $column, $limit, $relations, $depth, $query);
     }
 
     public static function getSalesByItemId(int $id, \DateTime $start, \DateTime $end) : Money
diff --git a/Models/StockBillMapper.php b/Models/StockBillMapper.php
index 63acb52..52866fe 100755
--- a/Models/StockBillMapper.php
+++ b/Models/StockBillMapper.php
@@ -39,7 +39,6 @@ final class StockBillMapper extends BillMapper
         mixed $pivot,
         string $column = null,
         int $limit = 50,
-        string $order = 'ASC',
         int $relations = RelationType::ALL,
         int $depth = 3,
         Builder $query = null
@@ -48,14 +47,13 @@ final class StockBillMapper extends BillMapper
         $query = self::getQuery(null, [], $relations, $depth);
         $query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
 
-        return self::getBeforePivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+        return self::getBeforePivot($pivot, $column, $limit, $relations, $depth, $query);
     }
 
     public static function getStockAfterPivot(
         mixed $pivot,
         string $column = null,
         int $limit = 50,
-        string $order = 'ASC',
         int $relations = RelationType::ALL,
         int $depth = 3,
         Builder $query = null
@@ -64,6 +62,6 @@ final class StockBillMapper extends BillMapper
         $query = self::getQuery(null, [], $relations, $depth);
         $query->where(BillTypeMapper::getTable() . '_d' . ($depth - 1) . '.billing_type_transfer_type', '=', BillTransferType::STOCK);
 
-        return self::getAfterPivot($pivot, $column, $limit, $order, $relations, $depth, $query);
+        return self::getAfterPivot($pivot, $column, $limit, $relations, $depth, $query);
     }
 }