Skip to content
This repository has been archived by the owner on May 5, 2022. It is now read-only.

Commit

Permalink
Features scriban migration #79 (#90)
Browse files Browse the repository at this point in the history
* Changes to run theme in scriban templating engine

* Remove named arguments for all pipe functions calls  (not supported in current scriban template engine)
Remove arguments for all Include statements
Replace  == blank  to .empty? == false check

* Remove AJAX load for product prices
Update theme to work with new data context (not finished)

* Changes in syntax to run theme with scriban

* Removed custom order collections by 'all-collections' linklist,
scriban syntax fix

* Sing in link shoing in header. solved. #83

* collection-sidebar.liquid problem was resolved.

* Problem "Images and prices for products are not showing" was resolved.
#87

* Added indents

* Product search functionality is repaired

* left code n comments was deleted

* product price actual price showing in search and collectiono-list pages

* price product snipped was extracted from prduct-grid-item, product-list-item and search-result-grid snippets Due to eliminate duplication

* small fix in search.liquid

* migration of localization files

* static page showing was fixed

* properly date showing in blogs page. also corrected another usings of dates filters in  liquid and angular markaups

* anonymous checkout page showing is fixed

* sidbar filter is rapaired. Multiple choise under one agr group.

* Process navigation links through absolute_url filter
tatarincev authored Jun 28, 2019
1 parent 4f82693 commit 6f6947e
Showing 66 changed files with 1,165 additions and 1,439 deletions.
11 changes: 6 additions & 5 deletions assets/js/account/account-orders.tpl.liquid
Original file line number Diff line number Diff line change
@@ -47,16 +47,17 @@
<div class="col col-66 main">
<div class="cols">
<div class="col col-66">
<h4>{{ 'customer.order.title' | t }} {% raw %}{{$ctrl.orderNumber}}{% endraw %}</h4>
{% capture order_number %}{% raw %}{{$ctrl.orderNumber}}{% endraw %}{% endcapture %}
<h4>{{ 'customer.order.title' | t: order_number }} </h4>
{% capture created_date %}<strong ng-bind="$ctrl.order.createdDate | date: 'medium'"></strong>{% endcapture %}
<p>
{{ 'customer.order.placed_on_date_html' | t }}
<strong ng-bind="$ctrl.order.createdDate | date: 'medium'"></strong>
{{ 'customer.order.placed_on_date_html' | t: created_date }}
</p>

<div ng-if="$ctrl.order.isCancelled" class="errors">
{% capture cancelled_on %}<span ng-bind="$ctrl.order.modifiedDate | date: 'medium'"></span>{% endcapture %}
<h5>
{{ 'customer.order.cancelled_on' | t }}
<span ng-bind="$ctrl.order.modifiedDate | date: 'medium'"></span>
{{ 'customer.order.cancelled_on' | t: cancelled_on }}
</h5>
<p>{{ 'customer.order.cancel_reason' | t }}: {% raw %}{{ $ctrl.order.cancelReason }}{% endraw %}</p>
</div>
12 changes: 9 additions & 3 deletions assets/js/account/account-subscriptions.tpl.liquid
Original file line number Diff line number Diff line change
@@ -41,15 +41,21 @@

<div class="cols">
<div class="col col-66 main">
<h4>{% raw %}{{ 'customer.subscription.title' | translate: $ctrl.subscription }}{% endraw %}</h4>
{% capture subscription_title %}{% raw %}{{$ctrl.subscription.number}}{% endraw %}{% endcapture %}
<h4>{{ 'customer.subscription.title' | t: subscription_title }}</h4>
<p>
<!--{{ 'customer.subscription.placed_on_date_html' | t }}
<strong ng-bind="$ctrl.subscription.createdDate | date: 'medium'"></strong>-->
<strong>{% raw %}{{ 'customer.subscription.details-sentence' | translate: $ctrl.subscription }}{% endraw %}</strong>
{% capture subscription_created_date %}{% raw %}{{$ctrl.subscription.createdDate | date: "MMM d, y"}}{% endraw %}{% endcapture %}
{% capture subscription_interval_count %}{% raw %}{{$ctrl.subscription.intervalCount}}{% endraw %}{% endcapture %}
{% capture subscription_interval %}{% raw %}{{$ctrl.subscription.interval}}{% endraw %}{% endcapture %}
{% capture subscription_next_billing %}{% raw %}{{$ctrl.subscription.currentPeriodEnd | date: "MMM d, y"}}{% endraw %}{% endcapture %}
<strong>{{ 'customer.subscription.details-sentence' | t: subscription_interval_count,subscription_interval,subscription_created_date,subscription_next_billing }}</strong>
</p>

<div ng-if="$ctrl.subscription.isCancelled" class="errors">
<h5 ng-bind="'customer.subscription.cancelled_on' | translate: {date: $ctrl.subscription.cancelledDate}"></h5>
{% capture cancellation_reason %}{% raw %}{{$ctrl.subscription.cancelledDate | date: "medium"}}{% endraw %}{% endcapture %}
<h5>{{ 'customer.subscription.cancelled_on' | t: cancellation_reason }}</h5>
<p>{{ 'customer.subscription.cancel_reason' | t }}: {% raw %}{{ $ctrl.subscription.cancelReason }}{% endraw %}</p>
</div>
<div class="form-fieldset">
17 changes: 0 additions & 17 deletions assets/js/product-list.js

This file was deleted.

30 changes: 6 additions & 24 deletions layout/account_layout.liquid
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
{% endif %}

<title>
{{ page_title }}{% if current_tags %}{% assign current_tags_joined = current_tags | join: ', ' %} - {{ 'general.meta.tags' | t: tags: current_tags_joined }}{% endif %}{% if current_page != 1 %} - {{ 'general.meta.page' | t: page: current_page }}{% endif %}{% unless page_title contains shop.name %} - {{ shop.name }}{% endunless %}
{{ page_title }}{% if current_tags %}{% assign current_tags_joined = current_tags | join: ', ' %} - {{ 'general.meta.tags' | t: current_tags_joined }}{% endif %}{% if page_number != 1 %} - {{ 'general.meta.page' | t: page_number }}{% endif %}{% unless page_title contains shop.name %} - {{ shop.name }}{% endunless %}
</title>
{% if page_description %}
<meta name="description" content="{{ page_description | escape }}" />
@@ -77,30 +77,12 @@
{% endif %}
</div>
<div class="grid-item large--two-third text-center large--text-right">
{% if settings.header_message != blank or shop.customer_accounts_enabled %}
<div class="site-header--text-links{% if settings.header_message == blank %} medium-down--hide{% endif %}">
{% if settings.header_message != blank %}

<div class="site-header--text-links{% if settings.header_message.empty? == false %} medium-down--hide{% endif %}">
{% if settings.header_message.empty? == false %}
{{ settings.header_message }}
{% endif %}
{% comment %}
{% if shop.customer_accounts_enabled %}
<span class="site-header--meta-links medium-down--hide">
{% if customer %}
{% capture first_name %}
<a href="{{ '/account' | absolute_url }}">{{ customer.first_name }}</a>
{% endcapture %}
{{ 'layout.customer.logged_in_as_html' | t: first_name: first_name }} &middot; {{ 'layout.customer.log_out' | t | customer_logout_link }}
{% else %}
{{ 'layout.customer.sign_in' | t | customer_login_link }}
{% if shop.customer_accounts_optional %}
<span class="site-header--spacer">{{ 'common.or' | t }}</span>
{{ 'layout.customer.create_account' | t | customer_register_link }}
{% endif %}
{% endif %}
</span>
{% endif %}
{% endcomment %}


<span class="site-header--meta-links medium-down--hide">
<span ng-if="customer && customer.isRegisteredUser && customer.operatorUserName" ng-cloak>
{{ 'layout.customer.logged_in_on_behalf_of_label' | t }} <a href="{{ 'account' | absolute_url }}" ng-bind="customer.firstName || customer.userName"></a> &middot; {{ 'layout.customer.log_out' | t | customer_logout_link }}
@@ -117,7 +99,7 @@

</div>
<br class="medium-down--hide" />
{% endif %}

{% include 'search-bar' %}
{% if settings.product_compare_enabled %}
<product-compare-list-bar></product-compare-list-bar>
42 changes: 17 additions & 25 deletions layout/theme.liquid
Original file line number Diff line number Diff line change
@@ -10,7 +10,17 @@
{% endif %}

<title>
{{ page_title }}{% if current_tags %}{% include 'tags-joined', separator: ', ', escape: true %} - {{ 'general.meta.tags' | t: tags: current_tags_joined }}{% endif %}{% if current_page != 1 %} - {{ 'general.meta.page' | t: page: current_page }}{% endif %}{% unless page_title contains shop.name %} - {{ shop.name }}{% endunless %}
{{ page_title }}
{% if current_tags %}
{% include 'tags-joined' %}
- {{ 'general.meta.tags' | t: current_tags_joined }}
{% endif %}
{% if page_mumber != 1 %}
- {{ 'general.meta.page' | t: page_mumber }}
{% endif %}
{% unless page_title contains shop.name %}
- {{ shop.name }}
{% endunless %}
</title>
{% if page_description %}
<meta name="description" content="{{ page_description | escape }}" />
@@ -77,30 +87,12 @@
</div>

<div class="grid-item large--two-third text-center large--text-right">
{% if settings.header_message != blank or shop.customer_accounts_enabled %}
<div class="site-header--text-links{% if settings.header_message == blank %} medium-down--hide{% endif %}">
{% if settings.header_message != blank %}
{{ settings.header_message }}

<div class="site-header--text-links{% if settings.header_message.empty? == false %} medium-down--hide{% endif %}">
{% if settings.header_message.empty? == false %}
{{ settings.header_message }}
{% endif %}
{% comment %}
{% if shop.customer_accounts_enabled %}
<span class="site-header--meta-links medium-down--hide">
{% if customer %}
{% capture first_name %}
<a href="{{ '/account' | absolute_url }}">{{ customer.first_name }}</a>
{% endcapture %}
{{ 'layout.customer.logged_in_as_html' | t: first_name: first_name }} &middot; {{ 'layout.customer.log_out' | t | customer_logout_link }}
{% else %}
{{ 'layout.customer.sign_in' | t | customer_login_link }}
{% if shop.customer_accounts_optional %}
<span class="site-header--spacer">{{ 'common.or' | t }}</span>
{{ 'layout.customer.create_account' | t | customer_register_link }}
{% endif %}
{% endif %}
</span>
{% endif %}
{% endcomment %}


<span class="site-header--meta-links medium-down--hide">
<span ng-if="customer && customer.isRegisteredUser && customer.operatorUserName" ng-cloak>
{{ 'layout.customer.logged_in_on_behalf_of_label' | t }} <a href="{{ 'account' | absolute_url }}" ng-bind="customer.firstName || customer.userName"></a> &middot; {{ 'layout.customer.log_out' | t | customer_logout_link }}
@@ -117,7 +109,7 @@

</div>
<br class="medium-down--hide" />
{% endif %}

{% include 'search-bar' %}
{% if settings.product_compare_enabled %}
<product-compare-list-bar></product-compare-list-bar>
68 changes: 34 additions & 34 deletions locales/de.json
Original file line number Diff line number Diff line change
@@ -4,23 +4,23 @@
"label": "Preis"
},
"pricerange": {
"less": "Unter {{ upper }}",
"between": "{{ lower }} bis {{ upper }}",
"greater": "{{ lower }} & Über"
"less": "Unter {0}",
"between": "{0} bis {1}",
"greater": "{0} & Über"
},
"range": {
"less": "Unter {{ upper }}",
"between": "{{ lower }} bis {{ upper }}",
"greater": "{{ lower }} & Oben"
"less": "Unter {0}",
"between": "{0} bis {0}",
"greater": "{0} & Oben"
}
},
"date_formats": {
"month_day_year": "%b %d, %Y"
},
"general": {
"meta": {
"tags": "Getaggt \"{{ tags }}\"",
"page": "Seite {{ page }}"
"tags": "Getaggt \"{0}\"",
"page": "Seite {0}"
},
"404": {
"title": "404 Seite nicht gefunden",
@@ -32,21 +32,21 @@
},
"forms": {
"post_error": "Tut uns leid, aber es ist ein Fehler aufgetreten. Folgendes müssten Sie bitte korrigieren und erneut übermitteln:",
"post_field_error_html": "<strong>{{ field }}</strong> {{ error }}"
"post_field_error_html": "<strong>{0}</strong> {0}"
},
"search": {
"no_results_html": "Ihre Suche nach \"{{ terms }}\" hat keine Ergebnisse hervorgebracht.",
"results_for_html": "Ihre Suche nach \"{{ terms }}\" hat folgende Ergebnisse hervorgebracht:",
"no_results_html": "Ihre Suche nach \"{0}\" hat keine Ergebnisse hervorgebracht.",
"results_for_html": "Ihre Suche nach \"{0}\" hat folgende Ergebnisse hervorgebracht:",
"title": "Suchen Sie auf unserer Seite nach Produkten"
}
},
"blogs": {
"article": {
"author_on_date_html": "Geposted von {{ author }} am {{ date }}",
"author_on_date_html": "Geposted von {0} am {1}",
"older_post": "Älterer Post",
"newer_post": "Neuerer Post",
"tags": "Tags",
"comment_meta_html": "{{ author }} am {{ date }}",
"comment_meta_html": "{0} am {1}",
"read_more": "Weiterlesen",
"share_this_post": "Diesen Post teilen"
},
@@ -62,7 +62,7 @@
"comments_with_count": {
"zero": "0 Kommentare",
"one": "1 Kommentar",
"other": "{{ count }} Kommentare"
"other": "{0} Kommentare"
}
},
"sidebar": {
@@ -88,18 +88,18 @@
"collections": {
"general": {
"no_matches": "Es tut uns leid, aber Ihre Suche nach Produkten hat keine Treffer ergeben.",
"link_title": "Durchsuchen Sie unsere {{ title }}-Zusammenstellung",
"link_title": "Durchsuchen Sie unsere {0}-Zusammenstellung",
"items_with_count": {
"zero": "0 Produkte",
"one": "1 Produkt",
"other": "{{ count }} Produkte"
"other": "{0} Produkte"
}
},
"sidebar": {
"filters": "Filter",
"shop_by": "Einkaufen nach",
"all": "Alle",
"all_collection": "All {{ collection_title }}",
"all_collection": "All {0}",
"no_tags": "Fügen Sie Ihren Produkten zum Aufbau dieser Liste Tags hinzu."
},
"sorting": {
@@ -181,9 +181,9 @@
"none": "Sie haben noch keine Bestellungen aufgegeben."
},
"order": {
"title": "Bestellung {{ name }}",
"placed_on_date_html": "Aufgegeben am {{ date }}",
"cancelled_on": "Bestellung storniert am {{ date }}",
"title": "Bestellung {0}",
"placed_on_date_html": "Aufgegeben am {0}",
"cancelled_on": "Bestellung storniert am {0}",
"cancel_reason": "Grund",
"billing_address": "Rechnungsadresse",
"payment_status": "Zahlungsstatus",
@@ -197,7 +197,7 @@
"price": "Preis",
"quantity": "Menge",
"total": "Gesamt",
"fulfilled_on": "Geliefert am {{ date }}",
"fulfilled_on": "Geliefert am {0}",
"subtotal": "Zwischensumme"
},
"recover_password": {
@@ -209,7 +209,7 @@
},
"reset_password": {
"title": "Account-Passwort zurücksetzen",
"subtext": "Geben Sie ein neues Passwort für {{ email }} ein",
"subtext": "Geben Sie ein neues Passwort für {0} ein",
"password": "Passwort",
"password_confirm": "Passwort bestätigen",
"submit": "Passwort zurücksetzen"
@@ -236,11 +236,11 @@
"featured_collection_rows": {
"heading": "Ausgewählte Zusammenstellung",
"more": "Mehr",
"no_products_in_collection_html": "Sie haben keine Artikel in Ihrer {{ collection_title }}-Zusammenstellung.",
"instructions_to_add_products_to_collection_html": "Dieser Platzhalter verschwindet, wenn Sie <a href=\"{{ collection_admin_url }}\">dieser Zusammenstellung einen Artikel hinzufügen</a> oder <em>Ausgewählte Reihe 1</em> in Ihren Theme-Einstellungen deaktivieren.",
"no_products_in_collection_html": "Sie haben keine Artikel in Ihrer {0}-Zusammenstellung.",
"instructions_to_add_products_to_collection_html": "Dieser Platzhalter verschwindet, wenn Sie <a href=\"{0}\">dieser Zusammenstellung einen Artikel hinzufügen</a> oder <em>Ausgewählte Reihe 1</em> in Ihren Theme-Einstellungen deaktivieren.",
"add_a_product": "Artikel hinzufügen",
"example_product_title": "Beispielhafter Produkttitel",
"more_in_collection": "Mehr {{ collection_title }}"
"more_in_collection": "Mehr {0}"
}
},
"layout": {
@@ -249,7 +249,7 @@
},
"customer": {
"view_account": "Account ansehen",
"logged_in_as_html": "Eingeloggt als {{ first_name }}",
"logged_in_as_html": "Eingeloggt als {0}",
"log_out": "Ausloggen",
"sign_in": "Anmelden",
"create_account": "Account erstellen",
@@ -265,11 +265,11 @@
},
"footer": {
"theme_settings": "Theme-Einstellungen",
"instructions_for_linklist_html": "Wählen Sie eine Link-Liste, die hier angezeigt werden soll, in Ihren {{ theme_settings_link }} unter {{ theme_settings_footer_linklist_path }} aus.",
"instructions_for_text_content_html": "Fügen Sie einen Text, der hier angezeigt werden soll, in Ihren {{ theme_settings_link }} aus.",
"instructions_for_linklist_html": "Wählen Sie eine Link-Liste, die hier angezeigt werden soll, in Ihren {0} unter {1} aus.",
"instructions_for_text_content_html": "Fügen Sie einen Text, der hier angezeigt werden soll, in Ihren {0} aus.",
"quick_links": "Quick Links",
"get_in_touch": "Bleiben Sie in Verbindung",
"store_on_social_network": "{{ store_name }} auf {{ social_network }}",
"store_on_social_network": "{0} auf {1}",
"newsletter_title": "Newsletter",
"newsletter_sign_up": "Registrieren",
"newsletter_email_placeholder": "E-Mail-Adresse"
@@ -282,23 +282,23 @@
"share_on_pinterest": "Pin it",
"share_on_fancy": "Fancy",
"related_products": "Wir empfehlen außerdem",
"save_html": "Speichern {{ saved_amount }}"
"save_html": "Speichern {0}"
},
"product": {
"sold_out": "Ausverkauft",
"unavailable": "Nicht verfügbar",
"only_left": "Nur noch {{ count }} übrig!",
"only_left": "Nur noch {0} übrig!",
"quantity": "Menge",
"add_to_cart": "In den Einkaufswagen legen"
}
},
"gift_cards": {
"issued": {
"title": "Hier ist Ihre {{ value }} Geschenkkarte für {{ shop }}!",
"title": "Hier ist Ihre {0} Geschenkkarte für {1}!",
"subtext": "Hier ist Ihre Geschenkkarte!",
"disabled": "Deaktiviert",
"expired": "Abgelaufen am {{ expiry }}",
"active": "Läuft ab am {{ expiry }}",
"expired": "Abgelaufen am {0}",
"active": "Läuft ab am {0}",
"redeem": "Nutzen Sie an der Kasse diesen Code, um Ihre Geschenkkarte einzulösen",
"shop_link": "Einkauf beginnen",
"print": "Drucken"
Loading

0 comments on commit 6f6947e

Please sign in to comment.