spree_cm_commissioner 2.0.3.pre.pre.pre7 → 2.1.0.pre.pre1

data/app/serializers/spree_cm_commissioner/v2/storefront/seat_layout_serializer.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class SeatLayoutSerializer < BaseSerializer
+        attributes :name, :status, :width, :height
+
+        has_many :seat_sections, serializer: SpreeCmCommissioner::V2::Storefront::SeatSectionSerializer
+        has_many :top_level_blocks, serializer: SpreeCmCommissioner::V2::Storefront::BlockSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/seat_section_serializer.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class SeatSectionSerializer < BaseSerializer
+        attributes :name, :width, :height, :x, :y, :rotation, :shape_path
+
+        has_many :blocks, serializer: SpreeCmCommissioner::V2::Storefront::BlockSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_place_serializer.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripPlaceSerializer < BaseSerializer
+        attributes :reference, :name, :vicinity, :lat, :lon, :icon, :url, :rating,
+                   :formatted_phone_number, :formatted_address, :address_components, :types
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_query_result_serializer.rb

@@ -0,0 +1,14 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripQueryResultSerializer < BaseSerializer
+        set_type :trip_query_result
+
+        attributes :quantity_available, :max_capacity
+
+        attribute :direct, &:direct?
+        has_many :trips, serializer: ::SpreeCmCommissioner::V2::Storefront::TripResultSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_result_serializer.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripResultSerializer < BaseSerializer
+        set_type :trip_result
+
+        attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
+                   :allow_seat_selection, :departure_time, :route_type
+        attribute :duration_in_hms, &:duration_in_hms
+        attribute :arrival_time, &:arrival_time
+        belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer
+        belongs_to :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_serializer.rb

@@ -0,0 +1,20 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripSerializer < BaseSerializer
+        attributes :departure_time, :arrival_time, :duration_in_hms, :route_type
+
+        has_one :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+
+        has_one :origin_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
+        has_one :destination_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
+
+        has_many :boarding_trip_stops, serializer: ::SpreeCmCommissioner::V2::Storefront::TripStopSerializer
+        has_many :drop_off_trip_stops, serializer: ::SpreeCmCommissioner::V2::Storefront::TripStopSerializer
+        has_many :variants, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVariantSerializer
+
+        belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_stop_serializer.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripStopSerializer < BaseSerializer
+        attributes :id, :stop_type, :stop_name, :arrival_time, :departure_time
+
+        has_one :stop_place, serializer: ::SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_variant_serializer.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripVariantSerializer < BaseSerializer
+        attributes :price, :display_price, :compare_at_price, :display_compare_at_price, :currency,
+                   :number_of_guests, :seat_type
+
+        has_many :variant_blocks, serializer: ::SpreeCmCommissioner::V2::Storefront::VariantBlockSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_vehicle_serializer.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripVehicleSerializer < BaseSerializer
+        set_type :vehicle
+
+        attributes :id, :code, :vehicle_type
+
+        has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
+
+        has_one :seat_layout, serializer: SpreeCmCommissioner::V2::Storefront::SeatLayoutSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_vendor_serializer.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripVendorSerializer < BaseSerializer
+        set_type :vendor
+
+        attributes :name, :star_rating
+
+        has_one :logo, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+
+        has_many :vendor_kind_option_types, serializer: ::Spree::V2::Storefront::OptionTypeSerializer
+        has_many :vendor_kind_option_values, serializer: ::Spree::V2::Storefront::OptionValueSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/variant_block_serializer.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class VariantBlockSerializer < BaseSerializer
+        attributes :variant_id, :block_id
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/transit/legs_builder_service.rb

@@ -0,0 +1,46 @@
+module SpreeCmCommissioner
+  module Transit
+    class LegsBuilderService
+      attr_reader :direction, :legs
+
+      def initialize(direction:, legs_params:)
+        @direction = direction
+        @legs = extract_legs_from_params(legs_params)
+      end
+
+      def call
+        legs.map do |leg|
+          SpreeCmCommissioner::Transit::Leg.new(
+            direction: direction,
+            trip_id: leg['trip_id'].to_i,
+            boarding_trip_stop_id: leg['boarding_trip_stop_id'].to_i,
+            drop_off_trip_stop_id: leg['drop_off_trip_stop_id'].to_i,
+            seat_selections: Array(leg['seat_selections']).map do |seat|
+              next if seat['quantity'].blank? && seat['block_ids'].blank?
+
+              SpreeCmCommissioner::Transit::SeatSelection.new(
+                variant_id: seat['variant_id'].to_i,
+                quantity: seat['quantity'].to_i.zero? ? seat['block_ids']&.size.to_i : seat['quantity'].to_i,
+                block_ids: seat['block_ids']&.map(&:to_i)
+              )
+            end.compact
+          )
+        end
+      end
+
+      def extract_legs_from_params(legs_params)
+        if legs_params.is_a?(String)
+          contents = Base64.urlsafe_decode64(legs_params)
+          JSON.parse(contents)
+        else
+          legs_params.map do |leg|
+            leg.permit(
+              :trip_id, :boarding_trip_stop_id, :drop_off_trip_stop_id,
+              seat_selections: [:variant_id, :quantity, { block_ids: [] }]
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -3,6 +3,10 @@ module SpreeCmCommissioner
   class UserAuthenticator
     # :username, :password
     # :id_token
+    # :fb_access_token
+    # :telegram_init_data, :tg_bot
+    # :session_id
+
     def self.call!(params)
       context = auth_context(params)
       raise exception(context.message) unless context.success?
@@ -25,7 +29,8 @@ module SpreeCmCommissioner
     end
 
     def self.auth_context(params)
-      tenant_id = find_oauth_application(params)&.tenant_id
+      oauth_application = find_oauth_application(params)
+      tenant_id = oauth_application&.tenant_id
 
       case flow_type(params)
       when 'login_auth'
@@ -34,6 +39,9 @@ module SpreeCmCommissioner
       when 'social_auth'
         options = { id_token: params[:id_token], tenant_id: tenant_id }
         SpreeCmCommissioner::UserIdTokenAuthenticator.call(options)
+      when 'facebook_auth'
+        options = { fb_access_token: params[:fb_access_token], tenant_id: tenant_id }
+        SpreeCmCommissioner::UserFbTokenAuthenticator.call(options)
       when 'telegram_web_app_auth'
         options = { telegram_init_data: params[:telegram_init_data], telegram_bot_username: params[:tg_bot] }
         SpreeCmCommissioner::UserTelegramWebAppAuthenticator.call(options)
@@ -46,6 +54,7 @@ module SpreeCmCommissioner
     def self.flow_type(params)
       return 'login_auth' if params.key?(:username) && params.key?(:password)
       return 'social_auth' if params.key?(:id_token)
+      return 'facebook_auth' if params.key?(:fb_access_token)
       return 'telegram_web_app_auth' if params.key?(:telegram_init_data) && params.key?(:tg_bot)
       return 'vattanac_bank_web_app_auth' if params.key?(:session_id)
 

data/app/views/shared/_map.html.erb

@@ -1,14 +1,15 @@
-<div class="border rounded mb-4"><div id="map" class="rounded" style="height: 200px;"></div></div>
+<% map_height ||= 200 %>
 
+<div class="border rounded mb-4">
+  <div id="map" class="rounded" style="height: <%= map_height %>px;"></div>
+</div>
 <% @default_latlon = ENV.fetch("DEFAULT_LATLON") %>
 <% @default_lat = @default_latlon.split(",")[0] %>
 <% @default_lon = @default_latlon.split(",")[1] %>
-
 <%= content_tag :div, class: 'map-selector', data: {
-  lat: lat || @default_lat, 
+  lat: lat || @default_lat,
   lon: lon || @default_lon
 } do %><% end %>
-
 <%# MAP scripts %>
 <% @map_key = ENV.fetch("GOOGLE_MAP_KEY") %>
 <% @map_src = "https://maps.googleapis.com/maps/api/js?key=#{@map_key}&callback=initMap&v=weekly" %>

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

@@ -77,9 +77,9 @@
 
     <div class="col-lg-12 col-sm-12">
       <div class="form-group">
-      <%= f.label :tenant_id, raw(Spree.t(:tenant) + ' (optional)') %>
-      <%= f.collection_select :tenant_id, SpreeCmCommissioner::Tenant.all, :id, :name, { prompt: Spree.t(:select_tenant) }, { class: 'form-control select2' } %>
-      <%= f.error_message_on :tenant_id %>
+      <%= f.label :vendor_id, raw(Spree.t(:vendor) + ' (optional)') %>
+      <%= f.collection_select :vendor_id, Spree::Vendor.all, :id, :name, { prompt: Spree.t(:select_vendor) }, { class: 'form-control select2' } %>
+      <%= f.error_message_on :vendor_id %>
       </div>
     </div>
   </div>

data/app/views/spree/admin/inventory_items/show.html.erb

@@ -0,0 +1,72 @@
+<%= turbo_frame_tag "inventory_item" do %>
+  <div>
+    <h5 class="modal-title">Inventory</h5>
+    <p>
+      <% if @inventory_item.inventory_date.present? %>
+        <span><%= @inventory_item.inventory_date %></span><br>
+      <% end %>
+      <%= @inventory_item.variant.options_text %>
+    </p>
+
+    <ul class="list-group mb-1">
+      <li class="list-group-item d-flex justify-content-between align-items-center">
+        Max capacity
+        <span class="badge badge-primary badge-pill"><%= @inventory_item.max_capacity %></span>
+      </li>
+      <li class="list-group-item d-flex justify-content-between align-items-center">
+        Quantity available
+        <span class="badge badge-primary badge-pill"><%= @inventory_item.quantity_available %></span>
+      </li>
+    </ul>
+
+    <small class="text-muted">
+      <%= inventory_item_message(@inventory_item, @cached_inventory_item) %>
+    </small>
+
+    <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
+      method: :patch,
+      remote: false,
+      class: 'icon_link btn btn-sm outline text-dark',
+      data: { confirm: "Only reset if stock is incorrect. Are you sure?" }, no_text: true
+    ) %>
+  </div>
+
+  <hr />
+
+  <div class="mt-2">
+    <h6 class="modal-title mb-1 d-flex flex-row justify-content-between">
+      Custom Prices
+      <%= link_to_with_icon('delete.svg', Spree.t(:remove),
+        delete_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id),
+        method: :delete, remote: false, class: 'icon_link btn btn-sm text-danger', data: { action: :remove, confirm: "Are you sure to remove these prices & use base price?" }, no_text: true
+      ) if @prices.any?(&:persisted?) %>
+    </h6>
+
+    <%= form_with url: update_prices_admin_product_variant_inventory_item_path(@product, @inventory_item.variant_id, @inventory_item.id), method: :patch, local: true, html: { class: 'inventory-item-prices-form' } do |form| %>
+      <table class="table">
+        <tbody>
+          <% @prices.each do |price| %>
+            <% currency = price.currency %>
+            <% default_price = @default_prices[currency] || Spree::Price.new %>
+            <tr id="inventory-item_prices_row_<%= currency %>" data-hook="inventory-item_prices_row">
+              <td><%= form.label "price_#{currency}", currency, class: 'form-label' %></td>
+              <td>
+                <%= form.hidden_field "prices[#{currency}][currency]", value: currency %>
+                <%= form.text_field "prices[#{currency}][price]", value: price.amount, placeholder: "Default: #{default_price.amount || 'N/A'}", class: 'form-control' %>
+              </td>
+              <td>
+                <%= form.text_field "prices[#{currency}][compare_at_price]", value: price.compare_at_price, placeholder: "Default: #{default_price.compare_at_price || 'N/A'}", class: 'form-control' %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+
+      <div class="d-flex flex-row justify-content-end mt-2">
+        <div class="form-actions" data-hook="buttons">
+          <%= button Spree.t('actions.save'), 'save.svg', 'submit', { class: 'btn-outline-success', data: { disable_with: "#{ Spree.t(:saving) }...", turbo_frame: "_top" } } %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,133 @@
+<div class="row g-4" data-controller="place">
+  <div class="col-md-6">
+    <div class="form-group">
+      <%= f.field_container :base_64_content do %>
+        <%= f.label :base_64_content, Spree.t(:place) %>
+        <% if can? :modify, SpreeCmCommissioner::Place %>
+          <% selected_name = f.object.name.presence || f.object.formatted_address || "Search Place" %>
+          <%= f.select :base_64_content, [], { include_hidden: true },
+            class: 'select2autocomplete',
+            data: {
+              autocomplete_url_value: 'places_api_v2',
+              autocomplete_return_attr_value: :name,
+              autocomplete_custom_return_id_value: :base_64_content
+            } do %>
+            <option selected><%= selected_name %></option>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <%= render 'shared/map', lat: f.object.lat, lon: f.object.lon, map_height: 270 %>
+  </div>
+
+  <div class="col-md-6">
+    <div class="card shadow-sm border-0">
+      <div class="card-header bg-light fw-semibold">
+        <i class="bi bi-geo-alt-fill me-2"></i><%= Spree.t(:location_details) %>
+      </div>
+
+      <div class="card-body">
+        <div class="mb-3">
+          <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+          <%= f.text_field :name,
+                class: "form-control",
+                placeholder: "Enter your name",
+                required: :required,
+                data: { target: "place.name" } %>
+          <%= error_message_on(f.object, :name) %>
+        </div>
+
+        <div class="row">
+          <div class="col-md-6 mb-3">
+            <%= f.label :lat, Spree.t(:lat), class: "form-label" %>
+            <%= f.text_field :lat,
+                  class: "form-control",
+                  placeholder: "e.g., 11.5621",
+                  data: { target: "place.lat" } %>
+            <%= error_message_on(f.object, :lat) %>
+          </div>
+
+          <div class="col-md-6 mb-3">
+            <%= f.label :lon, Spree.t(:lon), class: "form-label" %>
+            <%= f.text_field :lon,
+                  class: "form-control",
+                  placeholder: "e.g., 104.9143",
+                  data: { target: "place.lon" } %>
+            <%= error_message_on(f.object, :lon) %>
+          </div>
+        </div>
+
+        <div class="mb-3">
+          <%= f.label :formatted_address, Spree.t(:address), class: "form-label" %>
+          <%= f.text_field :formatted_address,
+                class: "form-control",
+                placeholder: "Enter your address",
+                data: { target: "place.address" } %>
+          <%= error_message_on(f.object, :formatted_address) %>
+        </div>
+
+        <%= f.hidden_field :reference, value: f.object.reference, data: { target: "place.reference" } %>
+        <%= f.hidden_field :types, value: f.object.types, data: { target: "place.types" } %>
+        <%= f.hidden_field :vicinity, value: f.object.vicinity, data: { target: "place.vicinity" } %>
+        <%= f.hidden_field :icon, value: f.object.icon, data: { target: "place.icon" } %>
+        <%= f.hidden_field :rating, value: f.object.rating, data: { target: "place.rating" } %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  let map, marker;
+
+  function initMap() {
+    const mapElement = document.getElementById("map");
+    if (!mapElement) return;
+
+    const container = document.querySelector(".map-selector");
+    const defaultLat = parseFloat(container?.dataset.lat) || 11.5621;
+    const defaultLon = parseFloat(container?.dataset.lon) || 104.8885;
+
+    const center = { lat: defaultLat, lng: defaultLon };
+
+    map = new google.maps.Map(mapElement, { center, zoom: 18 });
+    marker = new google.maps.Marker({ position: center, map });
+  }
+
+  document.addEventListener("spree:load", () => {
+    const select = document.querySelector(".select2autocomplete");
+    if (!select) return;
+
+    $(select).on("select2:select", (e) => {
+      const base64Content = e.params.data.id;
+      if (!base64Content) return;
+
+      try {
+        const placeData = JSON.parse(atob(base64Content));
+
+        const setValue = (selector, value) => {
+          const el = document.querySelector(selector);
+          if (el) el.value = value ?? "";
+        };
+
+        setValue('[data-target="place.name"]', placeData.name);
+        setValue('[data-target="place.lat"]', placeData.lat);
+        setValue('[data-target="place.lon"]', placeData.lon);
+        setValue('[data-target="place.address"]', placeData.formatted_address);
+        setValue('[data-target="place.reference"]', placeData.reference);
+        setValue('[data-target="place.types"]', placeData.types?.[0] || "");
+        setValue('[data-target="place.vicinity"]', placeData.vicinity);
+        setValue('[data-target="place.icon"]', placeData.icon);
+        setValue('[data-target="place.rating"]', placeData.rating);
+
+        if (placeData.lat && placeData.lon && map && marker) {
+          const newLatLng = new google.maps.LatLng(+placeData.lat, +placeData.lon);
+          map.setCenter(newLatLng);
+          marker.setPosition(newLatLng);
+        }
+      } catch (err) {
+        console.error("Error decoding or parsing place data:", err);
+      }
+    });
+  });
+</script>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_locations_path %>
+  <%= @object.name %>
+<% end %>
+
+<%= form_with model: @object, url: { action: 'update' }, html: { multipart: true } do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

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

@@ -0,0 +1,67 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:locations) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <% if can?(:create, SpreeCmCommissioner::Place) %>
+    <%= button_link_to Spree.t(:new_location),
+                     new_object_url,
+                     class: "btn-success",
+                     icon: "add.svg",
+                     id: "admin_new_location" %>
+  <% end %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_locations_index_search">
+    <%= search_form_for [:admin, @search], url: spree.admin_locations_path do |f| %>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_name_cont, Spree.t(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target" %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="admin_locations_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<div class="table-responsive border rounded bg-white mb-3" >
+  <table class="table" id="listing_locations" data-hook>
+    <thead class="text-muted">
+      <tr data-hook="location_header">
+        <th><%= sort_link @search, :name, Spree.t(:name), {}, { title: 'name' } %></th>
+        <th><%= Spree.t(:address) %></th>
+        <th><%= Spree.t(:latitude) %></th>
+        <th><%= Spree.t(:longitude) %></th>
+        <th><%= sort_link @search, :created_at, Spree.t(:created_at), {}, { title: 'created_at' } %></th>
+        <th><%= sort_link @search, :updated_at, Spree.t(:updated_at), {}, { title: 'updated_at' } %></th>
+        <th scope="col" data-hook="admin_locations_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @locations.each do |location| %>
+        <tr id="<%= spree_dom_id(location) %>" data-hook="location_row">
+          <td><%= link_to location.name, spree.edit_admin_location_path(location) %></td>
+          <td><%= location.formatted_address.presence || location.vicinity %></td>
+          <td><%= location.lat %></td>
+          <td><%= location.lon %></td>
+          <td><%= location.created_at %></td>
+          <td><%= location.updated_at %></td>
+          <td data-hook="admin_locations_index_row_actions">
+            <span class="d-flex justify-content-end ">
+              <%= link_to_edit(location, url: edit_admin_location_url(location), no_text: true, class: 'edit') if can?(:edit, location) %>
+              <%= link_to_delete(location, url: admin_location_url(location), no_text: true) if can?(:delete, location) %>
+            </span>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<%= paginate @locations, theme: 'admin-twitter-bootstrap-4' %>

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

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_locations_path %>
+  <%= Spree.t(:new_location) %>
+<% end %>
+
+<%= form_with model: @object, url: { action: 'create' }, html: { multipart: true } do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb

@@ -17,9 +17,11 @@
           </td>
           <td class="text-center d-flex flex-column align-items-center justify-content-center">
             <div style="width: 90px;">
-              <%= form_tag admin_stock_items_path(variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
+              <%= form_tag admin_product_stock_managements_path(product_id: params[:product_id], variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
                 <div class="input-group input-group-sm">
                   <%= number_field_tag 'stock_movement[quantity]', 0, class: 'form-control text-center p-0' %>
+                  <%= hidden_field_tag 'stock_movement[originator_id]', spree_current_user.id %>
+                  <%= hidden_field_tag 'stock_movement[originator_type]', spree_current_user.class.name %>
                   <div class="input-group-append">
                     <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
                       <%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>
@@ -32,7 +34,10 @@
           <td class="text-center">
             <% if item.persisted? && can?(:update, item) %>
               <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?, class: 'stock_item_backorderable', id: "stock_item_backorderable_#{stock_location.id}" %>
+                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
+                  class: 'stock_item_backorderable',
+                  id: "stock_item_backorderable_#{stock_location.id}",
+                  onclick: "if (!confirm('Are you sure to change backorderable status?')) { this.checked = !this.checked; }" %>
               <% end %>
             <% else %>
               <%= 'N/A' %>