Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Open source missing line items views (#12390)

Damian Legawiec72273d2977df
diff --git a/admin/app/views/spree/admin/line_items/edit.html.erb b/admin/app/views/spree/admin/line_items/edit.html.erb
new file mode 100644
index 0000000000..3759ceb410
--- /dev/null
+++ b/admin/app/views/spree/admin/line_items/edit.html.erb
@@ -0,0 +1,36 @@
+<%= turbo_frame_tag dom_id(@line_item) do %>
+ <%= form_with model: @line_item, url: spree.admin_order_line_item_path(@order, @line_item), class: "order-line-items__form" do |f| %>
+ <%= render 'spree/admin/variants/variant', variant: @line_item.variant %>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= @line_item.single_money.to_html %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= f.number_field :quantity, class: 'form-control', required: true, max: @line_item.variant.should_track_inventory? && !@line_item.variant.backorderable? ? @line_item.variant.total_on_hand + @line_item.quantity : nil, min: 1 %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= @line_item.display_amount %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= @line_item.display_additional_tax_total || @line_item.display_included_tax_total %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= @line_item.display_promo_total %>
+ </span>
+ <span class="d-flex align-items-center justify-content-center">
+ <%= @line_item.display_total %>
+ </span>
+ <span>
+ </span>
+ <% if can?(:delete, @line_item) %>
+ <span style="grid-column-start: product_description/">
+ <%= link_to Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, @line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'btn btn-danger btn-sm' %>
+ </span>
+ <% end %>
+ <span class="d-flex gap-2 justify-content-center" style="grid-column: discount/-1">
+ <% if can?(:update, @line_item) %>
+ <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %>
+ <% end %>
+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>
+ </span>
+ <% end %>
+<% end %>
diff --git a/admin/app/views/spree/admin/line_items/new.html.erb b/admin/app/views/spree/admin/line_items/new.html.erb
new file mode 100644
index 0000000000..4d78cd2587
--- /dev/null
+++ b/admin/app/views/spree/admin/line_items/new.html.erb
@@ -0,0 +1,32 @@
+<%= turbo_frame_tag :dialog_modal do %>
+ <div class="modal-content" data-controller="search-picker">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_variant) %></h5>
+ <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
+ </div>
+ <div class="modal-body border-bottom pb-3">
+ <%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %>
+ <%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %>
+ <%= form.hidden_field :param_name, value: 'line_item' %>
+ <%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>
+ <%= form.hidden_field :currency, value: @order.currency %>
+ <% end %>
+ </div>
+ <%= form_with model: @line_item, url: spree.admin_order_line_items_path(@order), data: {turbo_frame: '_top'} do |form| %>
+ <div class="modal-body p-0" style="min-height: 200px">
+ <div id="variants_search_results" class="overflow-y-auto overflow-x-hidden" style="max-height: 300px">
+ <p class="text-muted text-center pb-3 pt-5">
+ <%= Spree.t(:start_typing_to_search_for_variants) %>
+ </p>
+ </div>
+ </div>
+ <div class="modal-footer border-top d-flex justify-content-between">
+ <div class="d-flex gap-2 m-0 align-items-center">
+ <%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>
+ <%= form.number_field :quantity, class: "form-control" %>
+ </div>
+ <%= turbo_save_button_tag Spree.t(:add_selected_variant), disabled: true, data: { search_picker_target: :submit } %>
+ </div>
+ <% end %>
+ </div>
+<% end %>
diff --git a/admin/spec/controllers/spree/admin/line_items_controller_spec.rb b/admin/spec/controllers/spree/admin/line_items_controller_spec.rb
new file mode 100644
index 0000000000..917a89b59c
--- /dev/null
+++ b/admin/spec/controllers/spree/admin/line_items_controller_spec.rb
@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+RSpec.describe Spree::Admin::LineItemsController, type: :controller do
+ stub_authorization!
+ render_views
+
+ let(:store) { Spree::Store.default }
+ let(:order) { create(:order_ready_to_ship, store: store) }
+ let(:line_item) { order.line_items.first }
+
+ describe '#new' do
+ it 'returns a success response' do
+ get :new, params: { order_id: order.number }
+ expect(response).to render_template(:new)
+ end
+ end
+
+ describe '#create' do
+ let(:order) { create(:order, store: store) }
+ let(:product) { create(:product_in_stock, stores: [store]) }
+
+ it 'returns a success response' do
+ post :create, params: { order_id: order.number, line_item: { variant_id: product.default_variant.id, quantity: 1 } }
+ expect(response).to redirect_to(spree.edit_admin_order_path(order, line_item_updated: true))
+ expect(order.line_items.count).to eq(1)
+ end
+ end
+
+ describe '#edit' do
+ it 'returns a success response' do
+ get :edit, params: { id: line_item.id, order_id: order.number }
+ expect(response).to render_template(:edit)
+ end
+ end
+
+ describe '#update' do
+ it 'returns a success response' do
+ put :update, params: { id: line_item.id, order_id: order.number, line_item: { quantity: 2 } }
+ expect(response).to redirect_to(spree.edit_admin_order_path(order, line_item_updated: true))
+ end
+ end
+
+ describe '#destroy' do
+ it 'returns a success response' do
+ delete :destroy, params: { id: line_item.id, order_id: order.number }
+ expect(response).to redirect_to(spree.edit_admin_order_path(order, line_item_updated: true))
+ end
+ end
+end