From 22397d3dc92bc7370f168d723e19dbaa67478bac Mon Sep 17 00:00:00 2001
From: Hotlander <j.casteleijn@labelgoods.nl>
Date: Mon, 19 Apr 2021 17:25:45 +0200
Subject: [PATCH] - fixed layout on payment popup on Invoice/Creditmemo

---
 .../Resources/config/oro/actions.yml          |  1 +
 .../views/Action/payment_popup.html.twig      | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/Marello/Bundle/PaymentBundle/Resources/views/Action/payment_popup.html.twig

diff --git a/src/Marello/Bundle/InvoiceBundle/Resources/config/oro/actions.yml b/src/Marello/Bundle/InvoiceBundle/Resources/config/oro/actions.yml
index c001552a5..59d941be7 100644
--- a/src/Marello/Bundle/InvoiceBundle/Resources/config/oro/actions.yml
+++ b/src/Marello/Bundle/InvoiceBundle/Resources/config/oro/actions.yml
@@ -68,6 +68,7 @@ operations:
             options:
                 width: 2000
             show_dialog: true
+            template: MarelloPaymentBundle:Action:payment_popup.html.twig
         preactions:
             - '@call_service_method':
                   service: marello_invoice.provider.invoice_paid_amount
diff --git a/src/Marello/Bundle/PaymentBundle/Resources/views/Action/payment_popup.html.twig b/src/Marello/Bundle/PaymentBundle/Resources/views/Action/payment_popup.html.twig
new file mode 100644
index 000000000..af5ef2e24
--- /dev/null
+++ b/src/Marello/Bundle/PaymentBundle/Resources/views/Action/payment_popup.html.twig
@@ -0,0 +1,22 @@
+{% extends 'OroActionBundle:Operation:form.html.twig' %}
+
+{% block form %}
+    {% set buttonOptions = operation.definition.buttonOptions %}
+    <div class="widget-content">
+        {{ form_start(form, {'action': app.request.uri, 'attr': {'id': form.vars.id, 'data-collect': 'true', 'class': 'form-dialog'}}) }}
+        <div class="form-horizontal">
+            {{ form_row(form.payment_method) }}
+            {{ form_row(form.payment_date) }}
+            {{ form_row(form.payment_reference) }}
+            {{ form_row(form.payment_details) }}
+            {{ form_row(form.total_paid) }}
+        </div>
+        <div class="widget-actions">
+            <button class="btn" type="reset">{{ (options.cancelText|default('Cancel'))|trans }}</button>
+            <button class="btn btn-success" type="submit">{{ (options.okText|default('Submit'))|trans }}</button>
+        </div>
+        {{ form_rest(form) }}
+        {{ form_end(form) }}
+        {{ oro_form_js_validation(form) }}
+    </div>
+{% endblock %}