diff --git a/partials/builder/columns/events.htm b/partials/builder/columns/events.htm index c957765..8c3e7e2 100644 --- a/partials/builder/columns/events.htm +++ b/partials/builder/columns/events.htm @@ -15,6 +15,15 @@ {% set month_day_year_and_time = "M d, Y - g:i A" %} {% set sort_order = column.reverse_order ? 'desc' : 'asc' %} +{% if column.show_specific_items %} + {% set events = collect() %} + {% for event in column.specific_items %} + {% if event.item is not empty %} + {% do events.push(event.item) %} + {% endif %} + {% endfor %} +{% endif %} + {% if column.show == 'upcoming' %} {% set events = events.whereDate('date', '>=', today) %} {% endif %} @@ -24,21 +33,39 @@ {% endif %} {% if column.sort_by == 'title' %} - {% set events = events.orderBy('title', sort_order) %} - {% set older_events = older_events.orderBy('title', sort_order) %} + {% if column.show_specific_items %} + {% if sort_order == 'asc' %} + {% set events = events.sortBy('title') %} + {% else %} + {% set events = events.sortBy('title')|reverse %} + {% endif %} + {% else %} + {% set events = events.orderBy('title', sort_order) %} + {% set older_events = older_events.orderBy('title', sort_order) %} + {% endif %} {% endif %} {% if column.sort_by == 'date' %} - {% set events = events.orderBy('date', sort_order) %} - {% set older_events = older_events.orderBy('title', sort_order) %} + {% if column.show_specific_items %} + {% if sort_order == 'asc' %} + {% set events = events.sortBy('date') %} + {% else %} + {% set events = events.sortBy('date')|reverse %} + {% endif %} + {% else %} + {% set events = events.orderBy('date', sort_order) %} + {% set older_events = older_events.orderBy('date', sort_order) %} + {% endif %} {% endif %} {% if column.enable_pagination %} {% set events = events.paginateCustom(column.per_page, 'events_column') %} {% set older_events = older_events.paginateCustom(column.per_page, 'older_events_column') %} {% else %} - {% set events = events.limit(column.limit).get() %} - {% set older_events = older_events.limit(column.limit).get() %} + {% if not column.show_specific_items %} + {% set events = events.limit(column.limit).get() %} + {% set older_events = older_events.limit(column.limit).get() %} + {% endif %} {% endif %} {% if (column.show_older_events and column.show == 'upcoming') %} diff --git a/partials/builder/columns/posts.htm b/partials/builder/columns/posts.htm index 48717a6..7df0e60 100644 --- a/partials/builder/columns/posts.htm +++ b/partials/builder/columns/posts.htm @@ -3,34 +3,62 @@ == {% set sort_order = column.reverse_order ? 'desc' : 'asc' %} +{% if column.show_specific_items %} + {% set posts = collect() %} + {% for post in column.specific_items %} + {% if post.item is not empty %} + {% do posts.push(post.item) %} + {% endif %} + {% endfor %} +{% endif %} + {% if column.filter_by_category %} {% set posts = posts.whereRelation('categories', 'id', column.post_category_filter.id) %} {% endif %} {% if column.sort_by == 'title' %} - {% set posts = posts.orderBy('title', sort_order) %} + {% if column.show_specific_items %} + {% if sort_order == 'asc' %} + {% set posts = posts.sortBy('title') %} + {% else %} + {% set posts = posts.sortBy('title')|reverse %} + {% endif %} + {% else %} + {% set posts = posts.orderBy('title', sort_order) %} + {% endif %} {% endif %} {% if column.sort_by == 'date' %} - {% set posts = posts.orderBy('published_at_date', sort_order) %} + {% if column.show_specific_items %} + {% if sort_order == 'asc' %} + {% set posts = posts.sortBy('published_at_date') %} + {% else %} + {% set posts = posts.sortBy('published_at_date')|reverse %} + {% endif %} + {% else %} + {% set posts = posts.orderBy('published_at_date', sort_order) %} + {% endif %} {% endif %} {% if column.enable_pagination %} - {% set posts = posts.paginateCustom(column.per_page, "posts_column") %} + {% set posts = posts.paginateCustom(column.limit, "posts") %} {% else %} - {% set posts = posts.limit(column.limit).get() %} + {% if not column.show_specific_items %} + {% set posts = posts.limit(column.limit).get() %} + {% endif %} {% endif %} -{% partial 'builder/globals/shop_alerts' %} -