Skip to content

Commit

Permalink
DmfManuTheme v2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
proj-dmf committed May 26, 2021
2 parents 6d668bd + 413760d commit 1bbeeb7
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 17 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 2.0.1
- Fixed js error if wishlist is not enabled

# 2.0.0
- Corrected layout 'Search as icon / Navigation bottom'
- Corrected text align in search field suggestions
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG_de-DE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 2.0.1
- Fix für javascript Fehler wenn Merkzettel nicht aktiviert ist

# 2.0.0
- Die Variante 'Suche als Icon / Navigation Unterhalb' wurde korrigiert
- Textausrichtung bei Vorschlägen im Suchfeld korrigiert
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dmf/sw6-manu-theme",
"description": "Manu Theme",
"version": "2.0.0",
"version": "2.0.1",
"type": "shopware-platform-plugin",
"authors": [
{
Expand Down

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/Resources/app/storefront/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ PluginManager.register('NewsletterPrivacy', NewsletterPrivacy, '.footer-newslett
PluginManager.register('InputSpinner', InputSpinner, '[data-input-spinner]');
PluginManager.register('TogglePassword', TogglePassword, '[data-toggle-password]');
PluginManager.register('RegisterExpand', RegisterExpand, '[data-register-expand]');
PluginManager.override('WishlistWidget', ExtendedWishlistWidgetPlugin, '[data-wishlist-widget]');

if (window.wishlistEnabled) {
PluginManager.override('WishlistWidget', ExtendedWishlistWidgetPlugin, '[data-wishlist-widget]');
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{% endblock %}

{% block component_address_personal_fields_title %}
{% if shopware.config.core.loginRegistration.showTitleField %}
{% if config('core.loginRegistration.showTitleField') %}
<div class="form-group col-md-4">
{% block component_address_personal_fields_title_label %}
{{ parent() }}
Expand Down Expand Up @@ -97,15 +97,15 @@
{% if showBirthdayField %}
{% block component_address_personal_fields_birthday_label %}
<label for="{{ prefix }}personalBirthday">
{{ "account.personalBirthdayLabel"|trans|sw_sanitize }}{{ shopware.config.core.loginRegistration.birthdayFieldRequired ? "general.required"|trans|sw_sanitize }}
{{ "account.personalBirthdayLabel"|trans|sw_sanitize }}{{ config('core.loginRegistration.birthdayFieldRequired') ? "general.required"|trans|sw_sanitize }}
</label>
{% endblock %}

{% block component_address_personal_fields_birthday_selects %}
<div class="form-row">
{% block component_address_personal_fields_birthday_select_day %}
<div class="form-group col-md-4">
<select id="{{ prefix }}personalBirthday" name="{% if prefix %}{{ prefix }}[birthdayDay]{% else %}birthdayDay{% endif %}" class="custom-select{% if formViolations.getViolations('/birthdayDay') is not empty %} is-invalid{% endif %}" {{ shopware.config.core.loginRegistration.birthdayFieldRequired ? 'required="required"' }}>
<select id="{{ prefix }}personalBirthday" name="{% if prefix %}{{ prefix }}[birthdayDay]{% else %}birthdayDay{% endif %}" class="custom-select{% if formViolations.getViolations('/birthdayDay') is not empty %} is-invalid{% endif %}" {{ config('core.loginRegistration.birthdayFieldRequired') ? 'required="required"' }}>
{% if not data.get('birthdayDay') %}
<option selected="selected" value="">
{{ "account.personalBirthdaySelectDay"|trans|sw_sanitize }}
Expand All @@ -126,7 +126,7 @@

{% block component_address_personal_fields_birthday_select_month %}
<div class="form-group col-md-4">
<select name="{% if prefix %}{{ prefix }}[birthdayMonth]{% else %}birthdayMonth{% endif %}" class="custom-select{% if formViolations.getViolations('/birthdayMonth') is not empty %} is-invalid{% endif %}" {{ shopware.config.core.loginRegistration.birthdayFieldRequired ? 'required="required"' }}>
<select name="{% if prefix %}{{ prefix }}[birthdayMonth]{% else %}birthdayMonth{% endif %}" class="custom-select{% if formViolations.getViolations('/birthdayMonth') is not empty %} is-invalid{% endif %}" {{ config('core.loginRegistration.birthdayFieldRequired') ? 'required="required"' }}>
{% if not data.get('birthdayMonth') %}
<option selected="selected" value="">
{{ "account.personalBirthdaySelectMonth"|trans|sw_sanitize }}
Expand All @@ -150,7 +150,7 @@
{% set currentYear = "now"|date('Y') %}
{% set startYear = currentYear - 120 %}

<select name="{% if prefix %}{{ prefix }}[birthdayYear]{% else %}birthdayYear{% endif %}" class="custom-select{% if formViolations.getViolations('/birthdayYear') is not empty %} is-invalid{% endif %}" {{ shopware.config.core.loginRegistration.birthdayFieldRequired ? 'required="required"' }}>
<select name="{% if prefix %}{{ prefix }}[birthdayYear]{% else %}birthdayYear{% endif %}" class="custom-select{% if formViolations.getViolations('/birthdayYear') is not empty %} is-invalid{% endif %}" {{ config('core.loginRegistration.birthdayFieldRequired') ? 'required="required"' }}>
{% if not data.get('birthdayYear') %}
<option selected="selected" value="">
{{ "account.personalBirthdaySelectYear"|trans|sw_sanitize }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{% if theme_config('dmf-breadcrumb-home-icon-label') == "icon" %}
{% sw_icon 'shop' style { 'size': '1rem', 'pack': 'default'} %}
{% else %}
{{ shopware.config.core.basicInformation.shopName }}
{{ config('core.basicInformation.shopName') }}
{% endif %}
</a>
<div class="breadcrumb-placeholder">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
{% block component_product_box_info %}
<div class="col-12 col-md-8 justify-content-center product-info">
{% block component_product_box_rating %}
{% if shopware.config.core.listing.showReview %}
{% if config('core.listing.showReview') %}
{% if product.ratingAverage %}
<div class="product-rating">
{% sw_include '@Storefront/storefront/component/review/rating.html.twig' with {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</div>
<div class="footer-contact-form">
{{ 'footer.serviceContactLink'|trans({
'%url%': path('frontend.cms.page', { id: shopware.config.core.basicInformation.contactPage })
'%url%': path('frontend.cms.page', { id: config('core.basicInformation.contactPage') })
})|raw }}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{% endblock %}

{% block component_address_personal_fields_title %}
{% if shopware.config.core.loginRegistration.showTitleField %}
{% if config('core.loginRegistration.showTitleField') %}
<div class="form-group col-12">
{% block component_address_personal_fields_title_label %}
{{ parent() }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
{% if quantityInformation.maxPurchase %}
{% set maxQuantity = quantityInformation.maxPurchase %}
{% else %}
{% set maxQuantity = shopware.config.core.cart.maxQuantity %}
{% set maxQuantity = config('core.cart.maxQuantity') %}
{% endif %}

{% block page_product_detail_buy_quantity %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
{% endblock %}

{% block page_product_detail_accordion_reviews %}
{% if shopware.config.core.listing.showReview %}
{% if config('core.listing.showReview') %}
<div class="card card-accordion card-accordion-reviews">
{% block page_product_detail_accordion_reviews_header %}
<div class="card-header card-accordion-header" id="headingReviews">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</li>
{% endblock %}
{% block page_product_detail_anchors_navigation_review %}
{% if shopware.config.core.listing.showReview %}
{% if config('core.listing.showReview') %}
<li class="nav-item">
<a class="nav-link product-detail-anchor-navigation-link"
href="#review-tab-pane">
Expand All @@ -41,7 +41,7 @@
{% endblock %}

{% block page_product_detail_anchors_content_review %}
{% if shopware.config.core.listing.showReview %}
{% if config('core.listing.showReview') %}
<span class="product-detail-anchor-title"
id="review-tab-pane">{{ "detail.tabsReview"|trans|sw_sanitize }}</span>
<div class="anchor-pane">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
scrollToElement: true
} %}

{% if page.product.ratingAverage > 0 and shopware.config.core.listing.showReview %}
{% if page.product.ratingAverage > 0 and config('core.listing.showReview') %}
<p class="product-detail-reviews">
{% sw_include '@Storefront/storefront/component/review/rating.html.twig' with {
points: page.product.ratingAverage,
Expand Down

0 comments on commit 1bbeeb7

Please sign in to comment.