Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve UI for 2.0 #370

Open
wants to merge 2 commits into
base: 2.0
Choose a base branch
from
Open

Improve UI for 2.0 #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f1b9ec
Improve invoice UI
kulczy Jan 24, 2025
93c23ad
Add hooks for details section
bartek-sek Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 49 additions & 6 deletions config/twig_hooks/admin/invoice/show.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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':
Expand All @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -90,9 +136,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':
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/header/title_block/actions/back_to_index.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<a {{ sylius_test_html_attribute('back') }} href="{{ path('sylius_invoicing_admin_invoice_index') }}" class="btn">
<a {{ sylius_test_html_attribute('back') }} href="{{ path('sylius_invoicing_admin_invoice_index') }}" class="btn btn-icon">
{{ ux_icon('tabler:arrow-left', {'class': 'icon'}) }}
</a>
20 changes: 0 additions & 20 deletions templates/admin/invoice/show/content/header/title_block/title/subtitle.html.twig
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions templates/admin/invoice/show/content/sections/buyer.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="col">
<div class="card mb-3">
<div class="col-12 col-md-4 mb-3">
<div class="card h-full">
<div class="card-header">
<div class="card-title">
{{ 'sylius_invoicing.ui.buyer'|trans }}
Expand Down
4 changes: 3 additions & 1 deletion templates/admin/invoice/show/content/sections/buyer/first_name.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% set billing_data = hookable_metadata.context.resource.billingData %}

<strong>{{ billing_data.firstName }} {{ billing_data.lastName }}</strong>
<div>
<strong>{{ billing_data.firstName }} {{ billing_data.lastName }}</strong>
</div>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set invoice = hookable_metadata.context.resource %}

<div class="card mb-3 mb-2">
<div class="col-12">
{% hook 'card' %}
</div>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="card-body">
<div class="card">
{% hook 'body' %}
</div>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="table-responsive">
<table class="table table-bordered table-striped table-sm">
<table class="table">
{% hook 'table' %}
</table>
</div>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/body/currency.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<td>{{ hookable_metadata.context.resource.currencyCode }}</td>
<td class="text-center">{{ hookable_metadata.context.resource.currencyCode }}</td>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/body/no.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<td>{{ hookable_metadata.context.loop.index }}</td>
<td class="text-center">{{ hookable_metadata.context.loop.index }}</td>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/currency.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-total" scope="col">{{ 'sylius.ui.currency'|trans }}</th>
<th class="sylius-table-column-total text-center text-wrap" scope="col">{{ 'sylius.ui.currency'|trans }}</th>
2 changes: 1 addition & 1 deletion .../invoice/show/content/sections/card/body/table/header/discounted_unit_net_price.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-discounted-unit-net-price" scope="col">{{ 'sylius_invoicing.ui.discounted_unit_net_price'|trans }}</th>
<th class="sylius-table-column-discounted-unit-net-price text-end text-wrap" scope="col">{{ 'sylius_invoicing.ui.discounted_unit_net_price'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/gross_value.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-total" scope="col">{{ 'sylius_invoicing.ui.gross_value'|trans }}</th>
<th class="sylius-table-column-total text-end text-wrap" scope="col">{{ 'sylius_invoicing.ui.gross_value'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/name.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-name" scope="col">{{ 'sylius.ui.name'|trans }}</th>
<th class="sylius-table-column-name text-wrap" scope="col">{{ 'sylius.ui.name'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/net_value.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-subtotal" scope="col">{{ 'sylius_invoicing.ui.net_value'|trans }}</th>
<th class="sylius-table-column-subtotal text-end text-wrap" scope="col">{{ 'sylius_invoicing.ui.net_value'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/no.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-number" scope="col">{{ 'sylius_invoicing.ui.no'|trans }}</th>
<th class="sylius-table-column-number text-center text-wrap" scope="col">{{ 'sylius_invoicing.ui.no'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/quantity.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-quantity" scope="col">{{ 'sylius.ui.quantity'|trans }}</th>
<th class="sylius-table-column-quantity text-end text-wrap" scope="col">{{ 'sylius.ui.quantity'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/tax_amount.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-tax_total" scope="col">{{ 'sylius_invoicing.ui.tax_amount'|trans }}</th>
<th class="sylius-table-column-tax_total text-end text-wrap" scope="col">{{ 'sylius_invoicing.ui.tax_amount'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/invoice/show/content/sections/card/body/table/header/tax_rate.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-tax-rate" scope="col">{{ 'sylius_invoicing.ui.tax_rate'|trans }}</th>
<th class="sylius-table-column-tax-rate text-end text-wrap" scope="col">{{ 'sylius_invoicing.ui.tax_rate'|trans }}</th>
2 changes: 1 addition & 1 deletion ...lates/admin/invoice/show/content/sections/card/body/table/header/unit_net_price.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th class="sylius-table-column-unit-net-price" scope="col">{{ 'sylius_invoicing.ui.unit_net_price'|trans }}</th>
<th class="sylius-table-column-unit-net-price text-end text-wrap" scope="col">{{ 'sylius_invoicing.ui.unit_net_price'|trans }}</th>
12 changes: 0 additions & 12 deletions templates/admin/invoice/show/content/sections/card/footer.html.twig
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions templates/admin/invoice/show/content/sections/details.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<div class="col-12 col-md-4 mb-3">
<div class="card h-full">
<div class="card-header">
<div class="card-title">
{{ 'sylius.ui.details'|trans }}
</div>
</div>
<div class="card-body">
<table class="table table-sm table-borderless">
{% hook 'details' %}
</table>
</div>
</div>
</div>
3 changes: 3 additions & 0 deletions templates/admin/invoice/show/content/sections/details/channel.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<tr>
{% hook 'channel' %}
</tr>
1 change: 1 addition & 0 deletions templates/admin/invoice/show/content/sections/details/channel/label.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<td><strong>{{ 'sylius_invoicing.ui.issued_from'|trans }}:</strong></td>
5 changes: 5 additions & 0 deletions templates/admin/invoice/show/content/sections/details/channel/value.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{% set invoice = hookable_metadata.context.resource %}

<td {{ sylius_test_html_attribute('channel') }}>
{% include '@SyliusAdmin/shared/grid/field/channel.html.twig' with {'data': invoice.channel} %}
</td>
3 changes: 3 additions & 0 deletions templates/admin/invoice/show/content/sections/details/date.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<tr>
{% hook 'date' %}
</tr>
1 change: 1 addition & 0 deletions templates/admin/invoice/show/content/sections/details/date/label.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<td><strong>{{ 'sylius_invoicing.ui.issued_at'|trans }}:</strong></td>
3 changes: 3 additions & 0 deletions templates/admin/invoice/show/content/sections/details/date/value.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% set invoice = hookable_metadata.context.resource %}

<td><span {{ sylius_test_html_attribute('issued-at') }}>{{ invoice.issuedAt|format_datetime }}</span></td>
3 changes: 3 additions & 0 deletions templates/admin/invoice/show/content/sections/details/order.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<tr>
{% hook 'order' %}
</tr>
1 change: 1 addition & 0 deletions templates/admin/invoice/show/content/sections/details/order/label.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<td><strong>{{ 'sylius_invoicing.ui.issued_for_order'|trans }}:</strong></td>
3 changes: 3 additions & 0 deletions templates/admin/invoice/show/content/sections/details/order/value.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% set invoice = hookable_metadata.context.resource %}

<td>#{{ invoice.order.number }}</td>
3 changes: 3 additions & 0 deletions templates/admin/invoice/show/content/sections/details/paid.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<tr {{ sylius_test_html_attribute('invoice-is-paid') }}>
{% hook 'paid' %}
</tr>
1 change: 1 addition & 0 deletions templates/admin/invoice/show/content/sections/details/paid/label.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<td><strong>{{ 'sylius_invoicing.ui.payment.paid'|trans }}: </strong></td>
10 changes: 10 additions & 0 deletions templates/admin/invoice/show/content/sections/details/paid/value.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% set invoice = hookable_metadata.context.resource %}
{% set payment_state_completed = constant('Sylius\\InvoicingPlugin\\Entity\\InvoiceInterface::PAYMENT_STATE_COMPLETED') %}

<td>
{% if invoice.paymentState == payment_state_completed %}
<span class="text-success">{{ 'sylius_invoicing.ui.payment.yes'|trans }}</span>
{% else %}
<span class="text-danger">{{ 'sylius_invoicing.ui.payment.no'|trans }}</span>
{% endif %}
</td>
4 changes: 2 additions & 2 deletions templates/admin/invoice/show/content/sections/seller.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% set shop_billing_data = hookable_metadata.context.resource.shopBillingData %}

{% if shop_billing_data %}
<div class="col">
<div class="card mb-3">
<div class="col-12 col-md-4 mb-3">
<div class="card h-full">
<div class="card-header">
<div class="card-title">
{{ 'sylius_invoicing.ui.seller'|trans }}
Expand Down
6 changes: 5 additions & 1 deletion templates/admin/invoice/show/content/sections/seller/company.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{% set shop_billing_data = hookable_metadata.context.resource.shopBillingData %}

{% if shop_billing_data.company %}<strong>{{ shop_billing_data.company }}</strong>{% endif %}
{% if shop_billing_data.company %}
<div>
<strong>{{ shop_billing_data.company }}</strong>
</div>
{% endif %}
8 changes: 5 additions & 3 deletions templates/admin/order/show/content/sections/invoices/table.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
{{ 'sylius_invoicing.ui.invoices'|trans }}
</div>
</div>
<table class="table table-borderless align-middle mb-0">
{% hook 'table' %}
</table>
<div class="table-responsive">
<table class="table table-hover table-vcenter card-table">
{% hook 'table' %}
</table>
</div>
</div>
4 changes: 3 additions & 1 deletion templates/admin/order/show/content/sections/invoices/table/body/actions.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<td>
{% hook 'actions' %}
<div class="d-flex gap-1 justify-content-end">
{% hook 'actions' %}
</div>
</td>
2 changes: 1 addition & 1 deletion templates/admin/order/show/content/sections/invoices/table/body/issued_at.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<td {{ sylius_test_html_attribute('issued-at') }}>
<td class="text-end" {{ sylius_test_html_attribute('issued-at') }}>
{{ hookable_metadata.context.invoice.issuedAt|format_date }}
</td>
2 changes: 1 addition & 1 deletion templates/admin/order/show/content/sections/invoices/table/head/actions.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th>{{ 'sylius.ui.actions'|trans }}</th>
<th class="text-end">{{ 'sylius.ui.actions'|trans }}</th>
2 changes: 1 addition & 1 deletion templates/admin/order/show/content/sections/invoices/table/head/issued_at.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<th>{{ 'sylius_invoicing.ui.issued_at'|trans }}</th>
<th class="text-end">{{ 'sylius_invoicing.ui.issued_at'|trans }}</th>
Loading