Skip to content

Commit 5366129

Browse files
hmfilarhmfilar
committed
OP-289: Refactor templates
1 parent ed6d75b commit 5366129

13 files changed

Lines changed: 124 additions & 72 deletions

File tree

‎README.md‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,43 @@ doctrine:
260260
261261
```
262262
263-
11. Copy plugin templates into your project `templates/bundles` directory:
263+
11. Add plugin templates:
264+
- Inject blocks:
265+
266+
```yaml
267+
sylius_ui:
268+
events:
269+
sylius.shop.product.show.right_sidebar:
270+
blocks:
271+
variant_selection:
272+
template: "@BitBagSyliusProductBundlePlugin/Shop/Product/_variantSelection.html.twig"
273+
priority: 10
274+
sylius.shop.layout.javascripts:
275+
blocks:
276+
plugin_scripts:
277+
template: "@BitBagSyliusProductBundlePlugin/Shop/_scripts.html.twig"
278+
priority: 20
279+
sylius.shop.layout.stylesheets:
280+
blocks:
281+
plugin_stylesheets:
282+
template: "@BitBagSyliusProductBundlePlugin/Shop/_styles.html.twig"
283+
priority: 20
284+
sylius.admin.layout.javascripts:
285+
blocks:
286+
plugin_scripts:
287+
template: "@BitBagSyliusProductBundlePlugin/Admin/_scripts.html.twig"
288+
priority: 20
289+
sylius.admin.layout.stylesheets:
290+
blocks:
291+
plugin_stylesheets:
292+
template: "@BitBagSyliusProductBundlePlugin/Admin/_styles.html.twig"
293+
priority: 20
294+
295+
```
296+
- Copy plugin templates into your project `templates/bundles` directory:
264297
265298
```bash
266-
cp -R vendor/bitbag/product-bundle-plugin/tests/Application/templates/bundles/* templates/bundles/
299+
cp vendor/bitbag/product-bundle-plugin/src/Resources/views/Admin/Order/Show/Summary/_item.html.twig templates/bundles/SyliusAdminBundle/Order/Show/Summary
267300
```
268301
269302
12. Please clear application cache by running command below:

‎README_webpack-config.md‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,4 @@ webpack_encore:
4343
product_bundle_admin: '%kernel.project_dir%/public/build/bitbag/productBundle/admin'
4444
```
4545

46-
4. Add encore functions to your templates
47-
48-
```twig
49-
{# @SyliusShopBundle/_scripts.html.twig #}
50-
{{ encore_entry_script_tags('bitbag-productBundle-shop', null, 'product_bundle_shop') }}
51-
52-
{# @SyliusShopBundle/_styles.html.twig #}
53-
{{ encore_entry_link_tags('bitbag-productBundle-shop', null, 'product_bundle_shop') }}
54-
55-
{# @SyliusAdminBundle/_scripts.html.twig #}
56-
{{ encore_entry_script_tags('bitbag-productBundle-admin', null, 'product_bundle_admin') }}
57-
58-
{# @SyliusAdminBundle/_styles.html.twig #}
59-
{{ encore_entry_link_tags('bitbag-productBundle-admin', null, 'product_bundle_admin') }}
60-
```
61-
62-
5. Run `yarn encore dev` or `yarn encore production`
46+
4. Run `yarn encore dev` or `yarn encore production`

‎src/Resources/views/Admin/Order/Show/Summary/_item.html.twig‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{% import "@SyliusAdmin/Common/Macro/money.html.twig" as money %}
2+
3+
{% set orderPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT') %}
4+
{% set unitPromotionAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::ORDER_ITEM_PROMOTION_ADJUSTMENT') %}
5+
{% set shippingAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::SHIPPING_ADJUSTMENT') %}
6+
{% set taxAdjustment = constant('Sylius\\Component\\Core\\Model\\AdjustmentInterface::TAX_ADJUSTMENT') %}
7+
8+
{% set variant = item.variant %}
9+
{% set product = variant.product %}
10+
11+
{% set aggregatedUnitPromotionAdjustments = item.getAdjustmentsTotalRecursively(unitPromotionAdjustment) + item.getAdjustmentsTotalRecursively(orderPromotionAdjustment) %}
12+
{% set subtotal = (item.unitPrice * item.quantity) + aggregatedUnitPromotionAdjustments %}
13+
14+
{% set taxIncluded = sylius_admin_order_unit_tax_included(item) %}
15+
{% set taxExcluded = sylius_admin_order_unit_tax_excluded(item) %}
16+
17+
<tr>
18+
<td class="single line">
19+
{% include '@SyliusAdmin/Product/_info.html.twig' %}
20+
21+
{{ bitbag_render_product_bundle_order_items(item) }}
22+
</td>
23+
<td class="right aligned unit-price">
24+
{{ money.format(item.unitPrice, order.currencyCode) }}
25+
</td>
26+
<td class="right aligned unit-discount">
27+
{{ money.format(item.units.first.adjustmentsTotal(unitPromotionAdjustment), order.currencyCode) }}
28+
</td>
29+
<td class="right aligned unit-order-discount">
30+
<span style="font-style: italic;">~ {{ money.format(item.units.first.adjustmentsTotal(orderPromotionAdjustment), order.currencyCode) }}</span>
31+
</td>
32+
<td class="right aligned discounted-unit-price">
33+
{{ money.format(item.fullDiscountedUnitPrice, order.currencyCode) }}
34+
</td>
35+
<td class="right aligned quantity">
36+
{{ item.quantity }}
37+
</td>
38+
<td class="right aligned subtotal">
39+
{{ money.format(subtotal, order.currencyCode) }}
40+
</td>
41+
<td class="right aligned tax">
42+
<div class="tax-excluded">{{ money.format(taxExcluded, order.currencyCode) }}</div>
43+
<div class="tax-disabled">
44+
<div class="tax-included"> {{ money.format(taxIncluded, order.currencyCode) }}
45+
</div>
46+
<small>({{ 'sylius.ui.included_in_price'|trans }})</small>
47+
</div>
48+
</td>
49+
<td class="right aligned total">
50+
{{ money.format(item.total, order.currencyCode) }}
51+
</td>
52+
</tr>

tests/Application/templates/bundles/SyliusAdminBundle/_scripts.html.twig renamed to src/Resources/views/Admin/_scripts.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{ encore_entry_script_tags('admin-entry', null, 'admin') }}
21
{{ encore_entry_script_tags('bitbag-productBundle-admin', null, 'product_bundle_admin') }}

tests/Application/templates/bundles/SyliusAdminBundle/_styles.html.twig renamed to src/Resources/views/Admin/_styles.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{ encore_entry_link_tags('admin-entry', null, 'admin') }}
21
{{ encore_entry_link_tags('bitbag-productBundle-admin', null, 'product_bundle_admin') }}

tests/Application/templates/bundles/SyliusShopBundle/Product/Show/_inventory.html.twig renamed to src/Resources/views/Shop/Product/Show/_inventory.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% if product.variants.empty() or product.simple and not sylius_inventory_is_available(product.variants.first) %}
1+
{% if product.enabledVariants.empty() or product.simple and not sylius_inventory_is_available(product.enabledVariants.first) %}
22
{% include '@SyliusShop/Product/Show/_outOfStock.html.twig' %}
33
{% else %}
44
{% if product.isBundle %}

‎src/Resources/views/Shop/Product/_variantSelection.html.twig‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% if product.isConfigurable() and product.getVariantSelectionMethod() == 'match' and not product.enabledVariants.empty() %}
2+
{% include '@SyliusShop/Product/Show/_variantsPricing.html.twig' with {'pricing': sylius_product_variants_map(product, {'channel': sylius.channel}), 'variants': product.enabledVariants} %}
3+
{% endif %}
4+
5+
{% include '@BitBagSyliusProductBundlePlugin/Shop/Product/Show/_inventory.html.twig' %}
6+
7+
<div class="ui hidden divider"></div>

tests/Application/templates/bundles/SyliusShopBundle/_scripts.html.twig renamed to src/Resources/views/Shop/_scripts.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{ encore_entry_script_tags('shop-entry', null, 'shop') }}
21
{{ encore_entry_script_tags('bitbag-productBundle-shop', null, 'product_bundle_shop') }}

tests/Application/templates/bundles/SyliusShopBundle/_styles.html.twig renamed to src/Resources/views/Shop/_styles.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{ encore_entry_link_tags('shop-entry', null, 'shop') }}
21
{{ encore_entry_link_tags('bitbag-productBundle-shop', null, 'product_bundle_shop') }}

‎tests/Application/config/packages/sylius_ui.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
sylius_ui:
2+
events:
3+
sylius.shop.product.show.right_sidebar:
4+
blocks:
5+
variant_selection:
6+
template: "@BitBagSyliusProductBundlePlugin/Shop/Product/_variantSelection.html.twig"
7+
priority: 10
8+
sylius.shop.layout.javascripts:
9+
blocks:
10+
plugin_scripts:
11+
template: "@BitBagSyliusProductBundlePlugin/Shop/_scripts.html.twig"
12+
priority: 20
13+
sylius.shop.layout.stylesheets:
14+
blocks:
15+
plugin_stylesheets:
16+
template: "@BitBagSyliusProductBundlePlugin/Shop/_styles.html.twig"
17+
priority: 20
18+
sylius.admin.layout.javascripts:
19+
blocks:
20+
plugin_scripts:
21+
template: "@BitBagSyliusProductBundlePlugin/Admin/_scripts.html.twig"
22+
priority: 20
23+
sylius.admin.layout.stylesheets:
24+
blocks:
25+
plugin_stylesheets:
26+
template: "@BitBagSyliusProductBundlePlugin/Admin/_styles.html.twig"
27+
priority: 20

0 commit comments

Comments
 (0)