JE-400: Minor UI fixes

itk-dev · Dec 5, 2023 · e4fd359 · e4fd359
1 parent 748d382
commit e4fd359
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/src/Controller/InvoiceEntryController.php b/src/Controller/InvoiceEntryController.php
@@ -51,6 +51,10 @@ public function new(Request $request, Invoice $invoice, InvoiceEntryTypeEnum $ty
             // TODO: Handle this with a doctrine event listener instead.
             $billingService->updateInvoiceEntryTotalPrice($invoiceEntry);
 
+            if (InvoiceEntryTypeEnum::MANUAL == $invoiceEntry->getEntryType()) {
+                return $this->redirectToRoute('app_invoices_edit', ['id' => $invoice->getId()], Response::HTTP_SEE_OTHER);
+            }
+
             return $this->redirectToRoute('app_invoice_entry_edit', ['id' => $invoiceEntry->getId(), 'invoice' => $invoice->getId()], Response::HTTP_SEE_OTHER);
         }
 

diff --git a/templates/invoices/edit.html.twig b/templates/invoices/edit.html.twig
@@ -66,12 +66,20 @@
             </ul>
             {% endif %}
             <div class="actions-right">
-                <a type="button" href="{{ path('app_invoices_show_export', {'id': invoice.id}) }}" class="button button-green">{{ 'invoices.action_show_export'|trans }}</a>
-                {% if not invoice.recorded and invoice.projectBilling is null %}
-                    <a type="button" href="{{ path('app_invoices_record', {'id': invoice.id}) }}" class="button button-warning">{{ 'invoices.action_record'|trans }}</a>
-                {% endif %}
-                {% if invoice.recorded and invoice.projectBilling is null %}
-                    <a type="button" href="{{ path('app_invoices_export', {'id': invoice.id}) }}" class="button">{{ 'invoices.action_export'|trans }}</a>
+                {% if invoice.client is not null %}
+                    <a type="button" href="{{ path('app_invoices_show_export', {'id': invoice.id}) }}" class="button button-green">{{ 'invoices.action_show_export'|trans }}</a>
+                    {% if not invoice.recorded and invoice.projectBilling is null %}
+                        <a type="button" href="{{ path('app_invoices_record', {'id': invoice.id}) }}" class="button button-warning">{{ 'invoices.action_record'|trans }}</a>
+                    {% endif %}
+                    {% if invoice.recorded and invoice.projectBilling is null %}
+                        <a type="button" href="{{ path('app_invoices_export', {'id': invoice.id}) }}" class="button">{{ 'invoices.action_export'|trans }}</a>
+                    {% endif %}
+                {% else %}
+                    <div class="alert-info" role="alert">
+                        <svg class="flex-shrink-0 inline w-4 h-4 mr-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 20">
+                            <path d="M10 .5a9.5 9.5 0 1 0 9.5 9.5A9.51 9.51 0 0 0 10 .5ZM9.5 4a1.5 1.5 0 1 1 0 3 1.5 1.5 0 0 1 0-3ZM12 15H8a1 1 0 0 1 0-2h1v-3H8a1 1 0 0 1 0-2h2a1 1 0 0 1 1 1v4h1a1 1 0 0 1 0 2Z"></path>
+                        </svg> {{ 'invoices.export_only_available_when_mandatory_fields_are_set'|trans }}
+                    </div>
                 {% endif %}
             </div>
         </div>

diff --git a/templates/invoices/index.html.twig b/templates/invoices/index.html.twig
@@ -3,6 +3,7 @@
 {% block title %}{{ 'invoices.title'|trans }}{% endblock %}
 
 {% block content %}
+    <a class="link" href="{{ path('app_invoices_new') }}" style="float: right">{{ 'invoices.action_create_new'|trans }}</a>
     <h1 class="page-title">{{ 'invoices.title'|trans }}</h1>
 
     {{ form_start(form) }}

diff --git a/templates/project_billing/index.html.twig b/templates/project_billing/index.html.twig
@@ -3,6 +3,7 @@
 {% block title %}{{ 'project_billing.title'|trans }}{% endblock %}
 
 {% block content %}
+    <a class="link" href="{{ path('app_project_billing_new') }}" style="float: right">{{ 'project_billing.action_create_new'|trans }}</a>
     <h1 class="page-title">{{ 'project_billing.title'|trans }}</h1>
 
     {{ form_start(form) }}

diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml
@@ -222,6 +222,7 @@ invoices:
   without_project_billing: 'Udelad'
   only_project_billing: 'Kun PF'
   list_recorded: 'Bogført'
+  export_only_available_when_mandatory_fields_are_set: 'Eksport kun muligt når der er sat en kundekonto'
 
 material_number_enum:
   internal: "Interne: 103361"