Skip to content

feat(identity): render drivers, customers, vehicles and places through the shared identity components #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roncodes merged 2 commits into from
Oct 9, 2026
Merged

feat(identity): render drivers, customers, vehicles and places through the shared identity components #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f9ff8
fix(i18n): keep the Russian multi-cart label on its own lines so the …
roncodes Oct 9, 2026
c833b5c
feat(identity): drivers, customers, vehicles and places render throug…
roncodes Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion addon/components/modals/assign-driver.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<InputGroup class="mt-4" @name={{t "storefront.component.modals.assign-driver.message-driver"}}>
<ModelSelect
@modelName="driver"
@selectedItemComponent={{component "select-option/driver" compact=true}}
@selectedModel={{@options.order.driver_assigned}}
@placeholder={{t "storefront.component.modals.assign-driver.placeholder-driver"}}
@triggerClass="form-select form-input w-full"
Expand All @@ -24,7 +25,7 @@
@onChange={{fn (mut @options.order.driver_assigned)}}
as |model|
>
{{model.name}}
<SelectOption::Driver @option={{model}} />
</ModelSelect>
</InputGroup>
</div>
Expand Down
11 changes: 2 additions & 9 deletions addon/components/modals/create-food-truck.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<InputGroup @name="Assign Food Truck Vehicle">
<ModelSelect
@modelName="vehicle"
@selectedItemComponent={{component "select-option/vehicle" compact=true}}
@selectedModel={{@options.foodTruck.vehicle}}
@placeholder="Assign Food Truck Vehicle"
@triggerClass="form-select form-input"
Expand All @@ -11,15 +12,7 @@
@onChange={{fn (mut @options.foodTruck.vehicle)}}
as |model|
>
<div class="flex flex-row">
<div class="mr-2">
<Image src={{model.photo_url}} class="w-10 h-10 rounded-md shadow-sm" />
</div>
<div class="flex flex-col flex-1">
<div class="font-semibold">{{model.display_name}}</div>
<div>{{model.plate_number}}</div>
</div>
</div>
<SelectOption::Vehicle @option={{model}} />
</ModelSelect>
</InputGroup>
<InputGroup @name="Service Area">
Expand Down
2 changes: 1 addition & 1 deletion addon/components/modals/create-network-category.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
@onChange={{@options.setParentCategory}}
as |model|
>
{{model.name}}
<SelectOption::Category @option={{model}} />
</ModelSelect>
</InputGroup>
<InputGroup
Expand Down
2 changes: 1 addition & 1 deletion addon/components/modals/import-products.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
@onChange={{fn (mut @options.selectedCategory)}}
as |model|
>
{{model.name}}
<SelectOption::Category @option={{model}} />
</ModelSelect>
</InputGroup>
</div>
Expand Down
24 changes: 4 additions & 20 deletions addon/components/modals/incoming-order.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,7 @@
<h5 class="dark:text-gray-100 font-semibold">{{t "storefront.component.modals.incoming-order.assigned"}}</h5>
<div class="flex flex-col space-y-4">
{{#if @options.order.driver_assigned.id}}
<div class="flex items-center">
<Image src={{@options.order.driver_assigned.photoUrl}} class="w-12 h-12 rounded-md shadow-sm mr-4" alt={{@options.order.driver_assigned.name}} />
<div>
<h5 class="font-semibold dark:text-white text-xs">{{n-a @options.order.driver_assigned.displayName}}</h5>
<div class="font-semibold dark:text-gray-100 text-xs">{{n-a
@options.order.driver_assigned.phone
(t "storefront.component.modals.incoming-order.no-phone")
}}</div>
</div>
</div>
<Driver::Pill @driver={{@options.order.driver_assigned}} />
{{else}}
<div>
<h5 class="text-red-500 text-sm">{{t "storefront.component.modals.incoming-order.not-assigned"}}</h5>
Expand Down Expand Up @@ -72,16 +63,9 @@
<div class="bg-gray-100 border border-gray-200 dark:bg-gray-800 dark:border-gray-700 rounded-md px-4 py-2 space-y-2 h-full">
<h5 class="dark:text-gray-100 font-semibold">{{t "storefront.common.customer"}}</h5>
<div class="">
<div class="flex flex-row">
<div>
<Image src={{avatar-url @options.order.customer.photo_url}} class="w-12 h-12 rounded-md shadow-sm mr-4" alt={{@options.order.customer.name}} />
</div>
<div>
<div class="text-xs font-bold dark:text-gray-100">{{@options.order.customer.name}}</div>
<div class="text-xs dark:text-gray-100">{{@options.order.customer.email}}</div>
<div class="text-xs dark:text-gray-100">{{@options.order.customer.phone}}</div>
</div>
</div>
<Customer::Pill @customer={{@options.order.customer}} @static={{not @options.order.customer.id}} />
<div class="text-xs dark:text-gray-100 mt-1">{{n-a @options.order.customer.email}}</div>
<div class="text-xs dark:text-gray-100">{{n-a @options.order.customer.phone}}</div>
{{#unless @options.order.meta.is_pickup}}
<div class="mt-2">
<h5 class="dark:text-gray-100 font-semibold text-xs truncate">{{t "storefront.component.modals.incoming-order.address"}}</h5>
Expand Down
3 changes: 2 additions & 1 deletion addon/components/modals/order-ready-assign-driver.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<InputGroup class="mt-4" @name={{t "storefront.component.modals.order-ready-assign-driver.select-driver"}}>
<ModelSelect
@modelName="driver"
@selectedItemComponent={{component "select-option/driver" compact=true}}
@selectedModel={{@options.driver}}
@placeholder={{t "storefront.component.modals.order-ready-assign-driver.select-driver-to-assign"}}
@triggerClass="form-select form-input"
Expand All @@ -37,7 +38,7 @@
@onChange={{fn (mut @options.driver)}}
as |model|
>
{{model.name}}
<SelectOption::Driver @option={{model}} />
</ModelSelect>
</InputGroup>
{{/unless}}
Expand Down
16 changes: 4 additions & 12 deletions addon/components/storefront/order/details/customer.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
<ContentPanel @title="Customer" @open={{true}} @isLoading={{@isLoading}} @wrapperClass="bordered-top" ...attributes>
<div class="storefront-order-customer">
<div class="storefront-order-person">
<Image
src={{avatar-url @resource.customer.photo_url}}
@fallbackSrc={{config "defaultValues.contactImage"}}
class="storefront-order-person__avatar"
alt={{@resource.customer.name}}
/>
<div class="min-w-0">
<div class="storefront-order-person__name">{{n-a @resource.customer.name "No customer"}}</div>
<div class="storefront-order-person__meta">{{n-a @resource.customer.email "No email"}}</div>
<div class="storefront-order-person__meta">{{n-a @resource.customer.phone "No phone"}}</div>
</div>
<Customer::Pill @customer={{@resource.customer}} @titleFallback="No customer" @static={{not @resource.customer.id}} data-test-order-customer-pill />
<div class="storefront-order-facts mt-2">
<div><span>Email</span><strong>{{n-a @resource.customer.email "No email"}}</strong></div>
<div><span>Phone</span><strong>{{n-a @resource.customer.phone "No phone"}}</strong></div>
</div>

{{#unless @resource.meta.is_pickup}}
Expand Down
18 changes: 2 additions & 16 deletions addon/components/storefront/order/details/detail.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,13 @@
<div class="field-info-container">
<div class="field-name">Customer</div>
<div class="field-value">
<div class="storefront-order-person storefront-order-person--compact">
<Image src={{avatar-url @resource.customer.photo_url}} @fallbackSrc={{config "defaultValues.contactImage"}} class="storefront-order-person__avatar" alt={{@resource.customer.name}} />
<div class="min-w-0">
<div class="storefront-order-person__name {{unless @resource.customer "text-gray-300"}}">{{n-a @resource.customer.name "No customer"}}</div>
<div class="storefront-order-person__meta">{{n-a (or @resource.customer.phone @resource.customer.email) "No contact details"}}</div>
</div>
</div>
<Customer::Pill @customer={{@resource.customer}} @titleFallback="No customer" @static={{not @resource.customer.id}} data-test-order-customer-pill />
</div>
</div>
<div class="field-info-container">
<div class="field-name">Driver</div>
<div class="field-value">
<div class="storefront-order-person storefront-order-person--compact">
<Image src={{avatar-url @resource.driver_assigned.photo_url}} @fallbackSrc={{config "defaultValues.driverImage"}} class="storefront-order-person__avatar" alt={{@resource.driver_assigned.name}} />
<div class="min-w-0">
<div class="storefront-order-person__name {{unless @resource.driver_assigned "text-gray-300"}}">
{{n-a (or @resource.driver_assigned.displayName @resource.driver_assigned.name) "No driver assigned"}}
</div>
<div class="storefront-order-person__meta">{{n-a @resource.driver_assigned.phone "No phone"}}</div>
</div>
</div>
<Driver::Pill @driver={{@resource.driver_assigned}} @titleFallback="No driver assigned" @static={{not @resource.driver_assigned.id}} data-test-order-driver-pill />
</div>
</div>
</div>
Expand Down
13 changes: 1 addition & 12 deletions addon/components/storefront/order/details/fulfillment.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,7 @@
<div class="storefront-order-card-grid">
<div class="storefront-order-detail-card">
<div class="storefront-order-detail-card__label">Driver</div>
<div class="storefront-order-person storefront-order-person--compact">
<Image
src={{avatar-url @resource.driver_assigned.photo_url}}
@fallbackSrc={{config "defaultValues.driverImage"}}
class="storefront-order-person__avatar"
alt={{@resource.driver_assigned.name}}
/>
<div class="min-w-0">
<div class="storefront-order-person__name">{{n-a (or @resource.driver_assigned.displayName @resource.driver_assigned.name) "No driver assigned"}}</div>
<div class="storefront-order-person__meta">{{n-a @resource.driver_assigned.phone "No phone"}}</div>
</div>
</div>
<Driver::Pill @driver={{@resource.driver_assigned}} @titleFallback="No driver assigned" @static={{not @resource.driver_assigned.id}} data-test-order-driver-pill />
</div>
<div class="storefront-order-detail-card">
<div class="storefront-order-detail-card__label">Schedule</div>
Expand Down
11 changes: 3 additions & 8 deletions addon/components/widget/customers.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
{{#each this.customers as |customer|}}
<article class="storefront-customer-card storefront-animate-card">
<div class="flex items-center gap-3">
<Image src={{avatar-url customer.photo_url}} class="storefront-customer-avatar" alt={{customer.name}} />
<div class="min-w-0 flex-1">
<a href="javascript:;" {{on "click" (fn this.viewCustomer customer)}} class="storefront-customer-name">{{n-a customer.name}}</a>
<div class="storefront-table-muted">{{customer.public_id}}</div>
<Customer::Pill @customer={{customer}} @subtitle={{customer.public_id}} @onClick={{fn this.viewCustomer customer}} />
</div>
<div class="storefront-customer-order-count">{{n-a customer.orders 0}}</div>
</div>
Expand All @@ -32,7 +30,7 @@
{{/each}}
</div>
{{else}}
<div class="storefront-customers-table-wrap {{if (not this.customer) 'empty-state'}}">
<div class="storefront-customers-table-wrap {{unless this.customer 'empty-state'}}">
<table class="storefront-customers-table">
<thead>
<tr>
Expand All @@ -48,10 +46,7 @@
<tr class="storefront-animate-row">
<td><a href="javascript:;" {{on "click" (fn this.viewCustomer customer)}} class="storefront-customer-id">{{customer.public_id}}</a></td>
<td>
<div class="storefront-customer-cell">
<Image src={{avatar-url customer.photo_url}} class="storefront-customer-avatar" alt={{customer.name}} />
<span class="storefront-table-text">{{n-a customer.name}}</span>
</div>
<Customer::Pill @customer={{customer}} @onClick={{fn this.viewCustomer customer}} />
</td>
<td><span class="storefront-table-text">{{n-a customer.phone}}</span></td>
<td><span class="storefront-table-text">{{n-a customer.email}}</span></td>
Expand Down
20 changes: 9 additions & 11 deletions addon/components/widget/orders.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,12 @@
</div>

<div class="storefront-order-card-details">
<span>{{n-a order.customer.name}}</span>
<span>
{{#if order.meta.is_pickup}}
{{t "storefront.component.widget.orders.pickup-order"}}
{{else}}
{{n-a order.driver_assigned.name}}
{{/if}}
</span>
<Customer::Pill @customer={{order.customer}} @static={{not order.customer.id}} />
{{#if order.meta.is_pickup}}
<span>{{t "storefront.component.widget.orders.pickup-order"}}</span>
{{else}}
<Driver::Pill @driver={{order.driver_assigned}} @titleFallback="No driver assigned" @static={{not order.driver_assigned.id}} />
{{/if}}
</div>

<div class="storefront-order-card-actions">
Expand All @@ -46,7 +44,7 @@
{{/each}}
</div>
{{else}}
<div class="storefront-orders-table-wrap {{if (not this.orders) 'empty-state'}}">
<div class="storefront-orders-table-wrap {{unless this.orders 'empty-state'}}">
<table class="storefront-orders-table">
<thead>
<tr>
Expand All @@ -68,14 +66,14 @@
</a>
</td>
<td><span class="storefront-order-total">{{format-currency order.meta.total order.meta.currency}}</span></td>
<td><span class="storefront-table-text">{{n-a order.customer.name}}</span></td>
<td><Customer::Pill @customer={{order.customer}} @static={{not order.customer.id}} /></td>
<td>
{{#if order.meta.is_pickup}}
<Badge @hideStatusDot={{true}} @status="info"><FaIcon @icon="hand-holding-dollar" class="mr-1" />{{t
"storefront.component.widget.orders.pickup-order"
}}</Badge>
{{else}}
<span class="storefront-table-text">{{n-a order.driver_assigned.name}}</span>
<Driver::Pill @driver={{order.driver_assigned}} @titleFallback="No driver assigned" @static={{not order.driver_assigned.id}} />
{{/if}}
</td>
<td><Badge @status={{order.status}} /></td>
Expand Down
3 changes: 2 additions & 1 deletion addon/controllers/customers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ export default class CustomersIndexController extends BaseController {
label: this.intl.t('storefront.common.name'),
valuePath: 'name',
width: '15%',
cellComponent: 'table/cell/media-name',
cellComponent: 'table/cell/identity',
resourceType: 'customer',
action: this.viewCustomer,
resizable: true,
sortable: true,
Expand Down
3 changes: 2 additions & 1 deletion addon/controllers/networks/index/network/customers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export default class NetworksIndexNetworkCustomersController extends CustomersIn
label: this.intl.t('storefront.common.name'),
valuePath: 'name',
width: '25%',
cellComponent: 'table/cell/media-name',
cellComponent: 'table/cell/identity',
resourceType: 'customer',
action: this.viewCustomer,
resizable: true,
sortable: true,
Expand Down
Loading