Skip to content

Commit

Permalink
Merge pull request #328 from mpysiak/bump-twig-hooks
Browse files Browse the repository at this point in the history
[Maintenance] Bump twig hooks
  • Loading branch information
GSadee authored Oct 31, 2024
2 parents c40a3a2 + 562d5da commit be55712
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 27 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"sylius/grid-bundle": "^1.9",
"sylius/resource-bundle": "^1.9",
"sylius/sylius": "2.0.x-dev",
"sylius/twig-hooks": "^0.4",
"sylius/twig-hooks": "^0.5",
"symfony/config": "^6.4 || ^7.1",
"symfony/console": "^6.4.1 || ^7.1",
"symfony/console": "^6.4 || ^7.1",
"symfony/dependency-injection": "^6.4 || ^7.1",
"symfony/form": "^6.4 || ^7.1",
"symfony/framework-bundle": "^6.4 || ^7.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ sylius_grid:
resend:
type: default
label: sylius_invoicing_plugin.ui.resend_invoice
icon: send
icon: "tabler:send"
options:
link:
route: sylius_invoicing_plugin_admin_invoice_resend
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% from '@SyliusAdmin/shared/helper/icon.html.twig' import icon %}

<a {{ sylius_test_html_attribute('back') }} href="{{ path('sylius_invoicing_plugin_admin_invoice_index') }}" class="btn">
{{ icon({ icon: 'arrow_back_up', class: 'icon' }) }}
{{ ux_icon('tabler:arrow-left', {'class': 'icon'}) }}
</a>
4 changes: 1 addition & 3 deletions src/templates/admin/shared/action/resend.html.twig
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% from '@SyliusAdmin/shared/helper/icon.html.twig' import icon %}

{% if hookable_metadata.context.invoice is defined %}
{% set invoice = hookable_metadata.context.invoice %}
{% elseif hookable_metadata.context.resource is defined %}
Expand All @@ -11,6 +9,6 @@
{% set path = path('sylius_invoicing_plugin_admin_invoice_resend', {'id': invoice.id}) %}

<a href="{{ path }}" class="btn">
{{ icon({ icon: 'send', class: 'icon' }) }}
{{ ux_icon('tabler:send', {'class': 'icon'}) }}
{{ 'sylius_invoicing_plugin.ui.resend_invoice'|trans }}
</a>
27 changes: 9 additions & 18 deletions tests/Application/package.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
{
"license": "MIT",
"scripts": {
"build": "encore dev",
"build:prod": "encore production",
"watch": "encore dev --watch"
},
"dependencies": {
"@sylius-ui/admin": "file:../../vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle",
"@sylius-ui/shop": "file:../../vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle",
"@symfony/ux-live-component": "file:../../vendor/symfony/ux-live-component/assets",
"@symfony/ux-autocomplete": "file:../../vendor/symfony/ux-autocomplete/assets"
"@symfony/ux-autocomplete": "file:../../vendor/symfony/ux-autocomplete/assets",
"@symfony/ux-live-component": "file:../../vendor/symfony/ux-live-component/assets"
},
"devDependencies": {
"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
"@hotwired/stimulus": "^3.0.0",
"@symfony/stimulus-bridge": "^3.2.0",
"@symfony/webpack-encore": "^5.0.1",
"sass": "^1.54.8",
"sass-loader": "^16.0.2",
"tom-select": "^2.2.2"
},
"engines": {
"node": "^20 || ^22"
},
"scripts": {
"build": "encore dev",
"build:prod": "encore production",
"lint": "yarn lint:js",
"watch": "encore dev --watch"
},
"repository": {
"type": "git",
"url": "git+https://github.com/Sylius/Sylius.git"
}
}

0 comments on commit be55712

Please sign in to comment.