Skip to content

Commit

Permalink
Add a customer controller to allow editing the contact email
Browse files Browse the repository at this point in the history
  • Loading branch information
elia committed Nov 7, 2023
1 parent eab114b commit 3e89efa
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<%= page_with_sidebar_aside do %>
<%= render component('ui/panel').new(title: panel_title_with_more_links(t(".customer"), [
link_to(t(".edit_email"), "#", class: "p-2 hover:bg-gray-25 rounded-sm text-black"),
link_to(t(".edit_email"), solidus_admin.order_customer_path(@order), class: "p-2 hover:bg-gray-25 rounded-sm text-black"),
link_to(t(".edit_shipping"), "#", class: "p-2 hover:bg-gray-25 rounded-sm text-black"),
link_to(t(".edit_billing"), "#", class: "p-2 hover:bg-gray-25 rounded-sm text-black"),
link_to(t(".remove_customer"), "#", 'data-turbo-method': :delete, class: "p-2 hover:bg-gray-25 rounded-sm text-red-500"),
link_to(t(".remove_customer"), solidus_admin.order_customer_path(@order), 'data-turbo-method': :delete, class: "p-2 hover:bg-gray-25 rounded-sm text-red-500"),
])) do %>
<div class="flex flex-col -m-6 p-6 gap-6 border-t border-gray-100 mt-0">
<%# CUSTOMER %>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<div class="<%= stimulus_id %>">
<%= render component("orders/show").new(order: @order) %>
<%= render component("ui/modal").new(title: t(".title"), close_path: solidus_admin.order_path(@order)) do |modal| %>
<%= form_for @order, url: solidus_admin.order_path(@order), html: { id: form_id} do |f| %>
<%= render component("ui/forms/field").text_field(f, :email) %>
<% end %>
<% modal.with_actions do %>
<%= render component("ui/button").new(form: form_id, type: :submit, text: "Update") %>
<% end %>
<% end %>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# frozen_string_literal: true

class SolidusAdmin::Orders::Show::Customer::Component < SolidusAdmin::BaseComponent
def initialize(order:)
@order = order
end

def form_id
dom_id(@order, "#{stimulus_id}_email_form")
end
end
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
en:
title: "Edit customer"
19 changes: 19 additions & 0 deletions admin/app/controllers/solidus_admin/customers_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# frozen_string_literal: true

class SolidusAdmin::CustomersController < SolidusAdmin::BaseController
before_action :load_order, only: :show

def show
render component('orders/show/customer').new(order: @order)
end

private

def load_order
@order = Spree::Order.find_by!(number: params[:order_id])
end

def authorization_subject
@order || Spree::Order
end
end
21 changes: 21 additions & 0 deletions admin/app/controllers/solidus_admin/orders_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

module SolidusAdmin
class OrdersController < SolidusAdmin::BaseController
include Spree::Core::ControllerHelpers::StrongParameters

def index
orders = Spree::Order
.order(created_at: :desc, id: :desc)
Expand All @@ -26,6 +28,21 @@ def show
end
end

def update
load_order

@order.assign_attributes(order_params)
@order.email ||= @order.user.email if @order.user && @order.user.changed?

if @order.save
flash[:notice] = t('.success')
else
flash[:error] = t('.error')

Check warning on line 40 in admin/app/controllers/solidus_admin/orders_controller.rb

View check run for this annotation

Codecov / codecov/patch

admin/app/controllers/solidus_admin/orders_controller.rb#L40

Added line #L40 was not covered by tests
end

redirect_to spree.edit_admin_order_path(@order)
end

def edit
redirect_to action: :show
end
Expand Down Expand Up @@ -63,5 +80,9 @@ def load_order
@order = Spree::Order.find_by!(number: params[:id])
authorize! action_name, @order
end

def order_params
params.require(:order).permit(:user_id, permitted_order_attributes)
end
end
end
2 changes: 2 additions & 0 deletions admin/config/locales/orders.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ en:
solidus_admin:
orders:
title: "Orders"
update:
success: "Order was updated successfully"
3 changes: 2 additions & 1 deletion admin/config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
get 'states', to: 'countries#states'
end

resources :orders, only: [:index, :show, :edit] do
resources :orders, only: [:index, :show, :edit, :update] do
resources :line_items, only: [:destroy, :create, :update]
resource :customer

member do
get :variants_for
Expand Down
18 changes: 16 additions & 2 deletions admin/spec/features/order_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,25 @@

require 'spec_helper'

describe "Order", type: :feature do
describe "Order", :js, type: :feature do
before { sign_in create(:admin_user, email: '[email protected]') }

it "allows changing the order email" do
create(:order, number: "R123456789", total: 19.99)

visit "/admin/orders/R123456789/edit"

expect(page).to have_content("Order R123456789")
find("summary", text: "Customer").click
click_on "Edit order email"
fill_in "Customer Email", with: "[email protected]"
click_on "Update"
expect(page).to have_content("Order was updated successfully")
expect(page).to have_content("Order contact email [email protected]", normalize_ws: true)
end

context "in cart state" do
it "allows managing the cart", :js do
it "allows managing the cart" do
create(:product, name: "Just a product", slug: 'just-a-prod', price: 19.99)
create(:product, name: "Just another product", slug: 'just-another-prod', price: 29.99)
create(:order, number: "R123456789", total: 19.99, state: "cart")
Expand Down

0 comments on commit 3e89efa

Please sign in to comment.