From 3bcb5f7f026600fdc5ede273cd7799499fb8e0ef Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 4 Jul 2021 18:27:20 +0200 Subject: [PATCH] formatting fixes, bug fixes and support impl. --- Controller/ApiController.php | 8 ++++-- Models/BillStatus.php | 2 +- Models/BillTransferType.php | 2 +- Models/BillType.php | 4 +-- Models/NullBill.php | 6 ++--- Models/NullBillElement.php | 39 +++++++++++++++++++++++++++ Models/NullBillType.php | 2 +- Theme/Backend/bill-analysis.tpl.php | 0 Theme/Backend/region-analysis.tpl.php | 0 Theme/Backend/rep-analysis.tpl.php | 0 10 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 Models/NullBillElement.php mode change 100644 => 100755 Theme/Backend/bill-analysis.tpl.php mode change 100644 => 100755 Theme/Backend/region-analysis.tpl.php mode change 100644 => 100755 Theme/Backend/rep-analysis.tpl.php diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 20f94a0..af39d86 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -277,8 +277,12 @@ final class ApiController extends Controller . $bill->createdAt->format('m') . '/' . $bill->createdAt->format('d') . '/'; - if (!\is_dir($pdfDir)) { - \mkdir($pdfDir, 0755, true); + $status = !\is_dir($pdfDir) ? \mkdir($pdfDir, 0755, true) : true; + if ($status === false) { + $response->set($request->uri->__toString(), new FormValidation($status)); + $response->header->status = RequestStatusCode::R_400; + + return; } $view = new View($this->app->l11nManager, $request, $response); diff --git a/Models/BillStatus.php b/Models/BillStatus.php index e502133..24c9d41 100755 --- a/Models/BillStatus.php +++ b/Models/BillStatus.php @@ -17,7 +17,7 @@ namespace Modules\Billing\Models; use phpOMS\Stdlib\Base\Enum; /** - * Task type enum. + * Bill status enum. * * @package Modules\Billing\Models * @license OMS License 1.0 diff --git a/Models/BillTransferType.php b/Models/BillTransferType.php index d0e3d9e..52c30a9 100755 --- a/Models/BillTransferType.php +++ b/Models/BillTransferType.php @@ -17,7 +17,7 @@ namespace Modules\Billing\Models; use phpOMS\Stdlib\Base\Enum; /** - * Task type enum. + * Bill transfer type enum. * * @package Modules\Billing\Models * @license OMS License 1.0 diff --git a/Models/BillType.php b/Models/BillType.php index 186d24a..af50dfc 100755 --- a/Models/BillType.php +++ b/Models/BillType.php @@ -17,7 +17,7 @@ namespace Modules\Billing\Models; use phpOMS\Localization\ISO639x1Enum; /** - * Task type enum. + * Bill type enum. * * @package Modules\Billing\Models * @license OMS License 1.0 @@ -85,7 +85,7 @@ BillTypeL11n $l11n; { if ($l11n instanceof BillTypeL11n) { $this->l11n = $l11n; - } elseif ($this->l11n instanceof BillTypeL11n) { + } elseif (isset($this->l11n) && $this->l11n instanceof BillTypeL11n) { $this->l11n->name = $l11n; } else { $this->l11n = new BillTypeL11n(); diff --git a/Models/NullBill.php b/Models/NullBill.php index b6d4218..b644bbd 100755 --- a/Models/NullBill.php +++ b/Models/NullBill.php @@ -4,7 +4,7 @@ * * PHP Version 8.0 * - * @package phpOMS\Account + * @package Modules\Billing\Models * @copyright Dennis Eichhorn * @license OMS License 1.0 * @version 1.0.0 @@ -15,9 +15,9 @@ declare(strict_types=1); namespace Modules\Billing\Models; /** - * Null account class. + * Null bill class. * - * @package phpOMS\Account + * @package Modules\Billing\Models * @license OMS License 1.0 * @link https://orange-management.org * @since 1.0.0 diff --git a/Models/NullBillElement.php b/Models/NullBillElement.php new file mode 100644 index 0000000..b464d4d --- /dev/null +++ b/Models/NullBillElement.php @@ -0,0 +1,39 @@ +id = $id; + parent::__construct(); + } +} diff --git a/Models/NullBillType.php b/Models/NullBillType.php index ee5edb3..d41486d 100755 --- a/Models/NullBillType.php +++ b/Models/NullBillType.php @@ -15,7 +15,7 @@ declare(strict_types=1); namespace Modules\Billing\Models; /** - * Null account class. + * Null bill type class. * * @package Modules\Billing\Models * @license OMS License 1.0 diff --git a/Theme/Backend/bill-analysis.tpl.php b/Theme/Backend/bill-analysis.tpl.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/region-analysis.tpl.php b/Theme/Backend/region-analysis.tpl.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/rep-analysis.tpl.php b/Theme/Backend/rep-analysis.tpl.php old mode 100644 new mode 100755