spree_backend 4.2.5 → 4.3.0

data/app/helpers/spree/admin/cms_helper.rb

@@ -0,0 +1,15 @@
+module Spree
+  module Admin
+    module CmsHelper
+      def cms_page_preview_url(page)
+        page_localization = if page.locale == current_store.default_locale
+                              nil
+                            else
+                              page.locale
+                            end
+
+        spree_storefront_resource_url(page, locale: page_localization)
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/menu_helper.rb

@@ -0,0 +1,30 @@
+module Spree
+  module Admin
+    module MenuHelper
+      def menu_item_bar(menu, item)
+        render 'spree/admin/menus/nested_menu_items/item_bar', menu: menu, item: item
+      end
+
+      def build_menu_item(menu, item)
+        decendents = []
+
+        unless item.leaf?
+          item.children.each do |child_item|
+            decendents << build_menu_item(menu, child_item) unless item.leaf?
+          end
+        end
+
+        info_row = menu_item_bar(menu, item)
+        menu_container = content_tag(:div, raw(decendents.join), class: 'menu-container', data: { parent_id: item.id })
+
+        content_tag(:div, info_row + menu_container,
+                    class: 'menu-item menu-container-item dragable removable-dom-element',
+                    data: { item_id: item.id })
+      end
+
+      def default_menu_for_store?(menu)
+        menu.store.default_locale == menu.locale
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/stores_helper.rb

@@ -4,6 +4,27 @@ module Spree
       def selected_checkout_zone(store)
         store&.checkout_zone || Spree::Zone.default_checkout_zone
       end
+
+      def stores_dropdown_values
+        formatted_stores = []
+
+        @stores.map { |store| formatted_stores << [store.unique_name, store.id] }
+
+        formatted_stores
+      end
+
+      def store_switcher_link(store)
+        if current_store.id == store.id
+          classes = 'disabled bg-light'
+          icon = svg_icon name: 'circle-fill.svg', width: '18', height: '18'
+        else
+          classes = nil
+          icon = svg_icon name: 'circle.svg', width: '18', height: '18'
+        end
+
+        link_to icon + store.unique_name, url_for(host: store.formatted_url),
+                class: "#{classes} text-dark p-3 dropdown-item", id: store.code
+      end
     end
   end
 end

data/app/models/spree/backend_configuration.rb

@@ -1,6 +1,8 @@
 module Spree
   class BackendConfiguration < Preferences::Configuration
     preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :variants_per_page, :integer, default: Kaminari.config.default_per_page
+    preference :menus_per_page, :integer, default: Kaminari.config.default_per_page
 
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,

data/app/views/spree/admin/adjustments/_adjustment.html.erb

@@ -18,10 +18,12 @@
       <%= Spree.t("state_machine_states.#{adjustment.state}") %>
     </span>
   </td>
-  <td class="actions actions-2 text-center">
-    <% if adjustment.open? %>
-      <%= link_to_edit(adjustment, no_text: true) if can?(:edit, adjustment) %>
-      <%= link_to_delete(adjustment, no_text: true) if can?(:delete, adjustment) %>
-    <% end %>
+  <td class="actions">
+    <span class="d-flex justify-content-center">
+      <% if adjustment.open? %>
+        <%= link_to_edit(adjustment, no_text: true) if can?(:edit, adjustment) %>
+        <%= link_to_delete(adjustment, no_text: true) if can?(:delete, adjustment) %>
+      <% end %>
+    </span>
   </td>
 </tr>

data/app/views/spree/admin/cms_pages/_form.html.erb

@@ -0,0 +1,135 @@
+<div id="<% if @cms_page.type == 'Spree::Cms::Pages::StandardPage' %>standardPage<% end %>" data-hook="admin_page_form_fields">
+  <div class="row sp-pb-0">
+    <div class="col-12">
+      <div class="card sp-card">
+        <% unless %w[new create].include? controller.action_name %>
+        <div class="card-header col-12">
+          <div class="row no-gutters pb-0">
+            <div class="col d-flex justify-content-start align-items-center">
+              <%= f.field_container :visible, class: ['form-group pb-0 mb-0'] do %>
+                <div class="custom-control custom-switch custom-switch-md">
+                  <%= f.check_box :visible, class: 'custom-control-input', data: {cms_page_id: @cms_page.id} %>
+                  <label class="custom-control-label" for="cms_page_visible"></label>
+                  <%= f.error_message_on :visible %>
+                </div>
+              <% end %>
+
+              <span id="visibilityStatus" class="d-flex align-items-center">
+                <span class="page_hidden badge badge-secondary <% if @cms_page.visible? %>d-none<% end %>">
+                  <%= svg_icon name: "eye-slash-fill.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.draft_mode') %>
+                </span>
+
+                <span class="page_visible badge badge-primary <% if @cms_page.draft_mode? %>d-none<% end %>">
+                  <%= svg_icon name: "view.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.visible') %>
+                </span>
+              </span>
+            </div>
+            <div class="col-auto d-flex align-items-center">
+              <span class="badge badge-secondary">
+                  <%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_page.locale) %>
+              </span>
+            </div>
+          </div>
+        </div>
+        <% end %>
+
+        <div class="card-body pb-2">
+          <div class="row pb-0">
+
+            <%= f.field_container :title, class: ['form-group col-12 col-md-6'] do %>
+              <%= f.label :title, raw(Spree.t('admin.cms.title') + required_span_tag) %>
+              <%= f.text_field :title, class: 'form-control', required: true %>
+              <%= f.error_message_on :title %>
+            <% end %>
+
+            <%= f.field_container :type, class: ['form-group col-12 col-md-6'] do %>
+              <%= f.label :type, Spree.t('admin.cms.page_type') %>
+              <%= f.select(:type, spree_humanize_dropdown_values('Spree::CmsPage', {const: 'TYPES'}), {include_blank: false}, class: 'select2') %>
+              <%= f.error_message_on :type %>
+            <% end %>
+
+            <% unless %w[new create].include? controller.action_name %>
+              <div class="col-12 mt-3">
+                <div id="updatePageType" data-page-type="<%= @cms_page.type %>" class="alert alert-info d-none">
+                  <% button_type = Spree.t('update') %>
+                  <%= raw Spree.t('admin.cms.click_button_to_change_page_type', button_type: button_type) %>
+                </div>
+              </div>
+            <% end %>
+          </div>
+
+          <div class="<% unless %w[new create].include? controller.action_name %>collapse<% end %>" id="cmsPageSettings">
+            <div class="row pb-0">
+              <div class="col-12"><hr></div>
+              <%= f.field_container :locale, class: ['form-group col-12 col-md-4'] do %>
+                <%= f.label :language %>
+                <%= f.select :locale, options_from_collection_for_select(supported_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %>
+                <%= f.error_message_on :default_locale %>
+              <% end %>
+
+              <%= f.field_container :meta_title, class: ['form-group col-12 col-md-4'] do %>
+                <%= f.label :meta_title, Spree.t('admin.cms.meta_title') %>
+                <%= f.text_field :meta_title, class: 'form-control' %>
+                <%= f.error_message_on :meta_title %>
+              <% end %>
+
+              <%= f.field_container :slug, class: ['form-group col-12 col-md-4'] do %>
+                <div id="noHomePage">
+                  <%= f.label :slug, Spree.t('slug') %>
+                  <%= f.text_field :slug, class: 'form-control', disabled: @cms_page.homepage? %>
+                  <%= f.error_message_on :slug %>
+                </div>
+              <% end %>
+
+              <%= f.field_container :meta_description, class: ['form-group col-12'] do %>
+                <%= f.label :meta_description, Spree.t('admin.cms.meta_description') %>
+                <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>
+                <%= f.error_message_on :meta_description %>
+              <% end %>
+            </div>
+          </div>
+
+          <% unless %w[new create].include? controller.action_name %>
+            <div class="row pb-0">
+              <% if @cms_page.type != 'Spree::Cms::Pages::StandardPage' %>
+                <div class="col-12 col-sm-7">
+                    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+                </div>
+              <% else %>
+                <div class="col"></div>
+              <% end %>
+
+              <div class="col-12 col-sm text-right pt-3 pt-sm-0">
+                <button id="toggleMorePageSettingsButton" class="btn btn-outline-secondary" type="button" data-toggle="collapse" data-target="#cmsPageSettings" aria-expanded="false" aria-controls="collapsePageSettings">
+                  <%= raw Spree.t('admin.cms.more_page_settings') %>
+                </button>
+              </div>
+            </div>
+          <% end %>
+
+          <% if %w[new create].include? controller.action_name %>
+            <div class="row pb-0">
+              <div class="col-6">
+                <%= render partial: 'spree/admin/shared/new_resource_links' %>
+              </div>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<% if @cms_page.type == 'Spree::Cms::Pages::StandardPage' %>
+  <div class="row">
+    <div class="col-12">
+      <%= f.field_container :content, class: ['form-group']  do %>
+        <%= f.text_area :content, { rows: 22, class: 'spree-rte'} %>
+        <%= f.error_message_on :content %>
+      <% end %>
+    </div>
+  </div>
+  <div class="d-flex ">
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </div>
+<% end %>

data/app/views/spree/admin/cms_pages/_live_preview_area.html.erb

@@ -0,0 +1,61 @@
+ <div class="row">
+    <div id="pageSectionsArea" class="col-12">
+
+      <hr class="mt-4 hide-on-full-screen-mode">
+      <div class="row">
+        <div class="col d-flex justify-content-start">
+          <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+        </div>
+        <div class="col d-none d-md-flex justify-content-end">
+          <div id="LiveViewSwitcher" class="btn-group btn-group-toggle" data-toggle="buttons">
+            <label class="btn btn-outline-primary active">
+              <input type="radio" name="options" id="mobileLiveView" autocomplete="off"> Mobile
+            </label>
+            <label class="btn btn-outline-primary">
+              <input type="radio" name="options" id="tabletLiveView" autocomplete="off"> Tablet
+            </label>
+            <label class="btn btn-outline-primary">
+              <input type="radio" name="options" id="desktopLiveView" autocomplete="off" checked> Desktop
+            </label>
+          </div>
+
+          <div class="ml-2">
+              <button id="cmsSectionEditorFullScreen" type="button" class="btn btn-outline-primary no-wrap" data-toggle="button" autocomplete="off"><%= raw Spree.t('admin.cms.full_screen_mode') %></button>
+          </div>
+        </div>
+      </div>
+      <div class="row no-gutters">
+        <div id="draggableSectionsHolder" class="col-12 col-md-3 bg-light border">
+          <% if @cms_page.cms_sections.any? %>
+            <div id="cmsPagesectionsArea" class="card-body row m-0 p-1 no-gutters">
+              <% @cms_page.cms_sections.each do |section| %>
+                <%= render 'spree/admin/cms_pages/section_template', section: section %>
+              <% end %>
+            </div>
+
+          <% else %>
+            <div class="row">
+              <div class="col-12">
+                <div class="alert alert-info no-objects-found m-4">
+                  <%= raw Spree.t('admin.cms.no_sections_found_please_add_one') %>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        </div>
+
+        <div class="d-none d-md-block col bg-secondary border border-left-0">
+          <div id="liveViewCont" class="desktopLiveView">
+            <div class="embed-responsive embed-responsive-4by3">
+              <iframe class="embed-responsive-item"
+                      id="pageLivePreview"
+                      src="<%= cms_page_preview_url(@cms_page) + "?no_cache=#{rand(1...10000)}" %>"
+                      sandbox="allow-same-origin allow-forms allow-popups allow-scripts allow-modals">
+              </iframe>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  </div>

data/app/views/spree/admin/cms_pages/_section_template.html.erb

@@ -0,0 +1,16 @@
+<div class="col-12 p-0 removable-dom-element" data-section-id="<%= section.id %>">
+  <div class="row m-0 mb-1 pb-0 border border-secondary bg-white">
+    <div class="col move-handle d-flex pr-0 truncate">
+      <div class="py-3 align-items-center overflow-hidden w-100">
+          <h6 class="m-0 truncate"><%= section.name %></h6>
+          <small class="form-text mt-0 text-muted"><%= spree_humanize_type(section.type) %></small>
+      </div>
+    </div>
+    <div>
+      <div class="col h-100 d-flex flex-column align-self-sm-stretch p-0 justify-content-between actions cms_section_action_col">
+        <%= link_to_edit(section, no_text: true, url: spree.edit_admin_cms_page_cms_section_path(@cms_page, section)) %>
+        <%= link_to_delete(section, no_text: true, url: spree.admin_cms_page_cms_section_path(@cms_page, section)) if can?(:destroy, section) %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/cms_pages/edit.html.erb

@@ -0,0 +1,21 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.cms.all_pages'), spree.admin_cms_pages_path %> / <%= @cms_page.title %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to(Spree.t('admin.cms.preview_page'),
+                       cms_page_preview_url(@cms_page),
+                       class: 'btn-outline-secondary',
+                       icon: 'view.svg',
+                       id: 'admin_preview_product',
+                       target: :blank) %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>
+<%= form_for [:admin, @cms_page], as: :cms_page, url: spree.admin_cms_page_path do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+<% end %>
+
+<% if @cms_page.sections? %>
+  <%= render partial: 'live_preview_area' %>
+<% end %>

data/app/views/spree/admin/cms_pages/index.html.erb

@@ -0,0 +1,84 @@
+<% content_for :page_title do %>
+  <%= Spree.t('admin.cms.all_pages') %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= button_link_to Spree.t('admin.cms.add_new_page'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_page' } %>
+<% end if can?(:create, Spree::CmsPage) %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_menus_sidebar">
+    <%= search_form_for [:admin, @search] do |f| %>
+      <%- locals = {f: f} %>
+      <div class="row">
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= f.label :title_cont, Spree.t('admin.cms.title') %>
+            <%= f.text_field :title_cont, size: 15, class: "form-control js-quick-search-target js-filterable" %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+          <div class="form-group">
+            <%= label_tag :q_type_eq, Spree.t(:type) %>
+            <%= f.select(:type_eq, spree_humanize_dropdown_values('Spree::CmsPage', {const: 'TYPES'}), {include_blank: true}, class: 'select2-clear js-filterable') %>
+          </div>
+        </div>
+
+        <div class="col-12 col-lg-4">
+         <div class="form-group">
+           <%= label_tag :q_locale_eq, Spree.t(:language) %>
+           <%= f.select :locale_eq, all_locales_options, { include_blank: true }, class: 'select2-clear js-filterable' %>
+         </div>
+        </div>
+      </div>
+
+      <div data-hook="admin_menus_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:search), 'search.svg' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<% if @cms_pages.any? %>
+<div class="table-responsive">
+  <table class="table" id="pagesTable">
+    <thead>
+      <th scope="col"><%= Spree.t('admin.cms.title') %></th>
+      <th scope="col"><%= Spree.t('admin.cms.visible') %></th>
+      <th scope="col"><%= Spree.t('admin.cms.page_type') %></th>
+      <th scope="col"><%= Spree.t('language') %></th>
+      <th scope="col"></th>
+    </thead>
+    <tbody>
+      <% @cms_pages.each do |page| %>
+        <tr>
+          <td>
+            <%= page.title %>
+          </td>
+          <td>
+            <%= active_badge(page.visible?) %>
+          </td>
+          <td>
+            <%= spree_humanize_type(page.type) %>
+          </td>
+          <td>
+            <%= locale_full_name(page.locale) %>
+          </td>
+          <td class="actions" data-hook="admin_pages_index_row_actions">
+             <span class="d-flex justify-content-end">
+             <%= link_to_edit(page, no_text: true) %>
+             <%= link_to_delete page, no_text: true, url: spree.admin_cms_page_path(page) if can?(:destroy, page) %>
+            </span>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+<%= render 'spree/admin/shared/index_table_options', collection: @cms_pages, simple: true %>
+<% else %>
+  <div class="alert alert-info no-objects-found">
+    <%= raw Spree.t('admin.cms.you_have_no_pages') %>
+  </div>
+<% end %>

data/app/views/spree/admin/cms_pages/new.html.erb

@@ -0,0 +1,8 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.cms.all_pages'), spree.admin_cms_pages_path %> / <%= Spree.t('admin.cms.new_page') %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>
+<%= form_for [:admin, @cms_page] do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+<% end %>

data/app/views/spree/admin/cms_sections/_form.html.erb

@@ -0,0 +1,69 @@
+<div data-hook="admin_cms_section_form_fields">
+  <div class="row">
+    <div class="col-12 col-md-6">
+      <%= f.field_container :name, class: ['form-group'] do %>
+        <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+        <%= f.text_field :name, class: 'form-control', required: true, autocomplete: false %>
+        <%= f.error_message_on :name %>
+      <% end %>
+    </div>
+    <div class="col-12 col-md-6">
+      <%= f.field_container :type, class: ['form-group'] do %>
+        <%= f.label :type, Spree.t('admin.cms.section_type') %>
+        <%= f.select(:type, spree_humanize_dropdown_values('Spree::CmsSection', {const: 'TYPES'}), {include_blank: false}) %>
+        <%= f.error_message_on :type %>
+      <% end %>
+    </div>
+  </div>
+
+  <div id="alertToClickUpdate" class="d-none">
+    <div class="row">
+      <div class="col-12">
+        <div class="alert alert-warning mt-3">
+          <% if %w[new create].include? controller.action_name %>
+            <%= raw Spree.t('admin.cms.click_create_to_load_new_link') %>
+          <% else %>
+            <%= raw Spree.t('admin.cms.click_update_to_load_new_link') %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <% if @cms_section.type.present? %>
+    <div id="CmsSectionType"
+         data-hook="admin_cms_section_form_fields"
+         data-panel-section-type="<%= @cms_section.type %>">
+      <div class="row">
+        <div class="col-12">
+          <div class="card mb-3">
+            <div class="card-header d-flex">
+              <div class="d-flex flex-grow-1">
+                <h5 class="mb-0">
+                  <%= raw Spree.t('admin.cms.settings_for', section: spree_humanize_type(@cms_section.type)) %>
+                </h5>
+              </div>
+              <div class="d-flex">
+                <span data-show-info
+                          data-alert-kind="info"
+                          data-alert-title="<%= spree_humanize_type(@cms_section.type) %>"
+                          data-alert-html="<%= raw I18n.t("spree.admin.cms.info_#{spree_resource_path(@cms_section)}_body") %>">
+                          <%= svg_icon name: "info.svg", width: '25', height: '25' %>
+                </span>
+              </div>
+            </div>
+            <div class="card-body">
+              <% if @cms_section.type.present? %>
+              <div class="row pb-0">
+                <div class="col-12">
+                  <%= render "spree/admin/cms_sections/types/#{spree_resource_path(@cms_section)}", f: f %>
+                </div>
+              </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  <% end %>
+</div>