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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Added New Order screen (#13175)
Damian Legawieca7bb102f658d
diff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rbindex c669c42568..78eaf54c82 100644--- a/admin/app/controllers/spree/admin/orders_controller.rb+++ b/admin/app/controllers/spree/admin/orders_controller.rb@@ -12,11 +12,21 @@ module Spreehelper_method :model_class, :object_url+ # GET /admin/orders/new+ def new+ @order = current_store.orders.new+ end+# POST /admin/ordersdef create- @order = Spree::Order.create(created_by: try_spree_current_user, store: current_store)-- redirect_to spree.edit_admin_order_path(@order)+ @order = current_store.orders.new(permitted_resource_params)+ @order.created_by = try_spree_current_user+ if @order.save+ flash[:success] = flash_message_for(@order, :successfully_created)+ redirect_to spree.edit_admin_order_path(@order)+ else+ render :new, status: :unprocessable_entity+ endend# GET /admin/orders/:id/edit@@ -113,6 +123,10 @@ module Spreedef object_urlspree.admin_order_path(@order)end++ def permitted_resource_params+ params.require(:order).permit(permitted_order_attributes)+ endendendenddiff --git a/admin/app/views/spree/admin/orders/_form.html.erb b/admin/app/views/spree/admin/orders/_form.html.erbnew file mode 100644index 0000000000..fc83260d8f--- /dev/null+++ b/admin/app/views/spree/admin/orders/_form.html.erb@@ -0,0 +1,12 @@+<%= f.spree_select :currency, options_for_select(supported_currency_options, current_store.default_currency), { label: Spree.t(:currency), autocomplete: true } %>++<hr class="my-4" />++<div class="form-group">+ <%= f.label :user_id, Spree.t(:select_user) %>+ <%= tom_select_tag 'order[user_id]', { include_blank: Spree.t(:select_user), options: users_for_select_options } %>+</div>++<p class="text-center text-muted my-0"><%= Spree.t(:or) %></p>++<%= f.spree_email_field :email, autofocus: f.object.new_record?, label: Spree.t('admin.orders.provide_email') %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erbindex 6f1d4fac41..507d5d1b3a 100644--- a/admin/app/views/spree/admin/orders/_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_summary.html.erb@@ -20,6 +20,13 @@<% end %><% end %>+ <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <span><%= Spree.t(:currency) %></span>+ <span id='currency'>+ <%= @order.currency %>+ </span>+ </li>+<li class="list-group-item d-flex justify-content-between align-items-center border-0"><span data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %></span><span id='item_total'>diff --git a/admin/app/views/spree/admin/orders/index.html.erb b/admin/app/views/spree/admin/orders/index.html.erbindex 5ffd6232c5..d4d7ff3714 100644--- a/admin/app/views/spree/admin/orders/index.html.erb+++ b/admin/app/views/spree/admin/orders/index.html.erb@@ -9,7 +9,7 @@<% content_for :page_actions do %><%= render_admin_partials(:orders_actions_partials) %><%= link_to_export_modal %>- <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary", data: { turbo_method: :post } if can?(:create, Spree::Order) %>+ <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.new_admin_order_path, class: "btn btn-primary" if can?(:create, Spree::Order) %><% end %><%= render_admin_partials(:orders_header_partials) %>diff --git a/admin/app/views/spree/admin/orders/new.html.erb b/admin/app/views/spree/admin/orders/new.html.erbnew file mode 100644index 0000000000..ed79775ef5--- /dev/null+++ b/admin/app/views/spree/admin/orders/new.html.erb@@ -0,0 +1,22 @@+<% content_for :title do %>+ <%= Spree.t(:orders) %>+<% end %>++<% content_for :page_title do %>+ <%= page_header_back_button spree.admin_orders_path %>+ <%= Spree.t(:new_order) %>+<% end %>++<%= form_for @order, url: spree.admin_orders_path do |f| %>+ <div class="row">+ <div class="col-lg-6 offset-lg-3">+ <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>+ <div class="card mb-4">+ <div class="card-body">+ <%= render 'form', f: f %>+ </div>+ </div>+ <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_orders_path } %>+ </div>+ </div>+<% end %>\ No newline at end of filediff --git a/admin/config/locales/en.yml b/admin/config/locales/en.ymlindex 2c4e80944c..d97d50cc0e 100644--- a/admin/config/locales/en.yml+++ b/admin/config/locales/en.yml@@ -136,6 +136,7 @@ en:orders_to_fulfill: Orders to fulfillpartially_refunded: Partially Refundedpayment_link_sent: Payment link was sent to the customer+ provide_email: Provide an email addressrefunded: Refundedremove_user_from_this_order: Remove customer from this orderunfulfilled: Unfulfilleddiff --git a/admin/config/routes.rb b/admin/config/routes.rbindex e63984956b..15e9bc8c9b 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -54,7 +54,7 @@ Spree::Core::Engine.add_routes do# ordersresources :checkouts, only: %i[index]- resources :orders, only: [:index, :edit, :create, :destroy] do+ resources :orders, only: [:index, :edit, :new, :create, :destroy] domember dopost :resendput :canceldiff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rbindex 32a57aff9b..e894961b10 100644--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb@@ -6,20 +6,30 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller dolet(:store) { @default_store }+ describe '#new' do+ it 'returns a success response' do+ get :new+ expect(response).to render_template(:new)+ end+ end+describe '#create' do- subject { post :create }+ subject { post :create, params: { order: { currency: 'EUR', email: '[email protected]' } } }let(:order) { Spree::Order.last }- it 'creates a blank order' do+ it 'creates a new order' doexpect { subject }.to change(Spree::Order, :count).by(1)expect(assigns[:order]).to eq(order)expect(response).to redirect_to(spree.edit_admin_order_path(order))+ expect(flash[:success]).to eq('Order has been successfully created!')expect(order.line_items).to be_emptyexpect(order.created_by).to eq(admin_user)expect(order.store).to eq(assigns[:current_store])+ expect(order.currency).to eq('EUR')+ expect(order.email).to eq('[email protected]')endenddiff --git a/core/lib/spree/permitted_attributes.rb b/core/lib/spree/permitted_attributes.rbindex 5b2dbae4e5..42f0880dbc 100644--- a/core/lib/spree/permitted_attributes.rb+++ b/core/lib/spree/permitted_attributes.rb@@ -86,7 +86,7 @@ module Spree@@checkout_attributes = [:coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,- :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account+ :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency]@@classification_attributes = [