From 6f1b9ecc7065cfa7544b5e268fa693f1832bece4 Mon Sep 17 00:00:00 2001 From: kulczy Date: Fri, 24 Jan 2025 14:15:37 +0100 Subject: [PATCH 1/2] Improve invoice UI --- config/twig_hooks/admin/invoice/show.yaml | 9 ++--- .../actions/back_to_index.html.twig | 2 +- .../title_block/title/subtitle.html.twig | 20 ---------- .../show/content/sections/buyer.html.twig | 4 +- .../sections/buyer/first_name.html.twig | 4 +- .../show/content/sections/card.html.twig | 2 +- .../show/content/sections/card/body.html.twig | 2 +- .../sections/card/body/table.html.twig | 2 +- .../card/body/table/body/currency.html.twig | 2 +- .../card/body/table/body/no.html.twig | 2 +- .../card/body/table/header/currency.html.twig | 2 +- .../discounted_unit_net_price.html.twig | 2 +- .../body/table/header/gross_value.html.twig | 2 +- .../card/body/table/header/name.html.twig | 2 +- .../body/table/header/net_value.html.twig | 2 +- .../card/body/table/header/no.html.twig | 2 +- .../card/body/table/header/quantity.html.twig | 2 +- .../body/table/header/tax_amount.html.twig | 2 +- .../card/body/table/header/tax_rate.html.twig | 2 +- .../table/header/unit_net_price.html.twig | 2 +- .../content/sections/card/footer.html.twig | 12 ------ .../show/content/sections/details.html.twig | 39 +++++++++++++++++++ .../show/content/sections/seller.html.twig | 4 +- .../content/sections/seller/company.html.twig | 6 ++- .../content/sections/invoices/table.html.twig | 8 ++-- .../invoices/table/body/actions.html.twig | 4 +- .../invoices/table/body/issued_at.html.twig | 2 +- .../invoices/table/head/actions.html.twig | 2 +- .../invoices/table/head/issued_at.html.twig | 2 +- 29 files changed, 81 insertions(+), 67 deletions(-) delete mode 100644 templates/admin/invoice/show/content/header/title_block/title/subtitle.html.twig delete mode 100644 templates/admin/invoice/show/content/sections/card/footer.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details.html.twig diff --git a/config/twig_hooks/admin/invoice/show.yaml b/config/twig_hooks/admin/invoice/show.yaml index 29cb5209..0a91075a 100644 --- a/config/twig_hooks/admin/invoice/show.yaml +++ b/config/twig_hooks/admin/invoice/show.yaml @@ -16,9 +16,6 @@ sylius_twig_hooks: 'sylius_admin.invoice.show.content.header.title_block.title': number: template: '@SyliusInvoicingPlugin/admin/invoice/show/content/header/title_block/title/number.html.twig' - priority: 100 - subtitle: - template: '@SyliusInvoicingPlugin/admin/invoice/show/content/header/title_block/title/subtitle.html.twig' priority: 0 'sylius_admin.invoice.show.content.header.title_block.actions': @@ -34,6 +31,9 @@ sylius_twig_hooks: priority: 0 'sylius_admin.invoice.show.content.sections': + details: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details.html.twig' + priority: 300 buyer: template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/buyer.html.twig' priority: 200 @@ -90,9 +90,6 @@ sylius_twig_hooks: 'sylius_admin.invoice.show.content.sections.card': body: template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/card/body.html.twig' - priority: 100 - footer: - template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/card/footer.html.twig' priority: 0 'sylius_admin.invoice.show.content.sections.card.body': diff --git a/templates/admin/invoice/show/content/header/title_block/actions/back_to_index.html.twig b/templates/admin/invoice/show/content/header/title_block/actions/back_to_index.html.twig index 3edcf8d1..2495edfb 100644 --- a/templates/admin/invoice/show/content/header/title_block/actions/back_to_index.html.twig +++ b/templates/admin/invoice/show/content/header/title_block/actions/back_to_index.html.twig @@ -1,3 +1,3 @@ - + {{ ux_icon('tabler:arrow-left', {'class': 'icon'}) }} diff --git a/templates/admin/invoice/show/content/header/title_block/title/subtitle.html.twig b/templates/admin/invoice/show/content/header/title_block/title/subtitle.html.twig deleted file mode 100644 index 30b57583..00000000 --- a/templates/admin/invoice/show/content/header/title_block/title/subtitle.html.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% set invoice = hookable_metadata.context.resource %} - -
- -
diff --git a/templates/admin/invoice/show/content/sections/buyer.html.twig b/templates/admin/invoice/show/content/sections/buyer.html.twig index 6e89baa8..44794237 100644 --- a/templates/admin/invoice/show/content/sections/buyer.html.twig +++ b/templates/admin/invoice/show/content/sections/buyer.html.twig @@ -1,5 +1,5 @@ -
-
+
+
{{ 'sylius_invoicing.ui.buyer'|trans }} diff --git a/templates/admin/invoice/show/content/sections/buyer/first_name.html.twig b/templates/admin/invoice/show/content/sections/buyer/first_name.html.twig index 3149e9ef..5a47f781 100644 --- a/templates/admin/invoice/show/content/sections/buyer/first_name.html.twig +++ b/templates/admin/invoice/show/content/sections/buyer/first_name.html.twig @@ -1,3 +1,5 @@ {% set billing_data = hookable_metadata.context.resource.billingData %} -{{ billing_data.firstName }} {{ billing_data.lastName }} +
+ {{ billing_data.firstName }} {{ billing_data.lastName }} +
diff --git a/templates/admin/invoice/show/content/sections/card.html.twig b/templates/admin/invoice/show/content/sections/card.html.twig index d5e00f32..1c9a2f24 100644 --- a/templates/admin/invoice/show/content/sections/card.html.twig +++ b/templates/admin/invoice/show/content/sections/card.html.twig @@ -1,5 +1,5 @@ {% set invoice = hookable_metadata.context.resource %} -
+
{% hook 'card' %}
diff --git a/templates/admin/invoice/show/content/sections/card/body.html.twig b/templates/admin/invoice/show/content/sections/card/body.html.twig index 44429c31..9467c835 100644 --- a/templates/admin/invoice/show/content/sections/card/body.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body.html.twig @@ -1,3 +1,3 @@ -
+
{% hook 'body' %}
diff --git a/templates/admin/invoice/show/content/sections/card/body/table.html.twig b/templates/admin/invoice/show/content/sections/card/body/table.html.twig index e5e75a2c..ea65343e 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table.html.twig @@ -1,5 +1,5 @@
- +
{% hook 'table' %}
diff --git a/templates/admin/invoice/show/content/sections/card/body/table/body/currency.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/body/currency.html.twig index 3d2cf821..7abc3bdf 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/body/currency.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/body/currency.html.twig @@ -1 +1 @@ -{{ hookable_metadata.context.resource.currencyCode }} +{{ hookable_metadata.context.resource.currencyCode }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/body/no.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/body/no.html.twig index 468618da..4946a321 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/body/no.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/body/no.html.twig @@ -1 +1 @@ -{{ hookable_metadata.context.loop.index }} +{{ hookable_metadata.context.loop.index }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/currency.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/currency.html.twig index bb8d9b9d..aa11a93e 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/currency.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/currency.html.twig @@ -1 +1 @@ -{{ 'sylius.ui.currency'|trans }} +{{ 'sylius.ui.currency'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/discounted_unit_net_price.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/discounted_unit_net_price.html.twig index bd01e80d..cc179530 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/discounted_unit_net_price.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/discounted_unit_net_price.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.discounted_unit_net_price'|trans }} +{{ 'sylius_invoicing.ui.discounted_unit_net_price'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/gross_value.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/gross_value.html.twig index cd89f650..a5e7e76c 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/gross_value.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/gross_value.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.gross_value'|trans }} +{{ 'sylius_invoicing.ui.gross_value'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/name.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/name.html.twig index ec340a10..551408d7 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/name.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/name.html.twig @@ -1 +1 @@ -{{ 'sylius.ui.name'|trans }} +{{ 'sylius.ui.name'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/net_value.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/net_value.html.twig index 700a84ea..c68357cf 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/net_value.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/net_value.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.net_value'|trans }} +{{ 'sylius_invoicing.ui.net_value'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/no.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/no.html.twig index d5232429..22dc0fef 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/no.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/no.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.no'|trans }} +{{ 'sylius_invoicing.ui.no'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/quantity.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/quantity.html.twig index 2174fe59..c5d8f4d3 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/quantity.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/quantity.html.twig @@ -1 +1 @@ -{{ 'sylius.ui.quantity'|trans }} +{{ 'sylius.ui.quantity'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/tax_amount.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/tax_amount.html.twig index 6ea556b8..f22af3a9 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/tax_amount.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/tax_amount.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.tax_amount'|trans }} +{{ 'sylius_invoicing.ui.tax_amount'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/tax_rate.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/tax_rate.html.twig index 6e7a4a62..6363fecd 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/tax_rate.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/tax_rate.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.tax_rate'|trans }} +{{ 'sylius_invoicing.ui.tax_rate'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/body/table/header/unit_net_price.html.twig b/templates/admin/invoice/show/content/sections/card/body/table/header/unit_net_price.html.twig index 308c1721..0b26013a 100644 --- a/templates/admin/invoice/show/content/sections/card/body/table/header/unit_net_price.html.twig +++ b/templates/admin/invoice/show/content/sections/card/body/table/header/unit_net_price.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.unit_net_price'|trans }} +{{ 'sylius_invoicing.ui.unit_net_price'|trans }} diff --git a/templates/admin/invoice/show/content/sections/card/footer.html.twig b/templates/admin/invoice/show/content/sections/card/footer.html.twig deleted file mode 100644 index 2649cfbc..00000000 --- a/templates/admin/invoice/show/content/sections/card/footer.html.twig +++ /dev/null @@ -1,12 +0,0 @@ -
-
- {{ 'sylius_invoicing.ui.payment.paid'|trans }}: - - {% if hookable_metadata.context.resource.paymentState is constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %} - {{ 'sylius_invoicing.ui.payment.yes'|trans }} - {% else %} - {{ 'sylius_invoicing.ui.payment.no'|trans }} - {% endif %} - -
-
diff --git a/templates/admin/invoice/show/content/sections/details.html.twig b/templates/admin/invoice/show/content/sections/details.html.twig new file mode 100644 index 00000000..bae2130c --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details.html.twig @@ -0,0 +1,39 @@ +{% set invoice = hookable_metadata.context.resource %} + +
+
+
+
+ {{ 'sylius.ui.details'|trans }} +
+
+
+ + + + + + + + + + + + + + + + + +
{{ 'sylius_invoicing.ui.issued_at'|trans }}:{{ invoice.issuedAt|format_datetime }}
{{ 'sylius_invoicing.ui.issued_for_order'|trans }}:#{{ invoice.order.number }}
{{ 'sylius_invoicing.ui.issued_from'|trans }}: + {% include '@SyliusAdmin/shared/grid/field/channel.html.twig' with {'data': invoice.channel} %} +
{{ 'sylius_invoicing.ui.payment.paid'|trans }}: + {% if hookable_metadata.context.resource.paymentState is constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %} + {{ 'sylius_invoicing.ui.payment.yes'|trans }} + {% else %} + {{ 'sylius_invoicing.ui.payment.no'|trans }} + {% endif %} +
+
+
+
diff --git a/templates/admin/invoice/show/content/sections/seller.html.twig b/templates/admin/invoice/show/content/sections/seller.html.twig index cb8ff63b..65e0ea4a 100644 --- a/templates/admin/invoice/show/content/sections/seller.html.twig +++ b/templates/admin/invoice/show/content/sections/seller.html.twig @@ -1,8 +1,8 @@ {% set shop_billing_data = hookable_metadata.context.resource.shopBillingData %} {% if shop_billing_data %} -
-
+
+
{{ 'sylius_invoicing.ui.seller'|trans }} diff --git a/templates/admin/invoice/show/content/sections/seller/company.html.twig b/templates/admin/invoice/show/content/sections/seller/company.html.twig index b0da0fbd..1d0264eb 100644 --- a/templates/admin/invoice/show/content/sections/seller/company.html.twig +++ b/templates/admin/invoice/show/content/sections/seller/company.html.twig @@ -1,3 +1,7 @@ {% set shop_billing_data = hookable_metadata.context.resource.shopBillingData %} -{% if shop_billing_data.company %}{{ shop_billing_data.company }}{% endif %} +{% if shop_billing_data.company %} +
+ {{ shop_billing_data.company }} +
+{% endif %} diff --git a/templates/admin/order/show/content/sections/invoices/table.html.twig b/templates/admin/order/show/content/sections/invoices/table.html.twig index cb31eea6..8f06779f 100644 --- a/templates/admin/order/show/content/sections/invoices/table.html.twig +++ b/templates/admin/order/show/content/sections/invoices/table.html.twig @@ -4,7 +4,9 @@ {{ 'sylius_invoicing.ui.invoices'|trans }}
- - {% hook 'table' %} -
+
+ + {% hook 'table' %} +
+
diff --git a/templates/admin/order/show/content/sections/invoices/table/body/actions.html.twig b/templates/admin/order/show/content/sections/invoices/table/body/actions.html.twig index 82679abd..bd819d83 100644 --- a/templates/admin/order/show/content/sections/invoices/table/body/actions.html.twig +++ b/templates/admin/order/show/content/sections/invoices/table/body/actions.html.twig @@ -1,3 +1,5 @@ - {% hook 'actions' %} +
+ {% hook 'actions' %} +
diff --git a/templates/admin/order/show/content/sections/invoices/table/body/issued_at.html.twig b/templates/admin/order/show/content/sections/invoices/table/body/issued_at.html.twig index ff38fe43..0f0288a0 100644 --- a/templates/admin/order/show/content/sections/invoices/table/body/issued_at.html.twig +++ b/templates/admin/order/show/content/sections/invoices/table/body/issued_at.html.twig @@ -1,3 +1,3 @@ - + {{ hookable_metadata.context.invoice.issuedAt|format_date }} diff --git a/templates/admin/order/show/content/sections/invoices/table/head/actions.html.twig b/templates/admin/order/show/content/sections/invoices/table/head/actions.html.twig index 204784dd..fd3c2310 100644 --- a/templates/admin/order/show/content/sections/invoices/table/head/actions.html.twig +++ b/templates/admin/order/show/content/sections/invoices/table/head/actions.html.twig @@ -1 +1 @@ -{{ 'sylius.ui.actions'|trans }} +{{ 'sylius.ui.actions'|trans }} diff --git a/templates/admin/order/show/content/sections/invoices/table/head/issued_at.html.twig b/templates/admin/order/show/content/sections/invoices/table/head/issued_at.html.twig index 1d7b6540..720a8b27 100644 --- a/templates/admin/order/show/content/sections/invoices/table/head/issued_at.html.twig +++ b/templates/admin/order/show/content/sections/invoices/table/head/issued_at.html.twig @@ -1 +1 @@ -{{ 'sylius_invoicing.ui.issued_at'|trans }} +{{ 'sylius_invoicing.ui.issued_at'|trans }} From 93c23ade0894977dbc46c94664a38e4413ff43ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20S=C4=99k?= Date: Thu, 30 Jan 2025 07:55:40 +0100 Subject: [PATCH 2/2] Add hooks for details section --- config/twig_hooks/admin/invoice/show.yaml | 46 +++++++++++++++++++ .../show/content/sections/details.html.twig | 27 +---------- .../sections/details/channel.html.twig | 3 ++ .../sections/details/channel/label.html.twig | 1 + .../sections/details/channel/value.html.twig | 5 ++ .../content/sections/details/date.html.twig | 3 ++ .../sections/details/date/label.html.twig | 1 + .../sections/details/date/value.html.twig | 3 ++ .../content/sections/details/order.html.twig | 3 ++ .../sections/details/order/label.html.twig | 1 + .../sections/details/order/value.html.twig | 3 ++ .../content/sections/details/paid.html.twig | 3 ++ .../sections/details/paid/label.html.twig | 1 + .../sections/details/paid/value.html.twig | 10 ++++ 14 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 templates/admin/invoice/show/content/sections/details/channel.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/channel/label.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/channel/value.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/date.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/date/label.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/date/value.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/order.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/order/label.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/order/value.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/paid.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/paid/label.html.twig create mode 100644 templates/admin/invoice/show/content/sections/details/paid/value.html.twig diff --git a/config/twig_hooks/admin/invoice/show.yaml b/config/twig_hooks/admin/invoice/show.yaml index 0a91075a..b222dad6 100644 --- a/config/twig_hooks/admin/invoice/show.yaml +++ b/config/twig_hooks/admin/invoice/show.yaml @@ -44,6 +44,52 @@ sylius_twig_hooks: template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/card.html.twig' priority: 0 + 'sylius_admin.invoice.show.content.sections.details': + date: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/date.html.twig' + priority: 300 + order: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/order.html.twig' + priority: 200 + channel: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/channel.html.twig' + priority: 100 + paid: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/paid.html.twig' + priority: 0 + + 'sylius_admin.invoice.show.content.sections.details.date': + label: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/date/label.html.twig' + priority: 100 + value: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/date/value.html.twig' + priority: 0 + + 'sylius_admin.invoice.show.content.sections.details.order': + label: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/order/label.html.twig' + priority: 100 + value: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/order/value.html.twig' + priority: 0 + + 'sylius_admin.invoice.show.content.sections.details.channel': + label: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/channel/label.html.twig' + priority: 100 + value: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/channel/value.html.twig' + priority: 0 + + 'sylius_admin.invoice.show.content.sections.details.paid': + label: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/paid/label.html.twig' + priority: 100 + value: + template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/details/paid/value.html.twig' + priority: 0 + 'sylius_admin.invoice.show.content.sections.buyer': first_name: template: '@SyliusInvoicingPlugin/admin/invoice/show/content/sections/buyer/first_name.html.twig' diff --git a/templates/admin/invoice/show/content/sections/details.html.twig b/templates/admin/invoice/show/content/sections/details.html.twig index bae2130c..b6d55e99 100644 --- a/templates/admin/invoice/show/content/sections/details.html.twig +++ b/templates/admin/invoice/show/content/sections/details.html.twig @@ -1,5 +1,3 @@ -{% set invoice = hookable_metadata.context.resource %} -
@@ -9,30 +7,7 @@
- - - - - - - - - - - - - - - - + {% hook 'details' %}
{{ 'sylius_invoicing.ui.issued_at'|trans }}:{{ invoice.issuedAt|format_datetime }}
{{ 'sylius_invoicing.ui.issued_for_order'|trans }}:#{{ invoice.order.number }}
{{ 'sylius_invoicing.ui.issued_from'|trans }}: - {% include '@SyliusAdmin/shared/grid/field/channel.html.twig' with {'data': invoice.channel} %} -
{{ 'sylius_invoicing.ui.payment.paid'|trans }}: - {% if hookable_metadata.context.resource.paymentState is constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %} - {{ 'sylius_invoicing.ui.payment.yes'|trans }} - {% else %} - {{ 'sylius_invoicing.ui.payment.no'|trans }} - {% endif %} -
diff --git a/templates/admin/invoice/show/content/sections/details/channel.html.twig b/templates/admin/invoice/show/content/sections/details/channel.html.twig new file mode 100644 index 00000000..a913de26 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/channel.html.twig @@ -0,0 +1,3 @@ + + {% hook 'channel' %} + diff --git a/templates/admin/invoice/show/content/sections/details/channel/label.html.twig b/templates/admin/invoice/show/content/sections/details/channel/label.html.twig new file mode 100644 index 00000000..fb2d1223 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/channel/label.html.twig @@ -0,0 +1 @@ +{{ 'sylius_invoicing.ui.issued_from'|trans }}: diff --git a/templates/admin/invoice/show/content/sections/details/channel/value.html.twig b/templates/admin/invoice/show/content/sections/details/channel/value.html.twig new file mode 100644 index 00000000..ac5ce0be --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/channel/value.html.twig @@ -0,0 +1,5 @@ +{% set invoice = hookable_metadata.context.resource %} + + + {% include '@SyliusAdmin/shared/grid/field/channel.html.twig' with {'data': invoice.channel} %} + diff --git a/templates/admin/invoice/show/content/sections/details/date.html.twig b/templates/admin/invoice/show/content/sections/details/date.html.twig new file mode 100644 index 00000000..f5d57896 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/date.html.twig @@ -0,0 +1,3 @@ + + {% hook 'date' %} + diff --git a/templates/admin/invoice/show/content/sections/details/date/label.html.twig b/templates/admin/invoice/show/content/sections/details/date/label.html.twig new file mode 100644 index 00000000..543daf0d --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/date/label.html.twig @@ -0,0 +1 @@ +{{ 'sylius_invoicing.ui.issued_at'|trans }}: diff --git a/templates/admin/invoice/show/content/sections/details/date/value.html.twig b/templates/admin/invoice/show/content/sections/details/date/value.html.twig new file mode 100644 index 00000000..44158921 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/date/value.html.twig @@ -0,0 +1,3 @@ +{% set invoice = hookable_metadata.context.resource %} + +{{ invoice.issuedAt|format_datetime }} diff --git a/templates/admin/invoice/show/content/sections/details/order.html.twig b/templates/admin/invoice/show/content/sections/details/order.html.twig new file mode 100644 index 00000000..ad296b1c --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/order.html.twig @@ -0,0 +1,3 @@ + + {% hook 'order' %} + diff --git a/templates/admin/invoice/show/content/sections/details/order/label.html.twig b/templates/admin/invoice/show/content/sections/details/order/label.html.twig new file mode 100644 index 00000000..c5bd8545 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/order/label.html.twig @@ -0,0 +1 @@ +{{ 'sylius_invoicing.ui.issued_for_order'|trans }}: diff --git a/templates/admin/invoice/show/content/sections/details/order/value.html.twig b/templates/admin/invoice/show/content/sections/details/order/value.html.twig new file mode 100644 index 00000000..81e6ec3d --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/order/value.html.twig @@ -0,0 +1,3 @@ +{% set invoice = hookable_metadata.context.resource %} + +#{{ invoice.order.number }} diff --git a/templates/admin/invoice/show/content/sections/details/paid.html.twig b/templates/admin/invoice/show/content/sections/details/paid.html.twig new file mode 100644 index 00000000..a9ba7e65 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/paid.html.twig @@ -0,0 +1,3 @@ + + {% hook 'paid' %} + diff --git a/templates/admin/invoice/show/content/sections/details/paid/label.html.twig b/templates/admin/invoice/show/content/sections/details/paid/label.html.twig new file mode 100644 index 00000000..7f9b12ee --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/paid/label.html.twig @@ -0,0 +1 @@ +{{ 'sylius_invoicing.ui.payment.paid'|trans }}: diff --git a/templates/admin/invoice/show/content/sections/details/paid/value.html.twig b/templates/admin/invoice/show/content/sections/details/paid/value.html.twig new file mode 100644 index 00000000..477d6a57 --- /dev/null +++ b/templates/admin/invoice/show/content/sections/details/paid/value.html.twig @@ -0,0 +1,10 @@ +{% set invoice = hookable_metadata.context.resource %} +{% set payment_state_completed = constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %} + + + {% if invoice.paymentState == payment_state_completed %} + {{ 'sylius_invoicing.ui.payment.yes'|trans }} + {% else %} + {{ 'sylius_invoicing.ui.payment.no'|trans }} + {% endif %} +