spree_backend 4.1.13 → 4.2.0.rc4

data/app/views/spree/admin/users/_sidebar.html.erb

@@ -5,31 +5,31 @@
 <% content_for :sidebar do %>
   <ul class="nav flex-column nav-pills" data-hook="admin_user_tab_options">
     <li>
-      <%= link_to_with_icon 'user',
+      <%= link_to_with_icon 'user.svg',
         Spree.t(:"admin.user.account"),
         spree.edit_admin_user_path(@user),
         class: "nav-link #{'active' if current == :account}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'user',
+      <%= link_to_with_icon 'location.svg',
         Spree.t(:"admin.user.addresses"),
         spree.addresses_admin_user_path(@user),
         class: "nav-link #{'active' if current == :address}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'shopping-cart',
+      <%= link_to_with_icon 'list.svg',
         Spree.t(:"admin.user.orders"),
         spree.orders_admin_user_path(@user),
         class: "nav-link #{'active' if current == :orders}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'edit',
+      <%= link_to_with_icon 'items.svg',
         Spree.t(:"admin.user.items"),
         spree.items_admin_user_path(@user),
         class: "nav-link #{'active' if current == :items}" %>
     </li>
     <li>
-      <%= link_to_with_icon 'money',
+      <%= link_to_with_icon 'payments.svg',
         Spree.t(:"admin.user.store_credits"),
         spree.admin_user_store_credits_path(@user),
         class: "nav-link #{'active' if current == :store_credits}" %>

data/app/views/spree/admin/users/_user_page_actions.html.erb

@@ -1,3 +1,3 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add' if can?(:create, Spree::Order) %>
+  <%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::Order) %>
 <% end %>

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

@@ -46,13 +46,13 @@
       </div>
       <div class="form-actions">
         <%= form_tag spree.clear_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('clear_key', scope: 'api'), 'delete', 'submit', class: "btn-danger" %>
+          <%= button Spree.t('clear_key', scope: 'api'), 'delete.svg', 'submit', class: "btn-danger" %>
         <% end %>
 
         <span class="or"><%= Spree.t(:or)%></span>
 
         <%= form_tag spree.generate_api_key_admin_user_path(@user), method: :put do %>
-          <%= button Spree.t('regenerate_key', scope: 'api'), 'save' %>
+          <%= button Spree.t('regenerate_key', scope: 'api'), 'recycle.svg' %>
         <% end %>
       </div>
 

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_user), new_admin_user_url, class: "btn-success", icon: 'add', id: 'admin_new_user_link' %>
+  <%= button_link_to Spree.t(:new_user), new_admin_user_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_user_link' %>
 <% end if can? :create, Spree::user_class %>
 
 <% content_for :table_filter_title do %>
@@ -38,34 +38,36 @@
         </div>
       <% end %>
       <div data-hook="admin_users_index_search_buttons" class="form-actions">
-        <%= button Spree.t(:search), 'search' %>
+        <%= button Spree.t(:search), 'search.svg' %>
       </div>
     <% end %>
   </div>
 <% end %>
 
 <% if @users.any? %>
-  <table class="table" id="listing_users" data-hook>
-    <thead>
-      <tr data-hook="admin_users_index_headers">
-        <th>
-          <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
-        </th>
-        <th data-hook="admin_users_index_header_actions" class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @users.each do |user|%>
-        <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
-          <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
-          <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit user, no_text: true if can?(:edit, user) %>
-            <%= link_to_delete user, no_text: true if can?(:delete, user) %>
-          </td>
+  <div class="table-responsive">
+    <table class="table" id="listing_users" data-hook>
+      <thead>
+        <tr data-hook="admin_users_index_headers">
+          <th>
+            <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
+          </th>
+          <th data-hook="admin_users_index_header_actions" class="actions"></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @users.each do |user|%>
+          <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
+            <td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
+            <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
+              <%= link_to_edit user, no_text: true if can?(:edit, user) %>
+              <%= link_to_delete user, no_text: true if can?(:delete, user) %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree.user_class)) %>,
@@ -73,4 +75,4 @@
   </div>
 <% end %>
 
-<%= paginate @users, theme: 'twitter-bootstrap-4' %>
+<%= paginate @users, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/admin/users/items.html.erb

@@ -7,10 +7,10 @@
 <% end %>
 
 <fieldset data-hook="admin_user_items_purchased">
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
+    <div class="table-responsive">
     <table class="table table-condensed table-bordered stock-contents" id="listing_items" data-hook="stock-contents">
       <thead>
         <th><%= sort_link @search, :completed_at, I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
@@ -54,13 +54,14 @@
           <% end %>
         <% end %>
     </table>
+    </div>
   <% else %>
     <div class="alert alert-info no-objects-found">
       <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
       <%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
     </div>
   <% end %>
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
+  <%= paginate @orders, theme: 'admin-twitter-bootstrap-4' %>
 </fieldset>
 
 <%= render 'spree/admin/users/lifetime_stats' %>

data/app/views/spree/admin/users/orders.html.erb

@@ -7,38 +7,39 @@
 <% end %>
 
 <fieldset data-hook="admin_user_order_history">
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
 
   <% if @orders.any? %>
     <%# TODO add search interface %>
-    <table class="table table-condensed table-bordered" id="listing_orders" data-hook>
-      <thead>
-        <tr data-hook="admin_orders_index_headers">
-          <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
-          <th><%= sort_link @search, :number,         I18n.t(:number, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_number_title'} %></th>
-          <th><%= sort_link @search, :state,          I18n.t(:state, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_state_title'} %></th>
-          <th><%= sort_link @search, :total,          I18n.t(:total, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_total_title'} %></th>
-        </tr>
-      </thead>
-      <tbody>
-      <% @orders.each do |order| %>
-        <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
-          <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
-          <td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
-          <td class="order-state">
-            <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
-            <% if order.payment_state %>
-              <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
-            <% end %>
-            <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
-              <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
-            <% end %>
-          </td>
-          <td class="order-total"><%= order.display_total.to_html %></td>
-        </tr>
-      <% end %>
-      </tbody>
+    <div class="table-responsive">
+      <table class="table table-condensed table-bordered" id="listing_orders" data-hook>
+        <thead>
+          <tr data-hook="admin_orders_index_headers">
+            <th><%= sort_link @search, :completed_at,   I18n.t(:completed_at, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_completed_at_title'} %></th>
+            <th><%= sort_link @search, :number,         I18n.t(:number, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_number_title'} %></th>
+            <th><%= sort_link @search, :state,          I18n.t(:state, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_state_title'} %></th>
+            <th><%= sort_link @search, :total,          I18n.t(:total, scope: 'activerecord.attributes.spree/order'), {}, {title: 'orders_total_title'} %></th>
+          </tr>
+        </thead>
+        <tbody>
+        <% @orders.each do |order| %>
+          <tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
+            <td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
+            <td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
+            <td class="order-state">
+              <div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
+              <% if order.payment_state %>
+                <div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
+              <% end %>
+              <% if Spree::Order.checkout_step_names.include?(:delivery) && order.shipment_state %>
+                <div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
+              <% end %>
+            </td>
+            <td class="order-total"><%= order.display_total.to_html %></td>
+          </tr>
+        <% end %>
+        </tbody>
     </table>
+    </div>
   <% else %>
     <div class="alert alert-info no-objects-found">
       <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>,
@@ -46,7 +47,7 @@
     </div>
   <% end %>
 
-  <%= paginate @orders, theme: 'twitter-bootstrap-4' %>
+  <%= paginate @orders, theme: 'admin-twitter-bootstrap-4' %>
 </fieldset>
 
 <%= render 'spree/admin/users/lifetime_stats' %>

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -23,7 +23,7 @@
             </td>
             <td class="actions actions-1 text-center">
               <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                <span class="icon icon-add"></span>
+                 <%= svg_icon name: "add.svg", width: '16', height: '16' %>
               </button>
             </td>
           {{else}}
@@ -37,7 +37,7 @@
               </td>
               <td class="actions actions-1 text-center">
                 <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                  <span class="icon icon-add"></span>
+                   <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                 </button>
               </td>
             {{else}}
@@ -53,7 +53,7 @@
           </td>
           <td class="actions actions-1 text-center">
             <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-              <span class="icon icon-add"></span>
+              <%= svg_icon name: "add.svg", width: '16', height: '16' %>
             </button>
           </td>
         {{/if}}

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -19,7 +19,7 @@
             </td>
             <td class="actions actions-1">
               <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                <span class="icon icon-add"></span>
+                <%= svg_icon name: "add", width: '16', height: '16' %>
               </button>
             </td>
           {{else}}
@@ -33,7 +33,7 @@
               </td>
               <td class="actions actions-1">
                 <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                  <span class="icon icon-add"></span>
+                  <%= svg_icon name: "add", width: '16', height: '16' %>
                 </button>
               </td>
             {{else}}

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

@@ -6,10 +6,10 @@
           <%= label :new_variant, option_type.presentation %>
           <% if option_type.name == 'color' %>
             <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :name,
-              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear', id: "option_value_ids-#{option_type.id}" } %>
           <% else %>
             <%= f.collection_select 'option_value_ids', option_type.option_values, :id, :presentation,
-              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2' } %>
+              { include_blank: true }, { name: 'variant[option_value_ids][]', class: 'select2-clear', id: "option_value_ids-#{option_type.id}"  } %>
           <% end %>
         </div>
       <% end %>
@@ -24,6 +24,11 @@
         <%= f.text_field :price, value: number_to_currency(@variant.price, unit: ''), class: 'form-control' %>
       </div>
 
+      <div class="form-group" data-hook="compare_at_price">
+        <%= f.label :compare_at_price, Spree.t(:compare_at_price) %>
+        <%= f.text_field :compare_at_price, value: number_to_currency(@variant.compare_at_price, unit: ''), class: 'form-control' %>
+      </div>
+
       <div class="form-group" data-hook="cost_price">
         <%= f.label :cost_price, Spree.t(:cost_price) %>
         <%= f.text_field :cost_price, value: number_to_currency(@variant.cost_price, unit: ''), class: 'form-control' %>
@@ -35,10 +40,17 @@
       </div>
 
       <div class="form-group" data-hook="discontinue_on">
-
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
           <%= f.error_message_on :discontinue_on %>
-          <%= f.text_field :discontinue_on, value: datepicker_field_value(@variant.discontinue_on), class: 'datepicker form-control' %>
+          <div class="input-group datepicker" data-wrap="true" >
+            <%= f.text_field :discontinue_on,
+                             value: datepicker_field_value(@variant.discontinue_on),
+                             placeholder: Spree.t(:select_a_date),
+                             class: 'form-control shadow-none',
+                             'data-input':'' %>
+
+            <%= render partial: 'spree/admin/shared/cal_close' %>
+          </div>
       </div>
     </div>
   </div>

data/app/views/spree/admin/variants/_split.js.erb

@@ -23,10 +23,10 @@
     </td>
     <td class='actions text-center'>
       <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
-        <span class="icon icon-arrow-left"></span>
+        <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
       </a>
       <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
-        <span class="icon icon-save"></span>
+        <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
       </a>
     </td>
   </tr>

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

@@ -4,6 +4,7 @@
 <div id="new_variant" data-hook></div>
 
 <% if @variants.any? %>
+<div class="table-responsive">
   <table class="table sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
     <thead data-hook="variants_header">
       <tr>
@@ -13,16 +14,16 @@
         <th class="actions"></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody id="sortVert">
     <% @variants.each do |variant| %>
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
           <% if can? :edit, variant %>
-            <span class="icon icon-move handle"></span>
+            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
           <% end %>
         </td>
         <td><%= variant.options_text %></td>
-        <td><%= variant.display_price.to_html %></td>
+        <td><%= display_price(variant) %></td>
         <td><%= variant.sku %></td>
         <td class="actions actions-2 text-right">
           <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
@@ -37,6 +38,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="no-objects-found alert alert-info">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Variant)) %>
@@ -60,7 +62,7 @@
 <% else %>
   <% content_for :page_actions do %>
     <%= product_preview_link(@product) %>
-    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter' } %>
+    <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add.svg', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
+    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter.svg' } %>
   <% end %>
 <% end %>

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

@@ -3,12 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add', id: 'admin_new_zone_link' %>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
-<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
-
 <% if @zones.any? %>
+<div class="table-responsive">
   <table class="table" id='listing_zones' data-hook>
     <thead>
       <tr data-hook="zones_header">
@@ -25,7 +24,7 @@
         <tr id="<%= spree_dom_id zone %>" data-hook="zones_row">
           <td><%= zone.name %></td>
           <td><%= zone.description %></td>
-          <td><%= zone.default_tax? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td><%= active_badge(zone.default_tax?) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
             <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>
@@ -34,6 +33,7 @@
       <% end %>
     </tbody>
   </table>
+</div>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Zone)) %>,
@@ -41,4 +41,4 @@
   </div>
 <% end %>
 
-<%= paginate @zones, theme: 'twitter-bootstrap-4' %>
+<%= paginate @zones, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/layouts/admin.html.erb

@@ -24,14 +24,17 @@
     <%#-------------------------------------------------%>
     <%# Main content                                    %>
     <%#-------------------------------------------------%>
-    <div id="wrapper" class="container-fluid <%= wrapper_classes %>">
+    <div id="wrapper" class="container-fluid
+                            <% if content_for?(:sidebar) || content_for?(:page_actions) %>
+                             mb-4 mb-lg-0
+                            <% end %>">
       <div class="row">
 
         <%#-------------------------------------------------%>
         <%# Sidebar                                         %>
         <%#-------------------------------------------------%>
         <aside
-          class="<%= main_sidebar_classes %> sidebar position-fixed d-flex justify-content-between flex-column px-0"
+          class="col-12 col-lg-3 col-xl-2 sidebar position-fixed d-flex justify-content-between flex-column px-0"
           id="main-sidebar"
           data-hook="admin_tabs">
           <%= render partial: 'spree/admin/shared/main_menu' %>
@@ -42,38 +45,34 @@
         <%#-------------------------------------------------%>
         <%# Content                                         %>
         <%#-------------------------------------------------%>
-        <main class="<%= main_part_classes %> main" id="main-part" role="main">
+        <main class="col-12 col-lg-9 col-xl-10 offset-lg-3 offset-xl-2 main" id="main-part">
+          <div class="container">
 
-          <%#-------------------------------------------------%>
-          <%# Content header (page title/actions)             %>
-          <%#-------------------------------------------------%>
-          <%= render partial: 'spree/admin/shared/content_header' %>
-
-          <div class="row">
             <%#-------------------------------------------------%>
-            <%# Alerts                                          %>
+            <%# Content header (page title/actions)             %>
             <%#-------------------------------------------------%>
-            <%= flash_alert(flash) %>
+            <%= render partial: 'spree/admin/shared/content_header' %>
 
-            <%#-------------------------------------------------%>
-            <%# Main content                                    %>
-            <%#-------------------------------------------------%>
-            <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-8 col-md-9' : 'col-12'  %>" id="content" data-hook>
-              <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
-              <%= yield %>
-            </div>
-
-            <%#-------------------------------------------------%>
-            <%# Inner aside                                     %>
-            <%#-------------------------------------------------%>
-            <% if content_for?(:sidebar) %>
-              <div class="col-4 col-md-3">
-                <%= render partial: 'spree/admin/shared/sidebar' %>
+            <div class="row">
+              <%#-------------------------------------------------%>
+              <%# Main content                                    %>
+              <%#-------------------------------------------------%>
+              <div class="<%= content_for?(:sidebar) ? 'with-sidebar col-12 col-lg-9' : 'col-12'  %>" id="content" data-hook>
+                <%= render partial: 'spree/admin/shared/table_filter' if content_for?(:table_filter)%>
+                <%= yield %>
               </div>
-            <% end %>
-          </div>
 
+              <%#-------------------------------------------------%>
+              <%# Inner aside                                     %>
+              <%#-------------------------------------------------%>
+              <% if content_for?(:sidebar) || content_for?(:page_actions) %>
+                <div class="col-12 col-lg-3 m-0 p-4 p-lg-0" id="contextualSideMenu">
+                  <%= render partial: 'spree/admin/shared/sidebar' %>
+                </div>
+              <% end %>
+            </div>
 
+          </div>
         </main>
       </div>
     </div>
@@ -81,6 +80,13 @@
     <%#-------------------------------------------------%>
     <%# Insert footer scripts here                      %>
     <%#-------------------------------------------------%>
+    <div id="multi-backdrop" class="modal-backdrop fade"></div>
     <div data-hook="admin_footer_scripts"></div>
+
+    <%#-------------------------------------------------%>
+    <%# Alerts                                          %>
+    <%#-------------------------------------------------%>
+    <%= flash_alert(flash) %>
+    
   </body>
 </html>