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

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:05 +00:00
parent 0518ff6b89
commit dd9e4dae7e
2 changed files with 39 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Admin/Install/Navigation.install.json
View File

@ -5,7 +5,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "BusinessExpenses", "name": "BusinessExpenses",
"uri": "{/base}/businessexpenses/expense/list?{?}", "uri": "{/base}/businessexpenses/expense/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 40, "order": 40,
@ -19,7 +19,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/base}/businessexpenses/expense/list?{?}", "uri": "{/base}/businessexpenses/expense/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 40, "order": 40,
@ -35,7 +35,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/base}/businessexpenses/expense/create?{?}", "uri": "{/base}/businessexpenses/expense/create",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 40, "order": 40,
@ -53,7 +53,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "BusinessExpenses", "name": "BusinessExpenses",
"uri": "{/base}/businessexpenses/expense/list?{?}", "uri": "{/base}/businessexpenses/expense/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 40, "order": 40,
@ -67,7 +67,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/base}/businessexpenses/expense/list?{?}", "uri": "{/base}/businessexpenses/expense/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 40, "order": 40,
@ -83,7 +83,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/base}/businessexpenses/expense/create?{?}", "uri": "{/base}/businessexpenses/expense/create",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 40, "order": 40,

157
Controller/ApiController.php
View File

@ -31,6 +31,7 @@ use Modules\BusinessExpenses\Models\PermissionCategory;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaClass; use Modules\Media\Models\MediaClass;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullCollection;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\SupplierManagement\Models\NullSupplier; use Modules\SupplierManagement\Models\NullSupplier;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
@ -566,85 +567,39 @@ final class ApiController extends Controller
$expense = ExpenseMapper::get()->where('id', (int) $request->getData('expense'))->execute(); $expense = ExpenseMapper::get()->where('id', (int) $request->getData('expense'))->execute();
$path = $this->createExpenseDir($expense); $path = $this->createExpenseDir($expense);
$uploaded = []; $uploaded = new NullCollection();
if (!empty($uploadedFiles = $request->files)) { if (!empty($request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $request->files,
account: $request->header->account, account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path, virtualPath: $path,
pathSettings: PathSettings::FILE_PATH, pathSettings: PathSettings::FILE_PATH,
hasAccountRelation: false, hasAccountRelation: false,
readContent: $request->getDataBool('parse_content') ?? false readContent: $request->getDataBool('parse_content') ?? false,
type: $request->getDataInt('type'),
rel: $expense->id,
mapper: ExpenseMapper::class,
field: 'files'
); );
$collection = null;
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$expense->id,
$media->id,
ExpenseMapper::class,
'files',
'',
$request->getOrigin()
);
if ($request->hasData('type')) {
$this->createModelRelation(
$request->header->account,
$media->id,
$request->getDataInt('type'),
MediaMapper::class,
'types',
'',
$request->getOrigin()
);
}
if ($collection === null) {
/** @var \Modules\Media\Models\Collection $collection */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection->id === 0) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path,
);
}
}
$this->createModelRelation(
$request->header->account,
$collection->id,
$media->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
}
} }
$mediaFiles = $request->getDataJson('media'); if (!empty($media = $request->getDataJson('media'))) {
foreach ($mediaFiles as $media) { $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$this->createModelRelation(
$request->header->account, $request->header->account,
$media,
$expense->id, $expense->id,
(int) $media, ExpenseMapper::class,
ExpenseElementMapper::class,
'files', 'files',
'', $path
$request->getOrigin()
); );
} }
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to bill.', [ $this->fillJsonResponse($request, $response, NotificationLevel::OK, '', $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulAdd'), [
'upload' => $uploaded, 'upload' => $uploaded->sources,
'media' => $mediaFiles, 'media' => $media,
]); ]);
} }
@ -697,85 +652,39 @@ final class ApiController extends Controller
$element = (int) $request->getData('element'); $element = (int) $request->getData('element');
$uploaded = []; $uploaded = new NullCollection();
if (!empty($uploadedFiles = $request->files)) { if (!empty($request->files)) {
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $request->files,
account: $request->header->account, account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files' . $path, basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
virtualPath: $path, virtualPath: $path,
pathSettings: PathSettings::FILE_PATH, pathSettings: PathSettings::FILE_PATH,
hasAccountRelation: false, hasAccountRelation: false,
readContent: $request->getDataBool('parse_content') ?? false readContent: $request->getDataBool('parse_content') ?? false,
type: $request->getData('type'),
rel: $element,
mapper: ExpenseElementMapper::class,
field: 'files'
); );
$collection = null;
foreach ($uploaded as $media) {
$this->createModelRelation(
$request->header->account,
$element,
$media->id,
ExpenseElementMapper::class,
'files',
'',
$request->getOrigin()
);
if ($request->hasData('type')) {
$this->createModelRelation(
$request->header->account,
$media->id,
$request->getDataInt('type'),
MediaMapper::class,
'types',
'',
$request->getOrigin()
);
}
if ($collection === null) {
/** @var \Modules\Media\Models\Collection $collection */
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection->id === 0) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path,
);
}
}
$this->createModelRelation(
$request->header->account,
$collection->id,
$media->id,
CollectionMapper::class,
'sources',
'',
$request->getOrigin()
);
}
} }
$mediaFiles = $request->getDataJson('media'); if (!empty($media = $request->getDataJson('media'))) {
foreach ($mediaFiles as $media) { $this->app->moduleManager->get('Media', 'Api')->addMediaToCollectionAndModel(
$this->createModelRelation(
$request->header->account, $request->header->account,
$media,
$element, $element,
(int) $media,
ExpenseElementMapper::class, ExpenseElementMapper::class,
'files', 'files',
'', $path
$request->getOrigin()
); );
} }
// Is invoice // Is invoice
if ($request->getDataInt('file_type') === MediaType::BILL if ($request->getDataInt('file_type') === MediaType::BILL
&& \count($uploaded) + \count($mediaFiles) === 1 && \count($uploaded->sources) + \count($media) === 1
&& $this->app->moduleManager->isActive('Billing') && $this->app->moduleManager->isActive('Billing')
&& $expense->net->value !== 0 && $expense->net->value !== 0
) { ) {
@ -785,7 +694,7 @@ final class ApiController extends Controller
$internalRequest->header->account = $request->header->account; $internalRequest->header->account = $request->header->account;
$internalRequest->header->l11n = $request->header->l11n; $internalRequest->header->l11n = $request->header->l11n;
$internalRequest->setData('media', empty($uploaded) ? \reset($mediaFiles) : \reset($uploaded)->id); $internalRequest->setData('media', empty($uploaded->sources) ? \reset($media) : \reset($uploaded->sources)->id);
$internalRequest->setData('async', false); $internalRequest->setData('async', false);
$this->app->moduleManager->get('Billing', 'ApiPurchase')->apiSupplierBillUpload($internalRequest, $internalResponse, $data); $this->app->moduleManager->get('Billing', 'ApiPurchase')->apiSupplierBillUpload($internalRequest, $internalResponse, $data);
@ -816,10 +725,10 @@ final class ApiController extends Controller
$request, $request,
$response, $response,
NotificationLevel::OK, NotificationLevel::OK,
'Media', 'Media added to bill.', '', $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulAdd'),
[ [
'upload' => $uploaded, 'upload' => $uploaded,
'media' => $mediaFiles, 'media' => $media,
]); ]);
} }