@fleetbase/storefront-engine 0.2.4 → 0.2.6

package/server/src/Expansions/EntityExpansion.php

@@ -17,7 +17,7 @@ class EntityExpansion implements Expansion
     }
 
     /**
-     * Create a new Entity from a Storefront Product
+     * Create a new Entity from a Storefront Product.
      *
      * @return \Fleetbase\FleetOps\Models\Entity
      */
@@ -26,18 +26,18 @@ class EntityExpansion implements Expansion
         return static function (\Fleetbase\Storefront\Models\Product $product) {
             return new static([
                 'company_uuid' => session('company'),
-                'photo_uuid' => $product->primary_image_uuid,
-                'internal_id' => $product->public_id,
-                'name' => $product->name,
-                'description' => $product->description,
-                'currency' => $product->currency,
-                'sku' => $product->sku,
-                'price' => $product->price,
-                'sale_price' => $product->sale_price,
-                'meta' => [
+                'photo_uuid'   => $product->primary_image_uuid,
+                'internal_id'  => $product->public_id,
+                'name'         => $product->name,
+                'description'  => $product->description,
+                'currency'     => $product->currency,
+                'sku'          => $product->sku,
+                'price'        => $product->price,
+                'sale_price'   => $product->sale_price,
+                'meta'         => [
                     'product_id' => $product->public_id,
-                    'image_url' => $product->primary_image_url,
-                ]
+                    'image_url'  => $product->primary_image_url,
+                ],
             ]);
         };
     }

package/server/src/Expansions/OrderFilterExpansion.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Fleetbase\Storefront\Expansions;
+
+use Fleetbase\Build\Expansion;
+
+class OrderFilterExpansion implements Expansion
+{
+    /**
+     * Get the target class to expand.
+     *
+     * @return string|Class
+     */
+    public static function target()
+    {
+        return \Fleetbase\FleetOps\Http\Filter\OrderFilter::class;
+    }
+
+    /**
+     * Filter orders by the storefront id.
+     *
+     * @return \Closure
+     */
+    public function storefront()
+    {
+        return function (?string $storefront) {
+            /* @var \Fleetbase\FleetOps\Http\Filter\OrderFilter $this */
+            $this->builder->where('meta->storefront_id', $storefront);
+        };
+    }
+}

package/server/src/Expansions/VendorFilterExpansion.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Fleetbase\Storefront\Expansions;
+
+use Fleetbase\Build\Expansion;
+
+class VendorFilterExpansion implements Expansion
+{
+    /**
+     * Get the target class to expand.
+     *
+     * @return string|Class
+     */
+    public static function target()
+    {
+        return \Fleetbase\FleetOps\Http\Filter\VendorFilter::class;
+    }
+
+    /**
+     * Filter vendor's by their storefront order.
+     *
+     * @return \Closure
+     */
+    public function storefront()
+    {
+        return function (?string $storefront) {
+            /* @var \Fleetbase\FleetOps\Http\Filter\VendorFilter $this */
+            $this->builder->whereHas(
+                'customerOrders',
+                function ($query) use ($storefront) {
+                    $query->where('meta->storefront_id', $storefront);
+                }
+            );
+        };
+    }
+}

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

@@ -2,9 +2,9 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\FleetOps\Models\Contact;
 use Fleetbase\FleetOps\Models\Order;
+use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Storefront\Models\Store;
 use Illuminate\Http\Request;
 use Illuminate\Support\Carbon;
@@ -19,7 +19,6 @@ class ActionController extends Controller
     /**
      * Get the number of storefronts created.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function getStoreCount(Request $request)
@@ -32,21 +31,20 @@ class ActionController extends Controller
     /**
      * Get key metrics for storefront.
      *
-     * @param \Illuminate\Http\Request $request
      * @return \Illuminate\Http\Response
      */
     public function getMetrics(Request $request)
     {
         $store = $request->input('store');
         $start = $request->has('start') ? Carbon::fromString($request->input('start'))->toDateTimeString() : Carbon::now()->startOfMonth()->toDateTimeString();
-        $end = $request->has('end') ? Carbon::fromString($request->input('end'))->toDateTimeString() : Carbon::now()->toDateTimeString();
+        $end   = $request->has('end') ? Carbon::fromString($request->input('end'))->toDateTimeString() : Carbon::now()->toDateTimeString();
 
         // default metrics
         $metrics = [
-            'orders_count' => 0,
+            'orders_count'    => 0,
             'customers_count' => 0,
-            'stores_count' => 0,
-            'earnings_sum' => 0
+            'stores_count'    => 0,
+            'earnings_sum'    => 0,
         ];
 
         // get the current active store
@@ -60,7 +58,7 @@ class ActionController extends Controller
             return response()->json($metrics);
         }
 
-        /**
+        /*
          * Query metrics between given time period
          */
 
@@ -70,7 +68,7 @@ class ActionController extends Controller
         // - orders count
         $metrics['orders_count'] = Order::where([
             'company_uuid' => session('company'),
-            'type' => 'storefront'
+            'type'         => 'storefront',
         ])
             ->where('meta->storefront_id', $store->public_id)
             ->whereNotIn('status', ['canceled'])
@@ -79,7 +77,7 @@ class ActionController extends Controller
         // - customers count -- change to where has orders where meta->storefront_id === store
         $metrics['customers_count'] = Contact::where([
             'company_uuid' => session('company'),
-            'type' => 'customer'
+            'type'         => 'customer',
         ])->whereHas('customerOrders', function ($q) use ($start, $end, $store) {
             $q->whereBetween('created_at', [$start, $end]);
             $q->where('meta->storefront_id', $store->public_id);
@@ -93,7 +91,7 @@ class ActionController extends Controller
         // $metrics['earnings_sum'] = Transaction::where(['company_uuid' => session('company'), 'type' => 'storefront', 'meta->storefront_id' => $store->public_id])->whereBetween('created_at', [$start, $end])->sum('amount');
         $metrics['earnings_sum'] = Order::where([
             'company_uuid' => session('company'),
-            'type' => 'storefront'
+            'type'         => 'storefront',
         ])
             ->whereBetween('created_at', [$start, $end])
             ->where('meta->storefront_id', $store->public_id)

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class AddonCategoryController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class CustomerController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class GatewayController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,16 +2,16 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-use Fleetbase\Storefront\Support\Metrics;
 use Fleetbase\Http\Controllers\Controller;
+use Fleetbase\Storefront\Support\Metrics;
 use Illuminate\Http\Request;
 
 class MetricsController extends Controller
 {
     public function all(Request $request)
     {
-        $start = $request->date('start');
-        $end = $request->date('end');
+        $start    = $request->date('start');
+        $end      = $request->date('end');
         $discover = $request->array('discover', []);
 
         try {
@@ -25,10 +25,10 @@ class MetricsController extends Controller
 
     public function dashboard(Request $request)
     {
-        $start = $request->date('start');
-        $end = $request->date('end');
+        $start    = $request->date('start');
+        $end      = $request->date('end');
         $discover = $request->array('discover', []);
-        $metrics = [];
+        $metrics  = [];
 
         try {
             $metrics = Metrics::forCompany($request->user()->company, $start, $end)->with($discover)->get();
@@ -42,28 +42,28 @@ class MetricsController extends Controller
         // dashboard config
         $dashboardConfig = [
             [
-                'size' => 12,
-                'title' => 'Storefront Metrics',
-                'classList' => [],
-                'component' => null,
+                'size'        => 12,
+                'title'       => 'Storefront Metrics',
+                'classList'   => [],
+                'component'   => null,
                 'queryParams' => [
                     'start' => ['component' => 'date-picker'],
-                    'end' => ['component' => 'date-picker'],
+                    'end'   => ['component' => 'date-picker'],
                 ],
                 'widgets' => collect($metrics)
                     ->map(function ($value, $key) use ($metricsFormats) {
                         return [
                             'component' => 'count',
-                            'options' => [
+                            'options'   => [
                                 'format' => $metricsFormats[$key] ?? null,
-                                'title' => str_replace('_', ' ', \Illuminate\Support\Str::title($key)),
-                                'value' => $value
-                            ]
+                                'title'  => str_replace('_', ' ', \Illuminate\Support\Str::title($key)),
+                                'value'  => $value,
+                            ],
                         ];
                     })
                     ->values()
-                    ->toArray()
-            ]
+                    ->toArray(),
+            ],
         ];
 
         return response()->json(array_values($dashboardConfig));

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

@@ -2,21 +2,21 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
+use Fleetbase\FleetOps\Support\Utils;
+use Fleetbase\Models\Category;
+use Fleetbase\Models\Invite;
 use Fleetbase\Storefront\Http\Requests\AddStoreToNetworkCategory;
 use Fleetbase\Storefront\Http\Requests\NetworkActionRequest;
 use Fleetbase\Storefront\Mail\StorefrontNetworkInvite;
 use Fleetbase\Storefront\Models\Network;
 use Fleetbase\Storefront\Models\NetworkStore;
-use Fleetbase\Models\Category;
-use Fleetbase\Models\Invite;
-use Fleetbase\FleetOps\Support\Utils;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Str;
 
 class NetworkController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */
@@ -25,12 +25,11 @@ class NetworkController extends StorefrontController
     /**
      * Find network by public_id or invitation code.
      *
-     * @param string $id 
      * @return \Illuminate\Http\Response
      */
     public function findNetwork(string $id)
     {
-        $id = trim($id);
+        $id         = trim($id);
         $isPublicId = Str::startsWith($id, ['storefront_network_', 'network_']);
 
         if ($isPublicId) {
@@ -49,24 +48,22 @@ class NetworkController extends StorefrontController
     /**
      * Add stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function sendInvites(string $id, NetworkActionRequest $request)
     {
-        $network = Network::find($id);
+        $network    = Network::find($id);
         $recipients = $request->input('recipients', []);
 
         // create invitation
         $invitation = Invite::create([
-            'company_uuid' => session('company'),
+            'company_uuid'    => session('company'),
             'created_by_uuid' => session('user'),
-            'subject_uuid' => $network->uuid,
-            'subject_type' => Utils::getMutationType($network),
-            'protocol' => 'email',
-            'recipients' => $recipients,
-            'reason' => 'join_storefront_network'
+            'subject_uuid'    => $network->uuid,
+            'subject_type'    => Utils::getMutationType($network),
+            'protocol'        => 'email',
+            'recipients'      => $recipients,
+            'reason'          => 'join_storefront_network',
         ]);
 
         // make sure subject is set
@@ -82,15 +79,13 @@ class NetworkController extends StorefrontController
     /**
      * Add stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function addStores(string $id, NetworkActionRequest $request)
     {
         $network = Network::find($id);
-        $stores = collect($request->input('stores', []));
-        $remove = collect($request->input('remove', []));
+        $stores  = collect($request->input('stores', []));
+        $remove  = collect($request->input('remove', []));
 
         // firstOrCreate each
         foreach ($stores as $storeId) {
@@ -111,8 +106,6 @@ class NetworkController extends StorefrontController
     /**
      * Remove stores from a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function removeStores(string $id, NetworkActionRequest $request)
@@ -130,14 +123,12 @@ class NetworkController extends StorefrontController
     /**
      * Remove stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\AddStoreToNetworkCategory  $request
      * @return \Illuminate\Http\Response
      */
     public function addStoreToCategory(string $id, AddStoreToNetworkCategory $request)
     {
         $category = $request->input('category');
-        $store = $request->input('store');
+        $store    = $request->input('store');
 
         // get network store instance
         $networkStore = NetworkStore::where(['network_uuid' => $id, 'store_uuid' => $store])->first();
@@ -148,11 +139,10 @@ class NetworkController extends StorefrontController
 
         return response()->json(['status' => 'ok']);
     }
+
     /**
      * Remove stores to a network.
      *
-     * @param string $id 
-     * @param  \Fleetbase\Storefront\Http\Requests\NetworkActionRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function deleteCategory(string $id, NetworkActionRequest $request)

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

@@ -5,7 +5,7 @@ namespace Fleetbase\Storefront\Http\Controllers;
 class NotificationChannelController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,22 +2,22 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\FleetOps\Http\Controllers\Internal\v1\OrderController as FleetbaseOrderController;
+use Fleetbase\FleetOps\Models\Order;
 use Fleetbase\Storefront\Notifications\StorefrontOrderPreparing;
 use Illuminate\Http\Request;
 
 class OrderController extends FleetbaseOrderController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */
     public $resource = 'order';
 
     /**
-     * The filter to use
+     * The filter to use.
      *
      * @var \Fleetbase\Http\Filter\Filter
      */
@@ -26,7 +26,6 @@ class OrderController extends FleetbaseOrderController
     /**
      * Accept an order by incrementing status to preparing.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function acceptOrder(Request $request)
@@ -35,7 +34,7 @@ class OrderController extends FleetbaseOrderController
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to accept!'
+                'error' => 'No order to accept!',
             ], 400);
         }
 
@@ -45,27 +44,26 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 
     /**
      * Accept an order by incrementing status to preparing.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function markOrderAsReady(Request $request)
     {
-        $adhoc = $request->boolean('adhoc');
+        $adhoc  = $request->boolean('adhoc');
         $driver = $request->input('driver');
         /** @var \Fleetbase\Models\Order $order */
         $order = Order::where('uuid', $request->order)->whereNull('deleted_at')->with(['customer'])->first();
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to update!'
+                'error' => 'No order to update!',
             ], 400);
         }
 
@@ -74,8 +72,8 @@ class OrderController extends FleetbaseOrderController
 
             return response()->json([
                 'status' => 'ok',
-                'order' => $order->public_id,
-                'status' => $order->status
+                'order'  => $order->public_id,
+                'status' => $order->status,
             ]);
         }
 
@@ -94,15 +92,14 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 
     /**
      * Accept an order by incrementing status to preparing.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function markOrderAsCompleted(Request $request)
@@ -112,7 +109,7 @@ class OrderController extends FleetbaseOrderController
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to update!'
+                'error' => 'No order to update!',
             ], 400);
         }
 
@@ -121,15 +118,14 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 
     /**
      * Reject order and notify customer order is rejected/canceled.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function rejectOrder(Request $request)
@@ -138,7 +134,7 @@ class OrderController extends FleetbaseOrderController
 
         if (!$order) {
             return response()->json([
-                'error' => 'No order to cancel!'
+                'error' => 'No order to cancel!',
             ], 400);
         }
 
@@ -147,8 +143,8 @@ class OrderController extends FleetbaseOrderController
 
         return response()->json([
             'status' => 'ok',
-            'order' => $order->public_id,
-            'status' => $order->status
+            'order'  => $order->public_id,
+            'status' => $order->status,
         ]);
     }
 }

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

@@ -2,11 +2,10 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-
 class ProductAddonCategoryController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */

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

@@ -2,11 +2,10 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
-
 class ProductAddonController extends StorefrontController
 {
     /**
-     * The resource to query
+     * The resource to query.
      *
      * @var string
      */