Jingga/oms-LoanManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-LoanManagement.git synced 2026-01-11 17:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-07 17:47:07 +00:00
parent 7707a72946
commit 808fee548f
7 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin/Routes/Web/Backend.php
View File

@ -10,7 +10,7 @@ return [
[ [
'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanList', 'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -22,7 +22,7 @@ return [
[ [
'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanView', 'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanView',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -34,7 +34,7 @@ return [
[ [
'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanCreate', 'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
@ -46,7 +46,7 @@ return [
[ [
'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanTable', 'dest' => '\Modules\LoanManagement\Controller\BackendController:viewLoanTable',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

50
Controller/ApiController.php
View File

@ -19,11 +19,11 @@ use Modules\LoanManagement\Models\CostTypeL11nMapper;
use Modules\LoanManagement\Models\CostTypeMapper; use Modules\LoanManagement\Models\CostTypeMapper;
use Modules\LoanManagement\Models\Loan; use Modules\LoanManagement\Models\Loan;
use Modules\LoanManagement\Models\LoanElement; use Modules\LoanManagement\Models\LoanElement;
use phpOMS\Business\Finance\Loan as FinanceLoan;
use Modules\LoanManagement\Models\LoanMapper; use Modules\LoanManagement\Models\LoanMapper;
use Modules\LoanManagement\Models\LoanStatus; use Modules\LoanManagement\Models\LoanStatus;
use Modules\LoanManagement\Models\NullCostType; use Modules\LoanManagement\Models\NullCostType;
use Modules\SupplierManagement\Models\NullSupplier; use Modules\SupplierManagement\Models\NullSupplier;
use phpOMS\Business\Finance\Loan as FinanceLoan;
use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
@ -107,26 +107,26 @@ final class ApiController extends Controller
{ {
$loan = new Loan(); $loan = new Loan();
$loan->createdBy = $request->header->account; $loan->createdBy = $request->header->account;
$loan->name = $request->getDataString('name'); $loan->name = $request->getDataString('name');
$loan->description = $request->getDataString('description'); $loan->description = $request->getDataString('description');
$loan->loanProvider = new NullSupplier((int) $request->getDataInt('supplier')); $loan->loanProvider = new NullSupplier((int) $request->getDataInt('supplier'));
$loan->status = LoanStatus::tryFromValue($request->getData('status')) ?? LoanStatus::ACTIVE; $loan->status = LoanStatus::tryFromValue($request->getData('status')) ?? LoanStatus::ACTIVE;
$loan->nominalBorrowingRate = new FloatInt($request->getDataString('interest_rate') ?? 0); $loan->nominalBorrowingRate = new FloatInt($request->getDataString('interest_rate') ?? 0);
$loan->interestRateAfterDuration = new FloatInt($request->getDataString('post_interest_rate') ?? 0); $loan->interestRateAfterDuration = new FloatInt($request->getDataString('post_interest_rate') ?? 0);
$loan->start = $request->getDataDateTime('start') ?? new \DateTime('now'); $loan->start = $request->getDataDateTime('start') ?? new \DateTime('now');
$loan->end = SmartDateTime::createFromDateTime($loan->start)->smartModify(0, (int) $request->getDataInt('duration')); $loan->end = SmartDateTime::createFromDateTime($loan->start)->smartModify(0, (int) $request->getDataInt('duration'));
$loan->isSpecialPaymentAllowed = $request->getDataBool('special_payment_allowed') ?? false; $loan->isSpecialPaymentAllowed = $request->getDataBool('special_payment_allowed') ?? false;
$loan->unit = $request->getDataInt('unit') ?? $this->app->unitId; $loan->unit = $request->getDataInt('unit') ?? $this->app->unitId;
$paymentInterval = $request->getDataInt('payment_interval') ?? 12; $paymentInterval = $request->getDataInt('payment_interval') ?? 12;
/** @var CostType[] $types */ /** @var CostType[] $types */
$types = CostTypeMapper::getAll()->executeGetArray(); $types = CostTypeMapper::getAll()->executeGetArray();
$loanType = new NullCostType(); $loanType = new NullCostType();
$repaymentType = new NullCostType(); $repaymentType = new NullCostType();
$interestType = new NullCostType(); $interestType = new NullCostType();
foreach ($types as $type) { foreach ($types as $type) {
if ($type->name === 'loan') { if ($type->name === 'loan') {
@ -139,10 +139,10 @@ final class ApiController extends Controller
} }
// Loan // Loan
$element = new LoanElement(); $element = new LoanElement();
$element->amount = new FloatInt($request->getDataString('amount') ?? 0); $element->amount = new FloatInt($request->getDataString('amount') ?? 0);
$element->date = $loan->start; $element->date = $loan->start;
$element->type = $loanType; $element->type = $loanType;
$loan->elements[] = $element; $loan->elements[] = $element;
@ -163,18 +163,18 @@ final class ApiController extends Controller
} }
// Repayment // Repayment
$element = new LoanElement(); $element = new LoanElement();
$element->amount = new FloatInt($e['principal']); $element->amount = new FloatInt($e['principal']);
$element->date = clone $currentDate; $element->date = clone $currentDate;
$element->type = $repaymentType; $element->type = $repaymentType;
$loan->elements[] = $element; $loan->elements[] = $element;
// Interest // Interest
$element = new LoanElement(); $element = new LoanElement();
$element->amount = new FloatInt($e['interest']); $element->amount = new FloatInt($e['interest']);
$element->date = clone $currentDate; $element->date = clone $currentDate;
$element->type = $interestType; $element->type = $interestType;
$loan->elements[] = $element; $loan->elements[] = $element;
@ -277,9 +277,9 @@ final class ApiController extends Controller
*/ */
private function createCostTypeFromRequest(RequestAbstract $request) : CostType private function createCostTypeFromRequest(RequestAbstract $request) : CostType
{ {
$costType = new CostType(); $costType = new CostType();
$costType->name = $request->getDataString('name'); $costType->name = $request->getDataString('name');
$costType->sign = $request->getDataInt('sign') ?? -1; $costType->sign = $request->getDataInt('sign') ?? -1;
$costType->isLoan = $request->getDataBool('is_loan') ?? false; $costType->isLoan = $request->getDataBool('is_loan') ?? false;
$costType->setL11n( $costType->setL11n(
$request->getDataString('title') ?? '', $request->getDataString('title') ?? '',

4
Models/CostType.php
View File

@ -63,7 +63,7 @@ class CostType implements \JsonSerializable
* Set l11n * Set l11n
* *
* @param string|BaseStringL11n $l11n Tag article l11n * @param string|BaseStringL11n $l11n Tag article l11n
* @param string $lang Language * @param string $lang Language
* *
* @return void * @return void
* *
@ -88,7 +88,7 @@ class CostType implements \JsonSerializable
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'l11n' => $this->l11n, 'l11n' => $this->l11n,
]; ];
} }

2
Models/Loan.php
View File

@ -70,7 +70,7 @@ class Loan
$this->start = new \DateTime(); $this->start = new \DateTime();
$this->end = $this->start->modify('+1 year'); $this->end = $this->start->modify('+1 year');
$this->nominalBorrowingRate = new FloatInt(); $this->nominalBorrowingRate = new FloatInt();
$this->interestRateAfterDuration = new FloatInt(); $this->interestRateAfterDuration = new FloatInt();
} }
} }

4
Models/LoanElement.php
View File

@ -41,7 +41,7 @@ class LoanElement
public function __construct() public function __construct()
{ {
$this->amount = new FloatInt(); $this->amount = new FloatInt();
$this->date = new \DateTime(); $this->date = new \DateTime();
$this->type = new NullCostType(); $this->type = new NullCostType();
} }
} }

11
Models/LoanElementMapper.php
View File

@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Modules\LoanManagement\Models; namespace Modules\LoanManagement\Models;
use Modules\SupplierManagement\Models\SupplierMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
/** /**
@ -37,12 +36,12 @@ final class LoanElementMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'loanmgmt_loan_element_id' => ['name' => 'loanmgmt_loan_element_id', 'type' => 'int', 'internal' => 'id'], 'loanmgmt_loan_element_id' => ['name' => 'loanmgmt_loan_element_id', 'type' => 'int', 'internal' => 'id'],
'loanmgmt_loan_element_description' => ['name' => 'loanmgmt_loan_element_description', 'type' => 'string', 'internal' => 'description'], 'loanmgmt_loan_element_description' => ['name' => 'loanmgmt_loan_element_description', 'type' => 'string', 'internal' => 'description'],
'loanmgmt_loan_element_date' => ['name' => 'loanmgmt_loan_element_date', 'type' => 'DateTime', 'internal' => 'date'], 'loanmgmt_loan_element_date' => ['name' => 'loanmgmt_loan_element_date', 'type' => 'DateTime', 'internal' => 'date'],
'loanmgmt_loan_element_type' => ['name' => 'loanmgmt_loan_element_type', 'type' => 'int', 'internal' => 'type'], 'loanmgmt_loan_element_type' => ['name' => 'loanmgmt_loan_element_type', 'type' => 'int', 'internal' => 'type'],
'loanmgmt_loan_element_loan' => ['name' => 'loanmgmt_loan_element_loan', 'type' => 'int', 'internal' => 'loan'], 'loanmgmt_loan_element_loan' => ['name' => 'loanmgmt_loan_element_loan', 'type' => 'int', 'internal' => 'loan'],
'loanmgmt_loan_element_amount' => ['name' => 'loanmgmt_loan_element_amount', 'type' => 'Serializable', 'internal' => 'amount'], 'loanmgmt_loan_element_amount' => ['name' => 'loanmgmt_loan_element_amount', 'type' => 'Serializable', 'internal' => 'amount'],
]; ];
/** /**

24
Models/LoanMapper.php
View File

@ -37,18 +37,18 @@ final class LoanMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'loanmgmt_loan_id' => ['name' => 'loanmgmt_loan_id', 'type' => 'int', 'internal' => 'id'], 'loanmgmt_loan_id' => ['name' => 'loanmgmt_loan_id', 'type' => 'int', 'internal' => 'id'],
'loanmgmt_loan_name' => ['name' => 'loanmgmt_loan_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true], 'loanmgmt_loan_name' => ['name' => 'loanmgmt_loan_name', 'type' => 'string', 'internal' => 'name', 'autocomplete' => true],
'loanmgmt_loan_description' => ['name' => 'loanmgmt_loan_description', 'type' => 'string', 'internal' => 'description'], 'loanmgmt_loan_description' => ['name' => 'loanmgmt_loan_description', 'type' => 'string', 'internal' => 'description'],
'loanmgmt_loan_start' => ['name' => 'loanmgmt_loan_start', 'type' => 'DateTime', 'internal' => 'start'], 'loanmgmt_loan_start' => ['name' => 'loanmgmt_loan_start', 'type' => 'DateTime', 'internal' => 'start'],
'loanmgmt_loan_end' => ['name' => 'loanmgmt_loan_end', 'type' => 'DateTime', 'internal' => 'end'], 'loanmgmt_loan_end' => ['name' => 'loanmgmt_loan_end', 'type' => 'DateTime', 'internal' => 'end'],
'loanmgmt_loan_created_at' => ['name' => 'loanmgmt_loan_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'], 'loanmgmt_loan_created_at' => ['name' => 'loanmgmt_loan_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt'],
'loanmgmt_loan_created_by' => ['name' => 'loanmgmt_loan_created_by', 'type' => 'int', 'internal' => 'createdBy'], 'loanmgmt_loan_created_by' => ['name' => 'loanmgmt_loan_created_by', 'type' => 'int', 'internal' => 'createdBy'],
'loanmgmt_loan_unit' => ['name' => 'loanmgmt_loan_unit', 'type' => 'int', 'internal' => 'unit'], 'loanmgmt_loan_unit' => ['name' => 'loanmgmt_loan_unit', 'type' => 'int', 'internal' => 'unit'],
'loanmgmt_loan_supplier' => ['name' => 'loanmgmt_loan_supplier', 'type' => 'int', 'internal' => 'supplier'], 'loanmgmt_loan_supplier' => ['name' => 'loanmgmt_loan_supplier', 'type' => 'int', 'internal' => 'supplier'],
'loanmgmt_loan_status' => ['name' => 'loanmgmt_loan_status', 'type' => 'int', 'internal' => 'status'], 'loanmgmt_loan_status' => ['name' => 'loanmgmt_loan_status', 'type' => 'int', 'internal' => 'status'],
'loanmgmt_loan_borrowing_rate' => ['name' => 'loanmgmt_loan_borrowing_rate', 'type' => 'Serializable', 'internal' => 'nominalBorrowingRate'], 'loanmgmt_loan_borrowing_rate' => ['name' => 'loanmgmt_loan_borrowing_rate', 'type' => 'Serializable', 'internal' => 'nominalBorrowingRate'],
'loanmgmt_loan_post_rate' => ['name' => 'loanmgmt_loan_post_rate', 'type' => 'Serializable', 'internal' => 'interestRateAfterDuration'], 'loanmgmt_loan_post_rate' => ['name' => 'loanmgmt_loan_post_rate', 'type' => 'Serializable', 'internal' => 'interestRateAfterDuration'],
'loanmgmt_loan_special_payment' => ['name' => 'loanmgmt_loan_special_payment', 'type' => 'bool', 'internal' => 'isSpecialPaymentAllowed'], 'loanmgmt_loan_special_payment' => ['name' => 'loanmgmt_loan_special_payment', 'type' => 'bool', 'internal' => 'isSpecialPaymentAllowed'],
]; ];