@fleetbase/storefront-engine 0.4.0 → 0.4.2

package/server/src/Http/Controllers/OrderController.php

@@ -4,9 +4,10 @@ namespace Fleetbase\Storefront\Http\Controllers;
 
 use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrderController as FleetbaseOrderController;
 use Fleetbase\FleetOps\Models\Order;
-use Fleetbase\Storefront\Notifications\StorefrontOrderPreparing;
+use Fleetbase\Storefront\Notifications\StorefrontOrderAccepted;
 use Fleetbase\Storefront\Support\Storefront;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 
 class OrderController extends FleetbaseOrderController
 {
@@ -40,11 +41,29 @@ class OrderController extends FleetbaseOrderController
         }
 
         // Patch order config
-        Storefront::patchOrderConfig($order);
+        $orderConfig = Storefront::patchOrderConfig($order);
+        $activity    = Storefront::createAcceptedActivity($orderConfig);
 
-        // update activity to prepating
-        $order->updateStatus('preparing');
-        $order->customer->notify(new StorefrontOrderPreparing($order));
+        // Dispatch already if order is a pickup
+        if ($order->isMeta('is_pickup')) {
+            $order->firstDispatchWithActivity();
+        }
+
+        // Set order as accepted
+        try {
+            $order->setStatus($activity->code);
+            $order->insertActivity($activity, $order->getLastLocation());
+        } catch (\Exception $e) {
+            Log::debug('[Storefront] was unable to accept an order.', ['order' => $order, 'activity' => $activity]);
+
+            return response()->error('Unable to accept order.');
+        }
+
+        // Notify customer order was accepted
+        try {
+            $order->customer->notify(new StorefrontOrderAccepted($order));
+        } catch (\Exception $e) {
+        }
 
         return response()->json([
             'status' => 'ok',
@@ -66,9 +85,7 @@ class OrderController extends FleetbaseOrderController
         $order = Order::where('uuid', $request->order)->whereNull('deleted_at')->with(['customer'])->first();
 
         if (!$order) {
-            return response()->json([
-                'error' => 'No order to update!',
-            ], 400);
+            return response()->error('No order to update!');
         }
 
         // Patch order config
@@ -95,7 +112,7 @@ class OrderController extends FleetbaseOrderController
         }
 
         // update activity to dispatched
-        $order->updateStatus('dispatched');
+        $order->dispatchWithActivity();
 
         return response()->json([
             'status' => 'ok',
@@ -109,6 +126,42 @@ class OrderController extends FleetbaseOrderController
      *
      * @return \Illuminate\Http\Response
      */
+    public function markOrderAsPreparing(Request $request)
+    {
+        /** @var Order $order */
+        $order = Order::where('uuid', $request->order)->whereNull('deleted_at')->with(['customer'])->first();
+
+        if (!$order) {
+            return response()->error('No order to update!');
+        }
+
+        // Patch order config
+        $orderConfig = Storefront::patchOrderConfig($order);
+
+        // Get preparing activity
+        $activity = $orderConfig->getActivityByCode('preparing');
+
+        try {
+            $order->setStatus($activity->code);
+            $order->insertActivity($activity, $order->getLastLocation());
+        } catch (\Exception $e) {
+            Log::debug('[Storefront] was unable to trigger order preparing.', ['order' => $order, 'activity' => $activity]);
+
+            return response()->error('Unable to trigger order preparing.');
+        }
+
+        return response()->json([
+            'status' => 'ok',
+            'order'  => $order->public_id,
+            'status' => $order->status,
+        ]);
+    }
+
+    /**
+     * Accept an order by incrementing status to completed.
+     *
+     * @return \Illuminate\Http\Response
+     */
     public function markOrderAsCompleted(Request $request)
     {
         /** @var Order */

package/server/src/Http/Controllers/v1/CheckoutController.php

@@ -24,7 +24,6 @@ use Fleetbase\Storefront\Models\Gateway;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Models\StoreLocation;
-use Fleetbase\Storefront\Notifications\StorefrontOrderPreparing;
 use Fleetbase\Storefront\Support\QPay;
 use Fleetbase\Storefront\Support\Storefront;
 use Fleetbase\Storefront\Support\StripeUtils;
@@ -686,9 +685,7 @@ class CheckoutController extends Controller
 
         // if cart is null then cart has either been deleted or expired
         if (!$cart) {
-            return response()->json([
-                'error' => 'Cart expired',
-            ], 400);
+            return response()->apiError('Cart expired');
         }
 
         // $amount = $checkout->amount ?? ($checkout->is_pickup ? $cart->subtotal : $cart->subtotal + $serviceQuote->amount);
@@ -815,10 +812,15 @@ class CheckoutController extends Controller
             ->unique()
             ->filter()
             ->map(function ($foodTruckId) {
-                return FoodTruck::where('public_id', $foodTruckId)->first();
+                return FoodTruck::where('public_id', $foodTruckId)->with(['zone', 'serviceArea'])->first();
             })
             ->first();
 
+        // Set food truck vehicle location as origin
+        if ($foodTruck && $foodTruck->vehicle) {
+            $origin = ['name' => $foodTruck->name, 'street1' => data_get($foodTruck, 'zone.name'), 'city' => data_get($foodTruck, 'serviceArea.name'), 'country' => data_get($foodTruck, 'serviceArea.country'), 'location' => $foodTruck->vehicle->location];
+        }
+
         // if there is no origin attempt to get from cart
         if (!$origin) {
             $storeLocation = collect($cart->items)->map(function ($cartItem) {
@@ -888,7 +890,7 @@ class CheckoutController extends Controller
         $orderMeta = array_merge($orderMeta, [
             'checkout_id'  => $checkout->public_id,
             'subtotal'     => Utils::numbersOnly($cart->subtotal),
-            'delivery_fee' => $checkout->is_pickip ? 0 : Utils::numbersOnly($serviceQuote->amount),
+            'delivery_fee' => $checkout->is_pickup ? 0 : Utils::numbersOnly($serviceQuote->amount),
             'tip'          => $checkout->getOption('tip'),
             'delivery_tip' => $checkout->getOption('delivery_tip'),
             'total'        => Utils::numbersOnly($amount),
@@ -899,23 +901,33 @@ class CheckoutController extends Controller
             ...$transactionDetails,
         ]);
 
+        // Create order input here
+        $orderInput = [];
+
         // if there is a food truck include it in the order meta
         if ($foodTruck) {
             $orderMeta['food_truck_id'] = $foodTruck->public_id;
+            // assign the driver to the food truck driver
+            $driverAssigned = $foodTruck->getDriverAssigned();
+            if ($driverAssigned) {
+                $orderInput['driver_assigned_uuid'] = $driverAssigned->uuid;
+            }
         }
 
         // initialize order creation input
         $orderInput = [
-            'company_uuid'     => $store->company_uuid ?? session('company'),
-            'payload_uuid'     => $payload->uuid,
-            'customer_uuid'    => $customer->uuid,
-            'customer_type'    => Utils::getMutationType('fleet-ops:contact'),
-            'transaction_uuid' => $transaction->uuid,
-            'adhoc'            => $about->isOption('auto_dispatch'),
-            'type'             => 'storefront',
-            'status'           => 'created',
-            'meta'             => $orderMeta,
-            'notes'            => $notes,
+            ...$orderInput,
+            'company_uuid'      => $store->company_uuid ?? session('company'),
+            'payload_uuid'      => $payload->uuid,
+            'customer_uuid'     => $customer->uuid,
+            'customer_type'     => Utils::getMutationType('fleet-ops:contact'),
+            'transaction_uuid'  => $transaction->uuid,
+            'order_config_uuid' => $about->getOrderConfigId(),
+            'adhoc'             => $about->isOption('auto_dispatch'),
+            'type'              => 'storefront',
+            'status'            => 'created',
+            'meta'              => $orderMeta,
+            'notes'             => $notes,
         ];
 
         // if it's integrated vendor order apply to meta
@@ -930,6 +942,9 @@ class CheckoutController extends Controller
         // create order
         $order = Order::create($orderInput);
 
+        // notify driver if assigned
+        $order->notifyDriverAssigned();
+
         // notify order creation
         Storefront::alertNewOrder($order);
 
@@ -939,15 +954,11 @@ class CheckoutController extends Controller
         }
 
         // if order is auto accepted update status
-        if ($about->isOption('auto_accept_orders')) {
-            if ($about->isOption('auto_dispatch')) {
-                $order->updateStatus(['preparing', 'dispatched']);
-            } else {
-                $order->updateStatus('preparing');
+        if ($store->isOption('auto_accept_orders')) {
+            Storefront::autoAcceptOrder($order);
+            if ($store->isOption('auto_dispatch')) {
+                Storefront::autoDispatchOrder($order);
             }
-
-            // notify customer order is preparing
-            $customer->notify(new StorefrontOrderPreparing($order));
         }
 
         // update the cart with the checkout
@@ -1136,15 +1147,16 @@ class CheckoutController extends Controller
 
             // prepare order input
             $orderInput = [
-                'company_uuid'     => $store->company_uuid,
-                'payload_uuid'     => $payload->uuid,
-                'customer_uuid'    => $customer->uuid,
-                'customer_type'    => Utils::getMutationType('fleet-ops:contact'),
-                'transaction_uuid' => $transaction->uuid,
-                'adhoc'            => $about->isOption('auto_dispatch'),
-                'type'             => 'storefront',
-                'status'           => 'created',
-                'notes'            => $notes,
+                'company_uuid'      => $store->company_uuid,
+                'payload_uuid'      => $payload->uuid,
+                'customer_uuid'     => $customer->uuid,
+                'customer_type'     => Utils::getMutationType('fleet-ops:contact'),
+                'transaction_uuid'  => $transaction->uuid,
+                'order_config_uuid' => $store->getOrderConfigId(),
+                'adhoc'             => $about->isOption('auto_dispatch'),
+                'type'              => 'storefront',
+                'status'            => 'created',
+                'notes'             => $notes,
             ];
 
             // if it's integrated vendor order apply to meta
@@ -1173,14 +1185,10 @@ class CheckoutController extends Controller
 
             // if order is auto accepted update status
             if ($store->isOption('auto_accept_orders')) {
+                Storefront::autoAcceptOrder($order);
                 if ($store->isOption('auto_dispatch')) {
-                    $order->updateStatus(['preparing', 'dispatched']);
-                } else {
-                    $order->updateStatus('preparing');
+                    Storefront::autoDispatchOrder($order);
                 }
-
-                // notify customer order is preparing
-                $customer->notify(new StorefrontOrderPreparing($order));
             }
         }
 
@@ -1212,7 +1220,7 @@ class CheckoutController extends Controller
             'storefront_network_id' => $about->public_id,
             'checkout_id'           => $checkout->public_id,
             'subtotal'              => Utils::numbersOnly($cart->subtotal),
-            'delivery_fee'          => $checkout->is_pickip ? 0 : Utils::numbersOnly($serviceQuote->amount),
+            'delivery_fee'          => $checkout->is_pickup ? 0 : Utils::numbersOnly($serviceQuote->amount),
             'tip'                   => $checkout->getOption('tip'),
             'delivery_tip'          => $checkout->getOption('delivery_tip'),
             'total'                 => Utils::numbersOnly($amount),
@@ -1225,14 +1233,15 @@ class CheckoutController extends Controller
 
         // prepare master order input
         $masterOrderInput = [
-            'company_uuid'     => session('company'),
-            'payload_uuid'     => $payload->uuid,
-            'customer_uuid'    => $customer->uuid,
-            'customer_type'    => Utils::getMutationType('fleet-ops:contact'),
-            'transaction_uuid' => $transaction->uuid,
-            'adhoc'            => $about->isOption('auto_dispatch'),
-            'type'             => 'storefront',
-            'status'           => 'created',
+            'company_uuid'      => session('company'),
+            'payload_uuid'      => $payload->uuid,
+            'customer_uuid'     => $customer->uuid,
+            'customer_type'     => Utils::getMutationType('fleet-ops:contact'),
+            'transaction_uuid'  => $transaction->uuid,
+            'order_config_uuid' => $about->getOrderConfigId(),
+            'adhoc'             => $about->isOption('auto_dispatch'),
+            'type'              => 'storefront',
+            'status'            => 'created',
         ];
 
         // if it's integrated vendor order apply to meta

package/server/src/Http/Controllers/v1/ServiceQuoteController.php

@@ -10,10 +10,12 @@ use Fleetbase\FleetOps\Models\Place;
 use Fleetbase\FleetOps\Models\ServiceQuote;
 use Fleetbase\FleetOps\Models\ServiceQuoteItem;
 use Fleetbase\FleetOps\Models\ServiceRate;
+use Fleetbase\FleetOps\Models\Vehicle;
 use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Http\Requests\GetServiceQuoteFromCart;
 use Fleetbase\Storefront\Models\Cart;
+use Fleetbase\Storefront\Models\FoodTruck;
 use Fleetbase\Storefront\Models\Product;
 use Fleetbase\Storefront\Models\Store;
 use Fleetbase\Storefront\Models\StoreLocation;
@@ -121,8 +123,8 @@ class ServiceQuoteController extends Controller
 
                 // set origin and destination in service quote meta
                 $serviceQuote->updateMeta([
-                    'origin'      => $origin->public_id,
-                    'destination' => $destination->public_id,
+                    'origin'      => $origin->public_id ?? $request->input('origin'),
+                    'destination' => $destination->public_id ?? $request->input('destination'),
                 ]);
 
                 return new ServiceQuoteResource($serviceQuote);
@@ -392,8 +394,22 @@ class ServiceQuoteController extends Controller
             return Place::where(['public_id' => $id, 'company_uuid' => session('company')])->first();
         }
 
+        // If vehicle
+        if (Str::startsWith($id, 'vehicle_')) {
+            $vehicle = Vehicle::where('public_id', $id)->first();
+
+            return Place::createFromCoordinates($vehicle->location);
+        }
+
+        // If food truck
+        if (Str::startsWith($id, 'food_truck_')) {
+            $foodTruck = FoodTruck::where('public_id', $id)->with('vehicle')->first();
+
+            return $foodTruck->vehicle ? Place::createFromCoordinates($foodTruck->vehicle->location) : null;
+        }
+
         // handle coordinates tooo!
-        if (!Str::startsWith($id, ['place_', 'store_location']) && Utils::isCoordinates($id)) {
+        if (Utils::isCoordinates($id)) {
             $point = Utils::getPointFromCoordinates($id);
             $place = Place::createFromCoordinates($point, ['company_uuid' => session('company')], true);
 

package/server/src/Http/Middleware/SetStorefrontSession.php

@@ -59,17 +59,19 @@ class SetStorefrontSession
             $store = Store::select(['uuid', 'company_uuid', 'currency'])->where('key', $key)->first();
 
             if ($store) {
-                $session['storefront_store']    = $store->uuid;
-                $session['storefront_currency'] = $store->currency;
-                $session['company']             = $store->company_uuid;
+                $session['storefront_store']              = $store->uuid;
+                $session['storefront_store_public_id']    = $store->public_id;
+                $session['storefront_currency']           = $store->currency;
+                $session['company']                       = $store->company_uuid;
             }
         } elseif (Str::startsWith($key, 'network')) {
             $network = Network::select(['uuid', 'company_uuid', 'currency'])->where('key', $key)->first();
 
             if ($network) {
-                $session['storefront_network']  = $network->uuid;
-                $session['storefront_currency'] = $network->currency;
-                $session['company']             = $network->company_uuid;
+                $session['storefront_network']            = $network->uuid;
+                $session['storefront_network_public_id']  = $network->public_id;
+                $session['storefront_currency']           = $network->currency;
+                $session['company']                       = $network->company_uuid;
             }
         }
 

package/server/src/Http/Resources/Customer.php

@@ -3,9 +3,11 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\FleetOps\Http\Resources\v1\Place;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 use Fleetbase\Support\Utils;
+use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 
 class Customer extends FleetbaseResource
@@ -13,7 +15,7 @@ class Customer extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param \Illuminate\Http\Request $request
+     * @param Request $request
      *
      * @return array
      */
@@ -22,22 +24,44 @@ class Customer extends FleetbaseResource
         $this->loadMissing(['place', 'places']);
 
         return [
-            'id'                   => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
-            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
-            'address_id'           => $this->place ? $this->place->public_id : null,
-            'internal_id'          => $this->internal_id,
-            'name'                 => $this->name,
-            'photo_url'            => $this->photo_url,
-            'email'                => $this->email,
-            'phone'                => $this->phone,
-            'address'              => data_get($this, 'place.address'),
-            'addresses'            => $this->whenLoaded('places', Place::collection($this->places)),
-            'token'                => $this->when($this->token, $this->token),
-            'meta'                 => data_get($this, 'meta', Utils::createObject()),
-            'slug'                 => $this->slug,
-            'created_at'           => $this->created_at,
-            'updated_at'           => $this->updated_at,
+            'id'                           => $this->when(Http::isInternalRequest(), $this->id, Str::replaceFirst('contact', 'customer', $this->public_id)),
+            'uuid'                         => $this->when(Http::isInternalRequest(), $this->uuid),
+            'user_uuid'                    => $this->when(Http::isInternalRequest(), $this->user_uuid),
+            'company_uuid'                 => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'place_uuid'                   => $this->when(Http::isInternalRequest(), $this->place_uuid),
+            'photo_uuid'                   => $this->when(Http::isInternalRequest(), $this->photo_uuid),
+            'public_id'                    => $this->when(Http::isInternalRequest(), $this->public_id),
+            'address_id'                   => $this->place ? $this->place->public_id : null,
+            'internal_id'                  => $this->internal_id,
+            'name'                         => $this->name,
+            'title'                        => $this->title,
+            'photo_url'                    => $this->photo_url,
+            'email'                        => $this->email,
+            'phone'                        => $this->phone,
+            'address'                      => data_get($this, 'place.address'),
+            'addresses'                    => $this->whenLoaded('places', Place::collection($this->places)),
+            'token'                        => $this->when($this->token, $this->token),
+            'orders'                       => $this->getCustomerOrderCount($request),
+            'meta'                         => data_get($this, 'meta', Utils::createObject()),
+            'slug'                         => $this->slug,
+            'created_at'                   => $this->created_at,
+            'updated_at'                   => $this->updated_at,
         ];
     }
+
+    private function getCustomerOrderCount(Request $request): int
+    {
+        $storeId   = $request->input('storefront') ?? $request->session()->get('storefront_id');
+        $networkId = $request->input('network') ?? $request->session()->get('network_id');
+
+        if ($storeId) {
+            return Order::where(['customer_uuid' => $this->uuid, 'meta->storefront_id' => $storeId])->count();
+        }
+
+        if ($networkId) {
+            return Order::where(['customer_uuid' => $this->uuid, 'meta->storefront_network_id' => $networkId])->count();
+        }
+
+        return 0;
+    }
 }

package/server/src/Http/Resources/Gateway.php

@@ -17,17 +17,22 @@ class Gateway extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'           => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'         => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'    => $this->when(Http::isInternalRequest(), $this->public_id),
-            'name'         => $this->name,
-            'description'  => $this->description,
-            'logo_url'     => $this->logo_url,
-            'code'         => $this->code,
-            'type'         => $this->type,
-            'sandbox'      => $this->sandbox,
-            'return_url'   => $this->return_url,
-            'callback_url' => $this->callback_url,
+            'id'            => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'          => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'     => $this->when(Http::isInternalRequest(), $this->public_id),
+            'owner_uuid'    => $this->when(Http::isInternalRequest(), $this->owner_uuid),
+            'name'          => $this->name,
+            'description'   => $this->description,
+            'logo_url'      => $this->logo_url,
+            'code'          => $this->code,
+            'type'          => $this->type,
+            'sandbox'       => $this->sandbox,
+            'return_url'    => $this->return_url,
+            'callback_url'  => $this->callback_url,
+            'meta'          => $this->meta,
+            'config'        => $this->when(Http::isInternalRequest(), $this->config),
+            'updated_at'    => $this->updated_at,
+            'created_at'    => $this->created_at,
         ];
     }
 }

package/server/src/Http/Resources/Network.php

@@ -17,40 +17,41 @@ class Network extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
-            'key'                   => $this->when(Http::isInternalRequest(), $this->key),
-            'company_uuid'          => $this->when(Http::isInternalRequest(), $this->company_uuid),
-            'created_by_uuid'       => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
-            'logo_uuid'             => $this->when(Http::isInternalRequest(), $this->logo_uuid),
-            'backdrop_uuid'         => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
-            'name'                  => $this->name,
-            'description'           => $this->description,
-            'translations'          => $this->translations ?? [],
-            'website'               => $this->website,
-            'facebook'              => $this->facebook,
-            'instagram'             => $this->instagram,
-            'twitter'               => $this->twitter,
-            'email'                 => $this->email,
-            'phone'                 => $this->phone,
-            'tags'                  => $this->tags ?? [],
-            'currency'              => $this->currency ?? 'USD',
-            'options'               => $this->options ?? [],
-            'alertable'             => $this->alertable,
-            'logo_url'              => $this->logo_url,
-            'backdrop_url'          => $this->backdrop_url,
-            'rating'                => $this->rating,
-            'online'                => $this->online,
-            'stores'                => $this->when($request->boolean('with_stores') || $request->inArray('with', 'stores'), Store::collection($this->stores)),
-            'categories'            => $this->when($request->boolean('with_categories') || $request->inArray('with', 'categories'), Category::collection($this->categories)),
-            'gateways'              => $this->when($request->boolean('with_gateways') || $request->inArray('with', 'gateways'), Gateway::collection($this->gateways)),
-            'notification_channels' => $this->when($request->boolean('with_notification_channels') || $request->inArray('with', 'notification_channels'), NotificationChannel::collection($this->notificationChannels)),
-            'is_network'            => true,
-            'is_store'              => false,
-            'slug'                  => $this->slug,
-            'created_at'            => $this->created_at,
-            'updated_at'            => $this->updated_at,
+            'id'                        => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                      => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'                 => $this->when(Http::isInternalRequest(), $this->public_id),
+            'key'                       => $this->when(Http::isInternalRequest(), $this->key),
+            'company_uuid'              => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid'           => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'logo_uuid'                 => $this->when(Http::isInternalRequest(), $this->logo_uuid),
+            'backdrop_uuid'             => $this->when(Http::isInternalRequest(), $this->backdrop_uuid),
+            'order_config_uuid'         => $this->when(Http::isInternalRequest(), $this->order_config_uuid),
+            'name'                      => $this->name,
+            'description'               => $this->description,
+            'translations'              => $this->translations ?? [],
+            'website'                   => $this->website,
+            'facebook'                  => $this->facebook,
+            'instagram'                 => $this->instagram,
+            'twitter'                   => $this->twitter,
+            'email'                     => $this->email,
+            'phone'                     => $this->phone,
+            'tags'                      => $this->tags ?? [],
+            'currency'                  => $this->currency ?? 'USD',
+            'options'                   => $this->options ?? [],
+            'alertable'                 => $this->alertable,
+            'logo_url'                  => $this->logo_url,
+            'backdrop_url'              => $this->backdrop_url,
+            'rating'                    => $this->rating,
+            'online'                    => $this->online,
+            'stores'                    => $this->when($request->boolean('with_stores') || $request->inArray('with', 'stores'), Store::collection($this->stores)),
+            'categories'                => $this->when($request->boolean('with_categories') || $request->inArray('with', 'categories'), Category::collection($this->categories)),
+            'gateways'                  => $this->when($request->boolean('with_gateways') || $request->inArray('with', 'gateways'), Gateway::collection($this->gateways)),
+            'notification_channels'     => $this->when($request->boolean('with_notification_channels') || $request->inArray('with', 'notification_channels'), NotificationChannel::collection($this->notificationChannels)),
+            'is_network'                => true,
+            'is_store'                  => false,
+            'slug'                      => $this->slug,
+            'created_at'                => $this->created_at,
+            'updated_at'                => $this->updated_at,
         ];
     }
 }

package/server/src/Http/Resources/NotificationChannel.php

@@ -17,16 +17,23 @@ class NotificationChannel extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'             => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid'           => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'      => $this->when(Http::isInternalRequest(), $this->public_id),
-            'name'           => $this->name,
-            'scheme'         => $this->scheme,
-            'options'        => $this->options,
-            'is_apn_gateway' => $this->is_apn_gateway,
-            'is_fcm_gateway' => $this->is_fcm_gateway,
-            'created_at'     => $this->created_at,
-            'updated_at'     => $this->updated_at,
+            'id'                    => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
+            'company_uuid'          => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'created_by_uuid'       => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'certificate_uuid'      => $this->when(Http::isInternalRequest(), $this->certificate_uuid),
+            'owner_uuid'            => $this->when(Http::isInternalRequest(), $this->owner_uuid),
+            'owner_type'            => $this->when(Http::isInternalRequest(), $this->owner_type),
+            'name'                  => $this->name,
+            'scheme'                => $this->scheme,
+            'options'               => $this->options,
+            'config'                => $this->config,
+            'app_key'               => $this->app_key,
+            'is_apn_gateway'        => $this->is_apn_gateway,
+            'is_fcm_gateway'        => $this->is_fcm_gateway,
+            'created_at'            => $this->created_at,
+            'updated_at'            => $this->updated_at,
         ];
     }
 }

package/server/src/Http/Resources/Product.php

@@ -31,6 +31,7 @@ class Product extends FleetbaseResource
             'primary_image_uuid' => $this->when(Http::isInternalRequest(), $this->primary_image_uuid),
             'name'               => $this->name,
             'description'        => $this->description,
+            'category'           => $this->when(Http::isInternalRequest(), $this->category),
             'sku'                => $this->sku,
             'primary_image_url'  => $this->primary_image_url,
             'price'              => $this->price,