spree_backend 4.2.7 → 4.3.0.rc1

data/app/views/spree/admin/cms_sections/types/_image_gallery.html.erb

@@ -0,0 +1,177 @@
+<div class="row align-items-center">
+  <div id="ImageGalleryLayout" class="col-12 col-md-6 text-center m-auto">
+    <div id="LayoutType">
+      <div id="Default" class="<% unless @cms_section.layout_style == 'Default' %>d-none<% end %>">
+        <%= svg_icon name: "default-layout.svg", width: '150', height: '150' %>
+      </div>
+      <div id="Reversed" class="<% unless @cms_section.layout_style == 'Reversed' %>d-none<% end %>">
+        <%= svg_icon name: "reversed-layout.svg", width: '150', height: '150' %>
+      </div>
+    </div>
+
+    <%= f.field_container :layout_style, class: ['form-group'] do %>
+      <%= f.label :layout_style, Spree.t('admin.cms.image_gallery.layout_style') %>
+      <%= f.select(:layout_style,
+          spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
+                                          { const: 'LAYOUT_OPTIONS' }),
+                                          { include_blank: false }) %>
+      <%= f.error_message_on :layout_style %>
+    <% end %>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-12 col-md-4 mb-3">
+    <div class="card p-3">
+      <div class="text-center">
+        <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_a') %></h4>
+        <%= f.field_container :image_one, class: ['form-group'] do %>
+          <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
+            </figure>
+          <% elsif @cms_section.image_one.attached? && @cms_section.image_one.image? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_one) %>
+            </figure>
+          <% end %>
+          <%= f.field_container :image_one, class: ['form-group mb-0'] do %>
+            <%= f.file_field :image_one %>
+            <%= f.error_message_on :image_one %>
+          <% end %>
+        <% end %>
+      </div>
+      <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
+
+      <%= f.field_container :title_one, class: ['form-group'] do %>
+        <%= f.label :title_one, Spree.t('admin.cms.title') %>
+        <%= f.text_field :title_one, class: 'form-control' %>
+        <%= f.error_message_on :title_one %>
+      <% end %>
+
+      <div class="col-12"><hr></div>
+      <% unless rails_5? %>
+        <%= f.field_container :link_type_one, class: ['form-group'] do %>
+          <%= f.label :link_type_one, Spree.t('admin.navigation.link_to') %>
+          <%= f.select(:link_type_one,
+              spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
+                                              { const: 'LINKED_RESOURCE_TYPE' }),
+                                              { include_blank: false },
+                                              class: 'link_switcher',
+                                              data: { target_field: :link_one}) %>
+          <%= f.error_message_on :link_type_one %>
+        <% end %>
+      <% end %>
+      <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_one, save_to: :link_one, f: f %>
+    </div>
+  </div>
+
+  <div class="col-12 col-md-4 mb-3">
+    <div class="card p-3">
+      <div class="text-center">
+        <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_b') %></h4>
+        <%= f.field_container :image_two, class: ['form-group'] do %>
+          <% if @cms_section.image_two.attached? && @cms_section.image_two.variable? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_two.variant(resize: '244x104>')) %>
+            </figure>
+          <% elsif @cms_section.image_two.attached? && @cms_section.image_two.image? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_two) %>
+            </figure>
+          <% end %>
+          <%= f.field_container :image_two, class: ['form-group mb-0'] do %>
+            <%= f.file_field :image_two %>
+            <%= f.error_message_on :image_two %>
+          <% end %>
+        <% end %>
+      </div>
+      <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.tall_image') %></small>
+
+      <%= f.field_container :title_two, class: ['form-group'] do %>
+        <%= f.label :title_two, Spree.t('admin.cms.title') %>
+        <%= f.text_field :title_two, class: 'form-control' %>
+        <%= f.error_message_on :title_two %>
+      <% end %>
+
+      <div class="col-12"><hr></div>
+      <% unless rails_5? %>
+        <%= f.field_container :link_type_two, class: ['form-group'] do %>
+          <%= f.label :link_type_two, Spree.t('admin.navigation.link_to') %>
+          <%= f.select(:link_type_two,
+              spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
+                                              { const: 'LINKED_RESOURCE_TYPE' }),
+                                              { include_blank: false },
+                                              class: 'link_switcher',
+                                              data: { target_field: :link_two}) %>
+          <%= f.error_message_on :link_type_two %>
+        <% end %>
+      <% end %>
+      <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_two, save_to: :link_two, f: f %>
+    </div>
+  </div>
+
+  <div class="col-12 col-md-4 mb-3">
+    <div class="card p-3">
+      <div class="text-center">
+        <h4 class="pb-2"><%= Spree.t('admin.cms.image_gallery.image_c') %></h4>
+        <%= f.field_container :image_three, class: ['form-group'] do %>
+          <% if @cms_section.image_three.attached? && @cms_section.image_three.variable? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_three.variant(resize: '244x104>')) %>
+            </figure>
+          <% elsif @cms_section.image_three.attached? && @cms_section.image_three.image? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_three) %>
+            </figure>
+          <% end %>
+          <%= f.field_container :image_three, class: ['form-group mb-0'] do %>
+            <%= f.file_field :image_three %>
+            <%= f.error_message_on :image_three %>
+          <% end %>
+        <% end %>
+      </div>
+      <small class="text-muted mb-4"><%= Spree.t('admin.cms.image_gallery.square_image') %></small>
+
+      <%= f.field_container :title_three, class: ['form-group'] do %>
+        <%= f.label :title_three, Spree.t('admin.cms.title') %>
+        <%= f.text_field :title_three, class: 'form-control' %>
+        <%= f.error_message_on :title_three %>
+      <% end %>
+
+      <div class="col-12"><hr></div>
+      <% unless rails_5? %>
+        <%= f.field_container :link_type_three, class: ['form-group'] do %>
+          <%= f.label :link_type_three, Spree.t('admin.navigation.link_to') %>
+          <%= f.select(:link_type_three,
+              spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
+                                              { const: 'LINKED_RESOURCE_TYPE' }),
+                                              { include_blank: false },
+                                              class: 'link_switcher',
+                                              data: { target_field: :link_three}) %>
+          <%= f.error_message_on :link_type_three %>
+        <% end %>
+      <% end %>
+      <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_three, save_to: :link_three, f: f %>
+    </div>
+  </div>
+</div>
+
+<div class="row pb-0">
+  <div class="col-12"> <hr></div>
+  <%= f.field_container :fit, class: ['form-group col-6'] do %>
+    <%= f.label :fit, Spree.t('admin.cms.fit') %>
+    <%= f.select(:fit, @cms_section.boundaries, {include_blank: false}, class: 'select2') %>
+    <%= f.error_message_on :fit %>
+  <% end %>
+
+  <%= f.field_container :display_labels, class: ['form-group col-6'] do %>
+    <%= f.label :display_labels, Spree.t('admin.cms.image_gallery.display_labels') %>
+    <%= f.select(:display_labels,
+        spree_humanize_dropdown_values('Spree::Cms::Sections::ImageGallery',
+                                        { const: 'LABEL_OPTIONS' }),
+                                        { include_blank: false },
+                                        class:'select2') %>
+    <%= f.error_message_on :display_labels %>
+  <% end %>
+</div>

data/app/views/spree/admin/cms_sections/types/_product_carousel.html.erb

@@ -0,0 +1,5 @@
+<div class="row">
+  <div class="col-12">
+    <%= render "spree/admin/shared/link_fields", resource: @cms_section, f: f %>
+  </div>
+</div>

data/app/views/spree/admin/cms_sections/types/_rich_text_content.html.erb

@@ -0,0 +1,4 @@
+<%= f.field_container :rte_content, class: ['form-group mb-0'] do %>
+  <%= f.text_area :rte_content, { rows: "20", class: 'form-control spree-rte' } %>
+  <%= f.error_message_on :rte_content %>
+<% end %>

data/app/views/spree/admin/cms_sections/types/_side_by_side_images.html.erb

@@ -0,0 +1,121 @@
+<div class="row pb-0">
+  <div class="col-12 col-md-6 mb-3">
+    <div class="card p-3">
+      <div class="text-center">
+        <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.left_image') %></h4>
+        <%= f.field_container :image_one, class: ['form-group'] do %>
+          <% if @cms_section.image_one.attached? && @cms_section.image_one.variable? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_one.variant(resize: '244x104>')) %>
+            </figure>
+          <% elsif @cms_section.image_one.attached? && @cms_section.image_one.image? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_one) %>
+            </figure>
+          <% end %>
+          <%= f.field_container :image_one, class: ['form-group mb-0'] do %>
+            <%= f.file_field :image_one %>
+            <%= f.error_message_on :image_one %>
+          <% end %>
+          <small class="text-muted"><%= Spree.t('admin.cms.side_by_side.image_info') %></small>
+        <% end %>
+      </div>
+
+      <%= f.field_container :title_one, class: ['form-group'] do %>
+        <%= f.label :title_one, Spree.t('admin.cms.title') %>
+        <%= f.text_field :title_one, class: 'form-control' %>
+        <%= f.error_message_on :title_one %>
+      <% end %>
+
+      <%= f.field_container :subtitle_one, class: ['form-group'] do %>
+        <%= f.label :subtitle_one, Spree.t('admin.cms.subtitle') %>
+        <%= f.text_field :subtitle_one, class: 'form-control' %>
+        <%= f.error_message_on :subtitle_one %>
+      <% end %>
+
+      <div class="col-12"><hr></div>
+      <% unless rails_5? %>
+        <%= f.field_container :link_type_one, class: ['form-group'] do %>
+          <%= f.label :link_type_one, Spree.t('admin.navigation.link_to') %>
+          <%= f.select(:link_type_one,
+              spree_humanize_dropdown_values('Spree::Cms::Sections::SideBySideImages',
+                                              { const: 'LINKED_RESOURCE_TYPE' }),
+                                              { include_blank: false },
+                                              class: 'link_switcher',
+                                              data: { target_field: :link_one}) %>
+          <%= f.error_message_on :link_type_one %>
+        <% end %>
+      <% end %>
+      <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_one, save_to: :link_one, f: f %>
+    </div>
+  </div>
+
+  <div class="col-12 col-md-6 mb-3">
+    <div class="card p-3">
+      <div class="text-center">
+        <h4 class="pb-2"><%= Spree.t('admin.cms.side_by_side.right_image') %></h4>
+        <%= f.field_container :image_two, class: ['form-group'] do %>
+          <% if @cms_section.image_two.attached? && @cms_section.image_two.variable? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_two.variant(resize: '244x104>')) %>
+            </figure>
+          <% elsif @cms_section.image_two.attached? && @cms_section.image_two.image? %>
+            <figure class="admin-img-holder">
+              <%= image_tag main_app.url_for(@cms_section.image_two) %>
+            </figure>
+          <% end %>
+          <%= f.field_container :image_two, class: ['form-group mb-0'] do %>
+            <%= f.file_field :image_two %>
+            <%= f.error_message_on :image_two %>
+          <% end %>
+          <small class="text-muted"><%= Spree.t('admin.cms.side_by_side.image_info') %></small>
+        <% end %>
+      </div>
+
+      <%= f.field_container :title_two, class: ['form-group'] do %>
+        <%= f.label :title_two, Spree.t('admin.cms.title') %>
+        <%= f.text_field :title_two, class: 'form-control' %>
+        <%= f.error_message_on :title_two %>
+      <% end %>
+
+      <%= f.field_container :subtitle_two, class: ['form-group'] do %>
+        <%= f.label :subtitle_two, Spree.t('admin.cms.subtitle') %>
+        <%= f.text_field :subtitle_two, class: 'form-control' %>
+        <%= f.error_message_on :subtitle_two %>
+      <% end %>
+
+      <div class="col-12"><hr></div>
+
+      <% unless rails_5? %>
+        <%= f.field_container :link_type_two, class: ['form-group'] do %>
+          <%= f.label :link_type_two, Spree.t('admin.navigation.link_to') %>
+          <%= f.select(:link_type_two,
+              spree_humanize_dropdown_values('Spree::Cms::Sections::SideBySideImages',
+                                              { const: 'LINKED_RESOURCE_TYPE' }),
+                                              { include_blank: false },
+                                              class: 'link_switcher',
+                                              data: { target_field: :link_two}) %>
+          <%= f.error_message_on :link_type_two %>
+        <% end %>
+      <% end %>
+      <%= render "spree/admin/shared/link_fields", resource: @cms_section, linked_type: @cms_section.link_type_two, save_to: :link_two, f: f %>
+    </div>
+  </div>
+
+<div class="col-12"><hr></div>
+  <div class="col-6">
+    <%= f.field_container :fit, class: ['form-group'] do %>
+      <%= f.label :fit, Spree.t('admin.cms.fit') %>
+      <%= f.select(:fit, @cms_section.boundaries, {include_blank: false}, class: 'select2') %>
+      <%= f.error_message_on :fit %>
+    <% end %>
+  </div>
+
+  <div class="col-6">
+    <%= f.field_container :gutters, class: ['form-group'] do %>
+      <%= f.label :gutters, Spree.t('admin.cms.set_gutters') %>
+      <%= f.select(:gutters, @cms_section.gutters_sizes, {include_blank: false}, class: 'select2') %>
+      <%= f.error_message_on :gutters %>
+    <% end %>
+  </div>
+</div>

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

@@ -23,9 +23,11 @@
           <td class="text-center"><%= country.iso3 %></td>
           <td class="text-center"><%= active_badge(country.states_required?) %></td>
           <td class="text-center"><%= active_badge(country.zipcode_required?) %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(country, no_text: true) if can? :edit, country %>
-            <%= link_to_delete(country, no_text: true) if can? :delete, country %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(country, no_text: true) if can? :edit, country %>
+              <%= link_to_delete(country, no_text: true) if can? :delete, country %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb

@@ -26,10 +26,12 @@
             </span>
           </td>
           <td><%= pretty_time(reimbursement.created_at) %></td>
-          <td class="actions actions-1">
-            <% if !reimbursement.reimbursed? %>
-              <%= link_to_edit_url(url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true) if can?(:edit, reimbursement) %>
-            <% end %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <% if !reimbursement.reimbursed? %>
+                <%= link_to_edit_url(url_for([:edit, :admin, @order, reimbursement]), title: "admin_edit_#{dom_id(reimbursement)}", no_text: true) if can?(:edit, reimbursement) %>
+              <% end %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb

@@ -38,13 +38,15 @@
             <%= return_item.acceptance_status_errors if return_item.acceptance_status_errors.present? %>
           </td>
           <% if show_decision %>
-            <td class='actions actions-2'>
-              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
-                <%= Spree.t(:accept) %>
-              <% end if can?(:accept, return_item) %>
-              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
-                <%= Spree.t(:reject) %>
-              <% end if can?(:reject, return_item) %>
+            <td class='actions'>
+              <span class="d-flex justify-content-end">
+                <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
+                  <%= Spree.t(:accept) %>
+                <% end if can?(:accept, return_item) %>
+                <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
+                  <%= Spree.t(:reject) %>
+                <% end if can?(:reject, return_item) %>
+              </span>
             </td>
           <% end %>
         </tr>

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

@@ -37,8 +37,10 @@
                 <strong class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></strong>
               <% end %>
             </td>
-            <td class='actions actions-1' data-hook="admin_orders_customer_returns_index_row_actions">
-              <%= link_to_edit_url(edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true) if can?(:edit, customer_return) %>
+            <td class='actions' data-hook="admin_orders_customer_returns_index_row_actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_edit_url(edit_admin_order_customer_return_path(@order, customer_return), title: "admin_edit_#{dom_id(customer_return)}", no_text: true) if can?(:edit, customer_return) %>
+              </span>
             </td>
           </tr>
         <% end %>

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

@@ -47,9 +47,11 @@
             <td><%= options_text_for(image) %></td>
           <% end %>
           <td><%= image.alt %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_with_icon('edit.svg', Spree.t(:edit), spree.edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' }) if can? :edit, image %>
-            <%= link_to_delete(image, { url: spree.admin_product_image_url(@product, image), no_text: true }) if can? :destroy, image %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_with_icon('edit.svg', Spree.t(:edit), spree.edit_admin_product_image_url(@product, image), class: 'btn btn-primary btn-sm', no_text: true, data: { action: 'edit' }) if can? :edit, image %>
+              <%= link_to_delete(image, { url: spree.admin_product_image_url(@product, image), no_text: true }) if can? :destroy, image %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -0,0 +1,115 @@
+<div data-hook="admin_menu_item_form_fields">
+  <div class="row">
+    <div class="col-12 col-md-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t('admin.navigation.settings') %></h5>
+        </div>
+        <div class="card-body">
+          <%= f.field_container :item_type, class: ['form-group'] do %>
+            <%= f.label :item_type, Spree.t('admin.navigation.item_type') %>
+            <%= f.select(:item_type, @menu_item_types, {include_blank: false}) %>
+            <%= f.error_message_on :item_type %>
+          <% end %>
+
+          <%= f.field_container :code, class: ['form-group'] do %>
+            <%= f.label :code, Spree.t('admin.navigation.code') %>
+            <%= f.text_field :code, class: 'form-control' %>
+            <%= f.error_message_on :code %>
+            <small class="form-text text-muted">
+              <%= raw Spree.t('admin.navigation.set_a_code') %>
+            </small>
+          <% end %>
+
+          <%= f.field_container :parent_id, class: ['form-group'] do %>
+            <%= f.label :parent_id, Spree.t('admin.navigation.nested_under') %>
+            <%= f.select :parent_id, nested_set_options(@menu.menu_items, @menu_item) {|i| "#{'-' * i.level} #{i.name}" }, {include_blank: false}, {class: 'select2'} %>
+            <%= f.error_message_on :parent_id %>
+            <small class="form-text text-muted">
+              <%= Spree.t('admin.navigation.nested_under_info') %>
+            </small>
+          <% end %>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-12 col-md-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t('admin.navigation.public_details') %></h5>
+        </div>
+        <div class="card-body">
+          <%= 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 %>
+            <%= f.error_message_on :name %>
+          <% end %>
+
+          <%= f.field_container :subtitle, class: ['form-group'] do %>
+            <%= f.label :subtitle, Spree.t('admin.navigation.subtitle') %>
+            <%= f.text_field :subtitle, class: 'form-control' %>
+            <%= f.error_message_on :subtitle %>
+          <% end %>
+
+          <% @menu_item.build_icon unless @menu_item.icon %>
+            <%= f.fields_for :icon do |icon_field| %>
+              <%= f.field_container :icon_attachment do %>
+                <% unless @menu_item.icon.new_record? %>
+                  <div id="menuItemImgContainer" class="my-3 ">
+                    <%= image_tag(main_app.url_for(@menu_item.icon.attachment)) %>
+                    <%= link_to Spree.t(:remove_image), remove_icon_admin_menu_menu_item_path(@menu, @menu_item), method: :delete %>
+                  </div>
+                <% end %>
+              <div id="<% unless @menu_item.icon.new_record? %>MenuItemImageButton<% end %>">
+                <%= icon_field.file_field :attachment %>
+              </div>
+              <small class="form-text text-muted">
+                <%= raw Spree.t('admin.navigation.image_info') %>
+              </small>
+            <% end %>
+
+            <%= f.field_container :icon_alt do %>
+              <% unless @menu_item.icon.new_record? %>
+                <div class="form-group my-3">
+                  <%= icon_field.label :alt, Spree.t('admin.navigation.image_alt_text') %>
+                  <%= icon_field.text_field :alt, class: 'form-control' %>
+                </div>
+              <% end %>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-12">
+
+      <div id="LinkSettings">
+        <div class="card mb-3">
+          <div class="card-header">
+            <h5 class="mb-0"><%= Spree.t('admin.navigation.link_settings') %></h5>
+          </div>
+          <div class="card-body">
+            <div class="row">
+              <div class="col-12 col-md-6">
+                <%= f.field_container :linked_resource_type, class: ['form-group'] do %>
+                  <%= f.label :linked_resource_type, Spree.t('admin.navigation.link_to') %>
+                  <%= f.select(:linked_resource_type, spree_humanize_dropdown_values('Spree::MenuItem', {const: 'LINKED_RESOURCE_TYPE'}), {include_blank: false}, class: 'link_switcher') %>
+                  <%= f.error_message_on :linked_resource_type %>
+                <% end %>
+              </div>
+              <div class="col-12 col-md-6">
+                <%= render "spree/admin/shared/link_fields", resource: @menu_item, f: f %>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div id="usingContainerInfo" class="alert alert-info">
+        <%= raw Spree.t('admin.navigation.menu_item_type_container_message') %>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.navigation.all_menus'), spree.admin_menus_path %> /
+  <%= link_to @menu.name, spree.edit_admin_menu_path(@menu) %> / <%= @menu_item.name %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @menu_item } %>
+
+<%= form_for [:admin, @menu, @menu_item] do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+<% end %>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.navigation.all_menus'), spree.admin_menus_path %> /
+  <%= link_to @menu.name, spree.edit_admin_menu_path(@menu) %> / <%= Spree.t('admin.navigation.new_menu_item') %>
+<% end %>
+
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @menu_item } %>
+
+<%= form_for [:admin, @menu, @menu_item] do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <%= render partial: 'spree/admin/shared/new_resource_links' %>
+<% end %>

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

@@ -0,0 +1,19 @@
+<div data-hook="admin_menu_form_fields" class="row">
+  <%= f.field_container :name, class: ['form-group col-12 col-md-4'] do %>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+    <%= f.text_field :name, class: 'form-control', required: true %>
+    <%= f.error_message_on :name %>
+  <% end %>
+
+  <%= f.field_container :location, class: ['form-group col-12 col-md-4'] do %>
+    <%= f.label :location, Spree.t('location') %>
+    <%= f.select(:location, spree_humanize_dropdown_values('Spree::Menu', { const: 'MENU_LOCATIONS', paramterize_values: true }), {include_blank: false}, class: 'select2') %>
+    <%= f.error_message_on :location %>
+  <% end %>
+
+  <%= f.field_container :locale, class: ['form-group col-12 col-md-4'] do %>
+    <%= f.label :language %>
+    <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @menu.locale || I18n.locale), {}, { class: 'select2' } %>
+    <%= f.error_message_on :default_locale %>
+  <% end %>
+</div>

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

@@ -0,0 +1,57 @@
+<% content_for :page_title do %>
+  <%= link_to Spree.t('admin.navigation.all_menus'), spree.admin_menus_path %> / <%= @menu.name %>
+<% end %>
+
+<div class="row">
+    <div class="col-12">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t('settings') %></h5>
+        </div>
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @menu } %>
+          <%= form_for [:admin, @menu] do |f| %>
+            <%= render partial: 'form', locals: { f: f } %>
+            <div class="d-flex ">
+              <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+            </div>
+          <% end %>
+        </div>
+    </div>
+  </div>
+</div>
+
+<div id="menuArea">
+  <div class="row mt-2">
+    <div class="col-12">
+      <div class="card mb-3">
+        <div class="card-header">
+          <div class="row pb-0">
+            <div class="col d-flex">
+             <h5 class="mb-0 align-self-center"><%= Spree.t('admin.navigation.menu_items', menu_name: @menu.name) %></h5>
+            </div>
+            <div class="col d-flex justify-content-end">
+              <%= button_link_to Spree.t('admin.navigation.add_new_item', menu: @menu.name), spree.new_admin_menu_menu_item_path(@menu), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+            </div>
+          </div>
+        </div>
+
+        <% if @menu.root.present? %>
+          <div class="card-body p-0 bg-light">
+            <div id="primaryMenuContainer" class="menu-container" data-parent-id="<%= @menu.root.id %>">
+              <% if @menu.root.children.present? %>
+                <% @menu.root.children.each do |root_children| %>
+                     <%= build_menu_item(@menu, root_children) %>
+                <% end %>
+              <% else %>
+                <div class="alert alert-info no-objects-found m-5">
+                  <%= raw Spree.t('admin.navigation.no_menu_items', menu: @menu.root.name) %>
+                </div>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>