Merge pull request #358 from BartoszWojdalowicz/fix/publishAt

fix publish at

Author: leszczuu

src/Resources/config/doctrine/Page.orm.yml

@@ -32,7 +32,7 @@ BitBag\SyliusCmsPlugin\Entity\Page:
                     on: update
         publishAt:
             column: publish_at
-            type: date_immutable
+            type: datetime_immutable
             nullable: true
 
     manyToMany:

src/Resources/translations/messages.en.yml

@@ -57,3 +57,5 @@ bitbag_sylius_cms_plugin:
         form_was_submitted_with_errors: "The form was submitted with following errors:"
         title: Title
         empty_name: Empty name
+        publish_at: Publish at
+        page_will_be_publish_at: This page will be publish at

src/Resources/translations/messages.pl.yml

@@ -36,3 +36,5 @@ bitbag_sylius_cms_plugin:
         position: Pozycja
         title: Tytuł
         empty_name: Brak nazwy
+        publish_at: Opublikuj
+        page_will_be_publish_at: Strona zostanie opublikowana

src/Resources/views/Page/Crud/_form.html.twig

@@ -13,6 +13,7 @@
             {{ form_row(form.products) }}
             {{ form_row(form.sections) }}
             {{ form_row(form.channels) }}
+            {{ form_row(form.publishAt) }}
 
             <a href="#" class="ui labeled button icon primary bitbag-cms-resource-preview" data-url="{{ path('bitbag_sylius_cms_plugin_admin_page_preview', {'id': form.vars.data.id}) }}">
                 <i class="eye icon"></i>

src/Resources/views/Shop/Page/Error/_notPublished.html.twig

@@ -0,0 +1,3 @@
+<h1 class="ui header">
+    {{ 'bitbag_sylius_cms_plugin.ui.page_will_be_publish_at'|trans }} : {{ publishAt|date('Y/m/d H:i') }}
+</h1>

src/Resources/views/Shop/Page/show.html.twig

@@ -1,53 +1,61 @@
 {% extends '@SyliusShop/layout.html.twig' %}
 
+{% set published = (page.publishAt is not null and page.publishAt|date("Y-m-d H:i:s") < "now"|date("Y-m-d H:i:s") or page.publishAt is null) %}
+
 {%- block title -%}
-    {% if page.title is not empty %}
+    {% if page.title is not empty and published == true  %}
         {{ page.title }}
     {% else %}
         {{ parent() }}
     {% endif %}
 {%- endblock -%}
 
 {% block metatags %}
-    {% if page.metaKeywords is not empty %}
-        <meta name="keywords" content="{{ page.metaKeywords }}"/>
-    {% endif %}
-    {% if page.metaDescription is not empty %}
-        <meta name="description" content="{{ page.metaDescription }}"/>
+    {% if published == true %}
+        {% if page.metaKeywords is not empty %}
+            <meta name="keywords" content="{{ page.metaKeywords }}"/>
+        {% endif %}
+        {% if page.metaDescription is not empty %}
+            <meta name="description" content="{{ page.metaDescription }}"/>
+        {% endif %}
     {% endif %}
 {% endblock %}
-
 {% block content %}
-    <div class="ui breadcrumb">
-        <a href="{{ path('sylius_shop_homepage') }}" class="section">{{ 'sylius.ui.home'|trans }}</a>
-        <div class="divider"> /</div>
-        <div class="active section">{{ page.breadcrumb }}</div>
-    </div>
-    <div class="ui segment">
-        <h1 class="ui dividing header bitbag-page-name">{{ page.name }}</h1>
+    {% if published == true %}
+        <div class="ui breadcrumb">
+            <a href="{{ path('sylius_shop_homepage') }}" class="section">{{ 'sylius.ui.home'|trans }}</a>
+            <div class="divider"> /</div>
+            <div class="active section">{{ page.breadcrumb }}</div>
+        </div>
+        <div class="ui segment">
+            <h1 class="ui dividing header bitbag-page-name">{{ page.name }}</h1>
 
-        <div class="ui grid center aligned">
-            <div class="eight wide column">
-                {% if page.image %}
-                    <img class="page-image ui fluid image" src="{{ page.image.path }}" alt="">
-                {% endif %}
+            <div class="ui grid center aligned">
+                <div class="eight wide column">
+                    {% if page.image %}
+                        <img class="page-image ui fluid image" src="{{ page.image.path }}" alt="">
+                    {% endif %}
+                </div>
             </div>
-        </div>
 
-        <div class="ui hidden divider"></div>
+            <div class="ui hidden divider"></div>
 
-        <div class="bitbag-page-content">{{ bitbag_cms_render_content(page) }}</div>
-        <div class="ui dividing header"></div>
-        <div class="bitbag-page-sections">
-            {% include '@BitBagSyliusCmsPlugin/Shop/Page/Show/_sections.html.twig' %}
-        </div>
-    </div>
-    {% if page.products|length > 0 %}
-        <h2>
-            {{ 'bitbag_sylius_cms_plugin.ui.page_related_products'|trans }}
-        </h2>
-        <div class="bitbag-page-products">
-            {% include '@SyliusShop/Product/_horizontalList.html.twig' with {'products': page.products} %}
+            <div class="bitbag-page-content">{{ bitbag_cms_render_content(page) }}</div>
+            <div class="ui dividing header"></div>
+            <div class="bitbag-page-sections">
+                {% include '@BitBagSyliusCmsPlugin/Shop/Page/Show/_sections.html.twig' %}
+            </div>
         </div>
+        {% if page.products|length > 0 %}
+            <h2>
+                {{ 'bitbag_sylius_cms_plugin.ui.page_related_products'|trans }}
+            </h2>
+            <div class="bitbag-page-products">
+                {% include '@SyliusShop/Product/_horizontalList.html.twig' with {'products': page.products} %}
+            </div>
+        {% endif %}
+    {% else %}
+        {% include '@BitBagSyliusCmsPlugin/Shop/Page/Error/_notPublished.html.twig' with {'publishAt': page.publishAt} %}
     {% endif %}
+
 {% endblock %}