From d3d24a88f98209be17933a31133f6969e36655de Mon Sep 17 00:00:00 2001 From: myCreedo Date: Sat, 9 Sep 2023 15:24:10 +0200 Subject: [PATCH 01/46] Migration to BS v5.0 --- .../Order/Label/State/cancelled.html.twig | 3 --- .../Order/Label/State/fulfilled.html.twig | 3 --- .../Account/Order/Label/State/new.html.twig | 3 --- .../Common/Order/Table/_headers.html.twig | 6 ------ SyliusShopBundle/views/Form/theme.html.twig | 1 - .../AddressBook/_defaultAddress.html.twig | 0 .../AddressBook/_defaultAddressForm.html.twig | 0 .../Account/AddressBook/_item.html.twig | 0 .../Account/AddressBook/create.html.twig | 0 .../Account/AddressBook/index.html.twig | 0 .../Account/AddressBook/layout.html.twig | 0 .../Account/AddressBook/update.html.twig | 0 .../Account/Menu/_content.html.twig | 0 .../Account/Order/Grid/Action/pay.html.twig | 0 .../Account/Order/Grid/Field/address.html.twig | 0 .../Account/Order/Grid/Field/number.html.twig | 0 .../Account/Order/Grid/Field/total.html.twig | 0 .../Account/Order/Index/_breadcrumb.html.twig | 0 .../Account/Order/Index/_header.html.twig | 0 .../Account/Order/Index/_subcontent.html.twig | 0 .../Order/Label/State/cancelled.html.twig | 3 +++ .../Order/Label/State/fulfilled.html.twig | 3 +++ .../Account/Order/Label/State/new.html.twig | 3 +++ .../Account/Order/Show/_breadcrumb.html.twig | 0 .../Account/Order/Show/_header.html.twig | 6 +++--- .../Account/Order/index.html.twig | 0 .../Account/Order/show.html.twig | 0 .../Account/changePassword.html.twig | 0 .../Account/dashboard.html.twig | 4 ++-- .../SyliusShopBundle}/Account/layout.html.twig | 0 .../Account/profileUpdate.html.twig | 0 .../Account/requestPasswordReset.html.twig | 0 .../Account/resetPassword.html.twig | 0 .../Cart/Summary/_checkout.html.twig | 0 .../Cart/Summary/_coupon.html.twig | 4 +--- .../Cart/Summary/_header.html.twig | 0 .../Cart/Summary/_item.html.twig | 2 +- .../Cart/Summary/_items.html.twig | 4 ++-- .../Cart/Summary/_suggestions.html.twig | 0 .../Cart/Summary/_totals.html.twig | 0 .../Cart/Summary/_update.html.twig | 0 .../Cart/Widget/_button.html.twig | 4 ++-- .../Cart/Widget/_popup.html.twig | 4 ++-- .../SyliusShopBundle}/Cart/_widget.html.twig | 0 .../SyliusShopBundle}/Cart/summary.html.twig | 0 .../Address/_addressBookSelect.html.twig | 0 .../Checkout/Address/_form.html.twig | 0 .../Checkout/Address/_navigation.html.twig | 0 .../Checkout/Complete/_form.html.twig | 0 .../Checkout/Complete/_header.html.twig | 0 .../Checkout/Complete/_navigation.html.twig | 2 +- .../Checkout/SelectPayment/_choice.html.twig | 0 .../Checkout/SelectPayment/_form.html.twig | 0 .../SelectPayment/_navigation.html.twig | 0 .../Checkout/SelectPayment/_payment.html.twig | 0 .../SelectPayment/_unavailable.html.twig | 0 .../Checkout/SelectShipping/_choice.html.twig | 0 .../Checkout/SelectShipping/_form.html.twig | 0 .../SelectShipping/_navigation.html.twig | 0 .../SelectShipping/_shipment.html.twig | 0 .../SelectShipping/_unavailable.html.twig | 0 .../Checkout/_header.html.twig | 0 .../Checkout/_steps.html.twig | 0 .../Checkout/_summary.html.twig | 18 +++++++++--------- .../Checkout/_support.html.twig | 0 .../Checkout/address.html.twig | 0 .../Checkout/complete.html.twig | 0 .../Checkout/layout.html.twig | 0 .../Checkout/selectPayment.html.twig | 0 .../Checkout/selectShipping.html.twig | 0 .../Common/Form/_address.html.twig | 2 +- .../Common/Form/_countryCode.html.twig | 0 .../Common/Form/_login.html.twig | 0 .../Common/Form/_province.html.twig | 0 .../Common/Macro/buttons.html.twig | 0 .../Common/Macro/headers.html.twig | 0 .../Common/Macro/icons.html.twig | 0 .../Common/Macro/labels.html.twig | 10 +++++----- .../Common/Macro/messages.html.twig | 2 +- .../Common/Macro/money.html.twig | 0 .../Common/Macro/pagination.html.twig | 0 .../Common/Macro/sectionHeaders.html.twig | 0 .../Common/Macro/sorting.html.twig | 0 .../Common/Macro/table.html.twig | 0 .../PaymentState/orderPaymentState.html.twig | 2 +- .../PaymentState/singlePaymentState.html.twig | 2 +- .../ShipmentState/orderShipmentState.html.twig | 2 +- .../singleShipmentState.html.twig | 2 +- .../Common/Order/Table/_headers.html.twig | 6 ++++++ .../Common/Order/Table/_item.html.twig | 6 +++--- .../Common/Order/Table/_items.html.twig | 0 .../Common/Order/Table/_promotion.html.twig | 0 .../Common/Order/Table/_shipping.html.twig | 0 .../Common/Order/Table/_totals.html.twig | 0 .../Common/Order/_addresses.html.twig | 0 .../Common/Order/_payments.html.twig | 2 +- .../Common/Order/_shipments.html.twig | 2 +- .../Common/Order/_summary.html.twig | 0 .../Common/Order/_table.html.twig | 2 +- .../Common/_address.html.twig | 0 .../SyliusShopBundle}/Common/_rating.html.twig | 0 .../Contact/request.html.twig | 0 .../Email/contactRequest.html.twig | 0 .../Email/orderConfirmation.html.twig | 0 .../Email/passwordReset.html.twig | 0 .../Email/userRegistration.html.twig | 0 .../Email/verification.html.twig | 0 .../SyliusShopBundle/Form/theme.html.twig | 1 + .../Grid/Action/show.html.twig | 0 .../Grid/Filter/boolean.html.twig | 0 .../Grid/Filter/date.html.twig | 0 .../Grid/Filter/entity.html.twig | 0 .../Grid/Filter/exists.html.twig | 0 .../Grid/Filter/money.html.twig | 0 .../Grid/Filter/string.html.twig | 0 .../SyliusShopBundle}/Grid/_default.html.twig | 0 .../Homepage/_aboutUs.html.twig | 0 .../Homepage/_banner.html.twig | 0 .../Homepage/_carousel.html.twig | 0 .../Homepage/_latestProducts.html.twig | 0 .../Homepage/_latestProductsCarousel.html.twig | 0 .../SyliusShopBundle}/Homepage/_list.html.twig | 0 .../Homepage/_newsletter.html.twig | 2 +- .../Homepage/_productsGrid.html.twig | 0 .../SyliusShopBundle}/Homepage/index.html.twig | 0 .../Footer/Grid/_customer_care.html.twig | 0 .../Footer/Grid/_payment_methods.html.twig | 0 .../Layout/Footer/Grid/_plus.html.twig | 0 .../Layout/Footer/Grid/_your_store.html.twig | 0 .../Layout/Footer/_content.html.twig | 0 .../Layout/Footer/_grid.html.twig | 0 .../Layout/Header/_cart.html.twig | 2 +- .../Layout/Header/_content.html.twig | 0 .../Layout/Header/_logo.html.twig | 0 .../Layout/Header/_menu.html.twig | 0 .../Layout/Topbar/_currencySwitcher.html.twig | 0 .../Layout/Topbar/_localeSwitcher.html.twig | 0 .../Layout/Topbar/_securityWidget.html.twig | 0 .../SyliusShopBundle}/Login/_form.html.twig | 0 .../SyliusShopBundle}/Login/_header.html.twig | 0 .../SyliusShopBundle}/Login/_login.html.twig | 0 .../Login/_register.html.twig | 0 .../Menu/_currencySwitch.html.twig | 0 .../Menu/_localeSwitch.html.twig | 0 .../SyliusShopBundle}/Menu/_security.html.twig | 2 +- .../SyliusShopBundle}/Menu/simple.html.twig | 0 .../SyliusShopBundle}/Order/_summary.html.twig | 4 ++-- .../SyliusShopBundle}/Order/show.html.twig | 0 .../SyliusShopBundle}/Order/thankYou.html.twig | 0 .../Product/Box/_content.html.twig | 0 .../Product/Index/_header.html.twig | 0 .../Product/Index/_main.html.twig | 0 .../Product/Index/_pagination.html.twig | 2 +- .../Product/Index/_search.html.twig | 0 .../Product/Index/_sidebar.html.twig | 0 .../Product/Index/_sorting.html.twig | 2 +- .../Show/Tabs/Attributes/_list.html.twig | 0 .../Show/Tabs/Details/_description.html.twig | 0 .../Show/Tabs/Reviews/_create.html.twig | 0 .../Show/Tabs/Reviews/_latest.html.twig | 0 .../Show/Tabs/Reviews/_viewMore.html.twig | 0 .../Product/Show/Tabs/_attributes.html.twig | 0 .../Product/Show/Tabs/_content.html.twig | 0 .../Product/Show/Tabs/_details.html.twig | 0 .../Product/Show/Tabs/_menu.html.twig | 0 .../Product/Show/Tabs/_reviews.html.twig | 0 .../Product/Show/_addToCart.html.twig | 4 ++-- .../Product/Show/_association.html.twig | 0 .../Product/Show/_associations.html.twig | 0 .../Product/Show/_breadcrumb.html.twig | 0 .../Product/Show/_header.html.twig | 0 .../Product/Show/_imageVariants.html.twig | 0 .../Product/Show/_images.html.twig | 0 .../Product/Show/_inventory.html.twig | 0 .../Product/Show/_menu.html.twig | 0 .../Product/Show/_options.html.twig | 0 .../Product/Show/_outOfStock.html.twig | 0 .../Product/Show/_price.html.twig | 0 .../Product/Show/_priceWidget.html.twig | 0 .../Product/Show/_reviews.html.twig | 4 ++-- .../Product/Show/_shortDescription.html.twig | 0 .../Product/Show/_tabs.html.twig | 0 .../Product/Show/_variantSelection.html.twig | 0 .../Product/Show/_variants.html.twig | 4 ++-- .../Product/Show/_variantsPricing.html.twig | 0 .../SyliusShopBundle}/Product/_box.html.twig | 0 .../Product/_horizontalList.html.twig | 0 .../SyliusShopBundle}/Product/_info.html.twig | 6 +++--- .../Product/_mainImage.html.twig | 0 .../Product/_starRating.html.twig | 0 .../SyliusShopBundle}/Product/index.html.twig | 0 .../SyliusShopBundle}/Product/show.html.twig | 2 +- .../ProductReview/Box/_content.html.twig | 0 .../ProductReview/List/_addButton.html.twig | 0 .../ProductReview/_form.html.twig | 8 ++++---- .../ProductReview/_list.html.twig | 0 .../ProductReview/_single.html.twig | 2 +- .../ProductReview/create.html.twig | 0 .../ProductReview/index.html.twig | 0 .../SyliusShopBundle}/Register/_form.html.twig | 0 .../Register/_header.html.twig | 0 .../Taxon/Header/_content.html.twig | 0 .../Taxon/_breadcrumb.html.twig | 0 .../SyliusShopBundle}/Taxon/_header.html.twig | 0 .../Taxon/_horizontalMenu.html.twig | 0 .../Taxon/_verticalMenu.html.twig | 0 .../SyliusShopBundle}/_flashes.html.twig | 2 +- .../SyliusShopBundle}/_footer.html.twig | 0 .../SyliusShopBundle}/_header.html.twig | 4 ++-- .../SyliusShopBundle}/_scripts.html.twig | 0 .../SyliusShopBundle}/_styles.html.twig | 0 .../bundles/SyliusShopBundle}/error.html.twig | 0 .../SyliusShopBundle}/error403.html.twig | 0 .../SyliusShopBundle}/error404.html.twig | 0 .../SyliusShopBundle}/error500.html.twig | 0 .../bundles/SyliusShopBundle}/layout.html.twig | 2 +- .../bundles/SyliusShopBundle}/login.html.twig | 0 .../SyliusShopBundle}/register.html.twig | 0 218 files changed, 82 insertions(+), 84 deletions(-) delete mode 100644 SyliusShopBundle/views/Account/Order/Label/State/cancelled.html.twig delete mode 100644 SyliusShopBundle/views/Account/Order/Label/State/fulfilled.html.twig delete mode 100644 SyliusShopBundle/views/Account/Order/Label/State/new.html.twig delete mode 100644 SyliusShopBundle/views/Common/Order/Table/_headers.html.twig delete mode 100644 SyliusShopBundle/views/Form/theme.html.twig rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/_defaultAddress.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/_defaultAddressForm.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/_item.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/create.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/index.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/layout.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/AddressBook/update.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Menu/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Grid/Action/pay.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Grid/Field/address.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Grid/Field/number.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Grid/Field/total.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Index/_breadcrumb.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Index/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Index/_subcontent.html.twig (100%) create mode 100644 templates/bundles/SyliusShopBundle/Account/Order/Label/State/cancelled.html.twig create mode 100644 templates/bundles/SyliusShopBundle/Account/Order/Label/State/fulfilled.html.twig create mode 100644 templates/bundles/SyliusShopBundle/Account/Order/Label/State/new.html.twig rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Show/_breadcrumb.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/Show/_header.html.twig (91%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/index.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/Order/show.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/changePassword.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/dashboard.html.twig (94%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/layout.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/profileUpdate.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/requestPasswordReset.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Account/resetPassword.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_checkout.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_coupon.html.twig (73%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_item.html.twig (98%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_items.html.twig (92%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_suggestions.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_totals.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Summary/_update.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Widget/_button.html.twig (66%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/Widget/_popup.html.twig (87%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/_widget.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Cart/summary.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/Address/_addressBookSelect.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/Address/_form.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/Address/_navigation.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/Complete/_form.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/Complete/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/Complete/_navigation.html.twig (85%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectPayment/_choice.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectPayment/_form.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectPayment/_navigation.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectPayment/_payment.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectPayment/_unavailable.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectShipping/_choice.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectShipping/_form.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectShipping/_navigation.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectShipping/_shipment.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/SelectShipping/_unavailable.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/_steps.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/_summary.html.twig (84%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/_support.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/address.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/complete.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/layout.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/selectPayment.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Checkout/selectShipping.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Form/_address.html.twig (89%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Form/_countryCode.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Form/_login.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Form/_province.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/buttons.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/headers.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/icons.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/labels.html.twig (80%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/messages.html.twig (96%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/money.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/pagination.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/sectionHeaders.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/sorting.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Macro/table.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Label/PaymentState/orderPaymentState.html.twig (92%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Label/PaymentState/singlePaymentState.html.twig (90%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Label/ShipmentState/orderShipmentState.html.twig (90%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Label/ShipmentState/singleShipmentState.html.twig (85%) create mode 100644 templates/bundles/SyliusShopBundle/Common/Order/Table/_headers.html.twig rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Table/_item.html.twig (89%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Table/_items.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Table/_promotion.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Table/_shipping.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/Table/_totals.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/_addresses.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/_payments.html.twig (94%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/_shipments.html.twig (93%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/_summary.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/Order/_table.html.twig (92%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/_address.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Common/_rating.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Contact/request.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Email/contactRequest.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Email/orderConfirmation.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Email/passwordReset.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Email/userRegistration.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Email/verification.html.twig (100%) create mode 100644 templates/bundles/SyliusShopBundle/Form/theme.html.twig rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Action/show.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Filter/boolean.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Filter/date.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Filter/entity.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Filter/exists.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Filter/money.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/Filter/string.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Grid/_default.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_aboutUs.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_banner.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_carousel.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_latestProducts.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_latestProductsCarousel.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_list.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_newsletter.html.twig (95%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/_productsGrid.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Homepage/index.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Footer/Grid/_customer_care.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Footer/Grid/_payment_methods.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Footer/Grid/_plus.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Footer/Grid/_your_store.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Footer/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Footer/_grid.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Header/_cart.html.twig (88%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Header/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Header/_logo.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Header/_menu.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Topbar/_currencySwitcher.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Topbar/_localeSwitcher.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Layout/Topbar/_securityWidget.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Login/_form.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Login/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Login/_login.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Login/_register.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Menu/_currencySwitch.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Menu/_localeSwitch.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Menu/_security.html.twig (97%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Menu/simple.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Order/_summary.html.twig (90%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Order/show.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Order/thankYou.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Box/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Index/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Index/_main.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Index/_pagination.html.twig (92%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Index/_search.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Index/_sidebar.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Index/_sorting.html.twig (99%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/Attributes/_list.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/Details/_description.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/Reviews/_create.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/Reviews/_latest.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/Reviews/_viewMore.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/_attributes.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/_details.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/_menu.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/Tabs/_reviews.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_addToCart.html.twig (91%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_association.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_associations.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_breadcrumb.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_imageVariants.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_images.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_inventory.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_menu.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_options.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_outOfStock.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_price.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_priceWidget.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_reviews.html.twig (76%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_shortDescription.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_tabs.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_variantSelection.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_variants.html.twig (86%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/Show/_variantsPricing.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/_box.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/_horizontalList.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/_info.html.twig (93%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/_mainImage.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/_starRating.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/index.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Product/show.html.twig (95%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/Box/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/List/_addButton.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/_form.html.twig (87%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/_list.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/_single.html.twig (87%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/create.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/ProductReview/index.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Register/_form.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Register/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Taxon/Header/_content.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Taxon/_breadcrumb.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Taxon/_header.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Taxon/_horizontalMenu.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/Taxon/_verticalMenu.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/_flashes.html.twig (96%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/_footer.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/_header.html.twig (83%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/_scripts.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/_styles.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/error.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/error403.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/error404.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/error500.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/layout.html.twig (97%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/login.html.twig (100%) rename {SyliusShopBundle/views => templates/bundles/SyliusShopBundle}/register.html.twig (100%) diff --git a/SyliusShopBundle/views/Account/Order/Label/State/cancelled.html.twig b/SyliusShopBundle/views/Account/Order/Label/State/cancelled.html.twig deleted file mode 100644 index f33bf46..0000000 --- a/SyliusShopBundle/views/Account/Order/Label/State/cancelled.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ value|trans }} - diff --git a/SyliusShopBundle/views/Account/Order/Label/State/fulfilled.html.twig b/SyliusShopBundle/views/Account/Order/Label/State/fulfilled.html.twig deleted file mode 100644 index ed707c2..0000000 --- a/SyliusShopBundle/views/Account/Order/Label/State/fulfilled.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ value|trans }} - diff --git a/SyliusShopBundle/views/Account/Order/Label/State/new.html.twig b/SyliusShopBundle/views/Account/Order/Label/State/new.html.twig deleted file mode 100644 index 61a2e6e..0000000 --- a/SyliusShopBundle/views/Account/Order/Label/State/new.html.twig +++ /dev/null @@ -1,3 +0,0 @@ - - {{ value|trans }} - diff --git a/SyliusShopBundle/views/Common/Order/Table/_headers.html.twig b/SyliusShopBundle/views/Common/Order/Table/_headers.html.twig deleted file mode 100644 index 3c8c493..0000000 --- a/SyliusShopBundle/views/Common/Order/Table/_headers.html.twig +++ /dev/null @@ -1,6 +0,0 @@ - - {{ 'sylius.ui.item'|trans }} - {{ 'sylius.ui.unit_price'|trans }} - {{ 'sylius.ui.qty'|trans }} - {{ 'sylius.ui.subtotal'|trans }} - diff --git a/SyliusShopBundle/views/Form/theme.html.twig b/SyliusShopBundle/views/Form/theme.html.twig deleted file mode 100644 index b809639..0000000 --- a/SyliusShopBundle/views/Form/theme.html.twig +++ /dev/null @@ -1 +0,0 @@ -{% extends 'bootstrap_4_layout.html.twig' %} diff --git a/SyliusShopBundle/views/Account/AddressBook/_defaultAddress.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/_defaultAddress.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/_defaultAddress.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/_defaultAddress.html.twig diff --git a/SyliusShopBundle/views/Account/AddressBook/_defaultAddressForm.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/_defaultAddressForm.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/_defaultAddressForm.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/_defaultAddressForm.html.twig diff --git a/SyliusShopBundle/views/Account/AddressBook/_item.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/_item.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/_item.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/_item.html.twig diff --git a/SyliusShopBundle/views/Account/AddressBook/create.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/create.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/create.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/create.html.twig diff --git a/SyliusShopBundle/views/Account/AddressBook/index.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/index.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/index.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/index.html.twig diff --git a/SyliusShopBundle/views/Account/AddressBook/layout.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/layout.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/layout.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/layout.html.twig diff --git a/SyliusShopBundle/views/Account/AddressBook/update.html.twig b/templates/bundles/SyliusShopBundle/Account/AddressBook/update.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/AddressBook/update.html.twig rename to templates/bundles/SyliusShopBundle/Account/AddressBook/update.html.twig diff --git a/SyliusShopBundle/views/Account/Menu/_content.html.twig b/templates/bundles/SyliusShopBundle/Account/Menu/_content.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Menu/_content.html.twig rename to templates/bundles/SyliusShopBundle/Account/Menu/_content.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Grid/Action/pay.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Grid/Action/pay.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Grid/Action/pay.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Grid/Action/pay.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Grid/Field/address.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Grid/Field/address.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Grid/Field/address.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Grid/Field/address.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Grid/Field/number.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Grid/Field/number.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Grid/Field/number.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Grid/Field/number.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Grid/Field/total.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Grid/Field/total.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Grid/Field/total.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Grid/Field/total.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Index/_breadcrumb.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Index/_breadcrumb.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Index/_breadcrumb.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Index/_breadcrumb.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Index/_header.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Index/_header.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Index/_header.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Index/_header.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Index/_subcontent.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Index/_subcontent.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Index/_subcontent.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Index/_subcontent.html.twig diff --git a/templates/bundles/SyliusShopBundle/Account/Order/Label/State/cancelled.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Label/State/cancelled.html.twig new file mode 100644 index 0000000..27ba54d --- /dev/null +++ b/templates/bundles/SyliusShopBundle/Account/Order/Label/State/cancelled.html.twig @@ -0,0 +1,3 @@ + + {{ value|trans }} + diff --git a/templates/bundles/SyliusShopBundle/Account/Order/Label/State/fulfilled.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Label/State/fulfilled.html.twig new file mode 100644 index 0000000..7dc899e --- /dev/null +++ b/templates/bundles/SyliusShopBundle/Account/Order/Label/State/fulfilled.html.twig @@ -0,0 +1,3 @@ + + {{ value|trans }} + diff --git a/templates/bundles/SyliusShopBundle/Account/Order/Label/State/new.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Label/State/new.html.twig new file mode 100644 index 0000000..d01173a --- /dev/null +++ b/templates/bundles/SyliusShopBundle/Account/Order/Label/State/new.html.twig @@ -0,0 +1,3 @@ + + {{ value|trans }} + diff --git a/SyliusShopBundle/views/Account/Order/Show/_breadcrumb.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Show/_breadcrumb.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/Show/_breadcrumb.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Show/_breadcrumb.html.twig diff --git a/SyliusShopBundle/views/Account/Order/Show/_header.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/Show/_header.html.twig similarity index 91% rename from SyliusShopBundle/views/Account/Order/Show/_header.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/Show/_header.html.twig index 9566690..c288b7c 100644 --- a/SyliusShopBundle/views/Account/Order/Show/_header.html.twig +++ b/templates/bundles/SyliusShopBundle/Account/Order/Show/_header.html.twig @@ -10,13 +10,13 @@
{{ order.checkoutCompletedAt|format_date }}
-
+
{% include [('@SyliusShop/Account/Order/Label/State' ~ '/' ~ order.state ~ '.html.twig'), '@SyliusUi/Label/_default.html.twig'] with {'value': ('sylius.ui.' ~ order.state)|trans} %}
-
+
{{ order.currencyCode }}
-
+
{{ flags.fromLocaleCode(order.localeCode) }}{{ order.localeCode|locale_name }}
diff --git a/SyliusShopBundle/views/Account/Order/index.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/index.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/index.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/index.html.twig diff --git a/SyliusShopBundle/views/Account/Order/show.html.twig b/templates/bundles/SyliusShopBundle/Account/Order/show.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/Order/show.html.twig rename to templates/bundles/SyliusShopBundle/Account/Order/show.html.twig diff --git a/SyliusShopBundle/views/Account/changePassword.html.twig b/templates/bundles/SyliusShopBundle/Account/changePassword.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/changePassword.html.twig rename to templates/bundles/SyliusShopBundle/Account/changePassword.html.twig diff --git a/SyliusShopBundle/views/Account/dashboard.html.twig b/templates/bundles/SyliusShopBundle/Account/dashboard.html.twig similarity index 94% rename from SyliusShopBundle/views/Account/dashboard.html.twig rename to templates/bundles/SyliusShopBundle/Account/dashboard.html.twig index 0ff6073..5e64b8e 100644 --- a/SyliusShopBundle/views/Account/dashboard.html.twig +++ b/templates/bundles/SyliusShopBundle/Account/dashboard.html.twig @@ -43,7 +43,7 @@ {{ sylius_template_event('sylius.shop.account.dashboard.after_information', {'customer': customer}) }} {% endblock %} diff --git a/SyliusShopBundle/views/Account/layout.html.twig b/templates/bundles/SyliusShopBundle/Account/layout.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/layout.html.twig rename to templates/bundles/SyliusShopBundle/Account/layout.html.twig diff --git a/SyliusShopBundle/views/Account/profileUpdate.html.twig b/templates/bundles/SyliusShopBundle/Account/profileUpdate.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/profileUpdate.html.twig rename to templates/bundles/SyliusShopBundle/Account/profileUpdate.html.twig diff --git a/SyliusShopBundle/views/Account/requestPasswordReset.html.twig b/templates/bundles/SyliusShopBundle/Account/requestPasswordReset.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/requestPasswordReset.html.twig rename to templates/bundles/SyliusShopBundle/Account/requestPasswordReset.html.twig diff --git a/SyliusShopBundle/views/Account/resetPassword.html.twig b/templates/bundles/SyliusShopBundle/Account/resetPassword.html.twig similarity index 100% rename from SyliusShopBundle/views/Account/resetPassword.html.twig rename to templates/bundles/SyliusShopBundle/Account/resetPassword.html.twig diff --git a/SyliusShopBundle/views/Cart/Summary/_checkout.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/Summary/_checkout.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_checkout.html.twig diff --git a/SyliusShopBundle/views/Cart/Summary/_coupon.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig similarity index 73% rename from SyliusShopBundle/views/Cart/Summary/_coupon.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig index 448539b..fa5b742 100644 --- a/SyliusShopBundle/views/Cart/Summary/_coupon.html.twig +++ b/templates/bundles/SyliusShopBundle/Cart/Summary/_coupon.html.twig @@ -1,8 +1,6 @@
{{ form_widget(form.promotionCoupon, sylius_test_form_attribute('cart-promotion-coupon-input')|sylius_merge_recursive({'attr': {'form': main_form, 'placeholder': 'sylius.ui.enter_your_code'|trans ~ '...'}})) }} -
- -
+
diff --git a/SyliusShopBundle/views/Cart/Summary/_header.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_header.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/Summary/_header.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_header.html.twig diff --git a/SyliusShopBundle/views/Cart/Summary/_item.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_item.html.twig similarity index 98% rename from SyliusShopBundle/views/Cart/Summary/_item.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_item.html.twig index 5cf76a6..bdfa137 100644 --- a/SyliusShopBundle/views/Cart/Summary/_item.html.twig +++ b/templates/bundles/SyliusShopBundle/Cart/Summary/_item.html.twig @@ -25,7 +25,7 @@ {{ form_widget(form.quantity, sylius_test_form_attribute('cart-item-quantity-input', item.productName)) }} - + {{ money.convertAndFormat(item.subtotal) }} diff --git a/SyliusShopBundle/views/Cart/Summary/_items.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_items.html.twig similarity index 92% rename from SyliusShopBundle/views/Cart/Summary/_items.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_items.html.twig index 93c645f..ab29fd1 100644 --- a/SyliusShopBundle/views/Cart/Summary/_items.html.twig +++ b/templates/bundles/SyliusShopBundle/Cart/Summary/_items.html.twig @@ -12,7 +12,7 @@ {{ 'sylius.ui.item'|trans }} {{ 'sylius.ui.unit_price'|trans }} {{ 'sylius.ui.qty'|trans }} - {{ 'sylius.ui.total'|trans }} + {{ 'sylius.ui.total'|trans }} @@ -29,7 +29,7 @@
{% endif %} -
+
{% include '@SyliusShop/Cart/Summary/_update.html.twig' with {'main_form': form.vars.id} %}
diff --git a/SyliusShopBundle/views/Cart/Summary/_suggestions.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_suggestions.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/Summary/_suggestions.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_suggestions.html.twig diff --git a/SyliusShopBundle/views/Cart/Summary/_totals.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_totals.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/Summary/_totals.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_totals.html.twig diff --git a/SyliusShopBundle/views/Cart/Summary/_update.html.twig b/templates/bundles/SyliusShopBundle/Cart/Summary/_update.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/Summary/_update.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Summary/_update.html.twig diff --git a/SyliusShopBundle/views/Cart/Widget/_button.html.twig b/templates/bundles/SyliusShopBundle/Cart/Widget/_button.html.twig similarity index 66% rename from SyliusShopBundle/views/Cart/Widget/_button.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Widget/_button.html.twig index 6f3f4db..0ac96f0 100644 --- a/SyliusShopBundle/views/Cart/Widget/_button.html.twig +++ b/templates/bundles/SyliusShopBundle/Cart/Widget/_button.html.twig @@ -5,7 +5,7 @@ data-toggle="dropdown" href="#" id="sylius-cart-total" {{ sylius_test_html_attribute('cart-total') }}> - {{ money.convertAndFormat(cart.itemsTotal) }} + {{ money.convertAndFormat(cart.itemsTotal) }} {{ icons.cart('h1 m-0') }} - {{ cart.items|length }} + {{ cart.items|length }} diff --git a/SyliusShopBundle/views/Cart/Widget/_popup.html.twig b/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig similarity index 87% rename from SyliusShopBundle/views/Cart/Widget/_popup.html.twig rename to templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig index d08dc86..198ad31 100644 --- a/SyliusShopBundle/views/Cart/Widget/_popup.html.twig +++ b/templates/bundles/SyliusShopBundle/Cart/Widget/_popup.html.twig @@ -10,7 +10,7 @@ {% for item in cart.items %} {{ item.product }} - + {{ item.quantity }} x {{ money.convertAndFormat(item.unitPrice) }} @@ -18,7 +18,7 @@ {% endfor %} {{ 'sylius.ui.subtotal'|trans }}: - {{ money.convertAndFormat(cart.itemsTotal) }} + {{ money.convertAndFormat(cart.itemsTotal) }} diff --git a/SyliusShopBundle/views/Cart/_widget.html.twig b/templates/bundles/SyliusShopBundle/Cart/_widget.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/_widget.html.twig rename to templates/bundles/SyliusShopBundle/Cart/_widget.html.twig diff --git a/SyliusShopBundle/views/Cart/summary.html.twig b/templates/bundles/SyliusShopBundle/Cart/summary.html.twig similarity index 100% rename from SyliusShopBundle/views/Cart/summary.html.twig rename to templates/bundles/SyliusShopBundle/Cart/summary.html.twig diff --git a/SyliusShopBundle/views/Checkout/Address/_addressBookSelect.html.twig b/templates/bundles/SyliusShopBundle/Checkout/Address/_addressBookSelect.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/Address/_addressBookSelect.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/Address/_addressBookSelect.html.twig diff --git a/SyliusShopBundle/views/Checkout/Address/_form.html.twig b/templates/bundles/SyliusShopBundle/Checkout/Address/_form.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/Address/_form.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/Address/_form.html.twig diff --git a/SyliusShopBundle/views/Checkout/Address/_navigation.html.twig b/templates/bundles/SyliusShopBundle/Checkout/Address/_navigation.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/Address/_navigation.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/Address/_navigation.html.twig diff --git a/SyliusShopBundle/views/Checkout/Complete/_form.html.twig b/templates/bundles/SyliusShopBundle/Checkout/Complete/_form.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/Complete/_form.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/Complete/_form.html.twig diff --git a/SyliusShopBundle/views/Checkout/Complete/_header.html.twig b/templates/bundles/SyliusShopBundle/Checkout/Complete/_header.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/Complete/_header.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/Complete/_header.html.twig diff --git a/SyliusShopBundle/views/Checkout/Complete/_navigation.html.twig b/templates/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig similarity index 85% rename from SyliusShopBundle/views/Checkout/Complete/_navigation.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig index 9d444b2..aae3e83 100644 --- a/SyliusShopBundle/views/Checkout/Complete/_navigation.html.twig +++ b/templates/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig @@ -1,4 +1,4 @@ -
+
diff --git a/SyliusShopBundle/views/Checkout/SelectPayment/_choice.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectPayment/_choice.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectPayment/_form.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_form.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectPayment/_form.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_form.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectPayment/_navigation.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_navigation.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectPayment/_navigation.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_navigation.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectPayment/_payment.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_payment.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectPayment/_payment.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_payment.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectPayment/_unavailable.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_unavailable.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectPayment/_unavailable.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectPayment/_unavailable.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectShipping/_choice.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_choice.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectShipping/_choice.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_choice.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectShipping/_form.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_form.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectShipping/_form.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_form.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectShipping/_navigation.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_navigation.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectShipping/_navigation.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_navigation.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectShipping/_shipment.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectShipping/_shipment.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_shipment.html.twig diff --git a/SyliusShopBundle/views/Checkout/SelectShipping/_unavailable.html.twig b/templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_unavailable.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/SelectShipping/_unavailable.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/SelectShipping/_unavailable.html.twig diff --git a/SyliusShopBundle/views/Checkout/_header.html.twig b/templates/bundles/SyliusShopBundle/Checkout/_header.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/_header.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/_header.html.twig diff --git a/SyliusShopBundle/views/Checkout/_steps.html.twig b/templates/bundles/SyliusShopBundle/Checkout/_steps.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/_steps.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/_steps.html.twig diff --git a/SyliusShopBundle/views/Checkout/_summary.html.twig b/templates/bundles/SyliusShopBundle/Checkout/_summary.html.twig similarity index 84% rename from SyliusShopBundle/views/Checkout/_summary.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/_summary.html.twig index 3c0ea76..26f5aa9 100644 --- a/SyliusShopBundle/views/Checkout/_summary.html.twig +++ b/templates/bundles/SyliusShopBundle/Checkout/_summary.html.twig @@ -9,18 +9,18 @@ {{ 'sylius.ui.item'|trans }} - {{ 'sylius.ui.quantity'|trans }} - {{ 'sylius.ui.subtotal'|trans }} + {{ 'sylius.ui.quantity'|trans }} + {{ 'sylius.ui.subtotal'|trans }} {% for item in order.items %} {{ item.getVariant.product.name }} - + {{ item.quantity }} - + {{ money.convertAndFormat(item.subtotal) }} @@ -31,7 +31,7 @@ {{ 'sylius.ui.items_total'|trans }}: - + {{ money.convertAndFormat(items_subtotal) }} @@ -39,7 +39,7 @@ {{ 'sylius.ui.taxes_total'|trans }}: - + {% if not tax_included and not tax_excluded %}
{{ money.convertAndFormat(0) }}
{% endif %} @@ -58,7 +58,7 @@ {{ 'sylius.ui.discount'|trans }}: - + {{ money.convertAndFormat(order.orderPromotionTotal) }} @@ -66,7 +66,7 @@ {{ 'sylius.ui.shipping_estimated_cost'|trans }}: - + {% if order.getAdjustmentsTotal('shipping') > order.shippingTotal %} {{ money.convertAndFormat(order.getAdjustmentsTotal('shipping')) }} {% endif %} @@ -77,7 +77,7 @@
{{ 'sylius.ui.order_total'|trans }}:
- +
{{ money.convertAndFormat(order.total) }}
diff --git a/SyliusShopBundle/views/Checkout/_support.html.twig b/templates/bundles/SyliusShopBundle/Checkout/_support.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/_support.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/_support.html.twig diff --git a/SyliusShopBundle/views/Checkout/address.html.twig b/templates/bundles/SyliusShopBundle/Checkout/address.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/address.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/address.html.twig diff --git a/SyliusShopBundle/views/Checkout/complete.html.twig b/templates/bundles/SyliusShopBundle/Checkout/complete.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/complete.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/complete.html.twig diff --git a/SyliusShopBundle/views/Checkout/layout.html.twig b/templates/bundles/SyliusShopBundle/Checkout/layout.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/layout.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/layout.html.twig diff --git a/SyliusShopBundle/views/Checkout/selectPayment.html.twig b/templates/bundles/SyliusShopBundle/Checkout/selectPayment.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/selectPayment.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/selectPayment.html.twig diff --git a/SyliusShopBundle/views/Checkout/selectShipping.html.twig b/templates/bundles/SyliusShopBundle/Checkout/selectShipping.html.twig similarity index 100% rename from SyliusShopBundle/views/Checkout/selectShipping.html.twig rename to templates/bundles/SyliusShopBundle/Checkout/selectShipping.html.twig diff --git a/SyliusShopBundle/views/Common/Form/_address.html.twig b/templates/bundles/SyliusShopBundle/Common/Form/_address.html.twig similarity index 89% rename from SyliusShopBundle/views/Common/Form/_address.html.twig rename to templates/bundles/SyliusShopBundle/Common/Form/_address.html.twig index 62b5b91..c055a5b 100644 --- a/SyliusShopBundle/views/Common/Form/_address.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Form/_address.html.twig @@ -13,7 +13,7 @@ {% include '@SyliusShop/Common/Form/_countryCode.html.twig' with {'form': form.countryCode} %} -
+
{% if form.provinceCode is defined %} {{ form_row(form.provinceCode, sylius_test_form_attribute('province-code')|sylius_merge_recursive({'attr': {'class': 'ui dropdown'}})) }} {% elseif form.provinceName is defined %} diff --git a/SyliusShopBundle/views/Common/Form/_countryCode.html.twig b/templates/bundles/SyliusShopBundle/Common/Form/_countryCode.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Form/_countryCode.html.twig rename to templates/bundles/SyliusShopBundle/Common/Form/_countryCode.html.twig diff --git a/SyliusShopBundle/views/Common/Form/_login.html.twig b/templates/bundles/SyliusShopBundle/Common/Form/_login.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Form/_login.html.twig rename to templates/bundles/SyliusShopBundle/Common/Form/_login.html.twig diff --git a/SyliusShopBundle/views/Common/Form/_province.html.twig b/templates/bundles/SyliusShopBundle/Common/Form/_province.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Form/_province.html.twig rename to templates/bundles/SyliusShopBundle/Common/Form/_province.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/buttons.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/buttons.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/buttons.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/buttons.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/headers.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/headers.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/headers.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/headers.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/icons.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/icons.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/icons.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/icons.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/labels.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/labels.html.twig similarity index 80% rename from SyliusShopBundle/views/Common/Macro/labels.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/labels.html.twig index 81eb054..2683d97 100644 --- a/SyliusShopBundle/views/Common/Macro/labels.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Macro/labels.html.twig @@ -1,5 +1,5 @@ {% macro default(text) %} - {{ text|trans }} + {{ text|trans }} {% endmacro %} {% macro status(status) %} @@ -13,14 +13,14 @@ {% endmacro %} {% macro enabled() %} - + {{ 'sylius.ui.enabled'|trans }} {% endmacro %} {% macro disabled() %} - + {{ 'sylius.ui.disabled'|trans }} @@ -37,14 +37,14 @@ {% endmacro %} {% macro yes() %} - + {{ 'sylius.ui.yes_label'|trans }} {% endmacro %} {% macro no() %} - + {{ 'sylius.ui.no_label'|trans }} diff --git a/SyliusShopBundle/views/Common/Macro/messages.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/messages.html.twig similarity index 96% rename from SyliusShopBundle/views/Common/Macro/messages.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/messages.html.twig index 0a4245d..4f36901 100644 --- a/SyliusShopBundle/views/Common/Macro/messages.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Macro/messages.html.twig @@ -1,7 +1,7 @@ {% macro default(message, icon, type, header) %}
- + {{ icon }} diff --git a/SyliusShopBundle/views/Common/Macro/money.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/money.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/money.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/money.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/pagination.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/pagination.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/pagination.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/pagination.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/sectionHeaders.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/sectionHeaders.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/sectionHeaders.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/sectionHeaders.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/sorting.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/sorting.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/sorting.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/sorting.html.twig diff --git a/SyliusShopBundle/views/Common/Macro/table.html.twig b/templates/bundles/SyliusShopBundle/Common/Macro/table.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Macro/table.html.twig rename to templates/bundles/SyliusShopBundle/Common/Macro/table.html.twig diff --git a/SyliusShopBundle/views/Common/Order/Label/PaymentState/orderPaymentState.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Label/PaymentState/orderPaymentState.html.twig similarity index 92% rename from SyliusShopBundle/views/Common/Order/Label/PaymentState/orderPaymentState.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Label/PaymentState/orderPaymentState.html.twig index 131ec6c..45d0583 100644 --- a/SyliusShopBundle/views/Common/Order/Label/PaymentState/orderPaymentState.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/Label/PaymentState/orderPaymentState.html.twig @@ -12,7 +12,7 @@ {% set value = 'sylius.ui.' ~ state %} - + {{ 'sylius.ui.state'|trans }}: {{ value|trans }} diff --git a/SyliusShopBundle/views/Common/Order/Label/PaymentState/singlePaymentState.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Label/PaymentState/singlePaymentState.html.twig similarity index 90% rename from SyliusShopBundle/views/Common/Order/Label/PaymentState/singlePaymentState.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Label/PaymentState/singlePaymentState.html.twig index 88a429d..d36619d 100644 --- a/SyliusShopBundle/views/Common/Order/Label/PaymentState/singlePaymentState.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/Label/PaymentState/singlePaymentState.html.twig @@ -11,7 +11,7 @@ {% set value = 'sylius.ui.' ~ state %} - + {{ value|trans }} diff --git a/SyliusShopBundle/views/Common/Order/Label/ShipmentState/orderShipmentState.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Label/ShipmentState/orderShipmentState.html.twig similarity index 90% rename from SyliusShopBundle/views/Common/Order/Label/ShipmentState/orderShipmentState.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Label/ShipmentState/orderShipmentState.html.twig index 6b1c3f6..5cf4ad9 100644 --- a/SyliusShopBundle/views/Common/Order/Label/ShipmentState/orderShipmentState.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/Label/ShipmentState/orderShipmentState.html.twig @@ -9,7 +9,7 @@ {% set value = 'sylius.ui.' ~ state %} - + {{ 'sylius.ui.state'|trans }}: {{ value|trans }} diff --git a/SyliusShopBundle/views/Common/Order/Label/ShipmentState/singleShipmentState.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Label/ShipmentState/singleShipmentState.html.twig similarity index 85% rename from SyliusShopBundle/views/Common/Order/Label/ShipmentState/singleShipmentState.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Label/ShipmentState/singleShipmentState.html.twig index f0dc4df..1bf6dcb 100644 --- a/SyliusShopBundle/views/Common/Order/Label/ShipmentState/singleShipmentState.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/Label/ShipmentState/singleShipmentState.html.twig @@ -8,7 +8,7 @@ {% set value = 'sylius.ui.' ~ state %} - + {{ value|trans }} diff --git a/templates/bundles/SyliusShopBundle/Common/Order/Table/_headers.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Table/_headers.html.twig new file mode 100644 index 0000000..fc256d6 --- /dev/null +++ b/templates/bundles/SyliusShopBundle/Common/Order/Table/_headers.html.twig @@ -0,0 +1,6 @@ + + {{ 'sylius.ui.item'|trans }} + {{ 'sylius.ui.unit_price'|trans }} + {{ 'sylius.ui.qty'|trans }} + {{ 'sylius.ui.subtotal'|trans }} + diff --git a/SyliusShopBundle/views/Common/Order/Table/_item.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Table/_item.html.twig similarity index 89% rename from SyliusShopBundle/views/Common/Order/Table/_item.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Table/_item.html.twig index ccff2b8..747d360 100644 --- a/SyliusShopBundle/views/Common/Order/Table/_item.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/Table/_item.html.twig @@ -5,7 +5,7 @@ {% include '@SyliusShop/Product/_info.html.twig' with {'variant': item.variant} %} - + {% if item.unitPrice != item.discountedUnitPrice %} {{ money.convertAndFormat(item.unitPrice) }} {% endif %} @@ -18,6 +18,6 @@ {% endif %} - {{ item.quantity }} - {{ money.convertAndFormat(item.subtotal) }} + {{ item.quantity }} + {{ money.convertAndFormat(item.subtotal) }} diff --git a/SyliusShopBundle/views/Common/Order/Table/_items.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Table/_items.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Order/Table/_items.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Table/_items.html.twig diff --git a/SyliusShopBundle/views/Common/Order/Table/_promotion.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Table/_promotion.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Order/Table/_promotion.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Table/_promotion.html.twig diff --git a/SyliusShopBundle/views/Common/Order/Table/_shipping.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Table/_shipping.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Order/Table/_shipping.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Table/_shipping.html.twig diff --git a/SyliusShopBundle/views/Common/Order/Table/_totals.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/Table/_totals.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Order/Table/_totals.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/Table/_totals.html.twig diff --git a/SyliusShopBundle/views/Common/Order/_addresses.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/_addresses.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Order/_addresses.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/_addresses.html.twig diff --git a/SyliusShopBundle/views/Common/Order/_payments.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/_payments.html.twig similarity index 94% rename from SyliusShopBundle/views/Common/Order/_payments.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/_payments.html.twig index d908abc..460298d 100644 --- a/SyliusShopBundle/views/Common/Order/_payments.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/_payments.html.twig @@ -7,7 +7,7 @@
-
{{ icons.creditCard() }}
+
{{ icons.creditCard() }}
{{ payment.method }} diff --git a/SyliusShopBundle/views/Common/Order/_shipments.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig similarity index 93% rename from SyliusShopBundle/views/Common/Order/_shipments.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig index cc2087c..1dfa266 100644 --- a/SyliusShopBundle/views/Common/Order/_shipments.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/_shipments.html.twig @@ -6,7 +6,7 @@
-
{{ icons.transport() }}
+
{{ icons.transport() }}
{{ shipment.method }} diff --git a/SyliusShopBundle/views/Common/Order/_summary.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/_summary.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/Order/_summary.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/_summary.html.twig diff --git a/SyliusShopBundle/views/Common/Order/_table.html.twig b/templates/bundles/SyliusShopBundle/Common/Order/_table.html.twig similarity index 92% rename from SyliusShopBundle/views/Common/Order/_table.html.twig rename to templates/bundles/SyliusShopBundle/Common/Order/_table.html.twig index 0745ff0..0ccab57 100644 --- a/SyliusShopBundle/views/Common/Order/_table.html.twig +++ b/templates/bundles/SyliusShopBundle/Common/Order/_table.html.twig @@ -5,7 +5,7 @@ {% include '@SyliusShop/Common/Order/Table/_items.html.twig' %} - + {% include '@SyliusShop/Common/Order/Table/_totals.html.twig' %} diff --git a/SyliusShopBundle/views/Common/_address.html.twig b/templates/bundles/SyliusShopBundle/Common/_address.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/_address.html.twig rename to templates/bundles/SyliusShopBundle/Common/_address.html.twig diff --git a/SyliusShopBundle/views/Common/_rating.html.twig b/templates/bundles/SyliusShopBundle/Common/_rating.html.twig similarity index 100% rename from SyliusShopBundle/views/Common/_rating.html.twig rename to templates/bundles/SyliusShopBundle/Common/_rating.html.twig diff --git a/SyliusShopBundle/views/Contact/request.html.twig b/templates/bundles/SyliusShopBundle/Contact/request.html.twig similarity index 100% rename from SyliusShopBundle/views/Contact/request.html.twig rename to templates/bundles/SyliusShopBundle/Contact/request.html.twig diff --git a/SyliusShopBundle/views/Email/contactRequest.html.twig b/templates/bundles/SyliusShopBundle/Email/contactRequest.html.twig similarity index 100% rename from SyliusShopBundle/views/Email/contactRequest.html.twig rename to templates/bundles/SyliusShopBundle/Email/contactRequest.html.twig diff --git a/SyliusShopBundle/views/Email/orderConfirmation.html.twig b/templates/bundles/SyliusShopBundle/Email/orderConfirmation.html.twig similarity index 100% rename from SyliusShopBundle/views/Email/orderConfirmation.html.twig rename to templates/bundles/SyliusShopBundle/Email/orderConfirmation.html.twig diff --git a/SyliusShopBundle/views/Email/passwordReset.html.twig b/templates/bundles/SyliusShopBundle/Email/passwordReset.html.twig similarity index 100% rename from SyliusShopBundle/views/Email/passwordReset.html.twig rename to templates/bundles/SyliusShopBundle/Email/passwordReset.html.twig diff --git a/SyliusShopBundle/views/Email/userRegistration.html.twig b/templates/bundles/SyliusShopBundle/Email/userRegistration.html.twig similarity index 100% rename from SyliusShopBundle/views/Email/userRegistration.html.twig rename to templates/bundles/SyliusShopBundle/Email/userRegistration.html.twig diff --git a/SyliusShopBundle/views/Email/verification.html.twig b/templates/bundles/SyliusShopBundle/Email/verification.html.twig similarity index 100% rename from SyliusShopBundle/views/Email/verification.html.twig rename to templates/bundles/SyliusShopBundle/Email/verification.html.twig diff --git a/templates/bundles/SyliusShopBundle/Form/theme.html.twig b/templates/bundles/SyliusShopBundle/Form/theme.html.twig new file mode 100644 index 0000000..3ccff5e --- /dev/null +++ b/templates/bundles/SyliusShopBundle/Form/theme.html.twig @@ -0,0 +1 @@ +{% extends 'bootstrap_5_layout.html.twig' %} diff --git a/SyliusShopBundle/views/Grid/Action/show.html.twig b/templates/bundles/SyliusShopBundle/Grid/Action/show.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Action/show.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Action/show.html.twig diff --git a/SyliusShopBundle/views/Grid/Filter/boolean.html.twig b/templates/bundles/SyliusShopBundle/Grid/Filter/boolean.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Filter/boolean.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Filter/boolean.html.twig diff --git a/SyliusShopBundle/views/Grid/Filter/date.html.twig b/templates/bundles/SyliusShopBundle/Grid/Filter/date.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Filter/date.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Filter/date.html.twig diff --git a/SyliusShopBundle/views/Grid/Filter/entity.html.twig b/templates/bundles/SyliusShopBundle/Grid/Filter/entity.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Filter/entity.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Filter/entity.html.twig diff --git a/SyliusShopBundle/views/Grid/Filter/exists.html.twig b/templates/bundles/SyliusShopBundle/Grid/Filter/exists.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Filter/exists.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Filter/exists.html.twig diff --git a/SyliusShopBundle/views/Grid/Filter/money.html.twig b/templates/bundles/SyliusShopBundle/Grid/Filter/money.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Filter/money.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Filter/money.html.twig diff --git a/SyliusShopBundle/views/Grid/Filter/string.html.twig b/templates/bundles/SyliusShopBundle/Grid/Filter/string.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/Filter/string.html.twig rename to templates/bundles/SyliusShopBundle/Grid/Filter/string.html.twig diff --git a/SyliusShopBundle/views/Grid/_default.html.twig b/templates/bundles/SyliusShopBundle/Grid/_default.html.twig similarity index 100% rename from SyliusShopBundle/views/Grid/_default.html.twig rename to templates/bundles/SyliusShopBundle/Grid/_default.html.twig diff --git a/SyliusShopBundle/views/Homepage/_aboutUs.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_aboutUs.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_aboutUs.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_aboutUs.html.twig diff --git a/SyliusShopBundle/views/Homepage/_banner.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_banner.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_banner.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_banner.html.twig diff --git a/SyliusShopBundle/views/Homepage/_carousel.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_carousel.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_carousel.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_carousel.html.twig diff --git a/SyliusShopBundle/views/Homepage/_latestProducts.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_latestProducts.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_latestProducts.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_latestProducts.html.twig diff --git a/SyliusShopBundle/views/Homepage/_latestProductsCarousel.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_latestProductsCarousel.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_latestProductsCarousel.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_latestProductsCarousel.html.twig diff --git a/SyliusShopBundle/views/Homepage/_list.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_list.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_list.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_list.html.twig diff --git a/SyliusShopBundle/views/Homepage/_newsletter.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_newsletter.html.twig similarity index 95% rename from SyliusShopBundle/views/Homepage/_newsletter.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_newsletter.html.twig index f31c8d4..5330282 100644 --- a/SyliusShopBundle/views/Homepage/_newsletter.html.twig +++ b/templates/bundles/SyliusShopBundle/Homepage/_newsletter.html.twig @@ -7,7 +7,7 @@
-
+
diff --git a/SyliusShopBundle/views/Homepage/_productsGrid.html.twig b/templates/bundles/SyliusShopBundle/Homepage/_productsGrid.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/_productsGrid.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/_productsGrid.html.twig diff --git a/SyliusShopBundle/views/Homepage/index.html.twig b/templates/bundles/SyliusShopBundle/Homepage/index.html.twig similarity index 100% rename from SyliusShopBundle/views/Homepage/index.html.twig rename to templates/bundles/SyliusShopBundle/Homepage/index.html.twig diff --git a/SyliusShopBundle/views/Layout/Footer/Grid/_customer_care.html.twig b/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_customer_care.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Footer/Grid/_customer_care.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_customer_care.html.twig diff --git a/SyliusShopBundle/views/Layout/Footer/Grid/_payment_methods.html.twig b/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_payment_methods.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Footer/Grid/_payment_methods.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_payment_methods.html.twig diff --git a/SyliusShopBundle/views/Layout/Footer/Grid/_plus.html.twig b/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_plus.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Footer/Grid/_plus.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_plus.html.twig diff --git a/SyliusShopBundle/views/Layout/Footer/Grid/_your_store.html.twig b/templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_your_store.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Footer/Grid/_your_store.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Footer/Grid/_your_store.html.twig diff --git a/SyliusShopBundle/views/Layout/Footer/_content.html.twig b/templates/bundles/SyliusShopBundle/Layout/Footer/_content.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Footer/_content.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Footer/_content.html.twig diff --git a/SyliusShopBundle/views/Layout/Footer/_grid.html.twig b/templates/bundles/SyliusShopBundle/Layout/Footer/_grid.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Footer/_grid.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Footer/_grid.html.twig diff --git a/SyliusShopBundle/views/Layout/Header/_cart.html.twig b/templates/bundles/SyliusShopBundle/Layout/Header/_cart.html.twig similarity index 88% rename from SyliusShopBundle/views/Layout/Header/_cart.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Header/_cart.html.twig index 9a53b08..fbb4d7a 100644 --- a/SyliusShopBundle/views/Layout/Header/_cart.html.twig +++ b/templates/bundles/SyliusShopBundle/Layout/Header/_cart.html.twig @@ -1,5 +1,5 @@
-
+
{{ render(url('sylius_shop_partial_cart_summary', {'template': '@SyliusShop/Cart/_widget.html.twig'})) }}
diff --git a/SyliusShopBundle/views/Layout/Header/_content.html.twig b/templates/bundles/SyliusShopBundle/Layout/Header/_content.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Header/_content.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Header/_content.html.twig diff --git a/SyliusShopBundle/views/Layout/Header/_logo.html.twig b/templates/bundles/SyliusShopBundle/Layout/Header/_logo.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Header/_logo.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Header/_logo.html.twig diff --git a/SyliusShopBundle/views/Layout/Header/_menu.html.twig b/templates/bundles/SyliusShopBundle/Layout/Header/_menu.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Header/_menu.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Header/_menu.html.twig diff --git a/SyliusShopBundle/views/Layout/Topbar/_currencySwitcher.html.twig b/templates/bundles/SyliusShopBundle/Layout/Topbar/_currencySwitcher.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Topbar/_currencySwitcher.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Topbar/_currencySwitcher.html.twig diff --git a/SyliusShopBundle/views/Layout/Topbar/_localeSwitcher.html.twig b/templates/bundles/SyliusShopBundle/Layout/Topbar/_localeSwitcher.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Topbar/_localeSwitcher.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Topbar/_localeSwitcher.html.twig diff --git a/SyliusShopBundle/views/Layout/Topbar/_securityWidget.html.twig b/templates/bundles/SyliusShopBundle/Layout/Topbar/_securityWidget.html.twig similarity index 100% rename from SyliusShopBundle/views/Layout/Topbar/_securityWidget.html.twig rename to templates/bundles/SyliusShopBundle/Layout/Topbar/_securityWidget.html.twig diff --git a/SyliusShopBundle/views/Login/_form.html.twig b/templates/bundles/SyliusShopBundle/Login/_form.html.twig similarity index 100% rename from SyliusShopBundle/views/Login/_form.html.twig rename to templates/bundles/SyliusShopBundle/Login/_form.html.twig diff --git a/SyliusShopBundle/views/Login/_header.html.twig b/templates/bundles/SyliusShopBundle/Login/_header.html.twig similarity index 100% rename from SyliusShopBundle/views/Login/_header.html.twig rename to templates/bundles/SyliusShopBundle/Login/_header.html.twig diff --git a/SyliusShopBundle/views/Login/_login.html.twig b/templates/bundles/SyliusShopBundle/Login/_login.html.twig similarity index 100% rename from SyliusShopBundle/views/Login/_login.html.twig rename to templates/bundles/SyliusShopBundle/Login/_login.html.twig diff --git a/SyliusShopBundle/views/Login/_register.html.twig b/templates/bundles/SyliusShopBundle/Login/_register.html.twig similarity index 100% rename from SyliusShopBundle/views/Login/_register.html.twig rename to templates/bundles/SyliusShopBundle/Login/_register.html.twig diff --git a/SyliusShopBundle/views/Menu/_currencySwitch.html.twig b/templates/bundles/SyliusShopBundle/Menu/_currencySwitch.html.twig similarity index 100% rename from SyliusShopBundle/views/Menu/_currencySwitch.html.twig rename to templates/bundles/SyliusShopBundle/Menu/_currencySwitch.html.twig diff --git a/SyliusShopBundle/views/Menu/_localeSwitch.html.twig b/templates/bundles/SyliusShopBundle/Menu/_localeSwitch.html.twig similarity index 100% rename from SyliusShopBundle/views/Menu/_localeSwitch.html.twig rename to templates/bundles/SyliusShopBundle/Menu/_localeSwitch.html.twig diff --git a/SyliusShopBundle/views/Menu/_security.html.twig b/templates/bundles/SyliusShopBundle/Menu/_security.html.twig similarity index 97% rename from SyliusShopBundle/views/Menu/_security.html.twig rename to templates/bundles/SyliusShopBundle/Menu/_security.html.twig index 6f1e88a..e85e5ee 100644 --- a/SyliusShopBundle/views/Menu/_security.html.twig +++ b/templates/bundles/SyliusShopBundle/Menu/_security.html.twig @@ -1,4 +1,4 @@ -
{% endif %} - diff --git a/templates/bundles/SyliusShopBundle/Menu/_security.html.twig b/templates/bundles/SyliusShopBundle/Menu/_security.html.twig index b6637ce..f4abbba 100644 --- a/templates/bundles/SyliusShopBundle/Menu/_security.html.twig +++ b/templates/bundles/SyliusShopBundle/Menu/_security.html.twig @@ -1,24 +1,59 @@ - - +
diff --git a/templates/bundles/SyliusShopBundle/Product/Box/_content.html.twig b/templates/bundles/SyliusShopBundle/Product/Box/_content.html.twig index c3a4da5..2aa3b3f 100644 --- a/templates/bundles/SyliusShopBundle/Product/Box/_content.html.twig +++ b/templates/bundles/SyliusShopBundle/Product/Box/_content.html.twig @@ -1,16 +1,22 @@ {% import "@SyliusShop/Common/Macro/money.html.twig" as money %} -
+
{% include '@SyliusShop/Product/_mainImage.html.twig' with {'product': product, 'class': 'card-img-top'} %} -
-
{{ product.name }}
+ +
+
+ + {{ product.name }} + +
+ {% if not product.variants.empty() %} - - {{ money.calculatePrice(product|sylius_resolve_variant) }} | + + {{ money.calculatePrice(product|sylius_resolve_variant) }} {% endif %} - {{ 'sylius.ui.view_more'|trans }} +
diff --git a/templates/bundles/SyliusShopBundle/Product/_box.html.twig b/templates/bundles/SyliusShopBundle/Product/_box.html.twig index dd260e1..b941647 100644 --- a/templates/bundles/SyliusShopBundle/Product/_box.html.twig +++ b/templates/bundles/SyliusShopBundle/Product/_box.html.twig @@ -1 +1,2 @@ -{{ sylius_template_event('sylius.shop.product.index.box', {'product': product}) }} +{{ sylius_template_event('sylius.shop.product.index.box', {'product': product, role: role|default('')}) }} + diff --git a/templates/bundles/SyliusShopBundle/Product/_mainImage.html.twig b/templates/bundles/SyliusShopBundle/Product/_mainImage.html.twig index 988b199..54f3ed5 100644 --- a/templates/bundles/SyliusShopBundle/Product/_mainImage.html.twig +++ b/templates/bundles/SyliusShopBundle/Product/_mainImage.html.twig @@ -3,7 +3,10 @@ {% elseif product.images.first %} {% set path = product.images.first.path|imagine_filter(filter|default('sylius_shop_product_thumbnail')) %} {% else %} - {% set path = '//placehold.it/200x200' %} {% endif %} + {% set size = random(5) * 200 %} + {% set path = "https://picsum.photos/#{ size }/#{ size }.jpg" %} -{{ product.name }} +
+ {{ product.name }} +
\ No newline at end of file diff --git a/templates/bundles/SyliusShopBundle/Taxon/_horizontalMenu.html.twig b/templates/bundles/SyliusShopBundle/Taxon/_horizontalMenu.html.twig index 818e30a..e15819e 100644 --- a/templates/bundles/SyliusShopBundle/Taxon/_horizontalMenu.html.twig +++ b/templates/bundles/SyliusShopBundle/Taxon/_horizontalMenu.html.twig @@ -8,24 +8,38 @@ {% else %} -
  • - {{ taxon.name }} +
  • {% endif %} {% endmacro %} +{% macro dropdownItem(taxon) %} +
  • + + {{ taxon.name }} + +
  • +{% endmacro %} + {% import _self as macros %} {% if taxons|length > 0 %}