feat: additional receipts as attachments to teamer invoices
addresses #869dv97u9
This commit is contained in:
1 parent
16d847137d
commit
52926ec6cc
29 files changed
+682
-23
No files matched your search
@@ -86,14 +86,18 @@ class DetailController extends AbstractController
|
||||
/** @var User $user */
|
||||
$user = $this->getUser();
|
||||
|
||||
$upload = Upload::fromUploadDto($uploadSession->getUploads()->first(), $user, Upload::TYPE_CONTRACT);
|
||||
$upload = Upload::fromUploadDto(
|
||||
$uploadSession->getUploadsByType(Upload::TYPE_CONTRACT)->first(),
|
||||
$user,
|
||||
Upload::TYPE_CONTRACT
|
||||
);
|
||||
$upload->setStatus(Upload::STATUS_NEW);
|
||||
|
||||
$disposition->addDocument($upload);
|
||||
$this->workflow->apply($disposition, 'upload_contract');
|
||||
|
||||
$this->uploadHandler->moveUploadSessionFilesFromOrphanage(Upload::TYPE_CONTRACT, $uploadSession);
|
||||
$this->uploadHandler->destroyUploadSession();
|
||||
$this->uploadHandler->removeUploadSessionUploadsByType(Upload::TYPE_CONTRACT);
|
||||
|
||||
if (true === $this->featureManager->isActive('sanitize_uploads')) {
|
||||
$this->uploadHandler->ensurePdf($upload);
|
||||
@@ -119,14 +123,18 @@ class DetailController extends AbstractController
|
||||
/** @var User $user */
|
||||
$user = $this->getUser();
|
||||
|
||||
$upload = Upload::fromUploadDto($uploadSession->getUploads()->first(), $user, Upload::TYPE_INVOICE);
|
||||
$upload = Upload::fromUploadDto(
|
||||
$uploadSession->getUploadsByType(Upload::TYPE_INVOICE)->first(),
|
||||
$user,
|
||||
Upload::TYPE_INVOICE
|
||||
);
|
||||
$upload->setStatus(Upload::STATUS_NEW);
|
||||
|
||||
$disposition->addDocument($upload);
|
||||
$this->workflow->apply($disposition, 'upload_invoice');
|
||||
|
||||
$this->uploadHandler->moveUploadSessionFilesFromOrphanage(Upload::TYPE_INVOICE, $uploadSession);
|
||||
$this->uploadHandler->destroyUploadSession();
|
||||
$this->uploadHandler->removeUploadSessionUploadsByType(Upload::TYPE_INVOICE);
|
||||
|
||||
if (true === $this->featureManager->isActive('sanitize_uploads')) {
|
||||
$this->uploadHandler->ensurePdf($upload);
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
<?php
|
||||
|
||||
namespace App\Controller\Teamer\Disposition;
|
||||
|
||||
use App\Entity\Disposition;
|
||||
use App\Entity\Upload;
|
||||
use App\Entity\User;
|
||||
use App\Htmx\HxRedirectResponse;
|
||||
use App\Model\UploadDto;
|
||||
use App\Service\Upload\UploadHandler;
|
||||
use Doctrine\ORM\EntityManagerInterface;
|
||||
use Flagception\Manager\FeatureManagerInterface;
|
||||
use Psr\Log\LoggerInterface;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Http\Attribute\IsGranted;
|
||||
|
||||
/**
|
||||
* Belege backing a Honorarnote.
|
||||
*
|
||||
* Deliberately separate from DetailController and from the disposition workflow: a receipt is
|
||||
* evidence for the invoice, never a document in its own right. It is not approved or rejected, it
|
||||
* carries no status, and it applies no transition - which is what lets a teamer keep managing
|
||||
* receipts while the invoice is being checked, a phase in which the state machine offers no
|
||||
* transition at all. The window is guarded by the MANAGE_RECEIPTS attribute on the disposition.
|
||||
*/
|
||||
class ReceiptController extends AbstractController
|
||||
{
|
||||
public function __construct(
|
||||
private readonly UploadHandler $uploadHandler,
|
||||
private readonly EntityManagerInterface $entityManager,
|
||||
private readonly LoggerInterface $logger,
|
||||
private readonly FeatureManagerInterface $featureManager,
|
||||
) {
|
||||
}
|
||||
|
||||
#[Route('/teamer/disposition/receipt/{uuid}', name: 'app_teamer_disposition_receipt_upload')]
|
||||
#[IsGranted('ROLE_TEAMER')]
|
||||
#[IsGranted('MANAGE_RECEIPTS', subject: 'disposition')]
|
||||
public function upload(Disposition $disposition, Request $request): Response
|
||||
{
|
||||
// Dummy form without fields, as elsewhere: the files travel in the upload session, not in
|
||||
// the form itself.
|
||||
$form = $this->createFormBuilder()->getForm();
|
||||
$form->handleRequest($request);
|
||||
|
||||
if ($form->isSubmitted() && $form->isValid()) {
|
||||
$count = $this->processUpload($disposition);
|
||||
|
||||
$this->addFlash(
|
||||
'success',
|
||||
1 === $count ? 'Der Beleg wurde hochgeladen' : 'Die Belege wurden hochgeladen'
|
||||
);
|
||||
|
||||
return new HxRedirectResponse($this->generateUrl('app_teamer_disposition_detail', [
|
||||
'uuid' => $disposition->getUuid(),
|
||||
'r' => $request->query->get('r'),
|
||||
]));
|
||||
}
|
||||
|
||||
return $this->render('teamer/disposition/modal_receipt_upload.html.twig', [
|
||||
'disposition' => $disposition,
|
||||
'form' => $form->createView(),
|
||||
]);
|
||||
}
|
||||
|
||||
#[Route('/teamer/disposition/receipt/delete/{uuid}', name: 'app_teamer_disposition_receipt_delete')]
|
||||
#[IsGranted('ROLE_TEAMER')]
|
||||
#[IsGranted('DELETE', subject: 'receipt')]
|
||||
public function delete(Upload $receipt, Request $request): Response
|
||||
{
|
||||
if (Upload::TYPE_RECEIPT !== $receipt->getType()) {
|
||||
throw $this->createNotFoundException('Not a receipt');
|
||||
}
|
||||
|
||||
// UploadVoter::DELETE only asserts ownership, which would still hold once the invoice has
|
||||
// been accepted. The window itself is the disposition's to answer.
|
||||
$this->denyAccessUnlessGranted('MANAGE_RECEIPTS', $receipt->getDisposition());
|
||||
|
||||
if (true === $request->isMethod('POST')) {
|
||||
$disposition = $receipt->getDisposition();
|
||||
|
||||
// Doctrine's DeleteUploadListener removes the file from disk on preRemove.
|
||||
$this->entityManager->remove($receipt);
|
||||
$this->entityManager->flush();
|
||||
|
||||
$this->addFlash('success', 'Der Beleg wurde gelöscht');
|
||||
$this->logger->info('Delete receipt', [
|
||||
'disposition_id' => $disposition->getId(),
|
||||
'receipt_filename' => $receipt->getOriginalFilename(),
|
||||
'owner' => $receipt->getOwner()->getFullName(),
|
||||
]);
|
||||
|
||||
return new HxRedirectResponse($this->generateUrl('app_teamer_disposition_detail', [
|
||||
'uuid' => $disposition->getUuid(),
|
||||
'r' => $request->query->get('r'),
|
||||
]));
|
||||
}
|
||||
|
||||
return $this->render('teamer/disposition/modal_receipt_delete.html.twig', [
|
||||
'receipt' => $receipt,
|
||||
]);
|
||||
}
|
||||
|
||||
private function processUpload(Disposition $disposition): int
|
||||
{
|
||||
/** @var User $user */
|
||||
$user = $this->getUser();
|
||||
|
||||
$uploadSession = $this->uploadHandler->getUploadSession();
|
||||
|
||||
// Only this dropzone's files: on the detail page in place "ended" the invoice dropzone is
|
||||
// live at the same time and shares the one session.
|
||||
$uploadDtos = $uploadSession->getUploadsByType(Upload::TYPE_RECEIPT);
|
||||
|
||||
$uploads = [];
|
||||
|
||||
/** @var UploadDto $uploadDto */
|
||||
foreach ($uploadDtos as $uploadDto) {
|
||||
$upload = Upload::fromUploadDto($uploadDto, $user, Upload::TYPE_RECEIPT);
|
||||
|
||||
// No status on purpose. UploadVoter grants CHECK only for "new" and "pending", so a
|
||||
// null status is what keeps a receipt out of the checking process by construction.
|
||||
$upload->setStatus(null);
|
||||
|
||||
$disposition->addDocument($upload);
|
||||
$this->entityManager->persist($upload);
|
||||
|
||||
$uploads[] = $upload;
|
||||
}
|
||||
|
||||
$this->uploadHandler->moveUploadSessionFilesFromOrphanage(Upload::TYPE_RECEIPT, $uploadSession);
|
||||
$this->uploadHandler->removeUploadSessionUploadsByType(Upload::TYPE_RECEIPT);
|
||||
|
||||
if (true === $this->featureManager->isActive('sanitize_uploads')) {
|
||||
foreach ($uploads as $upload) {
|
||||
$this->uploadHandler->ensurePdf($upload);
|
||||
}
|
||||
}
|
||||
|
||||
$this->entityManager->flush();
|
||||
|
||||
$this->logger->info('Upload receipts', [
|
||||
'user' => $user->getUserIdentifier(),
|
||||
'disposition_id' => $disposition->getId(),
|
||||
'count' => count($uploads),
|
||||
]);
|
||||
|
||||
// No DocumentUploadedEvent: its listener mails the managers about a document waiting to be
|
||||
// checked, which is exactly what a receipt is not.
|
||||
|
||||
return count($uploads);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user