spree_backend 4.4.0 → 4.5.0

data/app/views/spree/admin/product_properties/_product_property_fields.html.erb

@@ -1,22 +1,22 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <% if f.object.persisted? && can?(:edit, f.object) %>
   <td class="move-handle">
-    <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
     <%= f.hidden_field :id %>
   </td>
   <% else %>
   <td style="opacity:0.2;">
-    <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
     <%= f.hidden_field :id %>
   </td>
   <% end %>
   <td class='property_name'>
-    <%= f.text_field :property_name, class: 'autocomplete form-control' %>
+    <%= f.text_field :property_name, class: 'autocomplete form-control', required: true %>
   </td>
   <td class='value'>
-    <%= f.text_field :value, class: 'form-control' %>
+    <%= f.text_field :value, class: 'form-control', required: true %>
   </td>
-  <td class="show_property">
+  <td class="show_property text-center">
     <%= f.check_box :show_property %>
   </td>
   <td class="actions">

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

@@ -2,30 +2,31 @@
 <%= render 'spree/admin/shared/error_messages', target: @product %>
 
 <% content_for :page_actions do %>
-  <%= product_preview_link(@product) %>
-
-  <%= button_link_to(
-    Spree.t(:add_product_properties),
-    "javascript:;",
-    { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success spree_add_fields' }) %>
+  <%= external_page_preview_link(@product) %>
 
   <span class="js-new-ptype-link">
     <%= button_link_to Spree.t(:select_from_prototype),
       available_admin_prototypes_url,
-      { icon: 'list.svg', remote: true, 'data-update' => 'prototypes', class: 'btn-outline-secondary' } %>
+      { icon: 'list.svg', remote: true, 'data-update' => 'prototypes', class: 'btn-light' } %>
   </span>
+
+  <%= button_link_to(
+    Spree.t(:add_product_properties),
+    "javascript:;",
+    { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success spree_add_fields' }) %>
 <% end if can? :create, Spree::ProductProperty %>
 
 <%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>
   <fieldset>
     <div id="prototypes" data-hook></div>
-    <div class=" table-responsive mb-3">
+    <div class="table-responsive border rounded mb-3 bg-white">
       <table id="product_properties" class="table sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
-        <thead>
+        <thead class="text-muted">
           <tr data-hook="product_properties_header">
-            <th colspan="2"><%= Spree.t(:property) %></th>
+            <th></th>
+            <th><%= Spree.t(:property) %></th>
             <th><%= Spree.t(:value) %></th>
-            <th><%= Spree.t(:show_property) %></th>
+            <th class="text-center"><%= Spree.t(:show_property) %></th>
             <th class="actions"></th>
           </tr>
         </thead>

data/app/views/spree/admin/products/_add_stock_form.html.erb

@@ -1,10 +1,10 @@
 <div class="card-header">
-  <h1 class="card-title mb-0 h5">
+  <h5 class="card-title mb-0 h6">
     <%= Spree.t(:add_stock) %>
-  </h1>
+  </h5>
 </div>
 <% content_for :page_actions do %>
-  <%= product_preview_link(@product) %>
+  <%= external_page_preview_link(@product) %>
 <% end %>
 <div class="card-body">
   <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -5,11 +5,11 @@
         <a class=" sort-handle js-sort-handle">
           <%= svg_icon name: "move.svg", width: '22', height: '22' %>
         </a>
-        <div class="dropdown ">
-          <button class="btn btn-outline-secondary dropdown-toggle products-ddb btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <div class="dropdown p-0">
+          <button class="btn btn-light dropdown-toggle products-ddb btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= svg_icon name: "chevron-down.svg", width: '18', height: '18' %>
           </button>
-          <div class="dropdown-menu dropdown-menu-right p-0 mt-1" aria-labelledby="dropdownMenuButton">
+          <div class="dropdown-menu dropdown-menu-right p-2" aria-labelledby="dropdownMenuButton">
             <a href="{{ edit_product_url product.id }}" class="edit-product js-edit-product dropdown-item p-1"><%= Spree.t(:edit) %></a>
             <a href="javascript:;" class="delete-product js-delete-product dropdown-item p-1"><%= Spree.t(:remove) %></a>
           </div>
@@ -17,17 +17,17 @@
       </nav>
       <div class='image'>
         {{#if image }}
-          <div class="admin-product-image-container small-img">
+          <div class="admin-product-image-container">
             <img src='{{image}}' alt='{{ product.attributes.name }}' class='thumbnail rounded border border' />
           </div>
         {{ else }}
-          <div class="admin-product-image-container small-img">
+          <div class="admin-product-image-container">
             <%= inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%" %>
           </div>
         {{/if}}
       </div>
-      <div class="p-0 pt-1 text-center product-info">
-        <p class="name card-text">{{ product.attributes.name }}</p>
+      <div class="p-0 pt-3 text-center product-info">
+        <h6 class="name card-text">{{ product.attributes.name }}</h6>
         <p class="price card-text">{{ product.attributes.display_price }}</p>
       </div>
     </div>

data/app/views/spree/admin/products/_filters.html.erb

@@ -0,0 +1,31 @@
+<div data-hook="admin_products_sidebar">
+
+  <%= search_form_for [:admin, @search] do |f| %>
+    <div data-hook="admin_products_index_search" class="row">
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :search_by_name, Spree.t(:product_name) %>
+          <%= f.text_field :search_by_name, size: 15, class: "form-control js-quick-search-target js-filterable" %>
+        </div>
+      </div>
+      <div class="col-12 col-lg-6">
+        <div class="form-group">
+          <%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
+          <%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control js-filterable" %>
+        </div>
+      </div>
+      <div class="col-12">
+        <%= f.field_container :deleted_at_null do %>
+          <div class="custom-control custom-checkbox">
+            <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0', class: 'custom-control-input'}, '0', '1' %>
+            <%= f.label :deleted_at_null, Spree.t(:show_deleted), class: 'custom-control-label' %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div data-hook="admin_products_index_search_buttons" class="form-actions">
+      <%= button Spree.t(:search), 'search.svg' %>
+    </div>
+  <% end %>
+
+</div>

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

@@ -1,4 +1,4 @@
-<div data-hook="admin_product_form_fields">
+<div data-hook="admin_product_form_fields" data-controller="product-edit">
   <div class="row">
 
     <div class="col-12 col-md-8" data-hook="admin_product_form_left">
@@ -28,6 +28,94 @@
     </div>
 
     <div class="col-12 col-md-4" data-hook="admin_product_form_right">
+      <div data-hook="new_product_status">
+        <%= f.field_container :status do %>
+          <%= f.label :status, Spree.t(:status) %>
+          <% options = ['draft', 'active', 'archived'] %>
+          <% options.delete('active') if cannot? :activate, @product %>
+          <% select_html = { class: 'select2',
+                             data: {
+                               action: 'change->product-edit#switchAvailabilityDatesFields',
+                               'product-edit-target': 'status'
+                             } } %>
+          <%= f.select(:status, options.each_slice(1), { selected: @product.status }, select_html) %>
+          <%= f.error_message_on :status %>
+        <% end %>
+      </div>
+
+      <div data-hook="admin_product_form_available_on" data-product-edit-target="availableOn">
+        <%= f.field_container :available_on do %>
+          <%= f.label :available_on, Spree.t(:available_on) %>
+          <%= f.error_message_on :available_on %>
+
+          <div class="input-group datePickerFrom"
+               data-wrap="true"
+               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+               data-max-date="<%= @product.discontinue_on %>">
+
+            <%= f.text_field :available_on,
+                             value: datepicker_field_value(@product.available_on),
+                             placeholder: Spree.t(:select_a_date),
+                             class: 'form-control ',
+                             'data-input':'' %>
+
+            <%= render partial: 'spree/admin/shared/cal_close' %>
+          </div>
+        <% end %>
+      </div>
+
+      <% if can?(:activate, @product) %>
+        <div data-hook="admin_product_form_make_active_at" data-product-edit-target="makeActiveAt">
+          <%= f.field_container :make_active_at do %>
+            <%= f.label :make_active_at, Spree.t(:make_active_at) %>
+            <%= f.error_message_on :make_active_at %>
+
+            <div class="input-group datePickerFrom"
+                 data-wrap="true"
+                 data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+                 data-max-date="<%= @product.discontinue_on %>">
+
+              <%= f.text_field :make_active_at,
+                               value: datepicker_field_value(@product.make_active_at),
+                               placeholder: Spree.t(:select_a_date),
+                               class: 'form-control ',
+                               'data-input':'' %>
+
+              <%= render partial: 'spree/admin/shared/cal_close' %>
+            </div>
+          <% end %>
+        </div>
+      <% else %>
+        <div data-hook="admin_product_form_make_active_at">
+          <%= f.field_container :make_active_at do %>
+            <%= f.label :make_active_at, Spree.t(:make_active_at) %>
+            <%= f.text_field :make_active_at, value: datepicker_field_value(@product.make_active_at), class: 'form-control', disabled: true %>
+            <%= f.error_message_on :make_active_at %>
+          <% end %>
+        </div>
+      <% end %>
+
+      <div data-hook="admin_product_form_discontinue_on" data-product-edit-target="discontinueOn">
+        <%= f.field_container :discontinue_on do %>
+          <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
+          <%= f.error_message_on :discontinue_on %>
+
+          <div class="input-group datePickerTo"
+               data-wrap="true"
+               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+               data-min-date="<%= @product.make_active_at %>">
+
+            <%= f.text_field :discontinue_on,
+                             value: datepicker_field_value(@product.discontinue_on),
+                             placeholder: Spree.t(:select_a_date),
+                             class: 'form-control ',
+                             'data-input':'' %>
+
+            <%= render partial: 'spree/admin/shared/cal_close' %>
+          </div>
+        <% end %>
+      </div>
+
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price do %>
           <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
@@ -69,48 +157,6 @@
         <% end %>
       </div>
 
-      <div data-hook="admin_product_form_available_on">
-        <%= f.field_container :available_on do %>
-          <%= f.label :available_on, Spree.t(:available_on) %>
-          <%= f.error_message_on :available_on %>
-
-          <div class="input-group datePickerFrom"
-               data-wrap="true"
-               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
-               data-max-date="<%= @product.discontinue_on %>">
-
-            <%= f.text_field :available_on,
-                             value: datepicker_field_value(@product.available_on),
-                             placeholder: Spree.t(:select_a_date),
-                             class: 'form-control shadow-none ',
-                             'data-input':'' %>
-
-            <%= render partial: 'spree/admin/shared/cal_close' %>
-          </div>
-        <% end %>
-      </div>
-
-      <div data-hook="admin_product_form_discontinue_on">
-        <%= f.field_container :discontinue_on do %>
-          <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
-          <%= f.error_message_on :discontinue_on %>
-
-          <div class="input-group datePickerTo"
-               data-wrap="true"
-               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
-               data-min-date="<%= @product.available_on %>">
-
-            <%= f.text_field :discontinue_on,
-                              value: datepicker_field_value(@product.discontinue_on),
-                              placeholder: Spree.t(:select_a_date),
-                              class: 'form-control shadow-none ',
-                              'data-input':'' %>
-
-            <%= render partial: 'spree/admin/shared/cal_close' %>
-          </div>
-        <% end %>
-      </div>
-
       <div data-hook="admin_product_form_promotionable">
         <%= f.field_container :promotionable do %>
           <%= f.check_box :promotionable %>
@@ -143,7 +189,7 @@
               <% end %>
             <div class="info-actions">
               <% if can?(:admin, Spree::Variant) %>
-                <%= link_to_with_icon 'adjust.svg', Spree.t(:manage_variants), spree.admin_product_variants_url(@product), class: "btn btn-outline-secondary" %>
+                <%= link_to_with_icon 'adjust.svg', Spree.t(:manage_variants), spree.admin_product_variants_url(@product), class: "btn btn-light" %>
               <% end %>
             </div>
           </div>

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

@@ -1,8 +1,5 @@
 <% content_for :page_actions do %>
-  <%= product_preview_link(@product) %>
-  <% if can?(:create, Spree::Product) %>
-    <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_product' } %>
-  <% end %>
+  <%= external_page_preview_link(@product) %>
 <% end %>
 
 <%= render partial: 'spree/admin/shared/product_tabs', locals: {current: :details} %>

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

@@ -6,60 +6,48 @@
   <%= button_link_to Spree.t(:new_product), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_product' } %>
 <% end if can?(:create, Spree::Product) %>
 
-<% content_for :table_filter do %>
-  <div data-hook="admin_products_sidebar">
-
-    <%= search_form_for [:admin, @search] do |f| %>
-      <div data-hook="admin_products_index_search" class="row">
-        <div class="col-12 col-lg-6">
-          <div class="form-group">
-            <%= f.label :search_by_name, Spree.t(:product_name) %>
-            <%= f.text_field :search_by_name, size: 15, class: "form-control js-quick-search-target js-filterable" %>
-          </div>
-        </div>
-        <div class="col-12 col-lg-6">
-          <div class="form-group">
-            <%= f.label :variants_including_master_sku_cont, Spree.t(:sku) %>
-            <%= f.text_field :variants_including_master_sku_cont, size: 15, class: "form-control js-filterable" %>
-          </div>
-        </div>
-        <div class="col-12">
-          <%= f.field_container :deleted_at_null do %>
-            <div class="custom-control custom-checkbox">
-              <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0', class: 'custom-control-input'}, '0', '1' %>
-              <%= f.label :deleted_at_null, Spree.t(:show_deleted), class: 'custom-control-label' %>
-            </div>
-          <% end %>
+<% content_for :page_tabs do %>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.product.all'),
+                spree.admin_products_path,
+                class: "nav-link #{'active' if params[:q][:status_eq].blank?}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.product.active'),
+                params.merge({q: {status_eq: :active}}).permit!,
+                class: "nav-link #{'active' if params[:q][:status_eq] == 'active'}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.product.draft'),
+                params.merge({q: {status_eq: :draft}}).permit!,
+                class: "nav-link #{'active' if params[:q][:status_eq] == 'draft'}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to Spree.t('admin.product.archived'),
+                params.merge({q: {status_eq: :archived}}).permit!,
+                class: "nav-link #{'active' if params[:q][:status_eq] == 'archived'}" %>
+  </li>
+<% end  %>
 
-          <%= f.field_container :not_discontinued do %>
-            <div class="custom-control custom-checkbox">
-              <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0', class: 'custom-control-input'}, '0', '1' %>
-              <%= f.label :not_discontinued, Spree.t(:show_discontinued ), class: 'custom-control-label' %>
-            </div>
-          <% end %>
-        </div>
-      </div>
-      <div data-hook="admin_products_index_search_buttons" class="form-actions">
-        <%= button Spree.t(:search), 'search.svg' %>
-      </div>
-    <% end %>
-
-  </div>
+<% content_for :table_filter do %>
+  <%= render partial: 'filters' %>
 <% end %>
 
 <% if @collection.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id="listing_products">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="admin_products_index_headers">
-        <th scope="col" colspan="2"><%= sort_link @search,:name, Spree.t(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
-        <th scope="col"><%= Spree.t(:sku) %></th>
-        <th scope="col"><%= Spree.t('admin.digitals.digital') %></th>
-        <th scope="col"><%= Spree.t(:status) %></th>
-        <th scope="col" class="text-center">
-          <%= sort_link @search, :master_default_price_amount, Spree.t(:master_price), {}, {title: 'admin_products_listing_price_title'} %>
+        <th scope="col" class="pl-5" colspan="2"><%= sort_link @search,:name, Spree.t(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
+        <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) %>
+          <th scope="col" class="text-center"><%= Spree.t(:vendor) %></th>
+        <% end %>
+        <th scope="col" class="text-center"><%= Spree.t('admin.kind') %></th>
+        <th scope="col" class="text-center"><%= Spree.t(:status) %></th>
+        <th scope="col" class="text-center" class="text-center">
+          <%= sort_link @search, :master_default_price_amount, Spree.t(:price), {}, {title: 'admin_products_listing_price_title'} %>
         </th>
-        <th scope="col" data-hook="admin_products_index_header_actions" class="actions"></th>
+        <th scope="col" class="text-center" data-hook="admin_products_index_header_actions" class="actions"></th>
       </tr>
     </thead>
     <tbody>
@@ -71,10 +59,26 @@
                 <%= small_image product %>
               <% end %>
             </td>
-            <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
-            <td class="sku"><%= product.sku rescue '' %></td>
-            <td class="text-center"><%= active_badge(product.digitals.any?) %></td>
-            <td class="status"><%= active_badge(available_status == Spree.t(:available), label: available_status) %></td>
+            <td>
+              <%= link_to product.name, edit_admin_product_path(product) %>
+              <br />
+              <small><%= product.sku rescue '' %></small>
+            </td>
+            <% if defined?(Spree::Vendor) && can?(:manage, Spree::Vendor) %>
+              <td class="text-center">
+                <%= link_to product.vendor.name, spree.admin_vendor_path(product.vendor_id) if product.vendor.present? %>
+              </td>
+            <% end %>
+            <td class="text-center">
+              <span class="badge badge-pill badge-light">
+                <% if product.digital? %>
+                  <%= Spree.t('admin.product_kinds.digital') %>
+                <% else %>
+                  <%= Spree.t('admin.product_kinds.physical') %>
+                <% end %>
+              </span>
+            </td>
+            <td class="status text-center"><%= active_badge(available_status == Spree.t('admin.product.active'), label: available_status) %></td>
             <td class="text-center"><%= display_price(product) %></td>
 
             <td class="actions " data-hook="admin_products_index_row_actions">
@@ -90,7 +94,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Product)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Product) %>!
   </div>

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

@@ -5,82 +5,67 @@
   <%= Spree.t(:new_product) %>
 <% end %>
 
-<%= form_for [:admin, @product], html: { multipart: true } do |f| %>
-  <fieldset data-hook="new_product">
-    <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
-      <%= f.text_field :name, class: 'form-control title', required: :required %>
-      <%= f.error_message_on :name %>
-    <% end %>
+<div class="card">
+  <div class="card-body">
+    <%= form_for [:admin, @product], html: { multipart: true } do |f| %>
+      <fieldset data-hook="new_product">
+        <%= f.field_container :name do %>
+          <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+          <%= f.text_field :name, class: 'form-control title', required: :required %>
+          <%= f.error_message_on :name %>
+        <% end %>
 
-    <div data-hook="new_product_attrs" class="row">
-      <% unless @product.has_variants? %>
-        <div data-hook="new_product_sku" class="col-12 col-md-4">
-          <%= f.field_container :sku do %>
-            <%= f.label :sku, Spree.t(:sku) %>
-            <%= f.text_field :sku, size: 16, class: 'form-control' %>
-            <%= f.error_message_on :sku %>
+        <div data-hook="new_product_attrs" class="row">
+          <% unless @product.has_variants? %>
+            <div data-hook="new_product_sku" class="col-12 col-md-4">
+              <%= f.field_container :sku do %>
+                <%= f.label :sku, Spree.t(:sku) %>
+                <%= f.text_field :sku, size: 16, class: 'form-control' %>
+                <%= f.error_message_on :sku %>
+              <% end %>
+            </div>
           <% end %>
-        </div>
-      <% end %>
-
-      <div data-hook="new_product_prototype" class="col-12 col-md-4">
-        <%= f.field_container :prototype do %>
-          <%= f.label :prototype_id, Spree.t(:prototype) %>
-          <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
-        <% end %>
-      </div>
 
-      <div data-hook="new_product_price" class="col-12 col-md-4">
-        <%= f.field_container :price do %>
-        <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
-        <div class="input-group">
-          <div class="input-group-prepend">
-            <span class="input-group-text"><%= currency_symbol(current_currency) %></span>
+          <div data-hook="new_product_prototype" class="col-12 col-md-4">
+            <%= f.field_container :prototype do %>
+              <%= f.label :prototype_id, Spree.t(:prototype) %>
+              <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
+            <% end %>
           </div>
-          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', required: :required %>
-        </div>
-          <%= f.error_message_on :price %>
-        <% end %>
-      </div>
-
-      <div data-hook="new_product_available_on" class="col-12 col-md-4">
-        <%= f.field_container :available_on do %>
-          <%= f.label :available_on, Spree.t(:available_on) %>
-          <%= f.error_message_on :available_on %>
 
-          <div class="input-group datepicker"
-               data-wrap="true"
-               data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>">
-            <%= f.text_field :available_on,
-                             value: datepicker_field_value(@product.available_on),
-                             placeholder: Spree.t(:select_a_date),
-                             class: 'form-control shadow-none',
-                             'data-input':'' %>
-
-            <%= render partial: 'spree/admin/shared/cal_close' %>
+          <div data-hook="new_product_price" class="col-12 col-md-4">
+            <%= f.field_container :price do %>
+            <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
+            <div class="input-group">
+              <div class="input-group-prepend">
+                <span class="input-group-text"><%= currency_symbol(current_currency) %></span>
+              </div>
+              <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', required: :required %>
+            </div>
+              <%= f.error_message_on :price %>
+            <% end %>
           </div>
-        <% end %>
-      </div>
 
-      <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
-        <%= f.field_container :shipping_category do %>
-          <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
-          <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
-          <%= f.error_message_on :shipping_category_id %>
-        <% end %>
-      </div>
+          <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
+            <%= f.field_container :shipping_category do %>
+              <%= f.label :shipping_category_id, raw(Spree.t(:shipping_categories) + required_span_tag) %>
+              <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { selected: @product.shipping_category_id }, { class: 'select2 w-100' }) %>
+              <%= f.error_message_on :shipping_category_id %>
+            <% end %>
+          </div>
 
-    </div>
+        </div>
 
-    <div data-hook="product-from-prototype" id="product-from-prototype">
-      <%= render template: 'spree/admin/prototypes/show' if @prototype %>
-    </div>
+        <div data-hook="product-from-prototype" id="product-from-prototype">
+          <%= render template: 'spree/admin/prototypes/show' if @prototype %>
+        </div>
 
-    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+        <%= render partial: 'spree/admin/shared/new_resource_links' %>
 
-  </fieldset>
-<% end %>
+      </fieldset>
+    <% end %>
+  </div>
+</div>
 
 <script type="text/javascript">
 //<![CDATA[