spree_backend 4.3.0 → 4.4.0

data/app/views/spree/admin/shared/linkables/_url.html.erb

@@ -1,4 +1,4 @@
-<%= f.field_container :destination, class: ['form-group'] do %>
+<%= f.field_container :destination do %>
   <%= f.label :destination, Spree.t(:url) %>
   <%= f.text_field :destination, class: 'form-control' %>
   <%= f.error_message_on :destination %>

data/app/views/spree/admin/shared/named_types/_form.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="admin_named_type_form_fields">
-  <%= f.field_container :name, class: ['form-group'] do %>
+  <%= f.field_container :name do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>

data/app/views/spree/admin/{menus/nested_menu_items/_item_bar.html.erb → shared/sortable_tree/_menu.html.erb}

@@ -1,4 +1,7 @@
-<div class="container-item-row d-flex flex-nowrap">
+<% menu = parent_resource %>
+<% item = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
   <div class="move-handle d-flex align-items-center p-3">
     <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
   </div>
@@ -14,13 +17,13 @@
         <%= "| #{Spree.t('admin.navigation.code')}: #{item.code}" if item.code.present? %>
       </small>
     </div>
-      <% if item.icon.present? %>
-        <div class="ml-2">
-          <div class="menu_items_image_holder">
-            <%= image_tag main_app.url_for(item.icon.attachment) %>
-          </div>
+    <% if item.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.url_for(item.icon.attachment) %>
         </div>
-      <% end %>
+      </div>
+    <% end %>
   </div>
 
   <div class="d-flex align-items-center space-buttons px-2">

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -0,0 +1,34 @@
+<% taxonomy = parent_resource %>
+<% taxon = child_resource %>
+
+<div class="sortable-tree-item-row d-flex flex-nowrap">
+  <div class="move-handle d-flex align-items-center p-3">
+    <%= svg_icon(name: 'sort.svg', width: '20', height: '20') %>
+  </div>
+
+  <div class="d-flex align-items-center overflow-hidden w-100">
+    <div class="overflow-hidden">
+      <%= taxon.name %>
+      <!-- TODO: Taxon Paths do not update in view, fix with Turbo Frames.
+        <h6 class="form-text text-muted mt-0 mb-1">
+          <span class="badge badge-light badge-light-muted-text"><%#= svg_icon(name: 'link.svg', width: '16', height: '16') %> <%= taxon.permalink %></span>
+        </h6>
+      -->
+      <small class="form-text text-muted mt-0 mb-1">
+        <%= Spree.t('admin.taxonomies.submenu') %>: <%= active_badge(!taxon.hide_from_nav) %>
+      </small>
+    </div>
+    <% if taxon.icon.present? %>
+      <div class="ml-2">
+        <div class="item_image_holder">
+          <%= image_tag main_app.url_for(taxon.icon.attachment) %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
+  <div class="d-flex align-items-center space-buttons px-2">
+    <%= link_to_edit(taxon, no_text: true, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id)) %>
+    <%= link_to_delete(taxon, no_text: true, url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id)) if can?(:destroy, taxon) %>
+  </div>
+</div>

data/app/views/spree/admin/shared/sub_menu/_apps.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-apps" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_apps">
+  <%= tab :oauth_applications, match_path: '/oauth_applications', label: 'oAuth Applications', do_not_titleize: true %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_integrations.html.erb

@@ -0,0 +1,3 @@
+<ul id="sidebar-integrations" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_integrations">
+  <%= tab :webhooks_subscribers, match_path: '/webhooks_subscribers', label: 'Webhooks' %>
+</ul>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_shipping_category_form_fields">
   <div data-hook="name" class="form-group">
-    <%= f.field_container :name, class: ["form-group"] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>

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

@@ -1,7 +1,7 @@
 <div data-hook="admin_shipping_method_form_fields">
   <div class="row">
     <div data-hook="admin_shipping_method_form_name_field" class="col-12 col-lg-6">
-      <%= f.field_container :name, class: ['form-group'] do %>
+      <%= f.field_container :name do %>
         <%= f.label :name, Spree.t(:name) %>
         <%= f.text_field :name, class: 'form-control' %>
         <%= f.error_message_on :name %>
@@ -9,7 +9,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_display_field" class="col-12 col-lg-6">
-      <%= f.field_container :display_on, class: ['form-group'] do %>
+      <%= f.field_container :display_on do %>
         <%= f.label :display_on, Spree.t(:display) %>
         <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, { include_blank: true }, { class: 'select2-clear' }) %>
         <%= f.error_message_on :display_on %>
@@ -19,7 +19,7 @@
 
   <div class="row">
     <div data-hook="admin_shipping_method_form_internal_name_field" class="col-12 col-lg-4">
-      <%= f.field_container :admin_name, class: ['form-group'] do %>
+      <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <%= f.error_message_on :admin_name %>
@@ -27,7 +27,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_code" class="col-12 col-lg-4">
-      <%= f.field_container :code, class: ['form-group'] do %>
+      <%= f.field_container :code do %>
         <%= f.label :code, Spree.t(:code) %>
         <%= f.text_field :code, class: 'form-control', label: false %>
         <%= f.error_message_on :code %>
@@ -35,7 +35,7 @@
     </div>
 
     <div data-hook="admin_shipping_method_form_tracking_url_field" class="col-12 col-lg-4">
-      <%= f.field_container :tracking_url, class: ['form-group'] do %>
+      <%= f.field_container :tracking_url do %>
         <%= f.label :tracking_url, Spree.t(:tracking_url) %>
         <%= f.text_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
         <%= f.error_message_on :tracking_url %>
@@ -54,7 +54,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.field_container :categories, class: ['form-group'] do %>
+        <%= f.field_container :categories do %>
           <% Spree::ShippingCategory.all.each do |category| %>
             <div class="checkbox">
               <%= label_tag do %>
@@ -78,7 +78,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.field_container :zones, class: ['form-group'] do %>
+        <%= f.field_container :zones do %>
           <% shipping_method_zones = @shipping_method.zones.to_a %>
           <% Spree::Zone.all.each do |zone| %>
             <div class="checkbox">
@@ -109,7 +109,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.field_container :categories, class: ['form-group'] do %>
+        <%= f.field_container :categories do %>
           <%= f.select :tax_category_id, @tax_categories.map { |tc| [tc.name, tc.id] }, { include_blank: true }, class: "select2-clear" %>
           <%= f.error_message_on :tax_category_id %>
         <% end %>

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

@@ -1,13 +1,13 @@
 <div data-hook="admin_state_form_fields" class="row">
   <div class="col-12 col-md-6">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :abbr, class: ['form-group'] do %>
+    <%= f.field_container :abbr do %>
       <%= f.label :abbr, Spree.t(:abbreviation) %>
       <%= f.text_field :abbr, class: 'form-control' %>
     <% end %>

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

@@ -2,14 +2,14 @@
   <div class="row">
     <div class="col-12 col-md-9" data-hook="stock_location_names">
       <div data-hook="stock_location_name">
-        <%= f.field_container :name, class: ['form-group']  do %>
+        <%= f.field_container :name  do %>
           <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
           <%= f.text_field :name, class: 'form-control', required: true %>
           <%= f.error_message_on :name %>
         <% end %>
       </div>
       <div data-hook="stock_location_admin_name">
-        <%= f.field_container :admin_name, class: ['form-group']  do %>
+        <%= f.field_container :admin_name  do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %>
         <%= f.text_field :admin_name, class: 'form-control', label: false %>
         <% end %>

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

@@ -1,11 +1,11 @@
 <div data-hook="admin_stock_movements_form_fields">
-  <%= f.field_container :quantity, class: ['form-group'] do %>
+  <%= f.field_container :quantity do %>
     <%= f.label :quantity, Spree.t(:quantity) %>
     <%= f.text_field :quantity, class: 'form-control' %>
   <% end %>
-  <%= f.field_container :stock_item_id, class: ['form-group'] do %>
+  <%= f.field_container :stock_item_id do %>
     <%= f.label :stock_item_id, Spree.t(:stock_item_id) %>
-    <%= select_tag 'stock_movement[stock_item_id]', nil , class: 'variant_autocomplete d-block w-100', :'data-stock-location-id' => params[:stock_location_id] %>
+    <%= select_tag 'stock_movement[stock_item_id]', nil , id: 'stock_movement_stock_item_id', class: 'd-block w-100', :'data-stock-location-id' => params[:stock_location_id] %>
   <% end %>
 </div>
 

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_store_credit_category_form_fields">
-  <%= f.field_container :name, class: ['form-group'], 'data-hook' => 'store_credit_category_name' do %>
+  <%= f.field_container :name, 'data-hook' => 'store_credit_category_name' do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>

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

@@ -1,21 +1,21 @@
 <div data-hook='admin_store_credit_form_fields'>
-  <%= f.field_container :amount, class: %w[form-group] do %>
+  <%= f.field_container :amount do %>
     <%= f.label :amount, raw(Spree.t(:amount) + required_span_tag) %>
     <%= f.text_field :amount, class: 'form-control' %>
     <%= f.error_message_on :amount %>
   <% end %>
-  <%= f.field_container :currency, class: %w[form-group] do %>
+  <%= f.field_container :currency do %>
     <%= f.label :currency, raw(Spree.t(:currency) + required_span_tag) %>
     <%= f.select :currency, currency_options(f.object.currency) %>
     <%= f.error_message_on :currency %>
   <% end %>
-  <%= f.field_container :category, class: %w[form-group] do %>
+  <%= f.field_container :category do %>
     <%= f.label :category, raw(Spree.t(:category) + required_span_tag) %>
     <%= f.select :category_id, options_from_collection_for_select(@credit_categories, :id, :name, f.object.category.try(:id)),
         { include_blank: true }, { class: 'select2 fullwidth', placeholder: Spree.t(:select_a_store_credit_reason) } %>
     <%= f.error_message_on :category %>
   <% end %>
-  <%= f.field_container :memo, class: %w[form-group] do %>
+  <%= f.field_container :memo do %>
     <%= f.label :memo, Spree.t(:memo) %>
     <%= f.text_area :memo, class: 'form-control' %>
     <%= f.error_message_on :memo %>