@fleetbase/storefront-engine 0.2.4 → 0.2.6

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

@@ -10,21 +10,22 @@ class Review extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     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),
+            '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),
             'subject_id' => $this->subject->id,
-            'rating' => $this->rating,
-            'content' => $this->content,
-            'customer' => new ReviewCustomer($this->customer),
-            'slug' => $this->slug,
-            'photos' => $this->mapPhotos($this->photos),
+            'rating'     => $this->rating,
+            'content'    => $this->content,
+            'customer'   => new ReviewCustomer($this->customer),
+            'slug'       => $this->slug,
+            'photos'     => $this->mapPhotos($this->photos),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
         ];
@@ -34,11 +35,11 @@ class Review extends FleetbaseResource
     {
         return collect($photos)->map(function ($photo) {
             return [
-                'id' => $photo->public_id,
+                'id'       => $photo->public_id,
                 'filename' => $photo->original_filename,
-                'type' => $photo->content_type,
-                'caption' => $photo->caption,
-                'url' => $photo->url
+                'type'     => $photo->content_type,
+                'caption'  => $photo->caption,
+                'url'      => $photo->url,
             ];
         });
     }

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

@@ -11,24 +11,25 @@ class ReviewCustomer extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         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),
-            'name' => $this->name,
-            'email' => $this->email,
-            'phone' => $this->phone,
-            'photo_url' => $this->photo_url,
+            '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),
+            'name'          => $this->name,
+            'email'         => $this->email,
+            'phone'         => $this->phone,
+            'photo_url'     => $this->photo_url,
             'reviews_count' => $this->getReviewsCount(),
             'uploads_count' => $this->getUploadsCount(),
-            'slug' => $this->slug,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
+            'slug'          => $this->slug,
+            'created_at'    => $this->created_at,
+            'updated_at'    => $this->updated_at,
         ];
     }
 

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

@@ -10,49 +10,55 @@ class Store extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     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),
-            '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->formatOptions($this->options),
-            'logo_url' => $this->logo_url,
-            'backdrop_url' => $this->backdrop_url,
-            'rating' => $this->rating,
-            'online' => $this->online,
-            'is_network' => false,
-            'is_store' => true,
-            'category' => $this->when($request->filled('network') && $request->has('with_category'), new Category($this->getNetworkCategoryUsingId($request->input('network')))),
-            'networks' => $this->when($request->boolean('with_networks') || $request->inArray('with', 'networks'), Network::collection($this->networks)),
-            'locations' => $this->when($request->boolean('with_locations'), $this->locations->mapInto(StoreLocation::class)),
-            'media' => $this->when($request->boolean('with_media'), Media::collection($this->media)),
-            '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),
+            '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->formatOptions($this->options),
+            'logo_url'        => $this->logo_url,
+            'backdrop_url'    => $this->backdrop_url,
+            'rating'          => $this->rating,
+            'online'          => $this->online,
+            'is_network'      => false,
+            'is_store'        => true,
+            'category'        => $this->when($request->filled('network') && $request->has('with_category'), new Category($this->getNetworkCategoryUsingId($request->input('network')))),
+            'networks'        => $this->when($request->boolean('with_networks') || $request->inArray('with', 'networks'), Network::collection($this->networks)),
+            'locations'       => $this->when($request->boolean('with_locations'), $this->locations->mapInto(StoreLocation::class)),
+            'media'           => $this->when($request->boolean('with_media'), Media::collection($this->media)),
+            'slug'            => $this->slug,
+            'created_at'      => $this->created_at,
+            'updated_at'      => $this->updated_at,
         ];
     }
 
     /**
      * Format the given options array by removing excluded keys.
      *
-     * @param mixed $options The options array to format.
-     * @return array The formatted options array.
+     * @param mixed $options the options array to format
+     *
+     * @return array the formatted options array
      */
     public function formatOptions($options = []): array
     {
@@ -61,7 +67,7 @@ class Store extends FleetbaseResource
         }
 
         $formattedOptions = [];
-        $exclude = ['alerted_for_new_order'];
+        $exclude          = ['alerted_for_new_order'];
 
         foreach ($options as $key => $value) {
             if (in_array($key, $exclude)) {

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

@@ -10,20 +10,21 @@ class StoreHour extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     public function toArray($request)
     {
         return [
-            'id' => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
-            'uuid' => $this->when(Http::isInternalRequest(), $this->uuid),
+            'id'          => $this->when(Http::isInternalRequest(), $this->id, $this->public_id),
+            'uuid'        => $this->when(Http::isInternalRequest(), $this->uuid),
             'day_of_week' => $this->when(Http::isInternalRequest(), $this->day_of_week),
-            'day' => $this->day_of_week,
-            'start' => $this->start,
-            'end' => $this->end,
-            'created_at' => $this->when(Http::isInternalRequest(),  $this->created_at),
-            'updated_at' => $this->when(Http::isInternalRequest(), $this->updated_at),
+            'day'         => $this->day_of_week,
+            'start'       => $this->start,
+            'end'         => $this->end,
+            'created_at'  => $this->when(Http::isInternalRequest(), $this->created_at),
+            'updated_at'  => $this->when(Http::isInternalRequest(), $this->updated_at),
         ];
     }
 }

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

@@ -3,7 +3,6 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\FleetOps\Http\Resources\v1\Place;
-use Fleetbase\FleetOps\Http\Resources\Internal\v1\Place as InternalPlace;
 use Fleetbase\Http\Resources\FleetbaseResource;
 use Fleetbase\Support\Http;
 
@@ -12,20 +11,21 @@ class StoreLocation extends FleetbaseResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
+     *
      * @return array
      */
     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),
-            'store' => data_get($this, 'store.public_id'),
+            '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),
+            'store'      => data_get($this, 'store.public_id'),
             'store_data' => $this->when($request->boolean('with_store'), new Store($this->store)),
-            'name' => $this->name,
-            'place' =>  $this->when(Http::isInternalRequest(), new InternalPlace($this->place), new Place($this->place)),
-            'hours' => StoreHour::collection($this->hours),
+            'name'       => $this->name,
+            'place'      => $this->place ? new Place($this->place) : null,
+            'hours'      => StoreHour::collection($this->hours),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at,
         ];

package/server/src/Imports/ProductsImport.php

@@ -9,8 +9,6 @@ use Maatwebsite\Excel\Concerns\WithHeadingRow;
 class ProductsImport implements ToCollection, WithHeadingRow
 {
     /**
-     * @param array $row
-     *
      * @return \Illuminate\Support\Collection
      */
     public function collection(Collection $rows)

package/server/src/Jobs/DownloadProductImageUrl.php

@@ -2,9 +2,9 @@
 
 namespace Fleetbase\Storefront\Jobs;
 
-use Fleetbase\Storefront\Models\Product;
-use Fleetbase\Models\File;
 use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Models\File;
+use Fleetbase\Storefront\Models\Product;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -13,7 +13,10 @@ use Illuminate\Queue\SerializesModels;
 
 class DownloadProductImageUrl implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     /**
      * The uuid of the product.
@@ -37,7 +40,7 @@ class DownloadProductImageUrl implements ShouldQueue
     public function __construct(Product $product, string $url)
     {
         $this->product = $product->uuid;
-        $this->url = $url;
+        $this->url     = $url;
     }
 
     /**

package/server/src/Listeners/HandleOrderCompleted.php

@@ -14,7 +14,8 @@ class HandleOrderCompleted implements ShouldQueue
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param object $event
+     *
      * @return void
      */
     public function handle(OrderCompleted $event)

package/server/src/Listeners/HandleOrderDispatched.php

@@ -14,7 +14,8 @@ class HandleOrderDispatched implements ShouldQueue
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param object $event
+     *
      * @return void
      */
     public function handle(OrderDispatched $event)

package/server/src/Listeners/HandleOrderDriverAssigned.php

@@ -15,7 +15,8 @@ class HandleOrderDriverAssigned implements ShouldQueue
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param object $event
+     *
      * @return void
      */
     public function handle(OrderDriverAssigned $event)

package/server/src/Listeners/HandleOrderStarted.php

@@ -10,7 +10,8 @@ class HandleOrderStarted
     /**
      * Handle the event.
      *
-     * @param  object  $event
+     * @param object $event
+     *
      * @return void
      */
     public function handle(OrderStarted $event)
@@ -18,8 +19,8 @@ class HandleOrderStarted
         /** @var \Fleetbase\FleetOps\Models\Order $order */
         $order = $event->getModelRecord();
 
-         // if storefront order / notify customer driver has started and is en-route
-         if ($order->hasMeta('storefront_id')) {
+        // 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));
         }

package/server/src/Mail/StorefrontNetworkInvite.php

@@ -2,17 +2,18 @@
 
 namespace Fleetbase\Storefront\Mail;
 
-use Fleetbase\Storefront\Models\Network;
+use Fleetbase\FleetOps\Support\Utils;
 use Fleetbase\Models\Invite;
 use Fleetbase\Models\User;
-use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Storefront\Models\Network;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
 
 class StorefrontNetworkInvite extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public Invite $invite;
     public Network $network;
@@ -26,10 +27,10 @@ class StorefrontNetworkInvite extends Mailable
      */
     public function __construct(Invite $invite)
     {
-        $this->invite = $invite;
+        $this->invite  = $invite;
         $this->network = $this->invite->subject;
-        $this->sender = $this->invite->createdBy;
-        $this->url = Utils::consoleUrl('join/network/' . $this->invite->uri);
+        $this->sender  = $this->invite->createdBy;
+        $this->url     = Utils::consoleUrl('join/network/' . $this->invite->uri);
     }
 
     /**

package/server/src/Models/AddonCategory.php

@@ -7,16 +7,14 @@ use Fleetbase\Models\Category;
 class AddonCategory extends Category
 {
     /**
-     * Relationships to auto load with driver
+     * Relationships to auto load with driver.
      *
      * @var array
      */
     protected $with = ['addons'];
 
     /**
-     * The key to use in the payload responses
-     *
-     * @var string
+     * The key to use in the payload responses.
      */
     protected string $payloadKey = 'addon_category';