spree_admin 5.0.0.rc1

data/app/views/spree/admin/products/form/_inventory.html.erb

@@ -0,0 +1,63 @@
+<div class="card mb-4">
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h5 class="card-title"><%= Spree.t(:inventory) %></h5>
+
+    <% if can?(:manage, Spree::StockLocation) %>
+      <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_stock_locations'), spree.admin_stock_locations_path, class: 'btn btn-sm btn-light' %>
+    <% end %>
+  </div>
+  <div class="card-body">
+    <div class="custom-control custom-checkbox mb-4">
+      <%= f.check_box :track_inventory,
+            class: 'custom-control-input',
+            data: {
+              product_form_target: 'trackInventoryCheckbox',
+              action: 'product-form#toggleQuantityTracked'
+            }
+          %>
+      <%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %>
+    </div>
+    <div
+      class="master-variant-quantity-form <%= @product.has_variants? || !@product.track_inventory ? 'd-none' : '' %>"
+      data-product-form-target="<%= @product.has_variants? ? '' : 'quantityForm' %>"
+    >
+      <h6 class="font-weight-bold"><%= Spree.t(:quantity) %></h6>
+      <hr class="mt-0">
+      <div class="mb-4">
+        <%= f.fields_for :master, @product.master do |vf| %>
+          <%= vf.fields_for :stock_items do |sif| %>
+            <%= sif.hidden_field :stock_location_id %>
+            <div class="row mb-2">
+              <div class="col-md-6 d-flex align-items-center">
+                <%= sif.object.stock_location.name %>
+              </div>
+              <div class="col-md-2">
+                <%= sif.number_field :count_on_hand, class: 'form-control' %>
+              </div>
+              <div class="col-md-4">
+                <div class="custom-control custom-checkbox d-flex align-items-center h-100">
+                  <%= sif.check_box :backorderable, class: 'custom-control-input' %>
+                  <%= sif.label :backorderable, Spree.t(:continue_selling_when_out_of_stock), class: 'custom-control-label' %>
+                </div>
+              </div>
+            </div>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-md-6">
+        <div class="form-group">
+          <%= f.label :sku, Spree.t('admin.products.inventory.sku') %>
+          <%= f.text_field :sku, class: 'form-control' %>
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="form-group">
+          <%= f.label :barcode, Spree.t('admin.products.inventory.barcode') %>
+          <%= f.text_field :barcode, class: 'form-control' %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_properties.html.erb

@@ -0,0 +1,46 @@
+<div class="card mb-4">
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h5 class="card-title"><%= Spree.t(:properties) %></h5>
+
+    <% if can?(:manage, Spree::Property) %>
+      <%= link_to_with_icon 'adjustments', Spree.t('admin.manage_properties'), spree.admin_properties_path, class: 'btn btn-sm btn-light' %>
+    <% end %>
+  </div>
+  <div class="card-body p-0">
+    <table class="table">
+      <thead>
+        <tr>
+          <th><%= Spree.t(:property) %></th>
+          <th><%= Spree.t(:value) %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <%= f.fields_for :product_properties do |product_property_form| %>
+          <% property = product_property_form.object.property %>
+          <%= product_property_form.hidden_field :id %>
+          <%= product_property_form.hidden_field :property_id %>
+          <tr>
+            <td class="align-top pt-3 w-25">
+              <code><%= property.name %></code>
+            </td>
+            <td class="w-75">
+              <div class="form-group">
+                <% if property.long_text? %>
+                  <%= product_property_form.text_area :value, { class: 'form-control', data: { controller: 'textarea-autogrow'} } %>
+                <% elsif property.number? %>
+                  <%= product_property_form.number_field :value, class: 'form-control' %>
+                <% elsif property.rich_text? %>
+                  <div class="trix-container">
+                    <%= product_property_form.rich_text_area :value %>
+                  </div>
+                <% else %>
+                  <%= product_property_form.text_field :value, class: 'form-control' %>
+                <% end %>
+              </div>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_shipping.html.erb

@@ -0,0 +1,16 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:shipping) %></h5>
+  </div>
+  <div class="card-body">
+    <% unless @product.has_variants? %>
+      <%= render 'spree/admin/variants/form/dimensions', f: f %>
+    <% end %>
+
+    <div class="form-group">
+      <%= f.label :shipping_category_id, Spree.t(:shipping_category) %>
+      <%= f.select(:shipping_category_id, @shipping_categories.pluck(:name, :id), { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+      <%= f.error_message_on :shipping_category %>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_status.html.erb

@@ -0,0 +1,52 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:status) %></h5>
+  </div>
+  <div class="card-body">
+    <div class="row mb-3">
+      <div class="col-6">
+        <div class="form-group">
+          <%= f.label :status, Spree.t(:status) %>
+          <%= help_bubble(Spree.t('admin.products.status_form.status')) if show_product_status_help_bubble? %>
+          <% select_html = { 
+                            data: {
+                              controller: 'autocomplete-select',
+                              action: 'change->product-form#switchAvailabilityDatesFields',
+                              'product-form-target': 'status'
+                            } 
+          } %>
+          <%= f.select(:status, available_status_options(@product), { selected: @product.status }, select_html) %>
+          <%= f.error_message_on :status %>
+        </div>
+      </div>
+      <div class="col-6 <% if @product.active? %>d-none<% end %>" data-product-form-target="makeActiveAt">
+        <% if can?(:activate, @product) %>
+          <div class="form-group">
+            <%= f.label :make_active_at, Spree.t(:make_active_at) %>
+            <%= help_bubble(Spree.t('admin.products.status_form.make_active_at')) %>
+            <%= f.error_message_on :make_active_at %>
+            <%= f.datetime_field :make_active_at, class: 'form-control', max: @product.discontinue_on %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+    <div class="row">
+      <div data-product-form-target="availableOn" class="col-6">
+        <div class="form-group">
+          <%= f.label :available_on, Spree.t(:available_on) %>
+          <%= help_bubble(Spree.t('admin.products.status_form.available_on')) %>
+          <%= f.error_message_on :available_on %>
+          <%= f.datetime_field :available_on, class: 'form-control', max: @product.discontinue_on %>
+        </div>
+      </div>
+      <div data-product-form-target="discontinueOn" class="col-6">
+        <div class="form-group">
+          <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
+          <%= help_bubble(Spree.t('admin.products.status_form.discontinue_on')) %>
+          <%= f.error_message_on :discontinue_on %>
+          <%= f.datetime_field :discontinue_on, class: 'form-control', min: @product.make_active_at %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_stores.html.erb

@@ -0,0 +1,27 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:stores) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <% if can? :modify, Spree::StoreProduct %>
+        <p class="form-text"><%= Spree.t('admin.products.stores.choose_stores') %>.</p>
+
+        <%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>
+          <div class="custom-control custom-checkbox mb-1">
+            <%= b.check_box(class: 'custom-control-input') %>
+            <%= b.label(class: 'custom-control-label') %>
+          </div>
+        <% end %>
+      <% elsif @product.stores.any? %>
+        <ul class="text_list">
+          <% @product.stores.pluck(:name).each do |store_name| %>
+            <li><%= store_name %></li>
+          <% end %>
+        </ul>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -0,0 +1,171 @@
+<% if @product.has_variants? || can?(:manage_option_types, @product) %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title"><%= Spree.t(:variants) %></h5>
+    </div>
+    <% option_types_for_select = @option_types.pluck(:presentation, :id) %>
+    <div class="card-body p-0">
+      <div
+        data-controller="variants-form"
+        class="variants-form"
+        data-action="product-form:toggle-quantity-tracked@window->variants-form#toggleQuantityTracked"
+        <% if @product.persisted? %> data-variants-form-product-id-value="<%= @product.slug %>" <% end %>
+        data-variants-form-current-currency-value="<%= current_currency %>"
+        data-variants-form-currencies-value="<%= supported_currencies.map(&:to_s).to_json %>"
+        data-variants-form-current-stock-location-id-value="<%= default_stock_location_for_product(@product).id %>"
+        data-variants-form-stock-locations-value="<%= available_stock_locations_for_product(@product).ids.map(&:to_s).to_json %>"
+        <% if @product_options.present? %> data-variants-form-options-value="<%= @product_options.to_json %>" <% end %>
+        <% if @product_available_options.present? %> data-variants-form-available-options-value="<%= @product_available_options.to_json %>" <% end %>
+        <% if @product_stock.present? %> data-variants-form-stock-value="<%= @product_stock.to_json %>" <% end %>
+        <% if @product_prices.present? %> data-variants-form-prices-value="<%= @product_prices.to_json %>" <% end %>
+        <% if @product_variant_ids.present? %> data-variants-form-variant-ids-value="<%= @product_variant_ids.to_json %>" <% end %>
+        >
+        <div class="options-creator">
+          <%= render 'spree/admin/products/form/variants/option_template', option_types_for_select: option_types_for_select %>
+          <div data-variants-form-target="optionsContainer" class="options-creator__options_container">
+            <% @product.product_option_types.includes(:option_type).reorder('spree_product_option_types.position').each do |product_option_type| %>
+              <% option_type = product_option_type.option_type %>
+              <%= hidden_field_tag "product[option_type_ids][]", option_type.id %>
+              <div class="options-creator__option" data-variants-form-target="option" id="option-<%= option_type.id %>">
+                <% if can?(:manage_option_types, @product) %>
+                  <button class="draggable" type="button">
+                    <i class="ti ti-grip-vertical"></i>
+                  </button>
+                <% end%>
+                <div class="w-100">
+                  <div class="d-flex justify-content-between">
+                    <h6 data-slot="optionName"><%= option_type.presentation %></h6>
+                    <% if can?(:manage_option_types, @product) %>
+                      <button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param="<%= option_type.id %>"><%= Spree.t(:edit) %></button>
+                    <% end %>
+                  </div>
+                  <div data-slot="optionValuesContainer">
+                    <% @product.option_values.where(option_type: option_type).pluck(:presentation).uniq.each do |option_value| %>
+                      <span class="badge badge-light" data-slot="optionValueName" data-name="<%= option_value %>"><%= option_value %></span>
+                    <% end %>
+                  </div>
+                </div>
+              </div>
+            <% end %>
+          </div>
+          <div class="options-creator__option options-creator__option--new d-none" data-variants-form-target="newOptionForm">
+            <div class="w-100">
+              <div class="form-group">
+                <label class="label" for="new_option_name"><%= Spree.t(:option_name) %></label>
+                <%= tom_select_tag :new_option_name,
+                  multiple: false,
+                  create: true,
+                  preloaded_options: option_types_for_select,
+                  include_blank: true,
+                  select_data: {
+                    variants_form_target: "newOptionNameInput",
+                    action: "variants-form#handleSelectedOptionName tomSelectInitialized->variants-form#refreshOptionNameSelect"
+                  } %>
+                <% if can?(:manage, Spree::OptionType) %>
+                  <p class="form-text text-muted mt-2">
+                    <%= Spree.t('admin.products.variants.option_types_link', link: spree.admin_option_types_path).html_safe %>
+                  </p>
+                <% end %>
+              </div>
+              <div class="form-group">
+                <span class="label"><%= Spree.t(:option_values) %></span>
+                <div data-controller="multi-tom-select" class="values-inputs" data-variants-form-target="newOptionValuesSelectContainer">
+                  <%= tom_select_tag "new_option_values[]",
+                    template: true,
+                    multiple: false,
+                    create: true,
+                    include_blank: true,
+                    data: {
+                      multi_tom_select_target: "selectTemplate"
+                    },
+                    select_data: {
+                      variants_form_target: "newOptionValuesSelect",
+                      action: "multi-tom-select#handleSelect keydown.enter->variants-form#handleNewOption:prevent"
+                    } %>
+
+                  <%= tom_select_tag "new_option_values[]",
+                    multiple: false,
+                    create: true,
+                    include_blank: true,
+                    data: {
+                      multi_tom_select_target: "select"
+                    },
+                    select_data: {
+                      variants_form_target: "newOptionValuesSelect",
+                      action: "multi-tom-select#handleSelect keydown.enter->variants-form#handleNewOption:prevent"
+                    } %>
+                </div>
+              </div>
+              <div class="d-flex justify-content-between">
+                <button class="btn btn-light btn-sm" data-action="variants-form#hideNewOptionForm" type="button"><%= Spree.t('actions.discard') %></button>
+                <button class="btn btn-primary btn-sm" data-action="variants-form#handleNewOption" type="button"><%= Spree.t(:done) %></button>
+              </div>
+            </div>
+          </div>
+          <% if can?(:manage_option_types, @product) %>
+            <button
+              class="new_option_button"
+              type="button"
+              data-variants-form-target="newOptionButton" data-action="variants-form#showNewOptionForm"
+            >
+              <i class="ti ti-plus" ></i>
+              <span
+                data-has-options-text="<%= Spree.t('admin.variants_form.add_option.not_empty') %>"
+                data-no-options-text="<%= Spree.t('admin.variants_form.add_option.empty') %>"
+                data-variants-form-target="newOptionButtonLabel"
+              >
+                <%= Spree.t('admin.variants_form.add_option.empty') %>
+              </span>
+            </button>
+          <% end %>
+        </div>
+        <div class="variants-table <% unless @product.has_variants? %>d-none<% end %>" data-variants-form-target="variantsTable">
+          <div class="variants-table__actions gap-3">
+            <% if supported_currencies.length > 1 %>
+              <div class="d-flex flex-row align-items-center gap-2">
+                <label for="currency" class="mb-0"><%= Spree.t(:currency) %></label>
+                <%= select_tag 'currency', options_for_select(supported_currencies, current_store.default_currency), class: 'variants-table__actions__select custom-select', data: { action: 'variants-form#updateCurrency' } %>
+              </div>
+            <% end %>
+            <% if available_stock_locations_for_product(@product).size > 1 %>
+              <div class="d-flex flex-row align-items-center gap-2">
+                <label for="stock_location" class="mb-0"><%= Spree.t(:stock_location) %></label>
+                <%= select_tag 'stock_location', variant_form_stock_location_options, class: 'variants-table__actions__select custom-select', data: { action: 'variants-form#updateStockLocationId' } %>
+              </div>
+            <% end %>
+          </div>
+          <div class="variants-table__header border-top border-bottom">
+            <% if can?(:destroy, @product.default_variant)  %>
+              <div class="variants-table__body__cell column-checkbox">
+                <div class="custom-control custom-checkbox">
+                  <%= check_box_tag "ids[]", nil, false, class: "custom-control-input", id: "ids", data: { variants_form_target: "checkboxAll" } %>
+                  <label class="custom-control-label" for="ids"><span></span></label>
+                </div>
+              </div>
+            <% end%>
+            <div class="variants-table__header__cell column-variant">
+              <%= Spree.t(:variant) %>
+              <button data-variants-form-target="deleteButton" data-action="variants-form#deleteSelected" type="button" class="delete-button d-none ml-3">
+                <i class="ti ti-trash"></i> <%= Spree.t(:delete_selected) %>
+              </button>
+            </div>
+            <div class="variants-table__header__cell  column-price">
+              <%= Spree.t(:price) %>
+            </div>
+            <div class="variants-table__header__cell column-quantity">
+              <%= Spree.t(:quantity) %>
+            </div>
+            <div class="variants-table__header__cell column-actions">
+            </div>
+          </div>
+          <%= render 'spree/admin/products/form/variants/variant_template', default_stock_location: default_stock_location_for_product(@product) %>
+          <div class="variants-table__body" data-variants-form-target="variantsContainer">
+          </div>
+          <div class="variants-table__footer">
+            <%= Spree.t('admin.variants_form.total_inventory_html', stock_location: current_store.default_stock_location.name, count: raw("<span data-variants-form-target='stockItemsCount'>#{@product.total_on_hand}</span>") )%>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end%>

data/app/views/spree/admin/products/form/variants/_option_template.html.erb

@@ -0,0 +1,59 @@
+<template data-variants-form-target="optionValueTemplate">
+  <span class="badge badge-light" data-slot="optionValueName"></span>
+</template>
+<template data-variants-form-target="optionTemplate">
+  <div class="options-creator__option" data-variants-form-target="option">
+    <% if can?(:manage_option_types, @product)  %>
+      <button class="draggable" type="button">
+        <i class="ti ti-grip-vertical"></i>
+      </button>
+    <% end %>
+    <div class="w-100">
+      <div class="d-flex justify-content-between">
+        <h6 data-slot="optionName"></h6>
+        <% if can?(:manage_option_types, @product) %>
+          <button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param=""><%= Spree.t(:edit) %></button>
+        <% end %>
+      </div>
+      <div data-slot="optionValuesContainer"></div>
+    </div>
+  </div>
+</template>
+<template data-variants-form-target="optionFormTemplate">
+  <div class="options-creator__option options-creator__option--form" data-slot="optionForm">
+    <div class="w-100">
+      <div class="form-group">
+        <label class="label" for="option_name"><%= Spree.t(:option_name) %></label>
+        <%= tom_select_tag :option_name,
+          multiple: false,
+          create: true,
+          preloaded_options: option_types_for_select,
+          include_blank: true,
+          select_data: {
+            action: "variants-form#handleSelectedOptionName tomSelectInitialized->variants-form#refreshOptionNameSelect"
+          } %>
+      </div>
+      <div class="form-group">
+        <span class="label"><%= Spree.t(:option_values) %></span>
+        <div data-controller="multi-tom-select" class="values-inputs" data-variants-form-target="newOptionValuesSelectContainer" data-slot="optionValuesSelectContainer">
+          <%= tom_select_tag "new_option_values[]",
+            template: true,
+            multiple: false,
+            create: true,
+            include_blank: true,
+            data: {
+              multi_tom_select_target: "selectTemplate"
+            },
+            select_data: {
+              variants_form_target: "newOptionValuesSelect",
+              action: "multi-tom-select#handleSelect keydown.enter->variants-form#handleNewOption:prevent"
+            } %>
+        </div>
+      </div>
+      <div class="d-flex justify-content-between">
+        <button class="btn btn-danger btn-outline btn-sm" data-action="variants-form#discardOption" data-variants-form-option-id-param="" type="button"><%= Spree.t('actions.destroy') %></button>
+        <button class="btn btn-primary btn-sm" data-variants-form-option-id-param="" data-action="variants-form#saveOption" type="button"><%= Spree.t(:done) %></button>
+      </div>
+    </div>
+  </div>
+</template>

data/app/views/spree/admin/products/form/variants/_variant_template.html.erb

@@ -0,0 +1,44 @@
+<% test_stock_item = Spree::StockItem.new(variant_id: @product.default_variant.id) %>
+<% test_price = Spree::Price.new(variant_id: @product.default_variant.id) %>
+<% can_manage_stock = @product.new_record? ? true : can?(:manage, test_stock_item) %>
+<% can_manage_prices = @product.new_record? ? true : can?(:manage, test_price) %>
+<template data-variants-form-target="variantTemplate">
+  <div class="variants-table__body__row hover-light" data-variants-form-target="variant">
+    <% if can?(:destroy, @product.default_variant) %>
+      <div class="variants-table__body__cell column-checkbox">
+        <div class="custom-control custom-checkbox">
+          <input type="checkbox" value="1" class="custom-control-input"  data-variants-form-target="checkbox" id="checkbox_"  data-action="change->variants-form#refresh">
+          <label class="custom-control-label" for="checkbox_"><span></span></label>
+        </div>
+      </div>
+    <% end %>
+    <div class="variants-table__body__cell column-variant" data-slot="variantName">
+      Medium
+    </div>
+    <div class="variants-table__body__cell column-price">
+      <% supported_currencies.each_with_index do |currency, i| %>
+        <div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container <%= current_currency != currency ? 'd-none' : 'd-flex' %>" <%= !can_manage_prices ? 'readonly' : '' %>>
+          <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '',  class: 'form-control-plaintext px-0', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice', currency: currency.to_s }, readonly: !can_manage_prices %>
+          <span><%= currency_symbol(currency) %></span>
+        </div>
+        <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][currency]", currency, data: {slot: "[prices_attributes][#{currency}][currency]_input"} %>
+        <%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][id]", "", data: {slot: "[prices_attributes][#{currency}][id]_input"} %>
+      <% end %>
+    </div>
+    <div class="variants-table__body__cell column-quantity">
+      <% available_stock_locations_for_product(@product).ids.each_with_index do |id, i|  %>
+        <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, class: class_names('form-control', default_stock_location.id == id ? 'd-block' : 'd-none'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %>
+        <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][stock_location_id]", id, data: { slot: "[stock_items_attributes][#{id}][stock_location_id]_input" } %>
+        <%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][id]", "", data: { slot: "[stock_items_attributes][#{id}][id]_input" } %>
+      <% end %>
+    </div>
+    <% if can?(:manage, @product.default_variant) %>
+      <div class="variants-table__body__cell column-actions d-flex align-items-center">
+        <a href="#" class="btn btn-sm btn-light invisible ml-2" data-slot="variantEditButton">
+          <%= icon('edit') %>
+          <%= Spree.t(:edit)%>
+        </a>
+      </div>
+    <% end %>
+  </div>
+</template>

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

@@ -0,0 +1,18 @@
+<%= render 'index_header' %>
+
+<div class="card-lg p-0">
+  <% if params[:frame_name].present? %>
+    <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth } do %>
+      <%= render 'filters' %>
+      <%= render 'list' %>
+    <% end %>
+  <% else %>
+    <%= render 'filters' %>
+    <%= render 'list' %>
+  <% end %>
+</div>
+
+<p class="text-muted small text-center py-2 px-3 mt-4 rounded-pill mx-auto d-flex-inline">
+  Learn more about 
+  <%= external_link_to 'managing products', 'https://spreecommerce.org/docs/user/manage-products', class: 'text-decoration-none' %>
+</p>

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

@@ -0,0 +1,9 @@
+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @product } %>
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_products_path, @product %>
+  <%= Spree.t(:new_product) %>
+<% end %>
+<%= form_for [:admin, @product] do |f| %>
+  <%= render 'form', f: f %>
+  <%= render 'spree/admin/shared/new_resource_links' %>
+<% end %>

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

@@ -0,0 +1,79 @@
+<%= content_for(:page_title) do %>
+  <%= Spree.t('admin.edit_profile') %>
+<% end %>
+
+<%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>
+  <div class="row">
+    <div class="col-lg-6 mb-4">
+      <div class="card">
+        <div class="card-header">
+          <h5 class="card-title"><%= Spree.t('admin.personal_details') %></h5>
+        </div>
+        <div class="card-body">
+          <div class="form-group mb-4">
+            <%= f.label :email, class: 'form-label' %>
+            <%= f.email_field :email, class: 'form-control', required: true %>
+          </div>
+          <div class="form-group mb-4">
+            <%= f.label :first_name, class: 'form-label' %>
+            <%= f.text_field :first_name, class: 'form-control', required: true %>
+          </div>
+          <div class="form-group mb-4">
+            <%= f.label :last_name, class: 'form-label' %>
+            <%= f.text_field :last_name, class: 'form-control', required: true %>
+          </div>
+          <div class="form-group mb-0">
+            <div>
+              <%= f.label :avatar, class: 'form-label' %>
+            </div>
+            <%= render 'active_storage/upload_form', form: f, field_name: :avatar, crop: true %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="col-lg-6 mb-4">
+      <div class="card">
+        <div class="card-header">
+          <h5 class="card-title"><%= Spree.t('admin.notifications') %></h5>
+        </div>
+        <div class="card-body">
+          <% if @user.respond_to?(:deliver_invitation_accepted_email) %>
+            <div class="custom-control custom-switch mb-3">
+              <%= f.check_box :deliver_invitation_accepted_email, class: 'custom-control-input' %>
+              <%= f.label :deliver_invitation_accepted_email, 'Someone accepted your team invitation', class: 'custom-control-label' %>
+            </div>
+          <% end %>
+
+          <% if @user.respond_to?(:deliver_vendor_new_order_email) %>
+            <hr />
+            <div class="custom-control custom-switch mb-3">
+              <%= f.check_box :deliver_vendor_new_order_email, class: 'custom-control-input' %>
+              <%= f.label :deliver_vendor_new_order_email, 'New order notification', class: 'custom-control-label' %>
+            </div>
+          <% end %>
+
+          <% if @user.respond_to?(:deliver_vendor_onboarding_started_email) %>
+            <hr />
+            <div class="custom-control custom-switch mb-3">
+              <%= f.check_box :deliver_vendor_onboarding_started_email, class: 'custom-control-input' %>
+              <%= f.label :deliver_vendor_onboarding_started_email, 'Vendor started onboarding', class: 'custom-control-label' %>
+            </div>
+            <div class="custom-control custom-switch mb-3">
+              <%= f.check_box :deliver_vendor_onboarding_completed_email, class: 'custom-control-input' %>
+              <%= f.label :deliver_vendor_onboarding_completed_email, 'Vendor completed onboarding', class: 'custom-control-label' %>
+            </div>
+            <div class="custom-control custom-switch mb-3">
+              <%= f.check_box :deliver_vendor_approved_email, class: 'custom-control-input' %>
+              <%= f.label :deliver_vendor_approved_email, 'Vendor has been approved', class: 'custom-control-label' %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="form-actions">
+    <%= turbo_save_button_tag Spree.t('actions.update') %>
+  </div>
+<% end %>

data/app/views/spree/admin/promotion_actions/_promotion_action.html.erb

@@ -0,0 +1,45 @@
+<%= turbo_frame_tag promotion_action do  %>
+  <div class="card" id="<%= spree_dom_id(promotion_action) %>">
+    <div class="card-header d-flex justify-content-between align-items-center">
+      <h5 class="card-title"><%= promotion_action.human_name %></h5>
+
+      <% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %>
+        <div class="dropdown">
+          <button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">
+            <%= icon('dots', class: 'mr-0') %>
+        </button>
+        <div class="dropdown-menu">
+            <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item' if can?(:update, promotion_action) %> 
+            <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_action) %>
+          </div>
+        </div>
+      <% end %>
+    </div>
+    <div class="card-body">
+      <p class="text-muted"><%= promotion_action.human_description %></p>
+
+      <% if promotion_action.preferences.present? %>
+        <%= render 'spree/admin/shared/preferences', object: promotion_action %>
+      <% end %>
+
+      <% if promotion_action.respond_to?(:calculator) && promotion_action.calculator.present? && promotion_action.calculator.preferences.present? %>
+        <h6><%= Spree.t(:calculator) %>: <%= promotion_action.calculator.description %></h6>
+        <%= render 'spree/admin/shared/preferences', object: promotion_action.calculator %>
+      <% end %>
+
+      <% if promotion_action.respond_to?(:promotion_action_line_items) %>
+        <h6><%= Spree.t(:line_items) %></h6>
+        <ul class="list-group">
+          <% promotion_action.promotion_action_line_items.each do |line_item| %>
+            <li class="list-group-item d-flex justify-content-between align-items-center">
+              <%= link_to line_item.variant.descriptive_name, spree.edit_admin_product_variant_path(line_item.variant.product, line_item.variant) %>
+              <span>
+                <%= Spree.t(:quantity) %>: <%= line_item.quantity %>
+              </span>
+            </li>
+          <% end %>
+        </ul>
+      <% end %>
+    </div>
+  </div>
+<% end %>