diff --git a/addon/components/modals/create-notification-channel.hbs b/addon/components/modals/create-notification-channel.hbs
index be48cf72..59e63251 100644
--- a/addon/components/modals/create-notification-channel.hbs
+++ b/addon/components/modals/create-notification-channel.hbs
@@ -34,6 +34,20 @@
                         <div class="input-group">
                             <Checkbox @value={{value}} @label={{humanize key}} @onToggle={{fn @options.setConfigKey key}} />
                         </div>
+                    {{else if (eq key "environment")}}
+                        <InputGroup @name={{humanize key}} @helpText={{t "storefront.component.modals.create-notification-channel.environment-help-text"}}>
+                            <Select
+                                class="w-full"
+                                @options={{array "auto" "production" "sandbox"}}
+                                @value={{value}}
+                                @onSelect={{fn @options.setConfigKey key}}
+                                @humanize={{true}}
+                            />
+                        </InputGroup>
+                    {{else if (eq key "android_channel_id")}}
+                        <InputGroup @name={{humanize key}} @helpText={{t "storefront.component.modals.create-notification-channel.android-channel-id-help-text"}}>
+                            <Input class="form-input w-full" placeholder={{humanize key}} @value={{value}} {{on "blur" (fn @options.setConfigKey key)}} />
+                        </InputGroup>
                     {{else if (or (eq key "private_key_content") (eq key "firebase_credentials_json"))}}
                         <InputGroup @name={{humanize key}}>
                             <Textarea class="form-input w-full" rows="6" placeholder={{humanize key}} @value={{value}} {{on "blur" (fn @options.setConfigKey key)}} />
diff --git a/addon/components/modals/test-notification-channel.hbs b/addon/components/modals/test-notification-channel.hbs
new file mode 100644
index 00000000..bf2ae53f
--- /dev/null
+++ b/addon/components/modals/test-notification-channel.hbs
@@ -0,0 +1,33 @@
+<Modal::Default @modalIsOpened={{@modalIsOpened}} @options={{@options}} @confirm={{@onConfirm}} @decline={{@onDecline}}>
+    <div class="modal-body-container">
+        <InputGroup @name={{t "storefront.component.modals.test-notification-channel.token"}} @helpText={{t "storefront.component.modals.test-notification-channel.token-text"}}>
+            <Textarea class="form-input w-full" rows="3" @value={{@options.token}} {{on "blur" @options.setToken}} />
+        </InputGroup>
+
+        {{#if (eq @options.channel.scheme "apn")}}
+            <InputGroup @name={{t "storefront.component.modals.test-notification-channel.environment"}} @helpText={{t "storefront.component.modals.test-notification-channel.environment-text"}}>
+                <Select
+                    class="w-full"
+                    @options={{array "production" "sandbox"}}
+                    @value={{@options.environment}}
+                    @placeholder={{t "storefront.component.modals.test-notification-channel.environment"}}
+                    @onSelect={{@options.setEnvironment}}
+                    @humanize={{true}}
+                />
+            </InputGroup>
+        {{/if}}
+
+        {{#if @options.results}}
+            <div class="p-2 rounded-md my-2 border border-gray-200 dark:border-gray-800">
+                <h4 class="mb-2 font-semibold text-sm dark:text-white">{{t "storefront.component.modals.test-notification-channel.result"}}</h4>
+                {{#each @options.results as |result|}}
+                    <div class="text-xs font-mono dark:text-gray-200 mb-1">
+                        {{#if result.environment}}[{{result.environment}}]{{/if}}
+                        {{result.status}}
+                        {{#if result.reason}}- {{result.reason}}{{/if}}
+                    </div>
+                {{/each}}
+            </div>
+        {{/if}}
+    </div>
+</Modal::Default>
diff --git a/addon/controllers/networks/index/network/index.js b/addon/controllers/networks/index/network/index.js
index d954305f..5902ddd9 100644
--- a/addon/controllers/networks/index/network/index.js
+++ b/addon/controllers/networks/index/network/index.js
@@ -269,6 +269,16 @@ export default class NetworksIndexNetworkIndexController extends Controller {
         return this.notificationsController.deleteChannel(...arguments);
     }
 
+    /**
+     * Send a test push notification through a notification channel.
+     *
+     * @method testChannel
+     * @public
+     */
+    @action testChannel() {
+        return this.notificationsController.testChannel(...arguments);
+    }
+
     /**
      * Make an alertable action.
      *
diff --git a/addon/controllers/settings/notifications.js b/addon/controllers/settings/notifications.js
index 6579face..927119eb 100644
--- a/addon/controllers/settings/notifications.js
+++ b/addon/controllers/settings/notifications.js
@@ -14,6 +14,7 @@ export default class SettingsNotificationsController extends Controller {
     @service crud;
     @service storefront;
     @service hostRouter;
+    @service fetch;
     @alias('storefront.activeStore') activeStore;
     queryParams = ['query'];
 
@@ -88,6 +89,44 @@ export default class SettingsNotificationsController extends Controller {
         });
     }
 
+    @action testChannel(channel) {
+        this.modalsManager.show('modals/test-notification-channel', {
+            title: this.intl.t('storefront.settings.notification.send-test-push'),
+            acceptButtonText: this.intl.t('storefront.settings.notification.send-test-push-button'),
+            acceptButtonIcon: 'paper-plane',
+            channel,
+            token: '',
+            environment: null,
+            results: null,
+            setToken: (event) => {
+                this.modalsManager.setOption('token', event.target.value);
+            },
+            setEnvironment: (environment) => {
+                this.modalsManager.setOption('environment', environment);
+            },
+            keepOpen: true,
+            confirm: async (modal) => {
+                const { token, environment } = this.modalsManager.getOptions(['token', 'environment']);
+                modal.startLoading();
+
+                try {
+                    const response = await this.fetch.post(`notification-channels/${channel.id}/test`, { token, environment }, { namespace: 'storefront/int/v1' });
+                    this.modalsManager.setOption('results', response.results);
+
+                    if (response.status === 'OK') {
+                        this.notifications.success(this.intl.t('storefront.settings.notification.test-push-sent'));
+                    } else {
+                        this.notifications.warning(this.intl.t('storefront.settings.notification.test-push-failed'));
+                    }
+                } catch (error) {
+                    this.notifications.serverError(error);
+                } finally {
+                    modal.stopLoading();
+                }
+            },
+        });
+    }
+
     @action deleteChannel(channel) {
         this.modalsManager.confirm({
             title: this.intl.t('storefront.settings.notification.remove-this-notification-channel'),
diff --git a/addon/templates/networks/index/network/index.hbs b/addon/templates/networks/index/network/index.hbs
index 28991534..b5997801 100644
--- a/addon/templates/networks/index/network/index.hbs
+++ b/addon/templates/networks/index/network/index.hbs
@@ -419,6 +419,7 @@
                             <span class="dark:text-gray-50">{{notificationChannel.name}}</span>
                         </div>
                         <div class="flex items-center">
+                            <Button @size="xs" @type="default" @text={{t "storefront.settings.notification.send-test"}} @wrapperClass="mr-2" @onClick={{fn this.testChannel notificationChannel}} />
                             <Button @size="xs" @type="default" @text={{t "storefront.common.edit"}} @wrapperClass="mr-2" @onClick={{fn this.editChannel notificationChannel}} />
                             <Button @size="xs" @type="danger" @text={{t "storefront.common.delete"}} @onClick={{fn this.deleteChannel notificationChannel}} />
                         </div>
diff --git a/addon/templates/settings/notifications.hbs b/addon/templates/settings/notifications.hbs
index b70f0556..4925e7d9 100644
--- a/addon/templates/settings/notifications.hbs
+++ b/addon/templates/settings/notifications.hbs
@@ -22,6 +22,7 @@
                             <span class="dark:text-gray-50">{{notificationChannel.name}}</span>
                         </div>
                         <div class="flex items-center">
+                            <Button @size="xs" @type="default" @text={{t "storefront.settings.notification.send-test"}} @wrapperClass="mr-2" @onClick={{fn this.testChannel notificationChannel}} />
                             <Button @size="xs" @type="default" @text={{t "storefront.common.edit"}} @wrapperClass="mr-2" @onClick={{fn this.editChannel notificationChannel}} />
                             <Button @size="xs" @type="danger" @text={{t "storefront.common.delete"}} @onClick={{fn this.deleteChannel notificationChannel}} />
                         </div>
diff --git a/addon/utils/get-notification-schemas.js b/addon/utils/get-notification-schemas.js
index fd486de0..c6b94c22 100644
--- a/addon/utils/get-notification-schemas.js
+++ b/addon/utils/get-notification-schemas.js
@@ -5,12 +5,11 @@ export default function getNotificationSchemas() {
             team_id: '',
             app_bundle_id: '',
             private_key_content: '',
-            production: true,
+            environment: 'auto',
         },
         fcm: {
             firebase_credentials_json: '',
-            firebase_database_url: '',
-            firebase_project_name: '',
+            android_channel_id: '',
         },
     };
 
diff --git a/app/components/modals/test-notification-channel.js b/app/components/modals/test-notification-channel.js
new file mode 100644
index 00000000..40993d59
--- /dev/null
+++ b/app/components/modals/test-notification-channel.js
@@ -0,0 +1 @@
+export { default } from '@fleetbase/storefront-engine/components/modals/test-notification-channel';
diff --git a/server/config/storefront.php b/server/config/storefront.php
index 7161a4c8..3f6b48f1 100644
--- a/server/config/storefront.php
+++ b/server/config/storefront.php
@@ -45,6 +45,19 @@
         ))),
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Push Notifications
+    |--------------------------------------------------------------------------
+    |
+    | android_channel_id: the Android notification channel storefront pushes are
+    | posted to. Leave empty to use the app's default FCM channel. A notification
+    | channel's own `android_channel_id` setting takes precedence.
+    */
+    'push' => [
+        'android_channel_id' => env('STOREFRONT_PUSH_ANDROID_CHANNEL_ID'),
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | Database Connection
diff --git a/server/src/Http/Controllers/NotificationChannelController.php b/server/src/Http/Controllers/NotificationChannelController.php
index cdcbcf40..27922880 100644
--- a/server/src/Http/Controllers/NotificationChannelController.php
+++ b/server/src/Http/Controllers/NotificationChannelController.php
@@ -2,6 +2,13 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Push\ApnClientFactory;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\Transports\ApnTransport;
+use Fleetbase\Storefront\Push\Transports\FcmTransport;
+use Illuminate\Http\Request;
+
 class NotificationChannelController extends StorefrontController
 {
     /**
@@ -10,4 +17,59 @@ class NotificationChannelController extends StorefrontController
      * @var string
      */
     public $resource = 'notification_channel';
+
+    /**
+     * Send a test push to a single device token through a notification channel and report
+     * the provider's raw outcome, so credential or token problems can be diagnosed.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function testPush(string $id, Request $request, FcmTransport $fcm, ApnTransport $apn)
+    {
+        $token = trim((string) $request->input('token'));
+        if ($token === '') {
+            return response()->error('A device token is required.');
+        }
+
+        $channel = NotificationChannel::where(function ($query) use ($id) {
+            $query->where('uuid', $id)->orWhere('app_key', $id);
+        })->where('company_uuid', session('company'))->first();
+
+        if (!$channel) {
+            return response()->error('Notification channel not found.', 404);
+        }
+
+        $message = PushMessage::create(
+            $request->input('title', 'Test notification'),
+            $request->input('body', 'Push notifications from ' . ($channel->name ?? 'your storefront') . ' are working.'),
+            ['type' => 'test']
+        );
+
+        $results = [];
+        try {
+            if ($channel->scheme === 'fcm') {
+                $outcome   = $fcm->send($channel, $message, [$token])[$token] ?? null;
+                $results[] = ['environment' => null, 'status' => $outcome?->status ?? 'error', 'reason' => $outcome?->reason];
+            } else {
+                $environments = $request->filled('environment') ? [$request->input('environment')] : ApnClientFactory::environments($channel);
+                foreach ($environments as $environment) {
+                    $outcome   = $apn->send($channel, $environment, $message, [$token])[$token] ?? null;
+                    $results[] = ['environment' => $environment, 'status' => $outcome?->status ?? 'error', 'reason' => $outcome?->reason];
+                    if ($outcome?->status === 'sent') {
+                        break;
+                    }
+                }
+            }
+        } catch (\Throwable $e) {
+            $results[] = ['environment' => null, 'status' => 'error', 'reason' => $e->getMessage()];
+        }
+
+        $sent = collect($results)->contains('status', 'sent');
+
+        return response()->json([
+            'status'  => $sent ? 'OK' : 'FAILED',
+            'scheme'  => $channel->scheme,
+            'results' => $results,
+        ]);
+    }
 }
diff --git a/server/src/Http/Controllers/v1/CustomerController.php b/server/src/Http/Controllers/v1/CustomerController.php
index e7d742d6..1aa827e4 100644
--- a/server/src/Http/Controllers/v1/CustomerController.php
+++ b/server/src/Http/Controllers/v1/CustomerController.php
@@ -20,6 +20,7 @@
 use Fleetbase\Storefront\Http\Requests\CreateCustomerRequest;
 use Fleetbase\Storefront\Http\Requests\VerifyCreateCustomerRequest;
 use Fleetbase\Storefront\Http\Resources\Customer;
+use Fleetbase\Storefront\Push\StorefrontPushChannel;
 use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Support\Utils;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -48,18 +49,51 @@ public function registerDevice(Request $request)
             return response()->apiError('Not authorized to register device for cutomer');
         }
 
-        $device = UserDevice::firstOrCreate(
-            [
-                'token'    => $request->input('token'),
-                'platform' => $request->or(['platform', 'os']),
-            ],
-            [
-                'user_uuid' => $customer->user_uuid,
-                'platform'  => $request->or(['platform', 'os']),
-                'token'     => $request->input('token'),
-                'status'    => 'active',
-            ]
-        );
+        $token    = trim((string) $request->input('token'));
+        $platform = StorefrontPushChannel::normalizePlatform($request->or(['platform', 'os']));
+
+        if ($token === '') {
+            return response()->apiError('A device token is required.');
+        }
+
+        if (!$platform) {
+            return response()->apiError('Device platform must be either ios or android.');
+        }
+
+        if (!$customer->user_uuid) {
+            return response()->apiError('Unable to register device for customer without a user account.');
+        }
+
+        // A token identifies one app install, so it always belongs to the customer who
+        // registered it most recently (e.g. after logging out and in as someone else).
+        $devices = UserDevice::withTrashed()->where('token', $token)->orderByDesc('updated_at')->get();
+        $device  = $devices->shift() ?? new UserDevice();
+        $devices->each(fn (UserDevice $duplicate) => $duplicate->forceDelete());
+
+        if ($device->exists && $device->trashed()) {
+            $device->restore();
+        }
+
+        $device->fill([
+            'user_uuid' => $customer->user_uuid,
+            'platform'  => $platform,
+            'token'     => $token,
+            'status'    => 'active',
+        ]);
+
+        $optionalAttributes = [
+            'environment'    => in_array($request->input('environment'), ['production', 'sandbox'], true) ? $request->input('environment') : null,
+            'app_identifier' => session('storefront_store') ?? session('storefront_network'),
+            'last_seen_at'   => now(),
+        ];
+        $columns = static::userDeviceColumns();
+        foreach ($optionalAttributes as $column => $value) {
+            if (in_array($column, $columns, true)) {
+                $device->forceFill([$column => $value]);
+            }
+        }
+
+        $device->save();
 
         return response()->json([
             'status' => 'OK',
@@ -67,6 +101,42 @@ public function registerDevice(Request $request)
         ]);
     }
 
+    /**
+     * Unregister a device token for the authenticated customer, e.g. on logout.
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function unregisterDevice(Request $request)
+    {
+        $customer = Storefront::getCustomerFromToken();
+
+        if (!$customer) {
+            return response()->apiError('Not authorized to unregister device for customer');
+        }
+
+        $token = trim((string) $request->input('token'));
+        if ($token === '') {
+            return response()->apiError('A device token is required.');
+        }
+
+        $deleted = UserDevice::where('token', $token)->where('user_uuid', $customer->user_uuid)->get()->each(fn (UserDevice $device) => $device->delete())->count();
+
+        return response()->json([
+            'status'  => 'OK',
+            'deleted' => $deleted,
+        ]);
+    }
+
+    /**
+     * Newer core-api versions add push metadata columns to user_devices.
+     *
+     * @return string[]
+     */
+    protected static function userDeviceColumns(): array
+    {
+        return (new UserDevice())->getConnection()->getSchemaBuilder()->getColumnListing('user_devices');
+    }
+
     /**
      * Query for Storefront Customer orders.
      *
diff --git a/server/src/Http/Controllers/v1/NotificationController.php b/server/src/Http/Controllers/v1/NotificationController.php
new file mode 100644
index 00000000..fcf9eb80
--- /dev/null
+++ b/server/src/Http/Controllers/v1/NotificationController.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Controllers\v1;
+
+use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Models\Notification;
+use Fleetbase\Storefront\Http\Resources\v1\CustomerNotification;
+use Fleetbase\Storefront\Models\Customer;
+use Fleetbase\Storefront\Models\Network;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Support\NotificationPreferences;
+use Fleetbase\Storefront\Support\Storefront;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+
+/**
+ * The authenticated customer's notification inbox.
+ */
+class NotificationController extends Controller
+{
+    /**
+     * List the customer's notifications, newest first.
+     *
+     * Query params: `unread` (bool), `type`, `limit` (default 25, max 100), `offset`.
+     */
+    public function query(Request $request)
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to view customer notifications', 401);
+        }
+
+        $limit  = min(max((int) $request->input('limit', 25), 1), 100);
+        $offset = max((int) $request->input('offset', 0), 0);
+
+        $notifications = $this->inbox($customer)
+            ->when($request->boolean('unread'), fn ($query) => $query->whereNull('read_at'))
+            ->when($request->filled('type'), fn ($query) => $query->where('data->type', $request->input('type')))
+            ->orderByDesc('created_at')
+            ->skip($offset)
+            ->take($limit)
+            ->get();
+
+        return CustomerNotification::collection($notifications);
+    }
+
+    /**
+     * Number of unread notifications, for badges.
+     */
+    public function unreadCount()
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to view customer notifications', 401);
+        }
+
+        return response()->json(['count' => $this->inbox($customer)->whereNull('read_at')->count()]);
+    }
+
+    public function find(string $id)
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to view customer notifications', 401);
+        }
+
+        $notification = $this->inbox($customer)->where('id', $id)->first();
+        if (!$notification) {
+            return response()->apiError('Notification not found.', 404);
+        }
+
+        return new CustomerNotification($notification);
+    }
+
+    public function markAsRead(string $id)
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to update customer notifications', 401);
+        }
+
+        $notification = $this->inbox($customer)->where('id', $id)->first();
+        if (!$notification) {
+            return response()->apiError('Notification not found.', 404);
+        }
+
+        if ($notification->read_at === null) {
+            $notification->forceFill(['read_at' => now()])->save();
+        }
+
+        return new CustomerNotification($notification);
+    }
+
+    public function markAllAsRead()
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to update customer notifications', 401);
+        }
+
+        $updated = $this->inbox($customer)->whereNull('read_at')->update(['read_at' => now()]);
+
+        return response()->json(['status' => 'OK', 'updated' => $updated]);
+    }
+
+    public function delete(string $id)
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to delete customer notifications', 401);
+        }
+
+        $deleted = $this->inbox($customer)->where('id', $id)->delete();
+        if (!$deleted) {
+            return response()->apiError('Notification not found.', 404);
+        }
+
+        return response()->json(['status' => 'OK', 'id' => $id, 'deleted' => true]);
+    }
+
+    public function getPreferences()
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to view notification preferences', 401);
+        }
+
+        return response()->json(NotificationPreferences::for($customer));
+    }
+
+    public function updatePreferences(Request $request)
+    {
+        $customer = $this->customer();
+        if (!$customer) {
+            return response()->apiError('Not authorized to update notification preferences', 401);
+        }
+
+        foreach (array_keys(NotificationPreferences::DEFAULTS) as $key) {
+            if ($request->has($key) && filter_var($request->input($key), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) === null) {
+                return response()->apiError('The ' . $key . ' preference must be true or false.');
+            }
+        }
+
+        return response()->json(NotificationPreferences::update($customer, $request->only(array_keys(NotificationPreferences::DEFAULTS))));
+    }
+
+    protected function customer(): ?Contact
+    {
+        return Storefront::getCustomerFromToken();
+    }
+
+    /**
+     * Notifications addressed to the customer, limited to the current storefront app.
+     *
+     * A notification belongs to the app when it references the app's store, network or one of
+     * the network's member stores. Notifications that reference no storefront are shown in every
+     * app of the customer's company.
+     */
+    protected function inbox(Contact $customer): Builder
+    {
+        $storefrontIds = $this->storefrontPublicIds();
+
+        return Notification::query()
+            ->whereIn('notifiable_type', [Contact::class, Customer::class])
+            ->where('notifiable_id', $customer->uuid)
+            ->when(!empty($storefrontIds), function ($query) use ($storefrontIds) {
+                $query->where(function ($query) use ($storefrontIds) {
+                    foreach (['store_id', 'network_id', 'storefront_id'] as $key) {
+                        $query->orWhereIn('data->' . $key, $storefrontIds);
+                    }
+
+                    $query->orWhere(function ($query) {
+                        $query->whereNull('data->store_id')->whereNull('data->network_id')->whereNull('data->storefront_id');
+                    });
+                });
+            });
+    }
+
+    /**
+     * Public ids of the storefront the request was made with (a store, or a network and its member stores).
+     *
+     * @return string[]
+     */
+    protected function storefrontPublicIds(): array
+    {
+        if ($storeUuid = session('storefront_store')) {
+            return Store::where('uuid', $storeUuid)->pluck('public_id')->all();
+        }
+
+        if ($networkUuid = session('storefront_network')) {
+            $network = Network::where('uuid', $networkUuid)->first(['uuid', 'public_id']);
+            if (!$network) {
+                return [];
+            }
+
+            $storeIds = Store::whereHas('networks', fn ($query) => $query->where('network_uuid', $networkUuid))->pluck('public_id')->all();
+
+            return array_values(array_unique(array_merge([$network->public_id], $storeIds)));
+        }
+
+        return [];
+    }
+}
diff --git a/server/src/Http/Resources/v1/CustomerNotification.php b/server/src/Http/Resources/v1/CustomerNotification.php
new file mode 100644
index 00000000..d8c8bd8c
--- /dev/null
+++ b/server/src/Http/Resources/v1/CustomerNotification.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Fleetbase\Storefront\Http\Resources\v1;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Storefront\Support\CustomerNotificationPresenter;
+
+class CustomerNotification extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return array_merge(
+            ['id' => $this->id],
+            CustomerNotificationPresenter::present((array) $this->data, $this->type),
+            [
+                'is_read'    => $this->read_at !== null,
+                'read_at'    => $this->read_at,
+                'created_at' => $this->created_at,
+            ]
+        );
+    }
+}
diff --git a/server/src/Listeners/HandleOrderCompleted.php b/server/src/Listeners/HandleOrderCompleted.php
index 6b55c662..43113c3b 100644
--- a/server/src/Listeners/HandleOrderCompleted.php
+++ b/server/src/Listeners/HandleOrderCompleted.php
@@ -26,7 +26,10 @@ public function handle(OrderCompleted $event)
         // if storefront order notify customer driver has been addigned
         if ($order->hasMeta('storefront_id')) {
             $order->load(['customer']);
-            $order->customer->notify(new StorefrontOrderCompleted($order));
+
+            if ($order->customer) {
+                $order->customer->notify(new StorefrontOrderCompleted($order));
+            }
         }
     }
 }
diff --git a/server/src/Listeners/HandleOrderDriverAssigned.php b/server/src/Listeners/HandleOrderDriverAssigned.php
index 225f6971..6585e0f7 100644
--- a/server/src/Listeners/HandleOrderDriverAssigned.php
+++ b/server/src/Listeners/HandleOrderDriverAssigned.php
@@ -32,7 +32,10 @@ public function handle(OrderDriverAssigned $event)
         // if storefront order notify customer driver has been addigned
         if ($order->hasMeta('storefront_id')) {
             $order->load(['customer']);
-            $order->customer->notify(new StorefrontOrderDriverAssigned($order));
+
+            if ($order->customer) {
+                $order->customer->notify(new StorefrontOrderDriverAssigned($order));
+            }
         }
     }
 }
diff --git a/server/src/Listeners/HandleOrderStarted.php b/server/src/Listeners/HandleOrderStarted.php
index c8893edd..d7000b34 100644
--- a/server/src/Listeners/HandleOrderStarted.php
+++ b/server/src/Listeners/HandleOrderStarted.php
@@ -22,7 +22,10 @@ public function handle(OrderStarted $event)
         // if storefront order / notify customer driver has started and is en-route
         if ($order->hasMeta('storefront_id')) {
             $order->load(['customer']);
-            $order->customer->notify(new StorefrontOrderEnroute($order));
+
+            if ($order->customer) {
+                $order->customer->notify(new StorefrontOrderEnroute($order));
+            }
         }
     }
 }
diff --git a/server/src/Notifications/Channels/SafeBroadcastChannel.php b/server/src/Notifications/Channels/SafeBroadcastChannel.php
new file mode 100644
index 00000000..273e09b3
--- /dev/null
+++ b/server/src/Notifications/Channels/SafeBroadcastChannel.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Storefront\Notifications\Channels;
+
+use Illuminate\Notifications\Channels\BroadcastChannel;
+use Illuminate\Notifications\Notification;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Broadcasts a notification in realtime without letting a socket failure fail the send.
+ *
+ * Broadcasting runs after push and database delivery. If it threw, a queued listener would be
+ * retried and the customer would receive the push again, so failures are only logged.
+ */
+class SafeBroadcastChannel extends BroadcastChannel
+{
+    public function send($notifiable, Notification $notification)
+    {
+        try {
+            return parent::send($notifiable, $notification);
+        } catch (\Throwable $e) {
+            try {
+                Log::warning('[Storefront] Unable to broadcast notification.', ['notification' => get_class($notification), 'error' => $e->getMessage()]);
+            } catch (\Throwable $logError) {
+                // Logging must never break delivery.
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/server/src/Notifications/PromotionalPushNotification.php b/server/src/Notifications/PromotionalPushNotification.php
index 127a6365..0bd5be64 100644
--- a/server/src/Notifications/PromotionalPushNotification.php
+++ b/server/src/Notifications/PromotionalPushNotification.php
@@ -3,13 +3,17 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
+use Fleetbase\Storefront\Notifications\Channels\SafeBroadcastChannel;
+use Fleetbase\Storefront\Push\Contracts\SendsPushNotification;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\StorefrontPushChannel;
+use Fleetbase\Storefront\Support\CustomerNotificationPresenter;
+use Fleetbase\Storefront\Support\NotificationPreferences;
 use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\BroadcastMessage;
 use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class PromotionalPushNotification extends Notification
+class PromotionalPushNotification extends Notification implements SendsPushNotification
 {
     use Queueable;
 
@@ -57,120 +61,57 @@ public function __construct(string $title, string $body, Store $store)
      */
     public function via($notifiable): array
     {
-        $channels = [];
-
-        // Check if store has APN notification channel configured
-        $apnChannel = PushNotification::getNotificationChannel('apn', $this->store);
-        if ($apnChannel) {
-            $channels[] = ApnChannel::class;
-        }
-
-        // Check if store has FCM notification channel configured
-        $fcmChannel = PushNotification::getNotificationChannel('fcm', $this->store);
-        if ($fcmChannel) {
-            $channels[] = FcmChannel::class;
+        if (!NotificationPreferences::allows($notifiable, 'promotions')) {
+            return [];
         }
 
-        return $channels;
+        return [StorefrontPushChannel::class, 'database', SafeBroadcastChannel::class];
     }
 
     /**
-     * Get the APN representation of the notification.
+     * Realtime payload sent to the customer's `contact.{uuid}` channel.
      */
-    public function toApn($notifiable)
+    public function toBroadcast($notifiable): BroadcastMessage
     {
-        $client = $this->getApnClient();
-        if (!$client) {
-            return null;
-        }
-
-        return \NotificationChannels\Apn\ApnMessage::create()
-            ->badge(1)
-            ->title($this->title)
-            ->body($this->body)
-            ->custom('type', 'promotional')
-            ->custom('store', $this->store->uuid)
-            ->custom('store_id', $this->store->public_id)
-            ->via($client);
+        return new BroadcastMessage(CustomerNotificationPresenter::present($this->toArray($notifiable), static::class));
     }
 
     /**
-     * Get the FCM representation of the notification.
+     * The broadcast event uses this as the payload `type`, so keep it equal to the inbox item type.
      */
-    public function toFcm($notifiable)
+    public function broadcastType(): string
     {
-        $notificationChannel = $this->getFcmNotificationChannel();
-        if (!$notificationChannel) {
-            return null;
-        }
-
-        // Configure FCM
-        PushNotification::configureFcm($notificationChannel);
-
-        // Get FCM Client
-        $client = $this->getFcmClient($notificationChannel);
-
-        // Create Notification
-        $notification = new \NotificationChannels\Fcm\Resources\Notification(
-            title: $this->title,
-            body: $this->body
-        );
-
-        return (new \NotificationChannels\Fcm\FcmMessage(notification: $notification))
-            ->data([
-                'type'     => 'promotional',
-                'store'    => $this->store->uuid,
-                'store_id' => $this->store->public_id,
-            ])
-            ->custom([
-                'android' => [
-                    'notification' => [
-                        'color' => '#4391EA',
-                        'sound' => 'default',
-                    ],
-                    'fcm_options' => [
-                        'analytics_label' => 'promotional',
-                    ],
-                ],
-                'apns' => [
-                    'payload' => [
-                        'aps' => [
-                            'sound' => 'default',
-                        ],
-                    ],
-                    'fcm_options' => [
-                        'analytics_label' => 'promotional',
-                    ],
-                ],
-            ])
-            ->usingClient($client);
+        return 'promotional';
     }
 
     /**
-     * Resolve the APN client configured for the notification store.
+     * Get the push notification representation of the notification.
      */
-    protected function getApnClient(): ?\Pushok\Client
+    public function toPush($notifiable): ?PushMessage
     {
-        return PushNotification::getApnClient($this->store);
+        return PushMessage::create($this->title, $this->body, [
+            'type'     => 'promotional',
+            'store'    => $this->store->uuid,
+            'store_id' => $this->store->public_id,
+        ])->analyticsLabel('promotional');
     }
 
     /**
-     * Resolve the FCM channel configured for the notification store.
+     * The store's own app first, then the apps of networks the store belongs to.
      */
-    protected function getFcmNotificationChannel(): ?\Fleetbase\Storefront\Models\NotificationChannel
+    public function pushStorefronts(): array
     {
-        return PushNotification::getNotificationChannel('fcm', $this->store);
-    }
-
-    /**
-     * Resolve the Firebase messaging client for the selected channel.
-     */
-    protected function getFcmClient(\Fleetbase\Storefront\Models\NotificationChannel $notificationChannel)
-    {
-        $container      = \Illuminate\Container\Container::getInstance();
-        $projectManager = new \Kreait\Laravel\Firebase\FirebaseProjectManager($container);
+        $storefronts = [$this->store];
+
+        try {
+            foreach ($this->store->networks as $network) {
+                $storefronts[] = $network;
+            }
+        } catch (\Throwable $e) {
+            // Network membership is optional for promotional delivery.
+        }
 
-        return $projectManager->project($notificationChannel->app_key)->messaging();
+        return $storefronts;
     }
 
     /**
@@ -181,6 +122,8 @@ public function toArray($notifiable): array
         return [
             'title'           => $this->title,
             'body'            => $this->body,
+            'subject'         => $this->title,
+            'message'         => $this->body,
             'store'           => $this->store->uuid,
             'store_id'        => $this->store->public_id,
             'type'            => 'promotional',
diff --git a/server/src/Notifications/StorefrontOrderAccepted.php b/server/src/Notifications/StorefrontOrderAccepted.php
index e68d8eb2..487311c5 100644
--- a/server/src/Notifications/StorefrontOrderAccepted.php
+++ b/server/src/Notifications/StorefrontOrderAccepted.php
@@ -3,55 +3,9 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderAccepted extends Notification
+class StorefrontOrderAccepted extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -59,104 +13,10 @@ class StorefrontOrderAccepted extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
         $this->subject = 'Your order from ' . $this->storefront->name . ' has been accepted.';
         $this->body    = 'Your order was accepted.';
         $this->status  = 'order_accepted';
     }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
-    }
 }
diff --git a/server/src/Notifications/StorefrontOrderCanceled.php b/server/src/Notifications/StorefrontOrderCanceled.php
index d447a8f8..d1049296 100644
--- a/server/src/Notifications/StorefrontOrderCanceled.php
+++ b/server/src/Notifications/StorefrontOrderCanceled.php
@@ -3,55 +3,9 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderCanceled extends Notification
+class StorefrontOrderCanceled extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -59,103 +13,20 @@ class StorefrontOrderCanceled extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
         $this->subject = 'Your order from ' . $this->storefront->name . ' was canceled';
         $this->body    = 'Your order from ' . $this->storefront->name . ' has been canceled, if your card has been charged you will be refunded.';
         $this->status  = 'order_canceled';
     }
 
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
     /**
      * Get the mail representation of the notification.
      *
-     * @return MailMessage
+     * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body)
-            ->line('No further action is necessary.');
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->body,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
+        return parent::toMail($notifiable)->line('No further action is necessary.');
     }
 }
diff --git a/server/src/Notifications/StorefrontOrderCompleted.php b/server/src/Notifications/StorefrontOrderCompleted.php
index f8e973d6..12a7a86e 100644
--- a/server/src/Notifications/StorefrontOrderCompleted.php
+++ b/server/src/Notifications/StorefrontOrderCompleted.php
@@ -3,55 +3,9 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderCompleted extends Notification
+class StorefrontOrderCompleted extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -59,104 +13,10 @@ class StorefrontOrderCompleted extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
         $this->subject = 'Your order from ' . $this->storefront->name . ' has been delivered';
         $this->body    = 'Your order from ' . $this->storefront->name . ' has been delivered, enjoy!';
         $this->status  = 'order_completed';
     }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
-    }
 }
diff --git a/server/src/Notifications/StorefrontOrderDriverAssigned.php b/server/src/Notifications/StorefrontOrderDriverAssigned.php
index 6f9bc12c..9f89deed 100644
--- a/server/src/Notifications/StorefrontOrderDriverAssigned.php
+++ b/server/src/Notifications/StorefrontOrderDriverAssigned.php
@@ -4,60 +4,14 @@
 
 use Fleetbase\FleetOps\Models\Driver;
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderDriverAssigned extends Notification
+class StorefrontOrderDriverAssigned extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
     /**
      * The driver assigned to the order.
      */
     public Driver $driver;
 
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -65,105 +19,11 @@ class StorefrontOrderDriverAssigned extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->driver         = $order->driverAssigned;
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
+        $this->driver  = $order->driverAssigned;
         $this->subject = 'Your driver is ' . $this->driver->name;
         $this->body    = 'A driver has been assigned to your order from ' . $this->storefront->name . ', they are currently en-route for pickup';
         $this->status  = 'order_driver_assigned';
     }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
-    }
 }
diff --git a/server/src/Notifications/StorefrontOrderEnroute.php b/server/src/Notifications/StorefrontOrderEnroute.php
index fa14b2f4..23893981 100644
--- a/server/src/Notifications/StorefrontOrderEnroute.php
+++ b/server/src/Notifications/StorefrontOrderEnroute.php
@@ -3,55 +3,9 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderEnroute extends Notification
+class StorefrontOrderEnroute extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -59,104 +13,10 @@ class StorefrontOrderEnroute extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
         $this->subject = 'Your order from ' . $this->storefront->name . ' is on the way!';
         $this->body    = 'Your order from ' . $this->storefront->name . ' has been picked up, we will update you when your order is nearby';
         $this->status  = 'order_enroute';
     }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
-    }
 }
diff --git a/server/src/Notifications/StorefrontOrderNearby.php b/server/src/Notifications/StorefrontOrderNearby.php
index 455e67c2..8a56e801 100644
--- a/server/src/Notifications/StorefrontOrderNearby.php
+++ b/server/src/Notifications/StorefrontOrderNearby.php
@@ -3,41 +3,10 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Support\Utils;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderNearby extends Notification
+class StorefrontOrderNearby extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
     /**
      * The distance the driver is from the customer.
      */
@@ -48,21 +17,6 @@ class StorefrontOrderNearby extends Notification
      */
     public int $time = 0;
 
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -70,106 +24,12 @@ class StorefrontOrderNearby extends Notification
      */
     public function __construct(Order $order, int $distance = 0, int $time = 0)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->distance       = $distance;
-        $this->time           = $time;
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
-
-        $this->subject = 'Your order is nearby!';
-        $this->body    = 'Your order from ' . $this->storefront->name . ' is reaching in ' . Utils::formatSeconds($time);
-        $this->status  = 'order_nearby';
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
+        parent::__construct($order);
 
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
+        $this->distance = $distance;
+        $this->time     = $time;
+        $this->subject  = 'Your order is nearby!';
+        $this->body     = 'Your order from ' . $this->storefront->name . ' is reaching in ' . Utils::formatSeconds($time);
+        $this->status   = 'order_nearby';
     }
 }
diff --git a/server/src/Notifications/StorefrontOrderNotification.php b/server/src/Notifications/StorefrontOrderNotification.php
new file mode 100644
index 00000000..22e2f6dd
--- /dev/null
+++ b/server/src/Notifications/StorefrontOrderNotification.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Fleetbase\Storefront\Notifications;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Storefront\Models\Network;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Notifications\Channels\SafeBroadcastChannel;
+use Fleetbase\Storefront\Push\Contracts\SendsPushNotification;
+use Fleetbase\Storefront\Push\PushCredentialResolver;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\StorefrontPushChannel;
+use Fleetbase\Storefront\Support\CustomerNotificationPresenter;
+use Fleetbase\Storefront\Support\NotificationPreferences;
+use Fleetbase\Storefront\Support\Storefront;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\BroadcastMessage;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+/**
+ * Base class for order lifecycle notifications sent to storefront customers.
+ */
+abstract class StorefrontOrderNotification extends Notification implements SendsPushNotification
+{
+    use Queueable;
+
+    /**
+     * The order instance this notification is for.
+     */
+    public Order $order;
+
+    /**
+     * The storefront the order was placed with.
+     */
+    public Store|Network $storefront;
+
+    /**
+     * The time the notification was sent.
+     */
+    public string $sentAt;
+
+    /**
+     * The ID of the notification.
+     */
+    public string $notificationId;
+
+    /**
+     * The notification subject.
+     */
+    public string $subject;
+
+    /**
+     * The notification body.
+     */
+    public string $body;
+
+    /**
+     * The notification order status.
+     */
+    public string $status;
+
+    /**
+     * Create a new notification instance.
+     */
+    public function __construct(Order $order)
+    {
+        $this->order          = $order;
+        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
+        $this->sentAt         = now()->toDateTimeString();
+        $this->notificationId = uniqid('notification_');
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * Push is sent first and never throws, so mail or database failures cannot stop it. The
+     * customer can turn order update pushes off; the inbox copy is always kept.
+     */
+    public function via($notifiable): array
+    {
+        $channels = [];
+        if (NotificationPreferences::allows($notifiable, 'order_updates')) {
+            $channels[] = StorefrontPushChannel::class;
+        }
+
+        return [...$channels, 'database', 'mail', SafeBroadcastChannel::class];
+    }
+
+    /**
+     * Realtime payload sent to the customer's `contact.{uuid}` channel. Mirrors an inbox item,
+     * without the recipient details stored in the database copy.
+     */
+    public function toBroadcast($notifiable): BroadcastMessage
+    {
+        return new BroadcastMessage(CustomerNotificationPresenter::present($this->toArray($notifiable), static::class));
+    }
+
+    /**
+     * The broadcast event uses this as the payload `type`, so keep it equal to the inbox item type.
+     */
+    public function broadcastType(): string
+    {
+        return $this->status;
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @return MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage())
+            ->subject($this->subject)
+            ->line($this->body);
+    }
+
+    /**
+     * Get the push notification representation of the notification.
+     */
+    public function toPush($notifiable): ?PushMessage
+    {
+        return PushMessage::create($this->subject, $this->body, [
+            'type'       => $this->status,
+            'order'      => $this->order->uuid,
+            'id'         => $this->order->public_id,
+            'store_id'   => $this->order->getMeta('storefront_id'),
+            'network_id' => $this->order->getMeta('storefront_network_id'),
+        ])->analyticsLabel('storefront_order');
+    }
+
+    /**
+     * The storefronts whose push credentials may deliver this notification.
+     */
+    public function pushStorefronts(): array
+    {
+        $storefronts = PushCredentialResolver::storefrontsForOrder($this->order);
+
+        if (empty($storefronts) && isset($this->storefront)) {
+            $storefronts[] = $this->storefront;
+        }
+
+        return $storefronts;
+    }
+
+    /**
+     * Get the array representation of the notification.
+     */
+    public function toArray($notifiable): array
+    {
+        $this->order->loadMissing(['customer', 'company']);
+        $customer = $this->order->customer;
+        $company  = $this->order->company;
+
+        return [
+            'notifiable'      => data_get($notifiable, 'public_id'),
+            'notification_id' => $this->notificationId,
+            'sent_at'         => $this->sentAt,
+            'type'            => $this->status,
+            'title'           => $this->subject,
+            'body'            => $this->body,
+            'subject'         => $this->subject,
+            'message'         => $this->body,
+            'order'           => $this->order->uuid,
+            'order_id'        => $this->order->public_id,
+            'storefront'      => $this->storefront->name,
+            'storefront_id'   => $this->storefront->public_id,
+            'store_id'        => $this->order->getMeta('storefront_id'),
+            'network_id'      => $this->order->getMeta('storefront_network_id'),
+            'id'              => data_get($customer, 'public_id'),
+            'email'           => data_get($customer, 'email'),
+            'phone'           => data_get($customer, 'phone'),
+            'companyId'       => data_get($company, 'public_id'),
+            'company'         => data_get($company, 'name'),
+        ];
+    }
+}
diff --git a/server/src/Notifications/StorefrontOrderPreparing.php b/server/src/Notifications/StorefrontOrderPreparing.php
index 29f82173..1b298aa5 100644
--- a/server/src/Notifications/StorefrontOrderPreparing.php
+++ b/server/src/Notifications/StorefrontOrderPreparing.php
@@ -3,55 +3,9 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderPreparing extends Notification
+class StorefrontOrderPreparing extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -59,104 +13,10 @@ class StorefrontOrderPreparing extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
         $this->subject = 'Your order from ' . $this->storefront->name . ' is being prepared!';
         $this->body    = 'Your order is getting started.';
         $this->status  = 'order_preparing';
     }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
-    }
 }
diff --git a/server/src/Notifications/StorefrontOrderReadyForPickup.php b/server/src/Notifications/StorefrontOrderReadyForPickup.php
index 00e06543..7cd61c1c 100644
--- a/server/src/Notifications/StorefrontOrderReadyForPickup.php
+++ b/server/src/Notifications/StorefrontOrderReadyForPickup.php
@@ -3,55 +3,9 @@
 namespace Fleetbase\Storefront\Notifications;
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Storefront\Support\PushNotification;
-use Fleetbase\Storefront\Support\Storefront;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
-use NotificationChannels\Apn\ApnChannel;
-use NotificationChannels\Fcm\FcmChannel;
 
-class StorefrontOrderReadyForPickup extends Notification
+class StorefrontOrderReadyForPickup extends StorefrontOrderNotification
 {
-    use Queueable;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Order $order;
-
-    /**
-     * The order instance this notification is for.
-     */
-    public Store|Network $storefront;
-
-    /**
-     * The time the notification was sent.
-     */
-    public string $sentAt;
-
-    /**
-     * The ID of the notification.
-     */
-    public string $notificationId;
-
-    /**
-     * The notification subject.
-     */
-    public string $subject;
-
-    /**
-     * The notification body.
-     */
-    public string $body;
-
-    /**
-     * The notification order status.
-     */
-    public string $status;
-
     /**
      * Create a new notification instance.
      *
@@ -59,104 +13,10 @@ class StorefrontOrderReadyForPickup extends Notification
      */
     public function __construct(Order $order)
     {
-        $this->order          = $order;
-        $this->storefront     = Storefront::findAbout($order->getMeta('storefront_id'));
-        $this->sentAt         = now()->toDateTimeString();
-        $this->notificationId = uniqid('notification_');
+        parent::__construct($order);
 
         $this->subject = 'Your order from ' . $this->storefront->name . ' is ready for pickup!';
         $this->body    = 'You can proceed to pickup your order.';
         $this->status  = 'order_ready';
     }
-
-    /**
-     * Get the notification's delivery channels.
-     */
-    public function via($notifiable): array
-    {
-        $channels = ['mail', 'database'];
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'apn')) {
-            $channels[] = ApnChannel::class;
-        }
-
-        if (Storefront::hasNotificationChannelConfigured($this->storefront, 'fcm')) {
-            $channels[] = FcmChannel::class;
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     *
-     * @return MailMessage
-     */
-    public function toMail($notifiable)
-    {
-        $message = (new MailMessage())
-            ->subject($this->subject)
-            ->line($this->body);
-
-        // $message->action('View Details', Utils::consoleUrl('', ['shift' => 'fleet-ops/orders/view/' . $this->order->public_id]));
-
-        return $message;
-    }
-
-    /**
-     * Get the firebase cloud message representation of the notification.
-     *
-     * @return \NotificationChannels\Fcm\FcmMessage
-     */
-    public function toFcm($notifiable)
-    {
-        return PushNotification::createFcmMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the apns message representation of the notification.
-     *
-     * @return \NotificationChannels\Apn\ApnMessage
-     */
-    public function toApn($notifiable)
-    {
-        return PushNotification::createApnMessage(
-            $this->order,
-            $this->subject,
-            $this->body,
-            $this->status,
-            $notifiable
-        );
-    }
-
-    /**
-     * Get the array representation of the notification.
-     */
-    public function toArray($notifiable): array
-    {
-        $this->order->loadMissing(['customer', 'company']);
-        $customer = $this->order->customer;
-        $company  = $this->order->company;
-
-        return [
-            'notifiable'      => $notifiable->public_id,
-            'notification_id' => $this->notificationId,
-            'sent_at'         => $this->sentAt,
-            'subject'         => $this->subject,
-            'message'         => $this->status,
-            'storefront'      => $this->storefront->name,
-            'storefront_id'   => $this->storefront->public_id,
-            'id'              => $customer->public_id,
-            'email'           => $customer->email,
-            'phone'           => $customer->phone,
-            'companyId'       => $company->public_id,
-            'company'         => $company->name,
-        ];
-    }
 }
diff --git a/server/src/Push/ApnClientFactory.php b/server/src/Push/ApnClientFactory.php
new file mode 100644
index 00000000..a1b1b5f2
--- /dev/null
+++ b/server/src/Push/ApnClientFactory.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Pushok\AuthProvider\Token;
+use Pushok\Client;
+
+/**
+ * Builds APNs (pushok) clients for a storefront APN channel.
+ */
+class ApnClientFactory
+{
+    public const PRODUCTION = 'production';
+    public const SANDBOX    = 'sandbox';
+
+    public function make(NotificationChannel $channel, string $environment): Client
+    {
+        $config = static::credentialsFromChannel($channel);
+
+        return new Client(Token::create($config), $environment === self::PRODUCTION);
+    }
+
+    /**
+     * The APNs environments to try, in order, for a channel.
+     *
+     * An explicit `environment` of production or sandbox is strict. Otherwise the legacy
+     * `production` flag only decides which environment is tried first: a token rejected
+     * with BadDeviceToken is retried against the other environment, so development and
+     * TestFlight/App Store builds of the same app can share one channel.
+     *
+     * @return string[]
+     */
+    public static function environments(NotificationChannel $channel, ?string $deviceEnvironment = null): array
+    {
+        if (in_array($deviceEnvironment, [self::PRODUCTION, self::SANDBOX], true)) {
+            return [$deviceEnvironment];
+        }
+
+        $config      = (array) $channel->config;
+        $environment = $config['environment'] ?? null;
+
+        if ($environment === self::PRODUCTION || $environment === self::SANDBOX) {
+            return [$environment];
+        }
+
+        if ($environment === null && array_key_exists('production', $config)) {
+            $production = filter_var($config['production'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+            if ($production === false) {
+                return [self::SANDBOX, self::PRODUCTION];
+            }
+        }
+
+        return [self::PRODUCTION, self::SANDBOX];
+    }
+
+    /**
+     * @throws PushConfigurationException
+     */
+    public static function credentialsFromChannel(NotificationChannel $channel): array
+    {
+        $config = (array) $channel->config;
+
+        foreach (['key_id', 'team_id', 'app_bundle_id'] as $required) {
+            if (empty($config[$required])) {
+                throw new PushConfigurationException('APN channel "' . $channel->name . '" is missing "' . $required . '".');
+            }
+        }
+
+        if (empty($config['private_key_content']) && empty($config['private_key_path'])) {
+            throw new PushConfigurationException('APN channel "' . $channel->name . '" is missing its .p8 private key.');
+        }
+
+        if (!empty($config['private_key_content'])) {
+            $config['private_key_content'] = str_replace('\\n', "\n", trim($config['private_key_content']));
+        }
+
+        return [
+            'key_id'              => trim($config['key_id']),
+            'team_id'             => trim($config['team_id']),
+            'app_bundle_id'       => trim($config['app_bundle_id']),
+            'private_key_content' => $config['private_key_content'] ?? null,
+            'private_key_path'    => $config['private_key_path'] ?? null,
+            'private_key_secret'  => $config['private_key_secret'] ?? null,
+        ];
+    }
+}
diff --git a/server/src/Push/Contracts/SendsPushNotification.php b/server/src/Push/Contracts/SendsPushNotification.php
new file mode 100644
index 00000000..432a8297
--- /dev/null
+++ b/server/src/Push/Contracts/SendsPushNotification.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Fleetbase\Storefront\Push\Contracts;
+
+use Fleetbase\Storefront\Models\Network;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Push\PushMessage;
+
+/**
+ * Implemented by notifications delivered through the StorefrontPushChannel.
+ */
+interface SendsPushNotification
+{
+    /**
+     * Build the push payload for the notifiable, or null to skip push delivery.
+     */
+    public function toPush($notifiable): ?PushMessage;
+
+    /**
+     * The storefronts whose push credentials may be used, most preferred first.
+     *
+     * For a marketplace order this is the network (whose app the customer uses) followed
+     * by the store, so network apps and standalone store apps both resolve correctly.
+     *
+     * @return array<Store|Network>
+     */
+    public function pushStorefronts(): array;
+}
diff --git a/server/src/Push/FirebaseMessagingFactory.php b/server/src/Push/FirebaseMessagingFactory.php
new file mode 100644
index 00000000..beed569d
--- /dev/null
+++ b/server/src/Push/FirebaseMessagingFactory.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Kreait\Firebase\Contract\Messaging;
+use Kreait\Firebase\Factory;
+
+/**
+ * Builds an isolated Firebase Messaging client for a storefront FCM channel.
+ *
+ * The channel's service account JSON is passed straight to the Firebase SDK. The
+ * application-wide `firebase.projects.*` config is never read or mutated, so a
+ * storefront channel works whether or not the instance has its own Firebase project.
+ */
+class FirebaseMessagingFactory
+{
+    /**
+     * @var array<string, Messaging>
+     */
+    protected static array $clients = [];
+
+    public function make(NotificationChannel $channel): Messaging
+    {
+        $serviceAccount = static::serviceAccountFromChannel($channel);
+        $cacheKey       = ($channel->uuid ?? $channel->app_key) . ':' . md5(json_encode($serviceAccount));
+
+        if (isset(static::$clients[$cacheKey])) {
+            return static::$clients[$cacheKey];
+        }
+
+        return static::$clients[$cacheKey] = $this->createMessaging($serviceAccount);
+    }
+
+    protected function createMessaging(array $serviceAccount): Messaging
+    {
+        return (new Factory())
+            ->withServiceAccount($serviceAccount)
+            ->createMessaging();
+    }
+
+    /**
+     * Decode and normalize the service account stored on the channel.
+     *
+     * Accepts the JSON string pasted in the console or an already decoded array, and
+     * repairs private keys whose newlines were escaped (`\\n`) during copy/paste.
+     *
+     * @throws PushConfigurationException
+     */
+    public static function serviceAccountFromChannel(NotificationChannel $channel): array
+    {
+        $config      = (array) $channel->config;
+        $credentials = $config['firebase_credentials_json'] ?? $config['credentials'] ?? null;
+
+        if (is_string($credentials)) {
+            $decoded = json_decode(trim($credentials), true);
+            if (!is_array($decoded)) {
+                throw new PushConfigurationException('FCM channel "' . $channel->name . '" has invalid Firebase service account JSON.');
+            }
+            $credentials = $decoded;
+        }
+
+        if (!is_array($credentials)) {
+            throw new PushConfigurationException('FCM channel "' . $channel->name . '" is missing its Firebase service account JSON.');
+        }
+
+        foreach (['project_id', 'client_email', 'private_key'] as $required) {
+            if (empty($credentials[$required])) {
+                throw new PushConfigurationException('FCM channel "' . $channel->name . '" service account is missing "' . $required . '".');
+            }
+        }
+
+        $credentials['private_key'] = str_replace('\\n', "\n", $credentials['private_key']);
+        $credentials['type'] ??= 'service_account';
+
+        return $credentials;
+    }
+
+    public static function flush(): void
+    {
+        static::$clients = [];
+    }
+}
diff --git a/server/src/Push/PushConfigurationException.php b/server/src/Push/PushConfigurationException.php
new file mode 100644
index 00000000..690febf2
--- /dev/null
+++ b/server/src/Push/PushConfigurationException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+class PushConfigurationException extends \RuntimeException
+{
+}
diff --git a/server/src/Push/PushCredentialResolver.php b/server/src/Push/PushCredentialResolver.php
new file mode 100644
index 00000000..4bacd4e0
--- /dev/null
+++ b/server/src/Push/PushCredentialResolver.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Storefront\Models\Network;
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Support\Storefront;
+use Illuminate\Support\Collection;
+
+/**
+ * Resolves which storefront notification channels (push credentials) to use.
+ */
+class PushCredentialResolver
+{
+    /**
+     * Storefronts an order's push notifications may be sent through, most preferred first.
+     *
+     * Network (marketplace) orders are placed from the network's app, so the network's
+     * channels are preferred over the individual store's.
+     *
+     * @return array<Store|Network>
+     */
+    public static function storefrontsForOrder(Order $order): array
+    {
+        $storefronts = [];
+
+        foreach (['storefront_network_id', 'storefront_id'] as $metaKey) {
+            $id = $order->getMeta($metaKey);
+            if (!$id) {
+                continue;
+            }
+
+            $storefront = Storefront::findAbout($id);
+            if ($storefront && !collect($storefronts)->contains(fn ($existing) => $existing->uuid === $storefront->uuid)) {
+                $storefronts[] = $storefront;
+            }
+        }
+
+        return $storefronts;
+    }
+
+    /**
+     * Candidate channels for a scheme, in the order they should be tried.
+     *
+     * Channels owned by the storefront app the device registered from come first, then
+     * channels owned by each storefront in preference order (oldest first within a
+     * storefront, matching the historical behavior of using the first configured channel).
+     *
+     * @param array<Store|Network> $storefronts
+     *
+     * @return Collection<int, NotificationChannel>
+     */
+    public function channels(string $scheme, array $storefronts, ?string $appIdentifier = null): Collection
+    {
+        $ownerUuids = collect($storefronts)->pluck('uuid')->filter()->values();
+        if ($ownerUuids->isEmpty()) {
+            return collect();
+        }
+
+        $channels = NotificationChannel::query()
+            ->where('scheme', $scheme)
+            ->where(function ($query) use ($ownerUuids, $appIdentifier) {
+                $query->whereIn('owner_uuid', $ownerUuids->all());
+                if ($appIdentifier) {
+                    $query->orWhere('owner_uuid', $appIdentifier);
+                }
+            })
+            ->orderBy('created_at')
+            ->get();
+
+        return $channels
+            ->sortBy(function (NotificationChannel $channel) use ($ownerUuids, $appIdentifier) {
+                $appRank   = $appIdentifier && $channel->owner_uuid === $appIdentifier ? 0 : 1;
+                $ownerRank = $ownerUuids->search($channel->owner_uuid);
+
+                return sprintf('%d-%03d', $appRank, $ownerRank === false ? 999 : $ownerRank);
+            })
+            ->values();
+    }
+}
diff --git a/server/src/Push/PushMessage.php b/server/src/Push/PushMessage.php
new file mode 100644
index 00000000..5853cc5b
--- /dev/null
+++ b/server/src/Push/PushMessage.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+/**
+ * Provider-agnostic push notification payload.
+ *
+ * Notifications build a PushMessage and the StorefrontPushChannel renders it
+ * into the FCM (Android) or APNs (iOS) wire format for each device.
+ */
+class PushMessage
+{
+    public string $title;
+    public string $body;
+    public array $data             = [];
+    public ?int $badge             = 1;
+    public ?string $sound          = 'default';
+    public ?string $image          = null;
+    public ?string $category       = null;
+    public ?string $collapseKey    = null;
+    public ?string $analyticsLabel = null;
+
+    public function __construct(string $title, string $body, array $data = [])
+    {
+        $this->title = $title;
+        $this->body  = $body;
+        $this->data  = $data;
+    }
+
+    public static function create(string $title, string $body, array $data = []): self
+    {
+        return new static($title, $body, $data);
+    }
+
+    public function data(array $data): self
+    {
+        $this->data = array_merge($this->data, $data);
+
+        return $this;
+    }
+
+    public function badge(?int $badge): self
+    {
+        $this->badge = $badge;
+
+        return $this;
+    }
+
+    public function sound(?string $sound): self
+    {
+        $this->sound = $sound;
+
+        return $this;
+    }
+
+    public function image(?string $image): self
+    {
+        $this->image = $image;
+
+        return $this;
+    }
+
+    public function category(?string $category): self
+    {
+        $this->category = $category;
+
+        return $this;
+    }
+
+    public function collapseKey(?string $collapseKey): self
+    {
+        $this->collapseKey = $collapseKey;
+
+        return $this;
+    }
+
+    public function analyticsLabel(?string $analyticsLabel): self
+    {
+        $this->analyticsLabel = $analyticsLabel;
+
+        return $this;
+    }
+
+    /**
+     * FCM requires every data value to be a string.
+     */
+    public function stringData(): array
+    {
+        $data = [];
+        foreach ($this->data as $key => $value) {
+            if ($value === null) {
+                continue;
+            }
+
+            $data[(string) $key] = is_scalar($value) ? (is_bool($value) ? ($value ? 'true' : 'false') : (string) $value) : json_encode($value);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Render the FCM HTTP v1 message body (without a target).
+     */
+    public function toFcmArray(array $options = []): array
+    {
+        $androidChannelId = $options['android_channel_id'] ?? null;
+        $color            = $options['android_color'] ?? '#4391EA';
+
+        $notification = array_filter([
+            'title' => $this->title,
+            'body'  => $this->body,
+            'image' => $this->image,
+        ], fn ($value) => $value !== null);
+
+        $androidNotification = array_filter([
+            'channel_id'   => $androidChannelId,
+            'sound'        => $this->sound,
+            'color'        => $color,
+            'click_action' => $this->category,
+            'tag'          => $this->collapseKey,
+        ], fn ($value) => $value !== null && $value !== '');
+
+        $aps = array_filter([
+            'sound'    => $this->sound,
+            'badge'    => $this->badge,
+            'category' => $this->category,
+        ], fn ($value) => $value !== null);
+
+        $message = [
+            'notification' => $notification,
+            'data'         => $this->stringData(),
+            'android'      => array_filter([
+                'priority'     => 'high',
+                'collapse_key' => $this->collapseKey,
+                'notification' => $androidNotification,
+            ], fn ($value) => $value !== null && $value !== []),
+            'apns' => [
+                'headers' => ['apns-priority' => '10', 'apns-push-type' => 'alert'],
+                'payload' => ['aps' => $aps],
+            ],
+        ];
+
+        if ($this->analyticsLabel) {
+            $message['fcm_options'] = ['analytics_label' => $this->analyticsLabel];
+        }
+
+        if (empty($message['data'])) {
+            unset($message['data']);
+        }
+
+        return $message;
+    }
+
+    /**
+     * Render the APNs payload for pushok.
+     */
+    public function toApnPayload(): \Pushok\Payload
+    {
+        $alert = \Pushok\Payload\Alert::create()
+            ->setTitle($this->title)
+            ->setBody($this->body);
+
+        $payload = \Pushok\Payload::create()
+            ->setAlert($alert)
+            ->setPushType('alert');
+
+        if ($this->sound !== null) {
+            $payload->setSound($this->sound);
+        }
+
+        if ($this->badge !== null) {
+            $payload->setBadge($this->badge);
+        }
+
+        if ($this->category !== null) {
+            $payload->setCategory($this->category);
+        }
+
+        if ($this->image !== null) {
+            $payload->setMutableContent(true);
+        }
+
+        foreach ($this->data as $key => $value) {
+            if ($value === null || $key === 'aps') {
+                continue;
+            }
+
+            $payload->setCustomValue((string) $key, $value);
+        }
+
+        return $payload;
+    }
+}
diff --git a/server/src/Push/PushOutcome.php b/server/src/Push/PushOutcome.php
new file mode 100644
index 00000000..b61a0023
--- /dev/null
+++ b/server/src/Push/PushOutcome.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+/**
+ * Normalized per-token delivery outcome shared by the FCM and APNs transports.
+ */
+final class PushOutcome
+{
+    /** Accepted by the provider. */
+    public const SENT = 'sent';
+
+    /** Token is no longer valid (app uninstalled, token rotated, garbage token): prune it. */
+    public const DEAD = 'dead';
+
+    /** Token belongs to a different app/project than the channel (SenderId mismatch, DeviceTokenNotForTopic): try another channel. */
+    public const WRONG_APP = 'wrong_app';
+
+    /** APNs token was issued for the other environment (BadDeviceToken): try the other environment. */
+    public const WRONG_ENVIRONMENT = 'wrong_environment';
+
+    /** Anything else (credentials, quota, provider outage): logged, token kept. */
+    public const ERROR = 'error';
+
+    public function __construct(public string $status, public ?string $reason = null)
+    {
+    }
+
+    public static function sent(): self
+    {
+        return new self(self::SENT);
+    }
+
+    public static function dead(?string $reason = null): self
+    {
+        return new self(self::DEAD, $reason);
+    }
+
+    public static function wrongApp(?string $reason = null): self
+    {
+        return new self(self::WRONG_APP, $reason);
+    }
+
+    public static function wrongEnvironment(?string $reason = null): self
+    {
+        return new self(self::WRONG_ENVIRONMENT, $reason);
+    }
+
+    public static function error(?string $reason = null): self
+    {
+        return new self(self::ERROR, $reason);
+    }
+
+    public function is(string $status): bool
+    {
+        return $this->status === $status;
+    }
+}
diff --git a/server/src/Push/StorefrontPushChannel.php b/server/src/Push/StorefrontPushChannel.php
new file mode 100644
index 00000000..a56e2edf
--- /dev/null
+++ b/server/src/Push/StorefrontPushChannel.php
@@ -0,0 +1,236 @@
+<?php
+
+namespace Fleetbase\Storefront\Push;
+
+use Fleetbase\Models\UserDevice;
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Push\Contracts\SendsPushNotification;
+use Fleetbase\Storefront\Push\Transports\ApnTransport;
+use Fleetbase\Storefront\Push\Transports\FcmTransport;
+use Illuminate\Notifications\Notification;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Delivers storefront notifications to a notifiable's registered iOS and Android devices.
+ *
+ * For each platform the channel walks the candidate storefront channels (the app the device
+ * registered from, then network, then store) and, for iOS, the candidate APNs environments. Tokens that the
+ * provider reports as belonging to another app or environment are retried against the next
+ * candidate, dead tokens are pruned, and every failure is logged. Errors never propagate, so
+ * a push failure cannot block the notification's other channels.
+ */
+class StorefrontPushChannel
+{
+    public function __construct(
+        protected PushCredentialResolver $resolver,
+        protected FcmTransport $fcm,
+        protected ApnTransport $apn,
+    ) {
+    }
+
+    /**
+     * @return array<string, PushOutcome> final outcome keyed by device token
+     */
+    public function send($notifiable, Notification $notification): array
+    {
+        if (!$notification instanceof SendsPushNotification) {
+            return [];
+        }
+
+        try {
+            $message = $notification->toPush($notifiable);
+            $devices = static::devicesFor($notifiable);
+            if (!$message || $devices->isEmpty()) {
+                return [];
+            }
+
+            $storefronts = $notification->pushStorefronts();
+        } catch (\Throwable $e) {
+            static::log('error', 'Unable to prepare push notification.', ['notification' => get_class($notification), 'error' => $e->getMessage()]);
+
+            return [];
+        }
+
+        $outcomes = [];
+        foreach ($devices->groupBy(fn ($device) => static::normalizePlatform($device->platform)) as $platform => $platformDevices) {
+            foreach ($platformDevices->groupBy(fn ($device) => data_get($device, 'app_identifier') ?? '') as $appIdentifier => $group) {
+                $outcomes += match ($platform) {
+                    'android' => $this->sendToAndroid($group, $message, $storefronts, $appIdentifier ?: null),
+                    'ios'     => $this->sendToIos($group, $message, $storefronts, $appIdentifier ?: null),
+                    default   => [],
+                };
+            }
+        }
+
+        return $outcomes;
+    }
+
+    protected function sendToAndroid(Collection $devices, PushMessage $message, array $storefronts, ?string $appIdentifier): array
+    {
+        $channels = $this->resolver->channels('fcm', $storefronts, $appIdentifier);
+
+        return $this->deliver($devices, $channels, [null], function (NotificationChannel $channel, ?string $environment, array $tokens) use ($message) {
+            return $this->fcm->send($channel, $message, $tokens);
+        });
+    }
+
+    protected function sendToIos(Collection $devices, PushMessage $message, array $storefronts, ?string $appIdentifier): array
+    {
+        $channels = $this->resolver->channels('apn', $storefronts, $appIdentifier);
+        $outcomes = [];
+
+        // Devices that registered their APNs environment are sent to that environment only.
+        foreach ($devices->groupBy(fn ($device) => data_get($device, 'environment') ?? '') as $deviceEnvironment => $group) {
+            $outcomes += $this->deliver(
+                $group,
+                $channels,
+                fn (NotificationChannel $channel)                                      => ApnClientFactory::environments($channel, $deviceEnvironment ?: null),
+                fn (NotificationChannel $channel, ?string $environment, array $tokens) => $this->apn->send($channel, $environment, $message, $tokens)
+            );
+        }
+
+        return $outcomes;
+    }
+
+    /**
+     * @param array|callable $environments list of environments, or a resolver taking the channel
+     */
+    protected function deliver(Collection $devices, Collection $channels, array|callable $environments, callable $send): array
+    {
+        $devicesByToken = $devices->keyBy('token');
+        $pending        = $devicesByToken->keys()->all();
+        $outcomes       = [];
+
+        if ($channels->isEmpty()) {
+            static::log('warning', 'No push notification channel is configured for the storefront; skipping devices.', ['devices' => count($pending)]);
+
+            return [];
+        }
+
+        foreach ($channels as $channel) {
+            $channelEnvironments = is_callable($environments) ? $environments($channel) : $environments;
+            $retryOtherApp       = [];
+
+            foreach ($channelEnvironments as $environment) {
+                if (empty($pending)) {
+                    break;
+                }
+
+                try {
+                    $results = $send($channel, $environment, $pending);
+                } catch (\Throwable $e) {
+                    static::log('error', 'Push notification provider request failed.', [
+                        'channel'     => $channel->app_key,
+                        'scheme'      => $channel->scheme,
+                        'environment' => $environment,
+                        'error'       => $e->getMessage(),
+                    ]);
+                    foreach ($pending as $token) {
+                        $outcomes[$token] = PushOutcome::error($e->getMessage());
+                    }
+                    // Credentials for this channel are unusable; the next channel may still work.
+                    $pending = array_values(array_unique(array_merge($pending, $retryOtherApp)));
+                    continue 2;
+                }
+
+                $retryEnvironment = [];
+                foreach ($pending as $token) {
+                    $outcome          = $results[$token] ?? PushOutcome::error('No response from provider.');
+                    $outcomes[$token] = $outcome;
+
+                    if ($outcome->is(PushOutcome::WRONG_ENVIRONMENT)) {
+                        $retryEnvironment[] = $token;
+                    } elseif ($outcome->is(PushOutcome::WRONG_APP)) {
+                        $retryOtherApp[] = $token;
+                    }
+                }
+
+                $pending = $retryEnvironment;
+            }
+
+            // Still failing with BadDeviceToken in every environment: the token is invalid.
+            foreach ($pending as $token) {
+                $outcomes[$token] = PushOutcome::dead($outcomes[$token]->reason ?? 'BadDeviceToken');
+            }
+
+            $pending = $retryOtherApp;
+            if (empty($pending)) {
+                break;
+            }
+        }
+
+        foreach ($outcomes as $token => $outcome) {
+            $device = $devicesByToken->get($token);
+
+            if ($outcome->is(PushOutcome::DEAD)) {
+                static::pruneDevice($device, $outcome->reason);
+            } elseif (!$outcome->is(PushOutcome::SENT)) {
+                static::log('warning', 'Push notification was not delivered to device.', [
+                    'device'   => $device?->public_id,
+                    'platform' => $device?->platform,
+                    'status'   => $outcome->status,
+                    'reason'   => $outcome->reason,
+                ]);
+            }
+        }
+
+        return $outcomes;
+    }
+
+    /**
+     * Active devices registered for the notifiable.
+     */
+    public static function devicesFor($notifiable): Collection
+    {
+        if (is_object($notifiable) && method_exists($notifiable, 'routeNotificationForStorefrontPush')) {
+            $devices = collect($notifiable->routeNotificationForStorefrontPush());
+        } elseif (is_object($notifiable) && (method_exists($notifiable, 'devices') || isset($notifiable->devices))) {
+            $devices = collect($notifiable->devices);
+        } else {
+            return collect();
+        }
+
+        return $devices
+            ->filter(fn ($device) => is_object($device) && !empty($device->token) && !in_array($device->status, ['invalid', 'inactive'], true))
+            ->unique('token')
+            ->values();
+    }
+
+    public static function normalizePlatform(?string $platform): ?string
+    {
+        $platform = strtolower(trim((string) $platform));
+
+        return match ($platform) {
+            'ios', 'iphone', 'ipad', 'ipados', 'apple', 'apn', 'apns' => 'ios',
+            'android', 'fcm'                                          => 'android',
+            default                                                   => null,
+        };
+    }
+
+    protected static function pruneDevice($device, ?string $reason): void
+    {
+        if (!$device instanceof UserDevice) {
+            return;
+        }
+
+        static::log('info', 'Pruning push device with a dead token.', ['device' => $device->public_id, 'platform' => $device->platform, 'reason' => $reason]);
+
+        try {
+            $device->status = 'invalid';
+            $device->save();
+            $device->delete();
+        } catch (\Throwable $e) {
+            static::log('error', 'Unable to prune push device.', ['device' => $device->public_id, 'error' => $e->getMessage()]);
+        }
+    }
+
+    protected static function log(string $level, string $message, array $context = []): void
+    {
+        try {
+            Log::{$level}('[Storefront Push] ' . $message, $context);
+        } catch (\Throwable $e) {
+            // Logging must never break delivery.
+        }
+    }
+}
diff --git a/server/src/Push/Transports/ApnTransport.php b/server/src/Push/Transports/ApnTransport.php
new file mode 100644
index 00000000..deb144e3
--- /dev/null
+++ b/server/src/Push/Transports/ApnTransport.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Fleetbase\Storefront\Push\Transports;
+
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Push\ApnClientFactory;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\PushOutcome;
+use Pushok\Notification;
+use Pushok\Response;
+
+/**
+ * Sends push messages to iOS devices through APNs (token based .p8 auth).
+ */
+class ApnTransport
+{
+    public function __construct(protected ApnClientFactory $factory)
+    {
+    }
+
+    /**
+     * @param string[] $tokens
+     *
+     * @return array<string, PushOutcome> keyed by token
+     */
+    public function send(NotificationChannel $channel, string $environment, PushMessage $message, array $tokens): array
+    {
+        if (empty($tokens)) {
+            return [];
+        }
+
+        $client  = $this->factory->make($channel, $environment);
+        $payload = $message->toApnPayload();
+
+        foreach ($tokens as $token) {
+            $notification = new Notification($payload, $token);
+            $notification->setHighPriority();
+            if ($message->collapseKey) {
+                $notification->setCollapseId(substr($message->collapseKey, 0, 64));
+            }
+            $client->addNotification($notification);
+        }
+
+        $outcomes = [];
+        foreach ($client->push() as $response) {
+            $outcomes[$response->getDeviceToken()] = static::outcomeFor($response);
+        }
+
+        return $outcomes;
+    }
+
+    public static function outcomeFor(Response $response): PushOutcome
+    {
+        $status = $response->getStatusCode();
+        if ($status === 200) {
+            return PushOutcome::sent();
+        }
+
+        $reason = $response->getErrorReason();
+
+        return match (true) {
+            $status === 410, $reason === 'Unregistered', $reason === 'ExpiredToken' => PushOutcome::dead($reason),
+            $reason === 'BadDeviceToken'                                            => PushOutcome::wrongEnvironment($reason),
+            $reason === 'DeviceTokenNotForTopic', $reason === 'TopicDisallowed'     => PushOutcome::wrongApp($reason),
+            default                                                                 => PushOutcome::error($status . ' ' . $reason),
+        };
+    }
+}
diff --git a/server/src/Push/Transports/FcmTransport.php b/server/src/Push/Transports/FcmTransport.php
new file mode 100644
index 00000000..825cab70
--- /dev/null
+++ b/server/src/Push/Transports/FcmTransport.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Fleetbase\Storefront\Push\Transports;
+
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Push\FirebaseMessagingFactory;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\PushOutcome;
+use Kreait\Firebase\Exception\Messaging\AuthenticationError;
+use Kreait\Firebase\Exception\Messaging\InvalidArgument;
+use Kreait\Firebase\Exception\Messaging\NotFound;
+use Kreait\Firebase\Messaging\CloudMessage;
+use Kreait\Firebase\Messaging\SendReport;
+
+/**
+ * Sends push messages to Android devices through FCM HTTP v1.
+ */
+class FcmTransport
+{
+    public function __construct(protected FirebaseMessagingFactory $factory)
+    {
+    }
+
+    /**
+     * @param string[] $tokens
+     *
+     * @return array<string, PushOutcome> keyed by token
+     */
+    public function send(NotificationChannel $channel, PushMessage $message, array $tokens): array
+    {
+        if (empty($tokens)) {
+            return [];
+        }
+
+        $config  = (array) $channel->config;
+        $payload = $message->toFcmArray([
+            'android_channel_id' => $config['android_channel_id'] ?? config('storefront.push.android_channel_id'),
+            'android_color'      => $config['android_color'] ?? null,
+        ]);
+
+        $report   = $this->factory->make($channel)->sendMulticast(CloudMessage::fromArray($payload), array_values($tokens));
+        $outcomes = [];
+
+        foreach ($report->getItems() as $item) {
+            $outcomes[$item->target()->value()] = static::outcomeFor($item);
+        }
+
+        return $outcomes;
+    }
+
+    public static function outcomeFor(SendReport $report): PushOutcome
+    {
+        if ($report->isSuccess()) {
+            return PushOutcome::sent();
+        }
+
+        $error  = $report->error();
+        $reason = $error?->getMessage();
+
+        // 403 SENDER_ID_MISMATCH: token was issued for a different Firebase project.
+        if ($error instanceof AuthenticationError && stripos((string) $reason, 'mismatch') !== false) {
+            return PushOutcome::wrongApp($reason);
+        }
+
+        // 404 UNREGISTERED or 400 INVALID_ARGUMENT for the registration token.
+        if ($error instanceof NotFound || $report->messageWasSentToUnknownToken() || $report->messageTargetWasInvalid()) {
+            return PushOutcome::dead($reason);
+        }
+
+        if ($error instanceof InvalidArgument && stripos((string) $reason, 'registration') !== false) {
+            return PushOutcome::dead($reason);
+        }
+
+        return PushOutcome::error($reason);
+    }
+}
diff --git a/server/src/Support/CustomerNotificationPresenter.php b/server/src/Support/CustomerNotificationPresenter.php
new file mode 100644
index 00000000..9f2886de
--- /dev/null
+++ b/server/src/Support/CustomerNotificationPresenter.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Fleetbase\Storefront\Support;
+
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+
+/**
+ * Normalizes stored storefront notification payloads into the customer inbox shape.
+ *
+ * Handles current payloads (type/title/body) as well as rows written before they existed,
+ * where order notifications stored the status code in `message` and the title in `subject`.
+ */
+class CustomerNotificationPresenter
+{
+    /**
+     * Payload keys that are presentation or recipient details rather than deep-link data.
+     */
+    protected const HIDDEN_KEYS = [
+        'notifiable', 'notification_id', 'sent_at', 'type', 'title', 'body', 'subject', 'message', 'image',
+        'id', 'email', 'phone', 'companyId', 'company', 'storefront', 'order', 'store',
+    ];
+
+    public static function present(array $data, ?string $notificationClass = null): array
+    {
+        $message      = $data['message'] ?? null;
+        $legacyStatus = is_string($message) && preg_match('/^order_[a-z_]+$/', $message) ? $message : null;
+
+        $type  = $data['type'] ?? $legacyStatus ?? ($notificationClass ? Str::snake(class_basename($notificationClass)) : 'notification');
+        $title = $data['title'] ?? $data['subject'] ?? null;
+        $body  = $data['body'] ?? ($legacyStatus ? null : $message);
+
+        if ($title && !$body) {
+            $body = $title;
+        }
+
+        $payload = array_filter(Arr::except($data, static::HIDDEN_KEYS), fn ($value) => $value !== null);
+
+        return [
+            'type'  => $type,
+            'title' => $title,
+            'body'  => $body,
+            'image' => $data['image'] ?? null,
+            'data'  => $payload,
+        ];
+    }
+}
diff --git a/server/src/Support/NotificationPreferences.php b/server/src/Support/NotificationPreferences.php
new file mode 100644
index 00000000..6ba1384e
--- /dev/null
+++ b/server/src/Support/NotificationPreferences.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Fleetbase\Storefront\Support;
+
+/**
+ * Customer notification preferences, stored on the customer contact's meta.
+ *
+ * - `order_updates`: push notifications about the customer's orders. Order updates are
+ *   always kept in the inbox, only the push can be turned off.
+ * - `promotions`: promotional notifications, both push and inbox.
+ */
+class NotificationPreferences
+{
+    public const META_KEY = 'notification_preferences';
+
+    public const DEFAULTS = [
+        'order_updates' => true,
+        'promotions'    => true,
+    ];
+
+    public static function for($notifiable): array
+    {
+        $stored = [];
+        if (is_object($notifiable) && method_exists($notifiable, 'getMeta')) {
+            $stored = (array) $notifiable->getMeta(static::META_KEY, []);
+        }
+
+        $preferences = [];
+        foreach (static::DEFAULTS as $key => $default) {
+            $preferences[$key] = array_key_exists($key, $stored) ? filter_var($stored[$key], FILTER_VALIDATE_BOOLEAN) : $default;
+        }
+
+        return $preferences;
+    }
+
+    public static function allows($notifiable, string $preference): bool
+    {
+        return static::for($notifiable)[$preference] ?? true;
+    }
+
+    /**
+     * Merge the known preference keys from the input into the notifiable's stored preferences.
+     */
+    public static function update($notifiable, array $input): array
+    {
+        $preferences = static::for($notifiable);
+        foreach (array_keys(static::DEFAULTS) as $key) {
+            if (array_key_exists($key, $input)) {
+                $preferences[$key] = filter_var($input[$key], FILTER_VALIDATE_BOOLEAN);
+            }
+        }
+
+        $notifiable->updateMeta(static::META_KEY, $preferences);
+
+        return $preferences;
+    }
+}
diff --git a/server/src/Support/PushNotification.php b/server/src/Support/PushNotification.php
deleted file mode 100644
index 60f07f1c..00000000
--- a/server/src/Support/PushNotification.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-namespace Fleetbase\Storefront\Support;
-
-use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\NotificationChannel;
-use Fleetbase\Storefront\Models\Store;
-use Fleetbase\Support\Utils;
-use Illuminate\Container\Container;
-use Kreait\Laravel\Firebase\FirebaseProjectManager;
-use NotificationChannels\Apn\ApnMessage;
-use NotificationChannels\Fcm\FcmMessage;
-use NotificationChannels\Fcm\Resources\Notification as FcmNotification;
-use Pushok\AuthProvider\Token as PuskOkToken;
-use Pushok\Client as PushOkClient;
-
-class PushNotification
-{
-    public static function createApnMessage(Order $order, string $title, string $body, string $status, $notifiable = null): ?ApnMessage
-    {
-        $storefront = static::getStorefrontFromOrder($order);
-        $client     = static::getApnClient($storefront, $order);
-        if (!$client) {
-            // create apn message anyway
-            return new ApnMessage($title, $body);
-        }
-
-        return ApnMessage::create()
-            ->badge(1)
-            ->title($title)
-            ->body($body)
-            ->custom('type', $status)
-            ->custom('order', $order->uuid)
-            ->custom('id', $order->public_id)
-            ->action('view_order', ['id' => $order->public_id])
-            ->via($client);
-    }
-
-    public static function createFcmMessage(Order $order, string $title, string $body, string $status, $notifiable = null): ?FcmMessage
-    {
-        $storefront          = static::getStorefrontFromOrder($order);
-        $notificationChannel = static::getNotificationChannel('fcm', $storefront, $order);
-        if (!$notificationChannel) {
-            // create fcm message anyway
-            return new FcmMessage(
-                notification: new FcmNotification(
-                    title: $title,
-                    body: $body
-                )
-            );
-        }
-
-        // Configure FCM
-        static::configureFcm($notificationChannel);
-
-        // Get FCM Client using Notification Channel
-        $client = static::getFcmClient($notificationChannel);
-
-        // Create Notification
-        $notification = new FcmNotification(
-            title: $title,
-            body: $body
-        );
-
-        return (new FcmMessage(notification: $notification))
-            ->data(['order' => $order->uuid, 'id' => $order->public_id, 'type' => $status])
-            ->custom([
-                'android' => [
-                    'notification' => [
-                        'color' => '#4391EA',
-                        'sound' => 'default',
-                    ],
-                    'fcm_options' => [
-                        'analytics_label' => 'analytics',
-                    ],
-                ],
-                'apns' => [
-                    'payload' => [
-                        'aps' => [
-                            'sound' => 'default',
-                        ],
-                    ],
-                    'fcm_options' => [
-                        'analytics_label' => 'analytics',
-                    ],
-                ],
-            ])
-            ->usingClient($client);
-    }
-
-    protected static function getFcmClient(NotificationChannel $notificationChannel)
-    {
-        $container      = Container::getInstance();
-        $projectManager = new FirebaseProjectManager($container);
-
-        return $projectManager->project($notificationChannel->app_key)->messaging();
-    }
-
-    public static function configureFcm(NotificationChannel $notificationChannel)
-    {
-        // Convert the channel's config to an array.
-        $config = (array) $notificationChannel->config;
-
-        // Get the base firebase config.
-        $firebaseConfig = config('firebase.projects.app');
-
-        // Update the firebase config with values from the channel.
-        data_set($firebaseConfig, 'credentials.private_key', $config['firebase_credentials_json']);
-        data_set($firebaseConfig, 'database.url', $config['firebase_database_url']);
-
-        // Update the Laravel config for this project key.
-        config(['firebase.projects.' . $notificationChannel->app_key => $firebaseConfig]);
-
-        // Return the updated firebase config.
-        return $firebaseConfig;
-    }
-
-    public static function getNotificationChannel(string $scheme, Network|Store $storefront, ?Order $order = null): ?NotificationChannel
-    {
-        if ($order && $order->hasMeta('storefront_notification_channel')) {
-            return NotificationChannel::where([
-                'owner_uuid' => $storefront->uuid,
-                'app_key'    => $order->getMeta('storefront_notification_channel'),
-                'scheme'     => $scheme,
-            ])->first();
-        }
-
-        return NotificationChannel::where([
-            'owner_uuid' => $storefront->uuid,
-            'scheme'     => $scheme,
-        ])->first();
-    }
-
-    public static function getApnClient(Network|Store $storefront, ?Order $order = null): ?PushOkClient
-    {
-        $notificationChannel = static::getNotificationChannel('apn', $storefront, $order);
-        if (!$notificationChannel) {
-            return null;
-        }
-        $config              = (array) $notificationChannel->config;
-
-        $isProductionEnv = Utils::castBoolean(data_get($config, 'production', app()->isProduction()));
-
-        return new PushOkClient(PuskOkToken::create($config), $isProductionEnv);
-    }
-
-    public static function getStorefrontFromOrder(Order $order): Network|Store|null
-    {
-        return Storefront::findAbout($order->getMeta('storefront_id'));
-    }
-}
diff --git a/server/src/Support/Storefront.php b/server/src/Support/Storefront.php
index 6ef091ef..b3b40e8c 100644
--- a/server/src/Support/Storefront.php
+++ b/server/src/Support/Storefront.php
@@ -632,7 +632,8 @@ public static function autoAcceptOrder(Order $order)
         // Notify customer order was accepted
         try {
             $order->customer->notify(new StorefrontOrderAccepted($order));
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
+            Log::error('[Storefront] was unable to notify the customer that their order was accepted.', ['order' => $order->public_id, 'error' => $e->getMessage()]);
         }
 
         return $order;
diff --git a/server/src/routes.php b/server/src/routes.php
index 52adcd83..47bf5a37 100644
--- a/server/src/routes.php
+++ b/server/src/routes.php
@@ -99,11 +99,24 @@ function ($router) {
                     $router->post('receipt', 'OrderController@getReceipt');
                 });
 
+                // storefront/v1/notifications
+                $router->group(['prefix' => 'notifications'], function () use ($router) {
+                    $router->get('/', 'NotificationController@query');
+                    $router->get('unread-count', 'NotificationController@unreadCount');
+                    $router->get('preferences', 'NotificationController@getPreferences');
+                    $router->put('preferences', 'NotificationController@updatePreferences');
+                    $router->put('read-all', 'NotificationController@markAllAsRead');
+                    $router->get('{id}', 'NotificationController@find');
+                    $router->put('{id}/read', 'NotificationController@markAsRead');
+                    $router->delete('{id}', 'NotificationController@delete');
+                });
+
                 // storefront/v1/customers
                 $router->group(['prefix' => 'customers'], function () use ($router) {
                     $router->put('{id}', 'CustomerController@update');
                     $router->get('/', 'CustomerController@query');
                     $router->post('register-device', 'CustomerController@registerDevice');
+                    $router->post('unregister-device', 'CustomerController@unregisterDevice');
                     $router->get('places', 'CustomerController@places');
                     $router->get('orders', 'CustomerController@orders');
                     $router->get('{id}', 'CustomerController@find');
@@ -213,7 +226,12 @@ function ($router, $controller) {
                         $router->fleetbaseRoutes('product-addon-categories');
                         $router->fleetbaseRoutes('addon-categories');
                         $router->fleetbaseRoutes('gateways');
-                        $router->fleetbaseRoutes('notification-channels');
+                        $router->fleetbaseRoutes(
+                            'notification-channels',
+                            function ($router, $controller) {
+                                $router->post('{id}/test', $controller('testPush'));
+                            }
+                        );
                         $router->fleetbaseRoutes('reviews');
                         $router->fleetbaseRoutes('votes');
                         $router->fleetbaseRoutes('food-trucks');
diff --git a/server/tests/Unit/Http/Controllers/CustomerDeviceRegistrationTest.php b/server/tests/Unit/Http/Controllers/CustomerDeviceRegistrationTest.php
new file mode 100644
index 00000000..7ecded9c
--- /dev/null
+++ b/server/tests/Unit/Http/Controllers/CustomerDeviceRegistrationTest.php
@@ -0,0 +1,184 @@
+<?php
+
+use Fleetbase\Models\UserDevice;
+use Fleetbase\Storefront\Http\Controllers\v1\CustomerController;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Session\ArraySessionHandler;
+use Illuminate\Session\Store as SessionStore;
+
+function bootDeviceRegistrationCustomer(string $customerUuid, string $userUuid, string $secret): void
+{
+    $connection = Model::getConnectionResolver()->connection('mysql');
+    $schema     = $connection->getSchemaBuilder();
+
+    if (!$schema->hasTable('contacts')) {
+        $schema->create('contacts', function ($table) {
+            $table->increments('id');
+            $table->string('uuid')->nullable();
+            $table->string('public_id')->nullable();
+            $table->string('company_uuid')->nullable();
+            $table->string('user_uuid')->nullable();
+            $table->string('type')->nullable();
+            $table->text('meta')->nullable();
+            $table->timestamps();
+            $table->timestamp('deleted_at')->nullable();
+        });
+    }
+
+    if (!$schema->hasTable('personal_access_tokens')) {
+        $schema->create('personal_access_tokens', function ($table) {
+            $table->increments('id');
+            $table->string('tokenable_type')->nullable();
+            $table->string('tokenable_id')->nullable();
+            $table->string('name');
+            $table->string('token', 64)->unique();
+            $table->text('abilities')->nullable();
+            $table->timestamp('last_used_at')->nullable();
+            $table->timestamp('expires_at')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    $connection->table('contacts')->insert([
+        'uuid'      => $customerUuid,
+        'public_id' => 'contact_' . substr($customerUuid, 0, 4),
+        'user_uuid' => $userUuid,
+        'type'      => 'customer',
+    ]);
+    $connection->table('personal_access_tokens')->insert([
+        'name'       => $customerUuid,
+        'token'      => hash('sha256', $secret),
+        'abilities'  => '["*"]',
+        'created_at' => now(),
+        'updated_at' => now(),
+    ]);
+}
+
+function deviceRegistrationRequest(string $secret, array $input): Request
+{
+    $request = Request::create('/customers/register-device', 'POST', $input);
+    $request->setLaravelSession(new SessionStore('device-registration-test', new ArraySessionHandler(120)));
+    $request->headers->set('Customer-Token', $secret);
+    app()->instance('request', $request);
+
+    return $request;
+}
+
+beforeEach(function () {
+    $schema = Model::getConnectionResolver()->connection('mysql')->getSchemaBuilder();
+    foreach (['contacts', 'personal_access_tokens', 'user_devices'] as $table) {
+        $schema->dropIfExists($table);
+    }
+    $schema->create('user_devices', function ($table) {
+        $table->increments('id');
+        $table->string('uuid')->nullable();
+        $table->string('public_id')->nullable();
+        $table->string('user_uuid')->nullable();
+        $table->string('platform')->nullable();
+        $table->text('token')->nullable();
+        $table->string('status')->nullable();
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    });
+
+    bootDeviceRegistrationCustomer('11111111-1111-4111-8111-111111111111', 'first_user', 'first-secret');
+    bootDeviceRegistrationCustomer('22222222-2222-4222-8222-222222222222', 'second_user', 'second-secret');
+});
+
+test('device registration validates the token and platform', function () {
+    $controller = new CustomerController();
+
+    $missingToken = $controller->registerDevice(deviceRegistrationRequest('first-secret', ['platform' => 'ios']));
+    $badPlatform  = $controller->registerDevice(deviceRegistrationRequest('first-secret', ['token' => 'abc', 'platform' => 'web']));
+
+    expect($missingToken->getData(true))->toBe(['error' => 'A device token is required.'])
+        ->and($badPlatform->getData(true))->toBe(['error' => 'Device platform must be either ios or android.'])
+        ->and(UserDevice::query()->count())->toBe(0);
+});
+
+test('device registration requires the customer to have a user account', function () {
+    bootDeviceRegistrationCustomer('33333333-3333-4333-8333-333333333333', '', 'userless-secret');
+    Model::getConnectionResolver()->connection('mysql')->table('contacts')->where('uuid', '33333333-3333-4333-8333-333333333333')->update(['user_uuid' => null]);
+
+    $response = (new CustomerController())->registerDevice(deviceRegistrationRequest('userless-secret', ['token' => 'abc', 'platform' => 'ios']));
+
+    expect($response->getData(true))->toBe(['error' => 'Unable to register device for customer without a user account.']);
+});
+
+test('device registration normalizes the platform and reassigns a token to the latest customer', function () {
+    $controller = new CustomerController();
+
+    $controller->registerDevice(deviceRegistrationRequest('first-secret', ['token' => ' shared-token ', 'os' => 'Android']));
+
+    expect(UserDevice::where('token', 'shared-token')->get(['user_uuid', 'platform', 'status'])->toArray())->toBe([
+        ['user_uuid' => 'first_user', 'platform' => 'android', 'status' => 'active'],
+    ]);
+
+    // The same install logs in as another customer.
+    $response = $controller->registerDevice(deviceRegistrationRequest('second-secret', ['token' => 'shared-token', 'platform' => 'android']));
+
+    expect($response->getData(true)['status'])->toBe('OK')
+        ->and(UserDevice::withTrashed()->where('token', 'shared-token')->count())->toBe(1)
+        ->and(UserDevice::where('token', 'shared-token')->value('user_uuid'))->toBe('second_user');
+});
+
+test('device registration restores pruned tokens and collapses legacy duplicates', function () {
+    $connection = Model::getConnectionResolver()->connection('mysql');
+    $connection->table('user_devices')->insert([
+        ['uuid' => 'd1', 'user_uuid' => 'first_user', 'platform' => 'ios', 'token' => 'ios-token', 'status' => 'invalid', 'deleted_at' => now(), 'updated_at' => now()->subDay()],
+        ['uuid' => 'd2', 'user_uuid' => 'first_user', 'platform' => 'iOS', 'token' => 'ios-token', 'status' => 'active', 'deleted_at' => null, 'updated_at' => now()->subDays(2)],
+    ]);
+
+    (new CustomerController())->registerDevice(deviceRegistrationRequest('first-secret', ['token' => 'ios-token', 'platform' => 'ios']));
+
+    expect(UserDevice::withTrashed()->where('token', 'ios-token')->get(['uuid', 'platform', 'status', 'deleted_at'])->toArray())->toBe([
+        ['uuid' => 'd1', 'platform' => 'ios', 'status' => 'active', 'deleted_at' => null],
+    ]);
+});
+
+test('device unregistration only removes the authenticated customer token', function () {
+    $connection = Model::getConnectionResolver()->connection('mysql');
+    $connection->table('user_devices')->insert([
+        ['uuid' => 'd1', 'user_uuid' => 'first_user', 'platform' => 'ios', 'token' => 'first-token', 'status' => 'active'],
+        ['uuid' => 'd2', 'user_uuid' => 'second_user', 'platform' => 'ios', 'token' => 'second-token', 'status' => 'active'],
+    ]);
+    $controller = new CustomerController();
+
+    $other = $controller->unregisterDevice(deviceRegistrationRequest('first-secret', ['token' => 'second-token']));
+    $own   = $controller->unregisterDevice(deviceRegistrationRequest('first-secret', ['token' => 'first-token']));
+
+    expect($other->getData(true))->toBe(['status' => 'OK', 'deleted' => 0])
+        ->and($own->getData(true))->toBe(['status' => 'OK', 'deleted' => 1])
+        ->and(UserDevice::pluck('token')->all())->toBe(['second-token']);
+});
+
+test('device unregistration requires an authenticated customer and a token', function () {
+    $controller = new CustomerController();
+
+    $unauthenticated = $controller->unregisterDevice(deviceRegistrationRequest('wrong-secret', ['token' => 'first-token']));
+    $missingToken    = $controller->unregisterDevice(deviceRegistrationRequest('first-secret', []));
+
+    expect($unauthenticated->getData(true))->toBe(['error' => 'Not authorized to unregister device for customer'])
+        ->and($missingToken->getData(true))->toBe(['error' => 'A device token is required.']);
+});
+
+test('device registration records the app and APNs environment when core-api supports it', function () {
+    $schema = Model::getConnectionResolver()->connection('mysql')->getSchemaBuilder();
+    $schema->table('user_devices', function ($table) {
+        $table->string('app_identifier')->nullable();
+        $table->string('environment')->nullable();
+        $table->timestamp('last_seen_at')->nullable();
+    });
+
+    $request = deviceRegistrationRequest('first-secret', ['token' => 'ios-token', 'platform' => 'ios', 'environment' => 'sandbox']);
+    $request->session()->put('storefront_network', 'network_uuid');
+    session(['storefront_store' => null, 'storefront_network' => 'network_uuid']);
+
+    (new CustomerController())->registerDevice($request);
+    (new CustomerController())->registerDevice(deviceRegistrationRequest('first-secret', ['token' => 'android-token', 'platform' => 'android', 'environment' => 'bogus']));
+
+    expect(UserDevice::where('token', 'ios-token')->first(['app_identifier', 'environment'])->toArray())->toBe(['app_identifier' => 'network_uuid', 'environment' => 'sandbox'])
+        ->and(UserDevice::where('token', 'ios-token')->value('last_seen_at'))->not->toBeNull()
+        ->and(UserDevice::where('token', 'android-token')->value('environment'))->toBeNull();
+});
diff --git a/server/tests/Unit/Http/Controllers/CustomerNotificationInboxTest.php b/server/tests/Unit/Http/Controllers/CustomerNotificationInboxTest.php
new file mode 100644
index 00000000..42d36ac3
--- /dev/null
+++ b/server/tests/Unit/Http/Controllers/CustomerNotificationInboxTest.php
@@ -0,0 +1,419 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Contact;
+use Fleetbase\Storefront\Http\Controllers\v1\NotificationController;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Notifications\Channels\SafeBroadcastChannel;
+use Fleetbase\Storefront\Notifications\PromotionalPushNotification;
+use Fleetbase\Storefront\Notifications\StorefrontOrderCompleted;
+use Fleetbase\Storefront\Push\StorefrontPushChannel;
+use Fleetbase\Storefront\Support\CustomerNotificationPresenter;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Session\ArraySessionHandler;
+use Illuminate\Session\Store as SessionStore;
+
+const INBOX_CUSTOMER = '11111111-1111-4111-8111-111111111111';
+const INBOX_OTHER    = '22222222-2222-4222-8222-222222222222';
+
+function inboxConnection()
+{
+    return Model::getConnectionResolver()->connection('mysql');
+}
+
+function inboxRequest(?string $secret = 'inbox-secret', array $input = [], string $method = 'GET'): Request
+{
+    $request = Request::create('/notifications', $method, $input);
+    $request->setLaravelSession(new SessionStore('inbox-test', new ArraySessionHandler(120)));
+    if ($secret) {
+        $request->headers->set('Customer-Token', $secret);
+    }
+    app()->instance('request', $request);
+
+    return $request;
+}
+
+function inboxNotification(string $id, string $notifiable, array $data, array $attributes = []): array
+{
+    return array_merge([
+        'id'              => $id,
+        'type'            => StorefrontOrderCompleted::class,
+        'notifiable_type' => Contact::class,
+        'notifiable_id'   => $notifiable,
+        'data'            => json_encode($data),
+        'read_at'         => null,
+        'created_at'      => '2026-09-01 10:00:00',
+        'updated_at'      => '2026-09-01 10:00:00',
+    ], $attributes);
+}
+
+function inboxIds($collection): array
+{
+    return collect($collection->resolve())->pluck('id')->all();
+}
+
+beforeEach(function () {
+    $schema = inboxConnection()->getSchemaBuilder();
+    foreach (['contacts', 'personal_access_tokens', 'notifications', 'stores', 'networks', 'network_stores'] as $table) {
+        $schema->dropIfExists($table);
+    }
+
+    $schema->create('contacts', function ($table) {
+        $table->increments('id');
+        $table->string('uuid')->nullable();
+        $table->string('public_id')->nullable();
+        $table->string('company_uuid')->nullable();
+        $table->string('user_uuid')->nullable();
+        $table->string('type')->nullable();
+        $table->text('meta')->nullable();
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    });
+    $schema->create('personal_access_tokens', function ($table) {
+        $table->increments('id');
+        $table->string('tokenable_type')->nullable();
+        $table->string('tokenable_id')->nullable();
+        $table->string('name');
+        $table->string('token', 64)->unique();
+        $table->text('abilities')->nullable();
+        $table->timestamp('last_used_at')->nullable();
+        $table->timestamp('expires_at')->nullable();
+        $table->timestamps();
+    });
+    $schema->create('notifications', function ($table) {
+        $table->string('id')->primary();
+        $table->string('type');
+        $table->string('notifiable_type');
+        $table->string('notifiable_id');
+        $table->text('data');
+        $table->timestamp('read_at')->nullable();
+        $table->timestamps();
+    });
+    foreach (['stores', 'networks'] as $name) {
+        $schema->create($name, function ($table) {
+            $table->increments('id');
+            $table->string('uuid')->nullable();
+            $table->string('public_id')->nullable();
+            $table->string('name')->nullable();
+            $table->timestamps();
+            $table->timestamp('deleted_at')->nullable();
+        });
+    }
+    $schema->create('network_stores', function ($table) {
+        $table->increments('id');
+        $table->string('network_uuid')->nullable();
+        $table->string('store_uuid')->nullable();
+        $table->string('category_uuid')->nullable();
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    });
+
+    $db = inboxConnection();
+    $db->table('contacts')->insert([
+        ['uuid' => INBOX_CUSTOMER, 'public_id' => 'contact_inbox', 'user_uuid' => 'user_inbox', 'type' => 'customer', 'meta' => '{}'],
+        ['uuid' => INBOX_OTHER, 'public_id' => 'contact_other', 'user_uuid' => 'user_other', 'type' => 'customer', 'meta' => '{}'],
+    ]);
+    $db->table('personal_access_tokens')->insert([
+        ['name' => INBOX_CUSTOMER, 'token' => hash('sha256', 'inbox-secret'), 'abilities' => '["*"]'],
+        ['name' => INBOX_OTHER, 'token' => hash('sha256', 'other-secret'), 'abilities' => '["*"]'],
+    ]);
+    $db->table('stores')->insert([
+        ['uuid' => 'store_a_uuid', 'public_id' => 'store_a'],
+        ['uuid' => 'store_b_uuid', 'public_id' => 'store_b'],
+        ['uuid' => 'store_c_uuid', 'public_id' => 'store_c'],
+    ]);
+    $db->table('networks')->insert(['uuid' => 'network_uuid', 'public_id' => 'network_m']);
+    $db->table('network_stores')->insert([
+        ['network_uuid' => 'network_uuid', 'store_uuid' => 'store_a_uuid'],
+        ['network_uuid' => 'network_uuid', 'store_uuid' => 'store_b_uuid'],
+    ]);
+
+    $db->table('notifications')->insert([
+        inboxNotification('n_store_a', INBOX_CUSTOMER, [
+            'type' => 'order_completed', 'title' => 'Delivered', 'body' => 'Enjoy!', 'order_id' => 'order_a', 'store_id' => 'store_a', 'email' => 'me@example.test',
+        ], ['created_at' => '2026-09-05 10:00:00']),
+        inboxNotification('n_network', INBOX_CUSTOMER, [
+            'type' => 'order_enroute', 'title' => 'On the way', 'body' => 'Picked up', 'store_id' => 'store_b', 'network_id' => 'network_m',
+        ], ['created_at' => '2026-09-04 10:00:00']),
+        inboxNotification('n_store_c', INBOX_CUSTOMER, [
+            'type' => 'promotional', 'title' => 'Sale', 'body' => 'Store C sale', 'store_id' => 'store_c',
+        ], ['type' => PromotionalPushNotification::class, 'created_at' => '2026-09-03 10:00:00']),
+        inboxNotification('n_generic', INBOX_CUSTOMER, [
+            'title' => 'Welcome', 'body' => 'Hello there',
+        ], ['created_at' => '2026-09-02 10:00:00', 'read_at' => '2026-09-02 11:00:00']),
+        inboxNotification('n_legacy', INBOX_CUSTOMER, [
+            'subject' => 'Your order from Store A has been accepted.', 'message' => 'order_accepted', 'storefront_id' => 'store_a', 'id' => 'contact_inbox',
+        ], ['type' => 'Fleetbase\\Storefront\\Notifications\\StorefrontOrderAccepted', 'created_at' => '2026-09-01 10:00:00']),
+        inboxNotification('n_other_customer', INBOX_OTHER, [
+            'type' => 'order_completed', 'title' => 'Not yours', 'body' => 'Private', 'store_id' => 'store_a',
+        ]),
+    ]);
+
+    session(['storefront_store' => 'store_a_uuid', 'storefront_network' => null]);
+});
+
+test('inbox endpoints require an authenticated customer', function () {
+    $controller = new NotificationController();
+    inboxRequest(null);
+
+    foreach ([
+        $controller->query(request()),
+        $controller->unreadCount(),
+        $controller->find('n_store_a'),
+        $controller->markAsRead('n_store_a'),
+        $controller->markAllAsRead(),
+        $controller->delete('n_store_a'),
+        $controller->getPreferences(),
+        $controller->updatePreferences(request()),
+    ] as $response) {
+        expect($response->getStatusCode())->toBe(401);
+    }
+});
+
+test('a store app lists only the customer notifications for that store, newest first', function () {
+    $items = (new NotificationController())->query(inboxRequest())->resolve();
+
+    expect(collect($items)->pluck('id')->all())->toBe(['n_store_a', 'n_generic', 'n_legacy'])
+        ->and($items[0])->toMatchArray([
+            'type'    => 'order_completed',
+            'title'   => 'Delivered',
+            'body'    => 'Enjoy!',
+            'is_read' => false,
+            'data'    => ['order_id' => 'order_a', 'store_id' => 'store_a'],
+        ])
+        ->and($items[1]['is_read'])->toBeTrue()
+        ->and($items[2])->toMatchArray([
+            'type'  => 'order_accepted',
+            'title' => 'Your order from Store A has been accepted.',
+            'body'  => 'Your order from Store A has been accepted.',
+            'data'  => ['storefront_id' => 'store_a'],
+        ]);
+});
+
+test('a network app lists notifications for the network and its member stores', function () {
+    session(['storefront_store' => null, 'storefront_network' => 'network_uuid']);
+
+    expect(inboxIds((new NotificationController())->query(inboxRequest())))->toBe(['n_store_a', 'n_network', 'n_generic', 'n_legacy']);
+});
+
+test('the inbox supports unread, type and pagination filters', function () {
+    $controller = new NotificationController();
+
+    expect(inboxIds($controller->query(inboxRequest('inbox-secret', ['unread' => '1']))))->toBe(['n_store_a', 'n_legacy'])
+        ->and(inboxIds($controller->query(inboxRequest('inbox-secret', ['type' => 'order_completed']))))->toBe(['n_store_a'])
+        ->and(inboxIds($controller->query(inboxRequest('inbox-secret', ['limit' => 1, 'offset' => 1]))))->toBe(['n_generic']);
+});
+
+test('customers can read, count, mark and delete only their own notifications', function () {
+    $controller = new NotificationController();
+    inboxRequest();
+
+    expect($controller->unreadCount()->getData(true))->toBe(['count' => 2])
+        ->and($controller->find('n_other_customer')->getStatusCode())->toBe(404)
+        ->and($controller->find('n_store_c')->getStatusCode())->toBe(404)
+        ->and($controller->markAsRead('n_other_customer')->getStatusCode())->toBe(404)
+        ->and($controller->delete('n_other_customer')->getStatusCode())->toBe(404);
+
+    $read = $controller->markAsRead('n_store_a')->resolve();
+
+    expect($read['is_read'])->toBeTrue()
+        ->and($controller->unreadCount()->getData(true))->toBe(['count' => 1])
+        ->and($controller->markAllAsRead()->getData(true))->toBe(['status' => 'OK', 'updated' => 1])
+        ->and($controller->unreadCount()->getData(true))->toBe(['count' => 0])
+        ->and(inboxConnection()->table('notifications')->where('id', 'n_store_c')->value('read_at'))->toBeNull()
+        ->and(inboxConnection()->table('notifications')->where('id', 'n_other_customer')->value('read_at'))->toBeNull()
+        ->and($controller->delete('n_generic')->getData(true))->toBe(['status' => 'OK', 'id' => 'n_generic', 'deleted' => true])
+        ->and(inboxConnection()->table('notifications')->where('id', 'n_generic')->exists())->toBeFalse();
+});
+
+test('customers can read and update their notification preferences', function () {
+    $controller = new NotificationController();
+    inboxRequest();
+
+    expect($controller->getPreferences()->getData(true))->toBe(['order_updates' => true, 'promotions' => true]);
+
+    $invalid = $controller->updatePreferences(inboxRequest('inbox-secret', ['promotions' => 'sometimes'], 'PUT'));
+    $updated = $controller->updatePreferences(inboxRequest('inbox-secret', ['promotions' => false, 'ignored' => true], 'PUT'));
+
+    expect($invalid->getStatusCode())->toBe(400)
+        ->and($updated->getData(true))->toBe(['order_updates' => true, 'promotions' => false])
+        ->and(json_decode(inboxConnection()->table('contacts')->where('uuid', INBOX_CUSTOMER)->value('meta'), true))
+        ->toBe(['notification_preferences' => ['order_updates' => true, 'promotions' => false]]);
+});
+
+test('notification preferences control promotional delivery and order update pushes', function () {
+    $store = tap(new Store())->forceFill(['uuid' => 'store_a_uuid', 'public_id' => 'store_a', 'name' => 'Store A']);
+    $store->setRelation('networks', collect());
+    $promotion = new PromotionalPushNotification('Sale', 'Save now', $store);
+
+    $optedOut = new Contact();
+    $optedOut->forceFill(['meta' => ['notification_preferences' => ['promotions' => false, 'order_updates' => false]]]);
+    $defaults = new Contact();
+    $defaults->forceFill(['meta' => []]);
+
+    $order = new Fleetbase\FleetOps\Models\Order();
+    $order->forceFill(['meta' => []]);
+    $orderNotification = (new ReflectionClass(StorefrontOrderCompleted::class))->newInstanceWithoutConstructor();
+
+    expect($promotion->via($optedOut))->toBe([])
+        ->and($promotion->via($defaults))->toBe([StorefrontPushChannel::class, 'database', SafeBroadcastChannel::class])
+        ->and($orderNotification->via($optedOut))->toBe(['database', 'mail', SafeBroadcastChannel::class])
+        ->and($orderNotification->via($defaults))->toBe([StorefrontPushChannel::class, 'database', 'mail', SafeBroadcastChannel::class]);
+});
+
+test('realtime payloads mirror inbox items without recipient details', function () {
+    $store     = tap(new Store())->forceFill(['uuid' => 'store_a_uuid', 'public_id' => 'store_a', 'name' => 'Store A']);
+    $promotion = new PromotionalPushNotification('Sale', 'Save now', $store);
+
+    expect($promotion->toBroadcast(null)->data)->toBe([
+        'type'  => 'promotional',
+        'title' => 'Sale',
+        'body'  => 'Save now',
+        'image' => null,
+        'data'  => ['store_id' => 'store_a'],
+    ])->and($promotion->broadcastType())->toBe('promotional')
+        ->and(CustomerNotificationPresenter::present([], 'Fleetbase\\Storefront\\Notifications\\SomethingElse'))->toMatchArray(['type' => 'something_else', 'title' => null]);
+});
+
+test('broadcast failures never fail the notification send', function () {
+    $events = new class implements Illuminate\Contracts\Events\Dispatcher {
+        public function listen($events, $listener = null)
+        {
+        }
+
+        public function hasListeners($eventName)
+        {
+            return false;
+        }
+
+        public function subscribe($subscriber)
+        {
+        }
+
+        public function until($event, $payload = [])
+        {
+        }
+
+        public function dispatch($event, $payload = [], $halt = false)
+        {
+            throw new RuntimeException('socket unavailable');
+        }
+
+        public function push($event, $payload = [])
+        {
+        }
+
+        public function flush($event)
+        {
+        }
+
+        public function forget($event)
+        {
+        }
+
+        public function forgetPushed()
+        {
+        }
+    };
+    $store      = tap(new Store())->forceFill(['uuid' => 'store_a_uuid', 'public_id' => 'store_a', 'name' => 'Store A']);
+    $notifiable = new Contact();
+    $notifiable->forceFill(['uuid' => INBOX_CUSTOMER]);
+
+    expect((new SafeBroadcastChannel($events))->send($notifiable, new PromotionalPushNotification('Sale', 'Save now', $store)))->toBeNull();
+});
+
+test('a single notification can be fetched by id', function () {
+    inboxRequest();
+
+    expect((new NotificationController())->find('n_store_a')->resolve())->toMatchArray([
+        'id'    => 'n_store_a',
+        'type'  => 'order_completed',
+        'title' => 'Delivered',
+    ]);
+});
+
+test('an unknown network app shows nothing but storefront-less notifications, and no storefront context shows everything', function () {
+    session(['storefront_store' => null, 'storefront_network' => 'missing_network']);
+    $controller = new NotificationController();
+
+    expect(inboxIds($controller->query(inboxRequest())))->toBe(['n_store_a', 'n_network', 'n_store_c', 'n_generic', 'n_legacy']);
+
+    session(['storefront_store' => null, 'storefront_network' => null]);
+
+    expect(inboxIds($controller->query(inboxRequest())))->toBe(['n_store_a', 'n_network', 'n_store_c', 'n_generic', 'n_legacy']);
+});
+
+test('order notifications broadcast their inbox item', function () {
+    $order = new Fleetbase\FleetOps\Models\Order();
+    $order->forceFill(['uuid' => 'order_uuid', 'public_id' => 'order_public', 'meta' => ['storefront_id' => 'store_a']]);
+    $order->setRelation('customer', null);
+    $order->setRelation('company', null);
+    $notification                 = (new ReflectionClass(StorefrontOrderCompleted::class))->newInstanceWithoutConstructor();
+    $notification->order          = $order;
+    $notification->storefront     = tap(new Store())->forceFill(['public_id' => 'store_a', 'name' => 'Store A']);
+    $notification->sentAt         = '2026-09-01 10:00:00';
+    $notification->notificationId = 'notification_test';
+    $notification->subject        = 'Delivered';
+    $notification->body           = 'Enjoy!';
+    $notification->status         = 'order_completed';
+
+    expect($notification->toBroadcast(null)->data)->toBe([
+        'type'  => 'order_completed',
+        'title' => 'Delivered',
+        'body'  => 'Enjoy!',
+        'image' => null,
+        'data'  => ['order_id' => 'order_public', 'storefront_id' => 'store_a', 'store_id' => 'store_a'],
+    ])->and($notification->broadcastType())->toBe('order_completed');
+});
+
+test('successful broadcasts are delegated to the framework broadcast channel', function () {
+    $dispatched = [];
+    $events     = new class($dispatched) extends Illuminate\Events\Dispatcher {
+        public function __construct(public array &$dispatched)
+        {
+        }
+
+        public function dispatch($event, $payload = [], $halt = false)
+        {
+            $this->dispatched[] = $event;
+
+            return [];
+        }
+    };
+    $store      = tap(new Store())->forceFill(['uuid' => 'store_a_uuid', 'public_id' => 'store_a', 'name' => 'Store A']);
+    $notifiable = new Contact();
+    $notifiable->forceFill(['uuid' => INBOX_CUSTOMER]);
+
+    (new SafeBroadcastChannel($events))->send($notifiable, new PromotionalPushNotification('Sale', 'Save now', $store));
+
+    expect($dispatched)->toHaveCount(1)
+        ->and($dispatched[0])->toBeInstanceOf(Illuminate\Notifications\Events\BroadcastNotificationCreated::class);
+});
+
+test('broadcast failures are swallowed even when logging fails', function () {
+    $events = new class extends Illuminate\Events\Dispatcher {
+        public function dispatch($event, $payload = [], $halt = false)
+        {
+            throw new RuntimeException('socket unavailable');
+        }
+    };
+    $app      = Illuminate\Container\Container::getInstance();
+    $original = $app->make('log');
+    $app->instance('log', new class {
+        public function __call($method, $arguments)
+        {
+            throw new RuntimeException('logger unavailable');
+        }
+    });
+    Illuminate\Support\Facades\Log::clearResolvedInstance('log');
+    $store = tap(new Store())->forceFill(['uuid' => 'store_a_uuid', 'public_id' => 'store_a', 'name' => 'Store A']);
+
+    try {
+        $result = (new SafeBroadcastChannel($events))->send(new Contact(), new PromotionalPushNotification('Sale', 'Save now', $store));
+    } finally {
+        $app->instance('log', $original);
+        Illuminate\Support\Facades\Log::clearResolvedInstance('log');
+    }
+
+    expect($result)->toBeNull();
+});
diff --git a/server/tests/Unit/Http/Controllers/NotificationChannelTestPushTest.php b/server/tests/Unit/Http/Controllers/NotificationChannelTestPushTest.php
new file mode 100644
index 00000000..bc38b8f4
--- /dev/null
+++ b/server/tests/Unit/Http/Controllers/NotificationChannelTestPushTest.php
@@ -0,0 +1,121 @@
+<?php
+
+use Fleetbase\Storefront\Http\Controllers\NotificationChannelController;
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Push\ApnClientFactory;
+use Fleetbase\Storefront\Push\FirebaseMessagingFactory;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\PushOutcome;
+use Fleetbase\Storefront\Push\Transports\ApnTransport;
+use Fleetbase\Storefront\Push\Transports\FcmTransport;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Http\Request;
+
+beforeEach(function () {
+    $schema = Capsule::schema('mysql');
+    $schema->dropIfExists('notification_channels');
+    $schema->create('notification_channels', function ($table) {
+        $table->increments('id');
+        $table->string('uuid')->nullable();
+        $table->string('company_uuid')->nullable();
+        $table->string('owner_uuid')->nullable();
+        $table->string('owner_type')->nullable();
+        $table->string('name')->nullable();
+        $table->string('scheme')->nullable();
+        $table->string('app_key')->nullable();
+        $table->text('config')->nullable();
+        $table->text('options')->nullable();
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    });
+    Capsule::connection('mysql')->table('notification_channels')->insert([
+        ['uuid' => 'fcm_uuid', 'company_uuid' => 'company_uuid', 'name' => 'Android', 'scheme' => 'fcm', 'app_key' => 'fcm_key', 'config' => '{}'],
+        ['uuid' => 'apn_uuid', 'company_uuid' => 'company_uuid', 'name' => 'iOS', 'scheme' => 'apn', 'app_key' => 'apn_key', 'config' => '{"environment":"auto"}'],
+        ['uuid' => 'foreign_uuid', 'company_uuid' => 'other_company', 'name' => 'Other', 'scheme' => 'fcm', 'app_key' => 'foreign_key', 'config' => '{}'],
+    ]);
+    session(['company' => 'company_uuid']);
+});
+
+function testPushFcm(PushOutcome|Throwable $result): FcmTransport
+{
+    return new class($result) extends FcmTransport {
+        public function __construct(public PushOutcome|Throwable $result)
+        {
+            parent::__construct(new FirebaseMessagingFactory());
+        }
+
+        public function send(NotificationChannel $channel, PushMessage $message, array $tokens): array
+        {
+            if ($this->result instanceof Throwable) {
+                throw $this->result;
+            }
+
+            return [$tokens[0] => $this->result];
+        }
+    };
+}
+
+function testPushApn(array $byEnvironment): ApnTransport
+{
+    return new class($byEnvironment) extends ApnTransport {
+        public array $environments = [];
+
+        public function __construct(public array $byEnvironment)
+        {
+            parent::__construct(new ApnClientFactory());
+        }
+
+        public function send(NotificationChannel $channel, string $environment, PushMessage $message, array $tokens): array
+        {
+            $this->environments[] = $environment;
+
+            return [$tokens[0] => $this->byEnvironment[$environment]];
+        }
+    };
+}
+
+test('test push reports FCM provider outcomes for a company channel', function () {
+    $controller = new NotificationChannelController();
+    $apn        = testPushApn([]);
+
+    $sent   = $controller->testPush('fcm_uuid', Request::create('/', 'POST', ['token' => 'android-token']), testPushFcm(PushOutcome::sent()), $apn);
+    $failed = $controller->testPush('fcm_key', Request::create('/', 'POST', ['token' => 'android-token']), testPushFcm(new RuntimeException('missing "private_key"')), $apn);
+
+    expect($sent->getData(true))->toBe([
+        'status'  => 'OK',
+        'scheme'  => 'fcm',
+        'results' => [['environment' => null, 'status' => 'sent', 'reason' => null]],
+    ])->and($failed->getData(true))->toBe([
+        'status'  => 'FAILED',
+        'scheme'  => 'fcm',
+        'results' => [['environment' => null, 'status' => 'error', 'reason' => 'missing "private_key"']],
+    ]);
+});
+
+test('test push tries each APNs environment until one accepts the token', function () {
+    $apn = testPushApn([
+        'production' => PushOutcome::wrongEnvironment('BadDeviceToken'),
+        'sandbox'    => PushOutcome::sent(),
+    ]);
+
+    $response = (new NotificationChannelController())->testPush('apn_uuid', Request::create('/', 'POST', ['token' => 'ios-token']), testPushFcm(PushOutcome::sent()), $apn);
+
+    expect($response->getData(true)['status'])->toBe('OK')
+        ->and($response->getData(true)['results'])->toBe([
+            ['environment' => 'production', 'status' => 'wrong_environment', 'reason' => 'BadDeviceToken'],
+            ['environment' => 'sandbox', 'status' => 'sent', 'reason' => null],
+        ])
+        ->and($apn->environments)->toBe(['production', 'sandbox']);
+});
+
+test('test push requires a token and a channel owned by the company', function () {
+    $controller = new NotificationChannelController();
+    $fcm        = testPushFcm(PushOutcome::sent());
+    $apn        = testPushApn([]);
+
+    $missingToken = $controller->testPush('fcm_uuid', Request::create('/', 'POST'), $fcm, $apn);
+    $foreign      = $controller->testPush('foreign_uuid', Request::create('/', 'POST', ['token' => 'android-token']), $fcm, $apn);
+
+    expect($missingToken->getStatusCode())->toBe(400)
+        ->and($foreign->getStatusCode())->toBe(404);
+});
diff --git a/server/tests/Unit/Notifications/NotificationContractsTest.php b/server/tests/Unit/Notifications/NotificationContractsTest.php
index 1c9db676..f7166f32 100644
--- a/server/tests/Unit/Notifications/NotificationContractsTest.php
+++ b/server/tests/Unit/Notifications/NotificationContractsTest.php
@@ -1,8 +1,6 @@
 <?php
 
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Models\Network;
-use Fleetbase\Storefront\Models\NotificationChannel;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Notifications\PromotionalPushNotification;
 use Fleetbase\Storefront\Notifications\StorefrontOrderAccepted;
@@ -14,35 +12,12 @@
 use Fleetbase\Storefront\Notifications\StorefrontOrderNearby;
 use Fleetbase\Storefront\Notifications\StorefrontOrderPreparing;
 use Fleetbase\Storefront\Notifications\StorefrontOrderReadyForPickup;
-use Fleetbase\Storefront\Support\PushNotification;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\StorefrontPushChannel;
 use Illuminate\Notifications\Messages\MailMessage;
-use NotificationChannels\Apn\ApnMessage;
-use NotificationChannels\Fcm\FcmMessage;
 use NotificationChannels\Twilio\TwilioChannel;
 use NotificationChannels\Twilio\TwilioSmsMessage;
 
-class TestablePromotionalPushNotification extends PromotionalPushNotification
-{
-    public static ?Pushok\Client $apnClient        = null;
-    public static ?NotificationChannel $fcmChannel = null;
-    public static mixed $fcmClient                 = null;
-
-    protected function getApnClient(): ?Pushok\Client
-    {
-        return static::$apnClient;
-    }
-
-    protected function getFcmNotificationChannel(): ?NotificationChannel
-    {
-        return static::$fcmChannel;
-    }
-
-    protected function getFcmClient(NotificationChannel $notificationChannel)
-    {
-        return static::$fcmClient;
-    }
-}
-
 function notificationWithoutConstructor(string $class, Order $order, Store $store, array $properties = []): object
 {
     $notification                 = (new ReflectionClass($class))->newInstanceWithoutConstructor();
@@ -97,8 +72,13 @@ function notificationOrder(array $meta = []): Order
             'notifiable'      => 'user_public',
             'notification_id' => 'notification_contract',
             'sent_at'         => '2026-07-26 12:00:00',
+            'type'            => $status,
+            'title'           => $subject,
+            'body'            => $body,
             'subject'         => $subject,
             'message'         => $arrayMessage,
+            'order'           => 'order_uuid',
+            'order_id'        => 'order_public',
             'storefront'      => 'Corner Store',
             'storefront_id'   => 'store_public',
             'id'              => 'contact_public',
@@ -113,7 +93,7 @@ function notificationOrder(array $meta = []): Order
         'Order accepted',
         'Your order was accepted.',
         'order_accepted',
-        'order_accepted',
+        'Your order was accepted.',
     ],
     'canceled' => [
         StorefrontOrderCanceled::class,
@@ -127,42 +107,42 @@ function notificationOrder(array $meta = []): Order
         'Order completed',
         'Your order was delivered.',
         'order_completed',
-        'order_completed',
+        'Your order was delivered.',
     ],
     'driver assigned' => [
         StorefrontOrderDriverAssigned::class,
         'Driver assigned',
         'A driver is heading to the store.',
         'order_driver_assigned',
-        'order_driver_assigned',
+        'A driver is heading to the store.',
     ],
     'enroute' => [
         StorefrontOrderEnroute::class,
         'Order enroute',
         'Your order is on the way.',
         'order_enroute',
-        'order_enroute',
+        'Your order is on the way.',
     ],
     'nearby' => [
         StorefrontOrderNearby::class,
         'Order nearby',
         'Your order is almost there.',
         'order_nearby',
-        'order_nearby',
+        'Your order is almost there.',
     ],
     'preparing' => [
         StorefrontOrderPreparing::class,
         'Order preparing',
         'Your order is being prepared.',
         'order_preparing',
-        'order_preparing',
+        'Your order is being prepared.',
     ],
     'ready for pickup' => [
         StorefrontOrderReadyForPickup::class,
         'Order ready',
         'Your order is ready for pickup.',
         'order_ready',
-        'order_ready',
+        'Your order is ready for pickup.',
     ],
 ]);
 
@@ -209,25 +189,23 @@ function notificationOrder(array $meta = []): Order
         : new $class($order);
     $notifiable = (object) ['public_id' => 'user_public'];
 
+    $push = $notification->toPush($notifiable);
+
     expect($notification->storefront->public_id)->toBe('store_public')
         ->and($notification->status)->toBe($expectedStatus)
         ->and($notification->subject)->not->toBeEmpty()
         ->and($notification->body)->not->toBeEmpty()
-        ->and($notification->via($notifiable))->toBe(['mail', 'database'])
-        ->and($notification->toFcm($notifiable))->toBeInstanceOf(FcmMessage::class)
-        ->and($notification->toApn($notifiable))->toBeInstanceOf(ApnMessage::class);
-
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('notification_channels')->insert([
-        ['owner_uuid' => 'store_uuid', 'scheme' => 'apn'],
-        ['owner_uuid' => 'store_uuid', 'scheme' => 'fcm'],
-    ]);
-
-    expect($notification->via($notifiable))->toBe([
-        'mail',
-        'database',
-        NotificationChannels\Apn\ApnChannel::class,
-        NotificationChannels\Fcm\FcmChannel::class,
-    ]);
+        ->and($notification->via($notifiable))->toBe([StorefrontPushChannel::class, 'database', 'mail', Fleetbase\Storefront\Notifications\Channels\SafeBroadcastChannel::class])
+        ->and($push)->toBeInstanceOf(PushMessage::class)
+        ->and($push->title)->toBe($notification->subject)
+        ->and($push->body)->toBe($notification->body)
+        ->and($push->data)->toMatchArray([
+            'type'     => $expectedStatus,
+            'order'    => 'order_uuid',
+            'id'       => 'order_public',
+            'store_id' => 'store_public',
+        ])
+        ->and(collect($notification->pushStorefronts())->pluck('uuid')->all())->toBe(['store_uuid']);
 })->with([
     'accepted'        => [StorefrontOrderAccepted::class, 'order_accepted'],
     'canceled'        => [StorefrontOrderCanceled::class, 'order_canceled'],
@@ -335,6 +313,28 @@ function notificationOrder(array $meta = []): Order
         ->and($notification->sentAt)->not->toBeEmpty();
 });
 
+test('order notifications tolerate orders without a loaded customer or company', function () {
+    $order = new Order();
+    $order->forceFill(['uuid' => 'order_uuid', 'public_id' => 'order_public', 'meta' => []]);
+    $order->setRelation('customer', null);
+    $order->setRelation('company', null);
+    $store = new Store();
+    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public', 'name' => 'Corner Store']);
+
+    $notification = notificationWithoutConstructor(StorefrontOrderCompleted::class, $order, $store, [
+        'subject' => 'Order completed',
+        'body'    => 'Your order was delivered.',
+        'status'  => 'order_completed',
+    ]);
+
+    expect($notification->toArray(null))->toMatchArray([
+        'notifiable' => null,
+        'id'         => null,
+        'companyId'  => null,
+        'message'    => 'Your order was delivered.',
+    ]);
+});
+
 test('promotional notifications expose their persisted payload contract', function () {
     $store = new Store();
     $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public', 'name' => 'Corner Store']);
@@ -345,6 +345,7 @@ function notificationOrder(array $meta = []): Order
     expect($payload)->toMatchArray([
         'title'    => 'Weekend sale',
         'body'     => 'Save twenty percent',
+        'message'  => 'Save twenty percent',
         'store'    => 'store_uuid',
         'store_id' => 'store_public',
         'type'     => 'promotional',
@@ -352,409 +353,35 @@ function notificationOrder(array $meta = []): Order
         ->and($payload['notification_id'])->toStartWith('notification_');
 });
 
-test('promotional notifications build configured APN and FCM provider messages', function () {
-    config(['firebase.projects.app' => [
-        'credentials' => ['private_key' => 'default-key'],
-        'database'    => ['url' => 'https://default.example.test'],
-    ]]);
-
+test('promotional notifications deliver through the storefront push channel and the inbox', function () {
     $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public']);
-
-    $channel = new NotificationChannel();
-    $channel->forceFill(['app_key' => 'store-app']);
-    $channel->config = [
-        'firebase_credentials_json' => 'channel-private-key',
-        'firebase_database_url'     => 'https://channel.example.test',
-    ];
-
-    TestablePromotionalPushNotification::$apnClient  = (new ReflectionClass(Pushok\Client::class))->newInstanceWithoutConstructor();
-    TestablePromotionalPushNotification::$fcmChannel = $channel;
-    TestablePromotionalPushNotification::$fcmClient  = (new ReflectionClass(Kreait\Firebase\Messaging::class))->newInstanceWithoutConstructor();
-
-    $notification = new TestablePromotionalPushNotification('Weekend sale', 'Save now', $store);
-
-    expect($notification->toApn(null))->toBeInstanceOf(ApnMessage::class)
-        ->and($notification->toFcm(null))->toBeInstanceOf(FcmMessage::class)
-        ->and(data_get(config('firebase.projects.store-app'), 'credentials.private_key'))->toBe('channel-private-key');
-});
-
-test('promotional notification provider resolvers honor the persisted channel configuration', function () {
-    $schema = Illuminate\Database\Capsule\Manager::schema('mysql');
-    $schema->dropIfExists('notification_channels');
-    $schema->create('notification_channels', function (Illuminate\Database\Schema\Blueprint $table) {
-        $table->increments('id');
-        $table->string('uuid')->nullable();
-        $table->string('owner_uuid');
-        $table->string('app_key');
-        $table->string('scheme');
-        $table->text('config')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
+    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public', 'name' => 'Corner Store']);
+    $store->setRelation('networks', collect([tap(new Fleetbase\Storefront\Models\Network())->forceFill(['uuid' => 'network_uuid'])]));
 
-    $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public']);
     $notification = new PromotionalPushNotification('Weekend sale', 'Save now', $store);
+    $push         = $notification->toPush(null);
 
-    $apnResolver    = new ReflectionMethod($notification, 'getApnClient');
-    $fcmResolver    = new ReflectionMethod($notification, 'getFcmNotificationChannel');
-    $clientResolver = new ReflectionMethod($notification, 'getFcmClient');
-
-    expect($apnResolver->invoke($notification))->toBeNull()
-        ->and($fcmResolver->invoke($notification))->toBeNull();
-
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('notification_channels')->insert([
-        'uuid'       => 'channel_uuid',
-        'owner_uuid' => 'store_uuid',
-        'app_key'    => 'store-app',
-        'scheme'     => 'fcm',
-        'config'     => '{}',
-    ]);
-
-    $channel = $fcmResolver->invoke($notification);
-
-    expect($channel?->app_key)->toBe('store-app');
-
-    try {
-        $clientResolver->invoke($notification, $channel);
-    } catch (Throwable $exception) {
-        expect($exception)->toBeInstanceOf(Throwable::class);
-    }
-});
-
-test('push notification messages retain payloads when provider channels are not configured', function () {
-    $order = notificationOrder();
-    $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public']);
-
-    $double = new class extends PushNotification {
-        public static Store $store;
-        public static ?string $requestedScheme = null;
-
-        public static function getStorefrontFromOrder(Order $order): Network|Store|null
-        {
-            return static::$store;
-        }
-
-        public static function getApnClient(Network|Store $storefront, ?Order $order = null): ?Pushok\Client
-        {
-            return null;
-        }
-
-        public static function getNotificationChannel(string $scheme, Network|Store $storefront, ?Order $order = null): ?NotificationChannel
-        {
-            static::$requestedScheme = $scheme;
-
-            return null;
-        }
-    };
-    $double::$store = $store;
-
-    $apn = $double::createApnMessage($order, 'Order ready', 'Collect your order', 'pickup_ready');
-    $fcm = $double::createFcmMessage($order, 'Order ready', 'Collect your order', 'pickup_ready');
-
-    expect($apn)->toBeInstanceOf(ApnMessage::class)
-        ->and($fcm)->toBeInstanceOf(FcmMessage::class)
-        ->and($double::$requestedScheme)->toBe('fcm');
-});
-
-test('configured FCM messages include order routing metadata and the isolated provider client', function () {
-    $order = notificationOrder();
-    $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public']);
-    $channel = new NotificationChannel();
-    $channel->forceFill(['app_key' => 'store-app']);
-    $channel->config = [
-        'firebase_credentials_json' => 'channel-private-key',
-        'firebase_database_url'     => 'https://channel.example.test',
-    ];
-    $client = (new ReflectionClass(Kreait\Firebase\Messaging::class))->newInstanceWithoutConstructor();
-
-    $double = new class extends PushNotification {
-        public static Store $store;
-        public static NotificationChannel $channel;
-        public static Kreait\Firebase\Contract\Messaging $client;
-
-        public static function getStorefrontFromOrder(Order $order): Network|Store|null
-        {
-            return static::$store;
-        }
-
-        public static function getNotificationChannel(string $scheme, Network|Store $storefront, ?Order $order = null): ?NotificationChannel
-        {
-            return static::$channel;
-        }
-
-        protected static function getFcmClient(NotificationChannel $notificationChannel)
-        {
-            return static::$client;
-        }
-    };
-    $double::$store   = $store;
-    $double::$channel = $channel;
-    $double::$client  = $client;
-    config(['firebase.projects.app' => [
-        'credentials' => ['private_key' => 'default-key'],
-        'database'    => ['url' => 'https://default.example.test'],
-    ]]);
-
-    $message = $double::createFcmMessage($order, 'Order ready', 'Collect your order', 'pickup_ready');
-    $payload = $message->toArray();
-
-    expect($message->client)->toBe($client)
-        ->and($message->notification?->title)->toBe('Order ready')
-        ->and($message->notification?->body)->toBe('Collect your order')
-        ->and($message->data)->toBe([
-            'order' => $order->uuid,
-            'id'    => $order->public_id,
-            'type'  => 'pickup_ready',
-        ])
-        ->and(data_get($payload, 'android.notification.sound'))->toBe('default')
-        ->and(data_get($payload, 'apns.payload.aps.sound'))->toBe('default');
-});
-
-test('push notification creates the configured firebase project messaging client', function () {
-    $privateKey = openssl_pkey_new(['private_key_bits' => 2048]);
-    openssl_pkey_export($privateKey, $privateKeyContent);
-    config(['firebase.projects.real-app' => [
-        'credentials' => [
-            'type'                        => 'service_account',
-            'project_id'                  => 'storefront-tests',
-            'private_key_id'              => 'key-id',
-            'private_key'                 => $privateKeyContent,
-            'client_email'                => 'firebase-admin@example.test',
-            'client_id'                   => '123456789',
-            'auth_uri'                    => 'https://accounts.google.com/o/oauth2/auth',
-            'token_uri'                   => 'https://oauth2.googleapis.com/token',
-            'auth_provider_x509_cert_url' => 'https://www.googleapis.com/oauth2/v1/certs',
-            'client_x509_cert_url'        => 'https://www.googleapis.com/robot/v1/metadata/x509/firebase-admin',
-        ],
-    ]]);
-    Illuminate\Container\Container::getInstance()->instance('config', new class {
-        public function get(string $key)
-        {
-            return config($key);
-        }
-    });
-    $channel = new NotificationChannel();
-    $channel->forceFill(['app_key' => 'real-app']);
-    $method = new ReflectionMethod(PushNotification::class, 'getFcmClient');
-
-    $client = $method->invoke(null, $channel);
-
-    expect($client)->toBeInstanceOf(Kreait\Firebase\Contract\Messaging::class);
+    expect($notification->via(null))->toBe([StorefrontPushChannel::class, 'database', Fleetbase\Storefront\Notifications\Channels\SafeBroadcastChannel::class])
+        ->and($push)->toBeInstanceOf(PushMessage::class)
+        ->and($push->title)->toBe('Weekend sale')
+        ->and($push->data)->toBe(['type' => 'promotional', 'store' => 'store_uuid', 'store_id' => 'store_public'])
+        ->and(collect($notification->pushStorefronts())->pluck('uuid')->all())->toBe(['store_uuid', 'network_uuid']);
 });
 
-test('push notification configures isolated firebase projects from channel credentials', function () {
-    config(['firebase.projects.app' => [
-        'credentials' => ['private_key' => 'default-key', 'client_email' => 'firebase@example.test'],
-        'database'    => ['url' => 'https://default.example.test'],
-    ]]);
-
-    $channel = new NotificationChannel();
-    $channel->forceFill(['app_key' => 'store-app']);
-    $channel->config = [
-        'firebase_credentials_json' => 'channel-private-key',
-        'firebase_database_url'     => 'https://channel.example.test',
-    ];
-
-    $configured = PushNotification::configureFcm($channel);
-
-    expect(data_get($configured, 'credentials.private_key'))->toBe('channel-private-key')
-        ->and(data_get($configured, 'credentials.client_email'))->toBe('firebase@example.test')
-        ->and(data_get($configured, 'database.url'))->toBe('https://channel.example.test')
-        ->and(config('firebase.projects.store-app'))->toBe($configured);
-});
-
-test('push notification channel lookup honors an order channel override before storefront defaults', function () {
-    $schema = Illuminate\Database\Capsule\Manager::schema('mysql');
-    $schema->dropIfExists('notification_channels');
-    $schema->create('notification_channels', function (Illuminate\Database\Schema\Blueprint $table) {
-        $table->increments('id');
-        $table->string('uuid')->nullable();
-        $table->string('owner_uuid');
-        $table->string('owner_type')->nullable();
-        $table->string('app_key');
-        $table->string('scheme');
-        $table->text('config')->nullable();
-        $table->text('options')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('notification_channels')->insert([
-        [
-            'uuid'       => 'channel_default',
-            'owner_uuid' => 'store_uuid',
-            'app_key'    => 'default-app',
-            'scheme'     => 'fcm',
-        ],
-        [
-            'uuid'       => 'channel_override',
-            'owner_uuid' => 'store_uuid',
-            'app_key'    => 'override-app',
-            'scheme'     => 'fcm',
-        ],
-    ]);
-
-    $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid']);
-
-    $default  = PushNotification::getNotificationChannel('fcm', $store);
-    $order    = notificationOrder(['storefront_notification_channel' => 'override-app']);
-    $override = PushNotification::getNotificationChannel('fcm', $store, $order);
-
-    expect($default?->app_key)->toBe('default-app')
-        ->and($override?->app_key)->toBe('override-app')
-        ->and(PushNotification::getNotificationChannel('apn', $store))->toBeNull();
-});
+test('promotional notifications still use the store app when network membership cannot be loaded', function () {
+    Illuminate\Database\Capsule\Manager::schema('mysql')->dropIfExists('network_stores');
+    Illuminate\Database\Capsule\Manager::schema('mysql')->dropIfExists('networks');
 
-test('push notification resolves APN credentials into a production-aware provider client', function () {
-    $schema = Illuminate\Database\Capsule\Manager::schema('mysql');
-    $schema->dropIfExists('notification_channels');
-    $schema->create('notification_channels', function (Illuminate\Database\Schema\Blueprint $table) {
-        $table->increments('id');
-        $table->string('uuid')->nullable();
-        $table->string('owner_uuid');
-        $table->string('owner_type')->nullable();
-        $table->string('app_key');
-        $table->string('scheme');
-        $table->text('config')->nullable();
-        $table->text('options')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-    $privateKey = openssl_pkey_new([
-        'private_key_type' => OPENSSL_KEYTYPE_EC,
-        'curve_name'       => 'secp521r1',
-    ]);
-    openssl_pkey_export($privateKey, $privateKeyContent);
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('notification_channels')->insert([
-        'uuid'       => 'channel_apn',
-        'owner_uuid' => 'store_uuid',
-        'app_key'    => 'store-app',
-        'scheme'     => 'apn',
-        'config'     => json_encode([
-            'key_id'              => 'KEY123',
-            'team_id'             => 'TEAM123',
-            'app_bundle_id'       => 'com.example.storefront',
-            'private_key_content' => $privateKeyContent,
-            'production'          => false,
-        ]),
-    ]);
-    $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid']);
-
-    $client = PushNotification::getApnClient($store);
-
-    expect($client)->toBeInstanceOf(Pushok\Client::class);
-});
-
-test('push notification resolves the storefront referenced by order metadata', function () {
-    $schema = Illuminate\Database\Capsule\Manager::schema('mysql');
-    $schema->dropIfExists('stores');
-    $schema->create('stores', function (Illuminate\Database\Schema\Blueprint $table) {
-        $table->increments('id');
-        $table->string('uuid')->nullable();
-        $table->string('public_id')->nullable();
-        $table->string('key')->nullable();
-        $table->string('name')->nullable();
-        $table->string('company_uuid')->nullable();
-        $table->string('backdrop_uuid')->nullable();
-        $table->string('logo_uuid')->nullable();
-        $table->string('order_config_uuid')->nullable();
-        $table->text('description')->nullable();
-        $table->text('translations')->nullable();
-        $table->string('website')->nullable();
-        $table->string('facebook')->nullable();
-        $table->string('instagram')->nullable();
-        $table->string('twitter')->nullable();
-        $table->string('email')->nullable();
-        $table->string('phone')->nullable();
-        $table->text('tags')->nullable();
-        $table->string('currency')->nullable();
-        $table->string('timezone')->nullable();
-        $table->string('pod_method')->nullable();
-        $table->text('options')->nullable();
-        $table->timestamp('deleted_at')->nullable();
-    });
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('stores')->insert([
-        'uuid'      => 'store_uuid',
-        'public_id' => 'store_public',
-        'key'       => 'store_key',
-        'name'      => 'Test store',
-    ]);
-
-    $storefront = PushNotification::getStorefrontFromOrder(
-        notificationOrder(['storefront_id' => 'store_public'])
-    );
-
-    expect($storefront)->toBeInstanceOf(Store::class)
-        ->and($storefront->uuid)->toBe('store_uuid');
-});
-
-test('configured APN messages include order routing metadata and provider client', function () {
-    $order = notificationOrder();
     $store = new Store();
     $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public']);
-    $client = (new ReflectionClass(Pushok\Client::class))->newInstanceWithoutConstructor();
-
-    $double = new class extends PushNotification {
-        public static Store $store;
-        public static Pushok\Client $client;
-
-        public static function getStorefrontFromOrder(Order $order): Network|Store|null
-        {
-            return static::$store;
-        }
-
-        public static function getApnClient(Network|Store $storefront, ?Order $order = null): ?Pushok\Client
-        {
-            return static::$client;
-        }
-    };
-    $double::$store  = $store;
-    $double::$client = $client;
 
-    $message = $double::createApnMessage($order, 'Order ready', 'Collect it now', 'pickup_ready');
-
-    expect($message)->toBeInstanceOf(ApnMessage::class);
+    expect(collect((new PromotionalPushNotification('Sale', 'Save now', $store))->pushStorefronts())->pluck('uuid')->all())->toBe(['store_uuid']);
 });
 
-test('promotional notifications select only configured provider channels and fail closed without them', function () {
-    $schema = Illuminate\Database\Capsule\Manager::schema('mysql');
-    $schema->dropIfExists('notification_channels');
-    $schema->create('notification_channels', function (Illuminate\Database\Schema\Blueprint $table) {
-        $table->increments('id');
-        $table->string('uuid')->nullable();
-        $table->string('owner_uuid');
-        $table->string('owner_type')->nullable();
-        $table->string('app_key');
-        $table->string('scheme');
-        $table->text('config')->nullable();
-        $table->text('options')->nullable();
-        $table->timestamps();
-        $table->softDeletes();
-    });
-
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('notification_channels')->insert([
-        ['owner_uuid' => 'store_uuid', 'app_key' => 'apn-app', 'scheme' => 'apn'],
-        ['owner_uuid' => 'store_uuid', 'app_key' => 'fcm-app', 'scheme' => 'fcm'],
-    ]);
-
+test('order notifications fall back to their storefront when the order has no storefront metadata', function () {
     $store = new Store();
-    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public']);
-    $notification = new PromotionalPushNotification('Weekend sale', 'Save now', $store);
-
-    expect($notification->via(null))->toBe([
-        NotificationChannels\Apn\ApnChannel::class,
-        NotificationChannels\Fcm\FcmChannel::class,
-    ]);
-
-    Illuminate\Database\Capsule\Manager::connection('mysql')->table('notification_channels')->delete();
+    $store->forceFill(['uuid' => 'store_uuid', 'public_id' => 'store_public', 'name' => 'Corner Store']);
+    $notification = notificationWithoutConstructor(StorefrontOrderAccepted::class, notificationOrder(), $store);
 
-    expect($notification->via(null))->toBe([])
-        ->and($notification->toApn(null))->toBeNull()
-        ->and($notification->toFcm(null))->toBeNull();
+    expect(collect($notification->pushStorefronts())->pluck('uuid')->all())->toBe(['store_uuid']);
 });
diff --git a/server/tests/Unit/Push/PushLayerTest.php b/server/tests/Unit/Push/PushLayerTest.php
new file mode 100644
index 00000000..44160362
--- /dev/null
+++ b/server/tests/Unit/Push/PushLayerTest.php
@@ -0,0 +1,711 @@
+<?php
+
+use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Models\UserDevice;
+use Fleetbase\Storefront\Models\Network;
+use Fleetbase\Storefront\Models\NotificationChannel;
+use Fleetbase\Storefront\Models\Store;
+use Fleetbase\Storefront\Push\ApnClientFactory;
+use Fleetbase\Storefront\Push\Contracts\SendsPushNotification;
+use Fleetbase\Storefront\Push\FirebaseMessagingFactory;
+use Fleetbase\Storefront\Push\PushConfigurationException;
+use Fleetbase\Storefront\Push\PushCredentialResolver;
+use Fleetbase\Storefront\Push\PushMessage;
+use Fleetbase\Storefront\Push\PushOutcome;
+use Fleetbase\Storefront\Push\StorefrontPushChannel;
+use Fleetbase\Storefront\Push\Transports\ApnTransport;
+use Fleetbase\Storefront\Push\Transports\FcmTransport;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Notifications\Notification;
+use Kreait\Firebase\Exception\Messaging\AuthenticationError;
+use Kreait\Firebase\Exception\Messaging\InvalidMessage;
+use Kreait\Firebase\Exception\Messaging\NotFound;
+use Kreait\Firebase\Exception\Messaging\ServerUnavailable;
+use Kreait\Firebase\Messaging\MessageTarget;
+use Kreait\Firebase\Messaging\SendReport;
+
+function pushChannel(array $attributes, array $config = []): NotificationChannel
+{
+    $channel = new NotificationChannel();
+    $channel->forceFill(array_merge(['uuid' => $attributes['app_key'] ?? 'channel', 'name' => 'Test channel'], $attributes));
+    $channel->config = $config;
+
+    return $channel;
+}
+
+function pushDevice(string $token, string $platform, array $attributes = []): UserDevice
+{
+    $device = new UserDevice();
+    $device->forceFill(array_merge(['token' => $token, 'platform' => $platform, 'status' => 'active'], $attributes));
+
+    return $device;
+}
+
+function pushServiceAccount(): array
+{
+    $key = openssl_pkey_new(['private_key_bits' => 2048]);
+    openssl_pkey_export($key, $privateKey);
+
+    return [
+        'type'         => 'service_account',
+        'project_id'   => 'storefront-tests',
+        'client_email' => 'firebase-admin@storefront-tests.iam.gserviceaccount.com',
+        'client_id'    => '1234567890',
+        'private_key'  => $privateKey,
+    ];
+}
+
+function pushNotification(array $storefronts, ?PushMessage $message = null): Notification
+{
+    return new class($storefronts, $message ?? PushMessage::create('Order ready', 'Collect it now', ['id' => 'order_public'])) extends Notification implements SendsPushNotification {
+        public function __construct(public array $storefronts, public PushMessage $message)
+        {
+        }
+
+        public function toPush($notifiable): ?PushMessage
+        {
+            return $this->message;
+        }
+
+        public function pushStorefronts(): array
+        {
+            return $this->storefronts;
+        }
+    };
+}
+
+function fakeResolver(array $channelsByScheme): PushCredentialResolver
+{
+    return new class($channelsByScheme) extends PushCredentialResolver {
+        public array $calls = [];
+
+        public function __construct(public array $channelsByScheme)
+        {
+        }
+
+        public function channels(string $scheme, array $storefronts, ?string $appIdentifier = null): Illuminate\Support\Collection
+        {
+            $this->calls[] = [$scheme, $appIdentifier];
+
+            return collect($this->channelsByScheme[$scheme] ?? []);
+        }
+    };
+}
+
+function fakeFcm(callable $handler): FcmTransport
+{
+    return new class($handler) extends FcmTransport {
+        public array $calls = [];
+
+        public function __construct(public $handler)
+        {
+        }
+
+        public function send(NotificationChannel $channel, PushMessage $message, array $tokens): array
+        {
+            $this->calls[] = [$channel->app_key, $tokens];
+
+            return ($this->handler)($channel, $tokens);
+        }
+    };
+}
+
+function fakeApn(callable $handler): ApnTransport
+{
+    return new class($handler) extends ApnTransport {
+        public array $calls = [];
+
+        public function __construct(public $handler)
+        {
+        }
+
+        public function send(NotificationChannel $channel, string $environment, PushMessage $message, array $tokens): array
+        {
+            $this->calls[] = [$channel->app_key, $environment, $tokens];
+
+            return ($this->handler)($channel, $environment, $tokens);
+        }
+    };
+}
+
+function createUserDevicesTable(): void
+{
+    $schema = Capsule::schema('mysql');
+    $schema->dropIfExists('user_devices');
+    $schema->create('user_devices', function ($table) {
+        $table->increments('id');
+        $table->string('uuid')->nullable();
+        $table->string('public_id')->nullable();
+        $table->string('user_uuid')->nullable();
+        $table->string('platform')->nullable();
+        $table->text('token')->nullable();
+        $table->string('status')->nullable();
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    });
+}
+
+test('push messages render high priority FCM payloads with string data', function () {
+    $message = PushMessage::create('Order ready', 'Collect it now', [
+        'id'       => 'order_public',
+        'count'    => 2,
+        'pickup'   => true,
+        'meta'     => ['a' => 1],
+        'optional' => null,
+    ])->analyticsLabel('storefront_order');
+
+    $payload = $message->toFcmArray(['android_channel_id' => 'orders']);
+
+    expect($payload['notification'])->toBe(['title' => 'Order ready', 'body' => 'Collect it now'])
+        ->and($payload['data'])->toBe(['id' => 'order_public', 'count' => '2', 'pickup' => 'true', 'meta' => '{"a":1}'])
+        ->and($payload['android']['priority'])->toBe('high')
+        ->and($payload['android']['notification'])->toMatchArray(['channel_id' => 'orders', 'sound' => 'default'])
+        ->and($payload['apns']['headers'])->toBe(['apns-priority' => '10', 'apns-push-type' => 'alert'])
+        ->and($payload['apns']['payload']['aps'])->toBe(['sound' => 'default', 'badge' => 1])
+        ->and($payload['fcm_options'])->toBe(['analytics_label' => 'storefront_order'])
+        ->and(Kreait\Firebase\Messaging\CloudMessage::fromArray($payload))->toBeInstanceOf(Kreait\Firebase\Messaging\CloudMessage::class);
+
+    expect(PushMessage::create('Hi', 'There')->toFcmArray())->not->toHaveKey('data')
+        ->and(PushMessage::create('Hi', 'There')->toFcmArray()['android']['notification'])->not->toHaveKey('channel_id');
+});
+
+test('push messages render APNs payloads with sound badge and custom data', function () {
+    $payload = json_decode(json_encode(
+        PushMessage::create('Order ready', 'Collect it now', ['id' => 'order_public', 'type' => 'order_ready', 'aps' => 'ignored'])->toApnPayload()
+    ), true);
+
+    expect($payload['aps'])->toMatchArray([
+        'alert' => ['title' => 'Order ready', 'body' => 'Collect it now'],
+        'sound' => 'default',
+        'badge' => 1,
+    ])->and($payload['id'])->toBe('order_public')
+        ->and($payload['type'])->toBe('order_ready');
+});
+
+test('firebase service accounts are decoded from the channel and repaired', function () {
+    $account                = pushServiceAccount();
+    $escaped                = $account;
+    $escaped['private_key'] = str_replace("\n", '\\n', $account['private_key']);
+    unset($escaped['type']);
+
+    $decoded = FirebaseMessagingFactory::serviceAccountFromChannel(
+        pushChannel(['app_key' => 'fcm'], ['firebase_credentials_json' => json_encode($escaped)])
+    );
+
+    expect($decoded['private_key'])->toBe($account['private_key'])
+        ->and($decoded['type'])->toBe('service_account')
+        ->and($decoded['project_id'])->toBe('storefront-tests');
+
+    expect(fn () => FirebaseMessagingFactory::serviceAccountFromChannel(pushChannel(['app_key' => 'fcm'], ['firebase_credentials_json' => 'not json'])))
+        ->toThrow(PushConfigurationException::class, 'invalid Firebase service account JSON')
+        ->and(fn () => FirebaseMessagingFactory::serviceAccountFromChannel(pushChannel(['app_key' => 'fcm'], [])))
+        ->toThrow(PushConfigurationException::class, 'missing its Firebase service account JSON')
+        ->and(fn () => FirebaseMessagingFactory::serviceAccountFromChannel(pushChannel(['app_key' => 'fcm'], ['firebase_credentials_json' => json_encode(['project_id' => 'x'])])))
+        ->toThrow(PushConfigurationException::class, 'missing "client_email"');
+});
+
+test('firebase messaging clients are built from the channel without touching application config', function () {
+    FirebaseMessagingFactory::flush();
+    config(['firebase.projects.app' => null]);
+
+    $channel  = pushChannel(['app_key' => 'fcm', 'uuid' => 'fcm_uuid'], ['firebase_credentials_json' => json_encode(pushServiceAccount())]);
+    $factory  = new FirebaseMessagingFactory();
+    $client   = $factory->make($channel);
+
+    expect($client)->toBeInstanceOf(Kreait\Firebase\Contract\Messaging::class)
+        ->and($factory->make($channel))->toBe($client)
+        ->and(config('firebase.projects.fcm'))->toBeNull()
+        ->and(config('firebase.projects.app'))->toBeNull();
+});
+
+test('APNs environments honor device, explicit and legacy channel settings', function () {
+    $channel = fn (array $config) => pushChannel(['app_key' => 'apn'], $config);
+
+    expect(ApnClientFactory::environments($channel(['environment' => 'sandbox'])))->toBe(['sandbox'])
+        ->and(ApnClientFactory::environments($channel(['environment' => 'production'])))->toBe(['production'])
+        ->and(ApnClientFactory::environments($channel(['environment' => 'auto'])))->toBe(['production', 'sandbox'])
+        ->and(ApnClientFactory::environments($channel(['production' => true])))->toBe(['production', 'sandbox'])
+        ->and(ApnClientFactory::environments($channel(['production' => false])))->toBe(['sandbox', 'production'])
+        ->and(ApnClientFactory::environments($channel(['production' => 'false'])))->toBe(['sandbox', 'production'])
+        ->and(ApnClientFactory::environments($channel([])))->toBe(['production', 'sandbox'])
+        ->and(ApnClientFactory::environments($channel(['environment' => 'production']), 'sandbox'))->toBe(['sandbox']);
+});
+
+test('APNs credentials are validated and normalized', function () {
+    $credentials = ApnClientFactory::credentialsFromChannel(pushChannel(['app_key' => 'apn'], [
+        'key_id'              => ' KEY123 ',
+        'team_id'             => 'TEAM123',
+        'app_bundle_id'       => 'com.example.storefront',
+        'private_key_content' => "-----BEGIN PRIVATE KEY-----\\nabc\\n-----END PRIVATE KEY-----\n",
+    ]));
+
+    expect($credentials['key_id'])->toBe('KEY123')
+        ->and($credentials['private_key_content'])->toBe("-----BEGIN PRIVATE KEY-----\nabc\n-----END PRIVATE KEY-----");
+
+    expect(fn () => ApnClientFactory::credentialsFromChannel(pushChannel(['app_key' => 'apn'], ['key_id' => 'a', 'team_id' => 'b'])))
+        ->toThrow(PushConfigurationException::class, 'missing "app_bundle_id"')
+        ->and(fn () => ApnClientFactory::credentialsFromChannel(pushChannel(['app_key' => 'apn'], ['key_id' => 'a', 'team_id' => 'b', 'app_bundle_id' => 'c'])))
+        ->toThrow(PushConfigurationException::class, 'missing its .p8 private key');
+
+    $key = openssl_pkey_new(['private_key_type' => OPENSSL_KEYTYPE_EC, 'curve_name' => 'prime256v1']);
+    openssl_pkey_export($key, $privateKey);
+    $client = (new ApnClientFactory())->make(pushChannel(['app_key' => 'apn'], [
+        'key_id'              => 'KEY123',
+        'team_id'             => 'TEAM123',
+        'app_bundle_id'       => 'com.example.storefront',
+        'private_key_content' => $privateKey,
+    ]), 'sandbox');
+
+    expect($client)->toBeInstanceOf(Pushok\Client::class);
+});
+
+test('APNs responses map to push outcomes', function ($status, $reason, $expected) {
+    $response = new Pushok\Response($status, '', $reason ? json_encode(['reason' => $reason]) : '', 'token');
+
+    expect(ApnTransport::outcomeFor($response)->status)->toBe($expected);
+})->with([
+    'sent'                => [200, null, PushOutcome::SENT],
+    'unregistered'        => [410, 'Unregistered', PushOutcome::DEAD],
+    'expired'             => [410, 'ExpiredToken', PushOutcome::DEAD],
+    'bad device token'    => [400, 'BadDeviceToken', PushOutcome::WRONG_ENVIRONMENT],
+    'wrong topic'         => [400, 'DeviceTokenNotForTopic', PushOutcome::WRONG_APP],
+    'bad provider token'  => [403, 'InvalidProviderToken', PushOutcome::ERROR],
+]);
+
+test('FCM send reports map to push outcomes', function ($error, $expected) {
+    $target = MessageTarget::with(MessageTarget::TOKEN, 'token');
+    $error  = $error instanceof Closure ? $error() : $error;
+    $report = $error ? SendReport::failure($target, $error) : SendReport::success($target, ['name' => 'projects/x/messages/1']);
+
+    expect(FcmTransport::outcomeFor($report)->status)->toBe($expected);
+})->with([
+    'sent'               => [null, PushOutcome::SENT],
+    'unregistered'       => [fn () => new NotFound('Requested entity was not found.'), PushOutcome::DEAD],
+    'invalid token'      => [fn () => new InvalidMessage('The registration token is not a valid FCM registration token'), PushOutcome::DEAD],
+    'sender mismatch'    => [fn () => new AuthenticationError('SenderId mismatch'), PushOutcome::WRONG_APP],
+    'bad credentials'    => [fn () => new AuthenticationError('Request had invalid authentication credentials.'), PushOutcome::ERROR],
+    'provider outage'    => [fn () => new ServerUnavailable('Service unavailable'), PushOutcome::ERROR],
+]);
+
+test('storefront push channel routes devices by platform and retries tokens from another app on the next channel', function () {
+    $network = pushChannel(['app_key' => 'network_fcm', 'scheme' => 'fcm']);
+    $store   = pushChannel(['app_key' => 'store_fcm', 'scheme' => 'fcm']);
+    $apn     = pushChannel(['app_key' => 'store_apn', 'scheme' => 'apn'], ['environment' => 'production']);
+
+    $fcm = fakeFcm(fn (NotificationChannel $channel, array $tokens) => collect($tokens)->mapWithKeys(fn ($token) => [
+        $token => $channel->app_key === 'network_fcm' && $token === 'android_store_app' ? PushOutcome::wrongApp('SenderId mismatch') : PushOutcome::sent(),
+    ])->all());
+    $apnTransport = fakeApn(fn ($channel, $environment, array $tokens) => array_fill_keys($tokens, PushOutcome::sent()));
+    $pushChannel  = new StorefrontPushChannel(fakeResolver(['fcm' => [$network, $store], 'apn' => [$apn]]), $fcm, $apnTransport);
+
+    $notifiable = new class {
+        public $devices;
+    };
+    $notifiable->devices = collect([
+        pushDevice('android_network_app', 'android'),
+        pushDevice('android_store_app', 'Android'),
+        pushDevice('ios_device', 'iOS'),
+        pushDevice('ios_device', 'ios'),
+        pushDevice('stale_device', 'android', ['status' => 'invalid']),
+        pushDevice('web_device', 'web'),
+    ]);
+
+    $outcomes = $pushChannel->send($notifiable, pushNotification([]));
+
+    expect(collect($outcomes)->map->status->all())->toBe([
+        'android_network_app' => PushOutcome::SENT,
+        'android_store_app'   => PushOutcome::SENT,
+        'ios_device'          => PushOutcome::SENT,
+    ])->and($fcm->calls)->toBe([
+        ['network_fcm', ['android_network_app', 'android_store_app']],
+        ['store_fcm', ['android_store_app']],
+    ])->and($apnTransport->calls)->toBe([
+        ['store_apn', 'production', ['ios_device']],
+    ]);
+});
+
+test('storefront push channel retries BadDeviceToken in the other APNs environment', function () {
+    $apn = pushChannel(['app_key' => 'store_apn', 'scheme' => 'apn'], ['production' => true]);
+
+    $transport = fakeApn(fn ($channel, string $environment, array $tokens) => collect($tokens)->mapWithKeys(fn ($token) => [
+        $token => $environment === 'production' && $token === 'dev_build' ? PushOutcome::wrongEnvironment('BadDeviceToken') : PushOutcome::sent(),
+    ])->all());
+    $pushChannel = new StorefrontPushChannel(fakeResolver(['apn' => [$apn]]), fakeFcm(fn () => []), $transport);
+
+    $notifiable          = new stdClass();
+    $notifiable->devices = collect([pushDevice('dev_build', 'ios'), pushDevice('app_store_build', 'ios')]);
+    $notifiable          = new class($notifiable->devices) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+
+    $outcomes = $pushChannel->send($notifiable, pushNotification([]));
+
+    expect($outcomes['dev_build']->status)->toBe(PushOutcome::SENT)
+        ->and($outcomes['app_store_build']->status)->toBe(PushOutcome::SENT)
+        ->and($transport->calls)->toBe([
+            ['store_apn', 'production', ['dev_build', 'app_store_build']],
+            ['store_apn', 'sandbox', ['dev_build']],
+        ]);
+});
+
+test('storefront push channel prunes dead tokens and keeps tokens with transient errors', function () {
+    createUserDevicesTable();
+    $dead      = tap(new UserDevice())->forceFill(['uuid' => 'dead_uuid', 'public_id' => 'device_dead', 'user_uuid' => 'user_uuid', 'platform' => 'android', 'token' => 'dead_token', 'status' => 'active']);
+    $dead->save();
+    $transient = tap(new UserDevice())->forceFill(['uuid' => 'transient_uuid', 'public_id' => 'device_transient', 'user_uuid' => 'user_uuid', 'platform' => 'android', 'token' => 'transient_token', 'status' => 'active']);
+    $transient->save();
+    $garbage   = tap(new UserDevice())->forceFill(['uuid' => 'garbage_uuid', 'public_id' => 'device_garbage', 'user_uuid' => 'user_uuid', 'platform' => 'ios', 'token' => 'garbage_token', 'status' => 'active']);
+    $garbage->save();
+
+    $pushChannel = new StorefrontPushChannel(
+        fakeResolver([
+            'fcm' => [pushChannel(['app_key' => 'fcm', 'scheme' => 'fcm'])],
+            'apn' => [pushChannel(['app_key' => 'apn', 'scheme' => 'apn'], ['environment' => 'auto'])],
+        ]),
+        fakeFcm(fn ($channel, array $tokens) => ['dead_token' => PushOutcome::dead('Unregistered'), 'transient_token' => PushOutcome::error('503')]),
+        fakeApn(fn ($channel, $environment, array $tokens) => ['garbage_token' => PushOutcome::wrongEnvironment('BadDeviceToken')])
+    );
+    $notifiable = new class(collect([$dead, $transient, $garbage])) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+
+    $outcomes = $pushChannel->send($notifiable, pushNotification([]));
+
+    expect($outcomes['dead_token']->status)->toBe(PushOutcome::DEAD)
+        ->and($outcomes['transient_token']->status)->toBe(PushOutcome::ERROR)
+        ->and($outcomes['garbage_token']->status)->toBe(PushOutcome::DEAD)
+        ->and(UserDevice::pluck('token')->all())->toBe(['transient_token'])
+        ->and(UserDevice::withTrashed()->where('token', 'dead_token')->value('status'))->toBe('invalid');
+});
+
+test('storefront push channel falls through to the next channel when a provider request throws', function () {
+    $broken  = pushChannel(['app_key' => 'broken', 'scheme' => 'fcm']);
+    $working = pushChannel(['app_key' => 'working', 'scheme' => 'fcm']);
+    $fcm     = fakeFcm(function (NotificationChannel $channel, array $tokens) {
+        if ($channel->app_key === 'broken') {
+            throw new PushConfigurationException('missing "private_key"');
+        }
+
+        return array_fill_keys($tokens, PushOutcome::sent());
+    });
+    $pushChannel = new StorefrontPushChannel(fakeResolver(['fcm' => [$broken, $working]]), $fcm, fakeApn(fn () => []));
+    $notifiable  = new class(collect([pushDevice('android_token', 'android')])) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+
+    $outcomes = $pushChannel->send($notifiable, pushNotification([]));
+
+    expect($outcomes['android_token']->status)->toBe(PushOutcome::SENT)
+        ->and(collect($fcm->calls)->pluck(0)->all())->toBe(['broken', 'working']);
+});
+
+test('storefront push channel is a no-op without devices, channels, a push payload or push support', function () {
+    $fcm         = fakeFcm(fn () => throw new RuntimeException('should not send'));
+    $pushChannel = new StorefrontPushChannel(fakeResolver([]), $fcm, fakeApn(fn () => throw new RuntimeException('should not send')));
+    $withDevices = new class(collect([pushDevice('android_token', 'android'), pushDevice('ios_token', 'ios')])) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+    $withoutDevices = new class(collect()) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+    $silent = new class extends Notification implements SendsPushNotification {
+        public function toPush($notifiable): ?PushMessage
+        {
+            return null;
+        }
+
+        public function pushStorefronts(): array
+        {
+            return [];
+        }
+    };
+
+    expect($pushChannel->send($withDevices, pushNotification([])))->toBe([])
+        ->and($pushChannel->send($withoutDevices, pushNotification([])))->toBe([])
+        ->and($pushChannel->send($withDevices, $silent))->toBe([])
+        ->and($pushChannel->send($withDevices, new class extends Notification {}))->toBe([])
+        ->and($pushChannel->send(null, pushNotification([])))->toBe([])
+        ->and($fcm->calls)->toBe([]);
+});
+
+test('storefront push channel prefers channels of the app the device registered from', function () {
+    $resolver    = fakeResolver(['fcm' => [pushChannel(['app_key' => 'fcm', 'scheme' => 'fcm'])]]);
+    $pushChannel = new StorefrontPushChannel($resolver, fakeFcm(fn ($channel, $tokens) => array_fill_keys($tokens, PushOutcome::sent())), fakeApn(fn () => []));
+    $notifiable  = new class(collect([pushDevice('a', 'android', ['app_identifier' => 'network_uuid']), pushDevice('b', 'android')])) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+
+    $pushChannel->send($notifiable, pushNotification([]));
+
+    expect($resolver->calls)->toBe([['fcm', 'network_uuid'], ['fcm', null]]);
+});
+
+test('credential resolver orders channels by device app, storefront preference and age', function () {
+    $schema = Capsule::schema('mysql');
+    $schema->dropIfExists('notification_channels');
+    $schema->create('notification_channels', function ($table) {
+        $table->increments('id');
+        $table->string('uuid')->nullable();
+        $table->string('owner_uuid')->nullable();
+        $table->string('owner_type')->nullable();
+        $table->string('name')->nullable();
+        $table->string('scheme')->nullable();
+        $table->string('app_key')->nullable();
+        $table->text('config')->nullable();
+        $table->text('options')->nullable();
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    });
+    Capsule::connection('mysql')->table('notification_channels')->insert([
+        ['uuid' => 'c1', 'owner_uuid' => 'store_uuid', 'scheme' => 'fcm', 'app_key' => 'store_old', 'created_at' => '2024-01-01 00:00:00'],
+        ['uuid' => 'c2', 'owner_uuid' => 'store_uuid', 'scheme' => 'fcm', 'app_key' => 'store_new', 'created_at' => '2025-01-01 00:00:00'],
+        ['uuid' => 'c3', 'owner_uuid' => 'network_uuid', 'scheme' => 'fcm', 'app_key' => 'network', 'created_at' => '2025-06-01 00:00:00'],
+        ['uuid' => 'c4', 'owner_uuid' => 'network_uuid', 'scheme' => 'apn', 'app_key' => 'network_apn', 'created_at' => '2023-01-01 00:00:00'],
+        ['uuid' => 'c5', 'owner_uuid' => 'other_store', 'scheme' => 'fcm', 'app_key' => 'other', 'created_at' => '2020-01-01 00:00:00'],
+    ]);
+
+    $store    = tap(new Store())->forceFill(['uuid' => 'store_uuid']);
+    $network  = tap(new Network())->forceFill(['uuid' => 'network_uuid']);
+    $resolver = new PushCredentialResolver();
+
+    expect($resolver->channels('fcm', [$network, $store])->pluck('app_key')->all())->toBe(['network', 'store_old', 'store_new'])
+        ->and($resolver->channels('fcm', [$network, $store], 'store_uuid')->pluck('app_key')->all())->toBe(['store_old', 'store_new', 'network'])
+        ->and($resolver->channels('fcm', [$store], 'other_store')->pluck('app_key')->all())->toBe(['other', 'store_old', 'store_new'])
+        ->and($resolver->channels('apn', [$network, $store])->pluck('app_key')->all())->toBe(['network_apn'])
+        ->and($resolver->channels('fcm', []))->toHaveCount(0);
+});
+
+test('credential resolver prefers the network app for marketplace orders', function () {
+    $columns = function ($table) {
+        $table->increments('id');
+        foreach (['uuid', 'public_id', 'company_uuid', 'backdrop_uuid', 'logo_uuid', 'order_config_uuid', 'name', 'description', 'translations', 'website', 'facebook', 'instagram', 'twitter', 'email', 'phone', 'tags', 'currency', 'timezone', 'pod_method', 'options'] as $column) {
+            $table->text($column)->nullable();
+        }
+        $table->timestamps();
+        $table->timestamp('deleted_at')->nullable();
+    };
+    $schema = Capsule::schema('mysql');
+    $schema->dropIfExists('stores');
+    $schema->dropIfExists('networks');
+    $schema->create('stores', $columns);
+    $schema->create('networks', $columns);
+    Capsule::connection('mysql')->table('stores')->insert(['uuid' => 'store_uuid', 'public_id' => 'store_public', 'name' => 'Corner Store']);
+    Capsule::connection('mysql')->table('networks')->insert(['uuid' => 'network_uuid', 'public_id' => 'network_public', 'name' => 'Marketplace']);
+
+    $order = new Order();
+    $order->forceFill(['meta' => ['storefront_id' => 'store_public', 'storefront_network_id' => 'network_public']]);
+    $storeOrder = new Order();
+    $storeOrder->forceFill(['meta' => ['storefront_id' => 'store_public']]);
+    $masterOrder = new Order();
+    $masterOrder->forceFill(['meta' => ['storefront_id' => 'network_public', 'storefront_network_id' => 'network_public']]);
+
+    expect(collect(PushCredentialResolver::storefrontsForOrder($order))->pluck('uuid')->all())->toBe(['network_uuid', 'store_uuid'])
+        ->and(collect(PushCredentialResolver::storefrontsForOrder($storeOrder))->pluck('uuid')->all())->toBe(['store_uuid'])
+        ->and(collect(PushCredentialResolver::storefrontsForOrder($masterOrder))->pluck('uuid')->all())->toBe(['network_uuid'])
+        ->and(PushCredentialResolver::storefrontsForOrder(new Order()))->toBe([]);
+});
+
+test('platform names are normalized', function () {
+    expect(StorefrontPushChannel::normalizePlatform('iOS'))->toBe('ios')
+        ->and(StorefrontPushChannel::normalizePlatform(' ANDROID '))->toBe('android')
+        ->and(StorefrontPushChannel::normalizePlatform('ipados'))->toBe('ios')
+        ->and(StorefrontPushChannel::normalizePlatform('web'))->toBeNull()
+        ->and(StorefrontPushChannel::normalizePlatform(null))->toBeNull();
+});
+
+test('push message fluent setters render into both provider payloads', function () {
+    $message = PushMessage::create('Order ready', 'Collect it now')
+        ->data(['id' => 'order_public'])
+        ->data(['type' => 'order_ready'])
+        ->badge(3)
+        ->sound('chime.caf')
+        ->image('https://example.test/order.png')
+        ->category('view_order')
+        ->collapseKey('order_public');
+
+    $fcm = $message->toFcmArray();
+    $apn = json_decode(json_encode($message->toApnPayload()), true);
+
+    expect($message->data)->toBe(['id' => 'order_public', 'type' => 'order_ready'])
+        ->and($fcm['notification']['image'])->toBe('https://example.test/order.png')
+        ->and($fcm['android']['collapse_key'])->toBe('order_public')
+        ->and($fcm['android']['notification'])->toMatchArray(['sound' => 'chime.caf', 'click_action' => 'view_order', 'tag' => 'order_public'])
+        ->and($fcm['apns']['payload']['aps'])->toBe(['sound' => 'chime.caf', 'badge' => 3, 'category' => 'view_order'])
+        ->and($apn['aps'])->toMatchArray(['sound' => 'chime.caf', 'badge' => 3, 'category' => 'view_order', 'mutable-content' => 1]);
+
+    $silent = json_decode(json_encode(PushMessage::create('Hi', 'There')->sound(null)->badge(null)->toApnPayload()), true);
+
+    expect($silent['aps'])->not->toHaveKey('sound')
+        ->and($silent['aps'])->not->toHaveKey('badge');
+});
+
+test('FCM transport multicasts the rendered message and maps each token report', function () {
+    $messaging = $this->createMock(Kreait\Firebase\Contract\Messaging::class);
+    $messaging->expects($this->once())
+        ->method('sendMulticast')
+        ->with(
+            $this->callback(fn ($message) => $message instanceof Kreait\Firebase\Messaging\CloudMessage
+                && data_get($message->jsonSerialize(), 'android.notification.channel_id') === 'orders'),
+            ['ok_token', 'dead_token']
+        )
+        ->willReturn(Kreait\Firebase\Messaging\MulticastSendReport::withItems([
+            SendReport::success(MessageTarget::with(MessageTarget::TOKEN, 'ok_token'), ['name' => 'projects/x/messages/1']),
+            SendReport::failure(MessageTarget::with(MessageTarget::TOKEN, 'dead_token'), new NotFound('Requested entity was not found.')),
+        ]));
+    $factory = new class($messaging) extends FirebaseMessagingFactory {
+        public function __construct(public $messaging)
+        {
+        }
+
+        public function make(NotificationChannel $channel): Kreait\Firebase\Contract\Messaging
+        {
+            return $this->messaging;
+        }
+    };
+    $transport = new FcmTransport($factory);
+    $channel   = pushChannel(['app_key' => 'fcm', 'scheme' => 'fcm'], ['android_channel_id' => 'orders']);
+
+    $outcomes = $transport->send($channel, PushMessage::create('Order ready', 'Collect it now'), ['ok_token', 'dead_token']);
+
+    expect(collect($outcomes)->map->status->all())->toBe(['ok_token' => PushOutcome::SENT, 'dead_token' => PushOutcome::DEAD])
+        ->and($transport->send($channel, PushMessage::create('Hi', 'There'), []))->toBe([]);
+});
+
+test('FCM invalid registration arguments are treated as dead tokens', function () {
+    $report = SendReport::failure(
+        MessageTarget::with(MessageTarget::TOKEN, 'token'),
+        new Kreait\Firebase\Exception\Messaging\InvalidArgument('The registration token is not valid')
+    );
+
+    expect(FcmTransport::outcomeFor($report)->status)->toBe(PushOutcome::DEAD);
+});
+
+test('APNs transport queues a high priority notification per token and maps each response', function () {
+    $client = $this->createMock(Pushok\Client::class);
+    $queued = [];
+    $client->expects($this->exactly(2))
+        ->method('addNotification')
+        ->willReturnCallback(function (Pushok\Notification $notification) use (&$queued) {
+            $queued[] = [$notification->getDeviceToken(), $notification->getPriority(), $notification->getCollapseId()];
+        });
+    $client->method('push')->willReturn([
+        new Pushok\Response(200, '', '', 'ok_token'),
+        new Pushok\Response(410, '', json_encode(['reason' => 'Unregistered']), 'gone_token'),
+    ]);
+    $factory = new class($client) extends ApnClientFactory {
+        public ?string $environment = null;
+
+        public function __construct(public $client)
+        {
+        }
+
+        public function make(NotificationChannel $channel, string $environment): Pushok\Client
+        {
+            $this->environment = $environment;
+
+            return $this->client;
+        }
+    };
+    $transport = new ApnTransport($factory);
+    $channel   = pushChannel(['app_key' => 'apn', 'scheme' => 'apn']);
+
+    $outcomes = $transport->send($channel, 'sandbox', PushMessage::create('Order ready', 'Collect it now')->collapseKey(str_repeat('k', 80)), ['ok_token', 'gone_token']);
+
+    expect(collect($outcomes)->map->status->all())->toBe(['ok_token' => PushOutcome::SENT, 'gone_token' => PushOutcome::DEAD])
+        ->and($factory->environment)->toBe('sandbox')
+        ->and($queued)->toBe([
+            ['ok_token', Pushok\Notification::PRIORITY_HIGH, str_repeat('k', 64)],
+            ['gone_token', Pushok\Notification::PRIORITY_HIGH, str_repeat('k', 64)],
+        ])
+        ->and($transport->send($channel, 'sandbox', PushMessage::create('Hi', 'There'), []))->toBe([]);
+});
+
+test('storefront push channel stops walking APNs environments once every token is delivered', function () {
+    $transport   = fakeApn(fn ($channel, $environment, array $tokens) => array_fill_keys($tokens, PushOutcome::sent()));
+    $pushChannel = new StorefrontPushChannel(fakeResolver(['apn' => [pushChannel(['app_key' => 'apn', 'scheme' => 'apn'], ['environment' => 'auto'])]]), fakeFcm(fn () => []), $transport);
+    $notifiable  = new class(collect([pushDevice('ios_token', 'ios')])) {
+        public function __construct(public $devices)
+        {
+        }
+    };
+
+    $pushChannel->send($notifiable, pushNotification([]));
+
+    expect($transport->calls)->toBe([['apn', 'production', ['ios_token']]]);
+});
+
+test('storefront push channel prefers an explicit push route and survives failing notifications', function () {
+    $fcm         = fakeFcm(fn ($channel, array $tokens) => array_fill_keys($tokens, PushOutcome::sent()));
+    $pushChannel = new StorefrontPushChannel(fakeResolver(['fcm' => [pushChannel(['app_key' => 'fcm', 'scheme' => 'fcm'])]]), $fcm, fakeApn(fn () => []));
+    $notifiable  = new class {
+        public $devices = [];
+
+        public function routeNotificationForStorefrontPush(): array
+        {
+            return [pushDevice('routed_token', 'android')];
+        }
+    };
+    $failing = new class extends Notification implements SendsPushNotification {
+        public function toPush($notifiable): ?PushMessage
+        {
+            throw new RuntimeException('payload failure');
+        }
+
+        public function pushStorefronts(): array
+        {
+            return [];
+        }
+    };
+
+    expect(array_keys($pushChannel->send($notifiable, pushNotification([]))))->toBe(['routed_token'])
+        ->and($pushChannel->send($notifiable, $failing))->toBe([]);
+});
+
+test('storefront push channel pruning tolerates non-model devices, storage failures and logger failures', function () {
+    $schema = Capsule::schema('mysql');
+    $schema->dropIfExists('user_devices');
+    $unsaved = tap(new UserDevice())->forceFill(['uuid' => 'unsaved_uuid', 'platform' => 'android', 'token' => 'unsaved_token', 'status' => 'active']);
+    $plain   = (object) ['token' => 'plain_token', 'platform' => 'android', 'status' => 'active'];
+
+    $app      = Illuminate\Container\Container::getInstance();
+    $original = $app->make('log');
+    $app->instance('log', new class {
+        public function __call($method, $arguments)
+        {
+            throw new RuntimeException('logger unavailable');
+        }
+    });
+    Illuminate\Support\Facades\Log::clearResolvedInstance('log');
+
+    try {
+        $pushChannel = new StorefrontPushChannel(
+            fakeResolver(['fcm' => [pushChannel(['app_key' => 'fcm', 'scheme' => 'fcm'])]]),
+            fakeFcm(fn ($channel, array $tokens) => array_fill_keys($tokens, PushOutcome::dead('Unregistered'))),
+            fakeApn(fn () => [])
+        );
+        $notifiable = new class(collect([$unsaved, $plain])) {
+            public function __construct(public $devices)
+            {
+            }
+        };
+
+        $outcomes = $pushChannel->send($notifiable, pushNotification([]));
+    } finally {
+        $app->instance('log', $original);
+        Illuminate\Support\Facades\Log::clearResolvedInstance('log');
+    }
+
+    expect(collect($outcomes)->map->status->all())->toBe(['unsaved_token' => PushOutcome::DEAD, 'plain_token' => PushOutcome::DEAD]);
+});
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index e5bc11bc..353e68b9 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -153,6 +153,14 @@ storefront:
         name-text: Give your notification channel a name, this will only be relevent internally
         key: Channel Key
         key-text: This is your notification channel key, use this to specify which apps should utilize this notification channel via sdk configs.
+        environment-help-text: Auto tries production first and retries sandbox (development builds) when Apple rejects the device token.
+        android-channel-id-help-text: Optional Android notification channel ID. Leave empty to use the app's default channel.
+      test-notification-channel:
+        token: Device token
+        token-text: Paste an FCM registration token (Android) or APNs device token (iOS) from a device running your app.
+        environment: APNs environment
+        environment-text: Leave empty to try the channel's configured environments.
+        result: Provider result
       create-product-category:
         name: Category name
         name-text: Enter a name for category
@@ -658,6 +666,11 @@ storefront:
       notification-settings: Notification Settings
       notification-storefront: Configure notification channels for your storefront, each notification channel additionally can have it's own rules and options.
       new-channel: New channel
+      send-test: Send test
+      send-test-push: Send a test push notification
+      send-test-push-button: Send test push
+      test-push-sent: Test push notification was delivered to the provider.
+      test-push-failed: Test push notification failed, see the provider result below.
   service:
     storefront:
       new-incoming-order: You have a new incoming order!