|
@@ -119,7 +119,7 @@ discard block |
|
|
block discarded – undo |
|
119
|
119
|
|
|
120
|
120
|
if ($payment_order->getDepartment() !== null && $payment_order->getDepartment()->getBankAccount() !== null) { |
|
121
|
121
|
//First folder for each bank account |
|
122
|
|
- $prefix = $payment_order->getDepartment()->getBankAccount()->getName() . ' [' . $payment_order->getDepartment()->getBankAccount()->getIban() .']' . '/'; |
|
|
122
|
+ $prefix = $payment_order->getDepartment()->getBankAccount()->getName() . ' [' . $payment_order->getDepartment()->getBankAccount()->getIban() . ']' . '/'; |
|
123
|
123
|
|
|
124
|
124
|
//A sub folder for each department |
|
125
|
125
|
$prefix .= $payment_order->getDepartment()->getName() . '/'; |
|
@@ -131,7 +131,7 @@ discard block |
|
|
block discarded – undo |
|
131
|
131
|
$project_name = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $project_name); |
|
132
|
132
|
$project_name = mb_ereg_replace("([\.]{2,})", '', $project_name); |
|
133
|
133
|
//Format: "ZA000001 Project Name.pdf" |
|
134
|
|
- $filename = $prefix.$payment_order->getIDString().' '.$project_name.'.'.$extension; |
|
|
134
|
+ $filename = $prefix . $payment_order->getIDString() . ' ' . $project_name . '.' . $extension; |
|
135
|
135
|
|
|
136
|
136
|
$data[$filename] = $path; |
|
137
|
137
|
|
|
@@ -148,7 +148,7 @@ discard block |
|
|
block discarded – undo |
|
148
|
148
|
|
|
149
|
149
|
return ZIPBinaryFileResponseFacade::createZIPResponseFromFiles( |
|
150
|
150
|
$data, |
|
151
|
|
- 'Belege_'.date('Y-m-d_H-i-s').'.zip'); |
|
|
151
|
+ 'Belege_' . date('Y-m-d_H-i-s') . '.zip'); |
|
152
|
152
|
} |
|
153
|
153
|
|
|
154
|
154
|
public function configureCrud(Crud $crud): Crud |
|
@@ -317,32 +317,32 @@ discard block |
|
|
block discarded – undo |
|
317
|
317
|
]); |
|
318
|
318
|
|
|
319
|
319
|
$emailAction = Action::new('sendEmail', 'payment_order.action.email', 'fas fa-envelope') |
|
320
|
|
- ->linkToUrl(function (PaymentOrder $paymentOrder) { |
|
|
320
|
+ ->linkToUrl(function(PaymentOrder $paymentOrder) { |
|
321
|
321
|
return $this->mailToGenerator->generateContactMailLink($paymentOrder); |
|
322
|
322
|
}) |
|
323
|
323
|
->setCssClass('btn btn-secondary text-dark'); |
|
324
|
324
|
|
|
325
|
325
|
//Hide action if no contact emails are associated with department |
|
326
|
|
- $emailAction->displayIf(function (PaymentOrder $paymentOrder) { |
|
|
326
|
+ $emailAction->displayIf(function(PaymentOrder $paymentOrder) { |
|
327
|
327
|
return null !== $this->mailToGenerator->generateContactMailLink($paymentOrder); |
|
328
|
328
|
}); |
|
329
|
329
|
|
|
330
|
330
|
$hhv_action = Action::new('contactHHV', 'payment_order.action.contact_hhv', 'fas fa-comment-dots') |
|
331
|
|
- ->linkToUrl(function (PaymentOrder $paymentOrder) { |
|
|
331
|
+ ->linkToUrl(function(PaymentOrder $paymentOrder) { |
|
332
|
332
|
return $this->mailToGenerator->getHHVMailLink($paymentOrder); |
|
333
|
333
|
}) |
|
334
|
334
|
->setCssClass('btn btn-secondary text-dark'); |
|
335
|
335
|
|
|
336
|
336
|
$resend_confirmation_action = Action::new('resendConfirmation', 'payment_order.action.resend_confirmation', 'fas fa-redo') |
|
337
|
337
|
->linkToCrudAction('resendConfirmationEmail') |
|
338
|
|
- ->displayIf(function (PaymentOrder $paymentOrder) { |
|
|
338
|
+ ->displayIf(function(PaymentOrder $paymentOrder) { |
|
339
|
339
|
return $this->isGranted('ROLE_EDIT_PAYMENT_ORDERS') && !$paymentOrder->isConfirmed(); |
|
340
|
340
|
}) |
|
341
|
341
|
->setCssClass('btn btn-secondary text-dark'); |
|
342
|
342
|
|
|
343
|
343
|
$mathematically_correct_action = Action::new('mathematicallyCorrect', 'payment_order.action.mathematically_correct', 'fas fa-check') |
|
344
|
344
|
->linkToCrudAction('checkMathematicallyCorrect') |
|
345
|
|
- ->displayIf(function (PaymentOrder $paymentOrder) { |
|
|
345
|
+ ->displayIf(function(PaymentOrder $paymentOrder) { |
|
346
|
346
|
return $this->isGranted('ROLE_PO_MATHEMATICALLY') |
|
347
|
347
|
&& $paymentOrder->isConfirmed() |
|
348
|
348
|
&& !$paymentOrder->isMathematicallyCorrect(); |
|
@@ -351,7 +351,7 @@ discard block |
|
|
block discarded – undo |
|
351
|
351
|
|
|
352
|
352
|
$factually_correct_action = Action::new('factuallyCorrect', 'payment_order.action.factually_correct', 'fas fa-check') |
|
353
|
353
|
->linkToCrudAction('checkFactuallyCorrect') |
|
354
|
|
- ->displayIf(function (PaymentOrder $paymentOrder) { |
|
|
354
|
+ ->displayIf(function(PaymentOrder $paymentOrder) { |
|
355
|
355
|
return $this->isGranted('ROLE_PO_FACTUALLY') |
|
356
|
356
|
&& $paymentOrder->isConfirmed() |
|
357
|
357
|
&& !$paymentOrder->isFactuallyCorrect() |
|
@@ -361,12 +361,12 @@ discard block |
|
|
block discarded – undo |
|
361
|
361
|
|
|
362
|
362
|
$manual_confirmation = Action::new('manual_confirmation', 'payment_order.action.manual_confirmation', 'fas fa-exclamation-triangle') |
|
363
|
363
|
->setCssClass('btn btn-secondary') |
|
364
|
|
- ->linkToRoute('payment_order_manual_confirm', function (PaymentOrder $paymentOrder) { |
|
|
364
|
+ ->linkToRoute('payment_order_manual_confirm', function(PaymentOrder $paymentOrder) { |
|
365
|
365
|
return [ |
|
366
|
366
|
'id' => $paymentOrder->getId(), |
|
367
|
367
|
]; |
|
368
|
368
|
}) |
|
369
|
|
- ->displayIf(function (PaymentOrder $paymentOrder) { |
|
|
369
|
+ ->displayIf(function(PaymentOrder $paymentOrder) { |
|
370
|
370
|
return $this->isGranted('ROLE_MANUAL_CONFIRMATION') |
|
371
|
371
|
&& !$paymentOrder->isConfirmed(); |
|
372
|
372
|
}); |
|
@@ -379,7 +379,7 @@ discard block |
|
|
block discarded – undo |
|
379
|
379
|
|
|
380
|
380
|
$actions->disable(Crud::PAGE_NEW); |
|
381
|
381
|
|
|
382
|
|
- if(!$this->isGranted('ROLE_EDIT_PAYMENT_ORDERS')) { |
|
|
382
|
+ if (!$this->isGranted('ROLE_EDIT_PAYMENT_ORDERS')) { |
|
383
|
383
|
$actions->disable('batchDelete'); |
|
384
|
384
|
} |
|
385
|
385
|
|