@fleetbase/storefront-engine 0.4.1 → 0.4.3

package/addon/components/widget/orders.hbs

@@ -25,7 +25,7 @@
         @titleStatusRight={{this.orders.length}}
         @titleStatuRightClass="info-status-badge"
         @hideStatusDot={{true}}
-        @open={{gt this.orders.length 0}}
+        @open={{true}}
         @isLoading={{this.loadOrders.isRunning}}
         @pad={{false}}
         @wrapperClass={{@wrapperClass}}

package/addon/controllers/products/index/category/new.js

@@ -21,7 +21,14 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @service crud;
     @service hostRouter;
     @alias('storefront.activeStore') activeStore;
-    @tracked product = this.store.createRecord('product', { store_uuid: this.activeStore.id, currency: this.activeStore.currency, tags: [], meta_array: [], status: 'published' });
+    @tracked product = this.store.createRecord('product', {
+        store_uuid: this.activeStore.id,
+        currency: this.activeStore.currency,
+        tags: [],
+        meta_array: [],
+        category: this.category,
+        status: 'published',
+    });
     @tracked uploadQueue = [];
     @tracked uploadedFiles = [];
     @tracked primaryFile = null;
@@ -29,6 +36,10 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @tracked statusOptions = ['published', 'draft'];
     abilityPermission = 'storefront create product';
 
+    get category() {
+        return this.productsIndexCategoryController?.category ?? null;
+    }
+
     /** overlay options */
     @tracked overlayTitle = 'New Product';
     @tracked overlayActionButtonTitle = 'Create Product';
@@ -47,7 +58,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     @tracked acceptedFileTypes = ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'video/mp4', 'video/quicktime', 'video/x-msvideo', 'video/x-flv', 'video/x-ms-wmv'];
 
     @action reset() {
-        this.product = this.store.createRecord('product', { store_uuid: this.activeStore.id, currency: this.activeStore.currency });
+        this.product = this.store.createRecord('product', { store_uuid: this.activeStore.id, category: this.category, currency: this.activeStore.currency });
         this.uploadQueue = [];
         this.uploadedFiles = [];
     }

package/addon/controllers/settings/notifications.js

@@ -12,6 +12,7 @@ export default class SettingsNotificationsController extends Controller {
     @service intl;
     @service crud;
     @service storefront;
+    @service hostRouter;
     @alias('storefront.activeStore') activeStore;
 
     @action createChannel() {

package/addon/templates/home.hbs

@@ -2,7 +2,7 @@
 
 <Layout::Section::Body class="space-y-4 h-full overflow-y-scroll" @padded={{true}}>
     <Widget::StorefrontMetrics />
-    <Widget::Orders />
-    <Widget::Customers />
+    <Widget::Orders @wrapperClass="bordered-classic" />
+    <Widget::Customers @wrapperClass="bordered-classic" />
     <Spacer @height="300px" />
 </Layout::Section::Body>

package/addon/templates/networks/index/network/index.hbs

@@ -1,5 +1,5 @@
-<div class="space-y-4 px-6 py-4">
-    <ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-title"}} @open={{true}} @pad={{true}}>
+<div class="space-y-2">
+    <ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-title"}} @open={{true}} @pad={{false}} @wrapperClass="bordered-top">
         <div class="space-y-4">
             <div>
                 <h1 class="text-lg leading-6 font-bold text-gray-900 dark:text-gray-100">
@@ -39,7 +39,7 @@
                 />
             </InputGroup>
 
-            <ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-form.contact-social-panel.panel-title"}} @open={{false}} @pad={{true}}>
+            <ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-form.contact-social-panel.panel-title"}} @open={{false}} @pad={{false}} @wrapperClass="bordered-top">
                 <InputGroup @name={{t "storefront.networks.index.network.index.general-network-settings-form.contact-social-panel.phone"}}>
                     <PhoneInput @value={{@model.phone}} @onInput={{fn (mut @model.phone)}} class="form-input w-full" />
                 </InputGroup>
@@ -75,7 +75,7 @@
                 />
             </ContentPanel>
 
-            <ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-form.logo-backdrop-panel.panel-title"}} @open={{false}} @pad={{true}}>
+            <ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-form.logo-backdrop-panel.panel-title"}} @open={{false}} @pad={{false}} @wrapperClass="bordered-top">
                 <InputGroup
                     @name={{t "storefront.networks.index.network.index.general-network-settings-form.logo-backdrop-panel.logo-label"}}
                     @helpText={{t "storefront.networks.index.network.index.general-network-settings-form.logo-backdrop-panel.logo-help-text"}}
@@ -268,7 +268,7 @@
         </div>
     </ContentPanel>
 
-    <ContentPanel @title={{t "storefront.networks.index.network.index.api-panel.panel-title"}} @open={{false}} @pad={{true}}>
+    <ContentPanel @title={{t "storefront.networks.index.network.index.api-panel.panel-title"}} @open={{false}} @pad={{false}} @wrapperClass="bordered-top">
         <div class="space-y-6">
             <div>
                 <h1 class="text-lg leading-6 font-bold text-gray-900 dark:text-gray-100">
@@ -288,7 +288,7 @@
         </div>
     </ContentPanel>
 
-    <ContentPanel @title={{t "storefront.networks.index.network.index.payment-gateways-panel.panel-title"}} @open={{false}} @pad={{true}}>
+    <ContentPanel @title={{t "storefront.networks.index.network.index.payment-gateways-panel.panel-title"}} @open={{false}} @pad={{false}} @wrapperClass="bordered-top">
         <div class="space-y-6">
             <div class="flex justify-between">
                 <div>
@@ -311,7 +311,7 @@
             </div>
 
             {{#each this.gateways as |gateway|}}
-                <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{true}}>
+                <ContentPanel @title={{gateway.name}} @open={{true}} @pad={{false}} @wrapperClass="bordered-top">
                     <InputGroup
                         @name={{t "storefront.networks.index.network.index.payment-gateways-panel.gateway-form.name"}}
                         @value={{gateway.name}}
@@ -368,7 +368,7 @@
         </div>
     </ContentPanel>
 
-    <ContentPanel @title={{t "storefront.networks.index.network.index.notification-channels-panel.panel-title"}} @open={{false}} @pad={{true}}>
+    <ContentPanel @title={{t "storefront.networks.index.network.index.notification-channels-panel.panel-title"}} @open={{false}} @pad={{false}} @wrapperClass="bordered-top">
         <div class="space-y-6">
             <div class="flex justify-between">
                 <div class="w-3/4">

package/addon/templates/products/index/category/new.hbs

@@ -7,79 +7,100 @@
         @headerLeftInnerClass="w-full flex-1"
         @onPressCancel={{this.transitionBack}}
     >
-        <Button
-            @icon={{this.overlayActionButtonIcon}}
-            @type="primary"
-            @text={{this.overlayActionButtonTitle}}
-            @onClick={{perform this.saveProduct}}
-            @isLoading={{not this.saveProduct.isIdle}}
-            @permission={{this.abilityPermission}}
-        />
+        <:actions>
+            <Button
+                @icon={{this.overlayActionButtonIcon}}
+                @type="primary"
+                @text={{this.overlayActionButtonTitle}}
+                @onClick={{perform this.saveProduct}}
+                @isLoading={{not this.saveProduct.isIdle}}
+                @permission={{this.abilityPermission}}
+            />
+        </:actions>
     </Overlay::Header>
 
-    <Overlay::Body @increaseInnerBodyHeightBy="0" @wrapperClass="new-order-overlay-body px-4 space-y-4 pt-4">
+    <Overlay::Body>
         {{#let (cannot this.abilityPermission) as |unauthorized|}}
-            <InputGroup @name="Product Name" @value={{this.product.name}} @helpText="Enter your product's name" @disabled={{unauthorized}} />
-            <InputGroup @name="Product Description" @helpText="Enter a description of your product">
-                <Textarea @value={{this.product.description}} class="form-input w-full" placeholder="Enter a description of your product...." disabled={{unauthorized}} rows={{4}} />
-            </InputGroup>
-            <InputGroup @name="Product Status">
-                <Select
-                    class="w-full"
-                    @value={{this.product.status}}
-                    @placeholder="Select product status"
-                    @options={{this.statusOptions}}
-                    @onSelect={{fn (mut this.product.status)}}
-                    @humanize={{true}}
-                />
-            </InputGroup>
-            <InputGroup @name="Product Tags">
-                <TagInput
-                    class="form-input"
-                    @placeholder="Add tags"
-                    @allowSpacesInTags={{true}}
-                    @tags={{this.product.tags}}
-                    @addTag={{this.addTag}}
-                    @removeTagAtIndex={{this.removeTag}}
-                    @disabled={{unauthorized}}
-                    as |tag|
-                >
-                    {{tag}}
-                </TagInput>
-            </InputGroup>
-            <InputGroup @name="Product SKU" @value={{this.product.sku}} @helpText="Enter product SKU if applicable" @disabled={{unauthorized}} />
-            <div class="grid grid-cols-2 gap-2">
-                <InputGroup @name="Price" @helpText="Enter a price users will pay to purchase this product">
-                    <MoneyInput
+            <ContentPanel @title={{t "common.details"}} @open={{true}} @wrapperClass="bordered-top">
+                <InputGroup @name="Product Name" @value={{this.product.name}} @helpText="Enter your product's name" @disabled={{unauthorized}} />
+                <InputGroup @name="Product Description" @helpText="Enter a description of your product">
+                    <Textarea @value={{this.product.description}} class="form-input w-full" placeholder="Enter a description of your product...." disabled={{unauthorized}} rows={{4}} />
+                </InputGroup>
+                <InputGroup @name="Product Category">
+                    <ModelSelect
+                        @modelName="category"
+                        @selectedModel={{this.product.category}}
+                        @query={{hash for="storefront_product" owner_uuid=this.activeStore.id}}
+                        @placeholder="Select Product Category"
+                        @triggerClass="form-select form-input"
+                        @infiniteScroll={{false}}
+                        @renderInPlace={{true}}
+                        @allowClear={{true}}
+                        @onChange={{fn (mut this.product.category)}}
+                        @onChangeId={{fn (mut this.product.category_uuid)}}
+                        as |model|
+                    >
+                        <div class="flex items-center">
+                            <span class="uppercase">
+                                {{model.name}}
+                            </span>
+                        </div>
+                    </ModelSelect>
+                </InputGroup>
+                <InputGroup @name="Product Status">
+                    <Select
                         class="w-full"
-                        @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
-                        @value={{this.product.price}}
-                        @canSelectCurrency={{false}}
-                        @onCurrencyChange={{fn (mut this.product.currency)}}
-                        @disabled={{unauthorized}}
+                        @value={{this.product.status}}
+                        @placeholder="Select product status"
+                        @options={{this.statusOptions}}
+                        @onSelect={{fn (mut this.product.status)}}
+                        @humanize={{true}}
                     />
                 </InputGroup>
-                <InputGroup @name="Sale Price" @helpText="Optionally add a sale price for the product if the product is put on sale">
-                    <MoneyInput
-                        class="w-full"
-                        @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
-                        @value={{this.product.sale_price}}
-                        @canSelectCurrency={{false}}
-                        @onCurrencyChange={{fn (mut this.product.currency)}}
+                <InputGroup @name="Product Tags">
+                    <TagInput
+                        class="form-input"
+                        @placeholder="Add tags"
+                        @allowSpacesInTags={{true}}
+                        @tags={{this.product.tags}}
+                        @addTag={{this.addTag}}
+                        @removeTagAtIndex={{this.removeTag}}
                         @disabled={{unauthorized}}
-                    />
+                        as |tag|
+                    >
+                        {{tag}}
+                    </TagInput>
                 </InputGroup>
-            </div>
+                <InputGroup @name="Product SKU" @value={{this.product.sku}} @helpText="Enter product SKU if applicable" @disabled={{unauthorized}} />
+                <div class="grid grid-cols-2 gap-2">
+                    <InputGroup @name="Price" @helpText="Enter a price users will pay to purchase this product">
+                        <MoneyInput
+                            class="w-full"
+                            @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
+                            @value={{this.product.price}}
+                            @canSelectCurrency={{false}}
+                            @onCurrencyChange={{fn (mut this.product.currency)}}
+                            @disabled={{unauthorized}}
+                        />
+                    </InputGroup>
+                    <InputGroup @name="Sale Price" @helpText="Optionally add a sale price for the product if the product is put on sale">
+                        <MoneyInput
+                            class="w-full"
+                            @currency={{if this.product.currency this.product.currency this.activeStore.currency}}
+                            @value={{this.product.sale_price}}
+                            @canSelectCurrency={{false}}
+                            @onCurrencyChange={{fn (mut this.product.currency)}}
+                            @disabled={{unauthorized}}
+                        />
+                    </InputGroup>
+                </div>
+            </ContentPanel>
 
-            <ContentPanel
-                @title="Metadata"
-                @open={{this.product.meta_array.length}}
-                @actionButtons={{this.metadataButtons}}
-                @pad={{true}}
-                @panelBodyWrapperClass="px-0 py-4"
-                @panelBodyClass="bg-white dark:bg-gray-800"
-            >
-                {{#each this.product.meta_array as |metaField index|}}
+            <ContentPanel @title={{t "common.metadata"}} @open={{true}} @wrapperClass="bordered-top">
+                <div>
+                    <MetadataEditor @value={{this.product.meta}} @onChange={{fn (mut this.product.meta)}} />
+                </div>
+                {{!-- {{#each this.product.meta_array as |metaField index|}}
                     <div class="px-4 py-3 border-b border-gray-200 dark:border-gray-700">
                         <div class="input-group">
                             <div class="flex justify-between items-center mb-1">
@@ -97,7 +118,7 @@
                             <Input class="w-full form-input" @value={{metaField.value}} placeholder={{metaField.label}} disabled={{unauthorized}} />
                         </div>
                     </div>
-                {{/each}}
+                {{/each}} --}}
             </ContentPanel>
 
             <InputGroup>
@@ -143,11 +164,9 @@
                 </div>
             </div>
 
-            <ContentPanel @title="Variants" @open={{true}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
-                <div class="content-panel-body p-4">
-                    <div class="flex items-center justify-end">
-                        <Button @text="New Variant" @icon="plus" @iconPrefix="fas" @onClick={{this.createProductVariant}} @permission="storefront create product-variant" />
-                    </div>
+            <ContentPanel @title="Variants" @open={{true}} @wrapperClass="bordered-top">
+                <div class="flex items-center justify-end">
+                    <Button @text="New Variant" @icon="plus" @iconPrefix="fas" @onClick={{this.createProductVariant}} @permission="storefront create product-variant" />
                 </div>
                 <Tabs class="overlay-content-panel" as |Tab|>
                     {{#each this.product.variants as |variant|}}
@@ -224,78 +243,74 @@
                 </Tabs>
             </ContentPanel>
 
-            <ContentPanel @title="Add-Ons" @open={{true}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
-                <div class="px-4">
-                    <div class="flex items-center justify-end mb-3">
-                        <Button
-                            @text="Select Addon Categories"
-                            @icon="plus"
-                            @iconPrefix="fas"
-                            @onClick={{perform this.promptSelectAddonCategories}}
-                            @permission="storefront list product-addon"
-                        />
-                    </div>
-                    <div class="space-y-2">
-                        {{#each this.product.addon_categories as |addonCategory index|}}
-                            <div>
-                                <div class="flex items-center rounded-md shadow-sm px-3 py-2 font-semibold bg-gray-200 dark:bg-gray-900 dark:text-gray-100 mb-2">
-                                    <div class="flex-1 flex items-center">
-                                        <FaIcon @icon="pencil" class="mr-1 dark:text-gray-100" />
-                                        <div class="w-full px-2 m-0 border-none bg-transparent dark:text-gray-100">
-                                            {{addonCategory.name}}
-                                        </div>
-                                    </div>
-                                    <div class="flex items-center">
-                                        <a
-                                            href="javascript:;"
-                                            class="destroy-action opacity-50 hover:opacity-100 text-sm"
-                                            {{on "click" (fn this.removeAddonCategory index)}}
-                                            disabled={{cannot "storefront delete product-addon"}}
-                                        >Remove</a>
+            <ContentPanel @title="Add-Ons" @open={{true}} @wrapperClass="bordered-top">
+                <div class="flex items-center justify-end mb-2">
+                    <Button
+                        @text="Select Addon Categories"
+                        @icon="plus"
+                        @iconPrefix="fas"
+                        @onClick={{perform this.promptSelectAddonCategories}}
+                        @permission="storefront list product-addon"
+                    />
+                </div>
+                <div class="space-y-2">
+                    {{#each this.product.addon_categories as |addonCategory index|}}
+                        <div>
+                            <div class="flex items-center rounded-md shadow-sm px-3 py-2 font-semibold bg-gray-200 dark:bg-gray-900 dark:text-gray-100 mb-2">
+                                <div class="flex-1 flex items-center">
+                                    <FaIcon @icon="pencil" class="mr-1 dark:text-gray-100" />
+                                    <div class="w-full px-2 m-0 border-none bg-transparent dark:text-gray-100">
+                                        {{addonCategory.name}}
                                     </div>
                                 </div>
-                                <div class="space-y-2 mb-2">
-                                    {{#each addonCategory.category.addons as |addon|}}
-                                        <div class="grid grid-cols-10 gap-1 px-3 py-2 rounded-md border border-gray-200 dark:border-gray-900 dark:text-gray-100 dark:bg-gray-800 bg-gray-200">
-                                            <div class="flex items-center">
-                                                <Checkbox
-                                                    @value={{not (in-array addon.id addonCategory.excluded_addons)}}
-                                                    @onToggle={{fn this.excludeAddon index addon}}
-                                                    disabled={{cannot "storefront update product-addon"}}
-                                                />
-                                            </div>
-                                            <div class="col-span-3 flex items-center">
-                                                {{addon.name}}
-                                            </div>
-                                            <div class="col-span-4">
-                                                {{addon.description}}
-                                            </div>
-                                            <div class="col-span-2">
-                                                {{format-currency addon.price this.product.currency}}
-                                            </div>
-                                        </div>
-                                    {{/each}}
+                                <div class="flex items-center">
+                                    <a
+                                        href="javascript:;"
+                                        class="destroy-action opacity-50 hover:opacity-100 text-sm"
+                                        {{on "click" (fn this.removeAddonCategory index)}}
+                                        disabled={{cannot "storefront delete product-addon"}}
+                                    >Remove</a>
                                 </div>
                             </div>
-                        {{/each}}
-                    </div>
+                            <div class="space-y-2 mb-2">
+                                {{#each addonCategory.category.addons as |addon|}}
+                                    <div class="grid grid-cols-10 gap-1 px-3 py-2 rounded-md border border-gray-200 dark:border-gray-900 dark:text-gray-100 dark:bg-gray-800 bg-gray-200">
+                                        <div class="flex items-center">
+                                            <Checkbox
+                                                @value={{not (in-array addon.id addonCategory.excluded_addons)}}
+                                                @onToggle={{fn this.excludeAddon index addon}}
+                                                disabled={{cannot "storefront update product-addon"}}
+                                            />
+                                        </div>
+                                        <div class="col-span-3 flex items-center">
+                                            {{addon.name}}
+                                        </div>
+                                        <div class="col-span-4">
+                                            {{addon.description}}
+                                        </div>
+                                        <div class="col-span-2">
+                                            {{format-currency addon.price this.product.currency}}
+                                        </div>
+                                    </div>
+                                {{/each}}
+                            </div>
+                        </div>
+                    {{/each}}
                 </div>
             </ContentPanel>
 
-            <ContentPanel @title="Availability" @open={{this.product.hours.length}} @pad={{false}} @panelBodyClass="bg-white dark:bg-gray-800">
-                <div class="p-2">
-                    <ScheduleManager
-                        @subject={{this.product}}
-                        @subjectKey="product_uuid"
-                        @hourModelType="product-hour"
-                        @disabled={{unauthorized}}
-                        class="grid grid-cols-1 gap-4 lg:grid-cols-2 lg:gap-2"
-                    />
-                </div>
+            <ContentPanel @title="Availability" @open={{true}} @wrapperClass="bordered-top">
+                <ScheduleManager
+                    @subject={{this.product}}
+                    @subjectKey="product_uuid"
+                    @hourModelType="product-hour"
+                    @disabled={{unauthorized}}
+                    class="grid grid-cols-1 gap-4 lg:grid-cols-2 lg:gap-2"
+                />
             </ContentPanel>
 
-            <ContentPanel @title="Images & Videos" @open={{this.product.files.length}} @pad={{false}} @panelBodyWrapperClass="px-0 py-4" @panelBodyClass="bg-white dark:bg-gray-800">
-                <div class="px-6 space-y-4">
+            <ContentPanel @title="Images & Videos" @open={{true}} @wrapperClass="bordered-top">
+                <div class="space-y-2">
                     {{#if this.isUploading}}
                         <div
                             class="min-h-56 dropzone w-full rounded-lg px-4 py-8 min-h bg-gray-50 dark:bg-gray-900 bg-opacity-25 text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500"
@@ -382,7 +397,7 @@
                 </div>
             </ContentPanel>
 
-            <ContentPanel @title="Youtube Videos" @open={{this.product.youtube_urls.length}} @wrapperClass="mb-12" @panelBodyWrapperClass="p-4" @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title="Youtube Videos" @open={{true}} @wrapperClass="bordered-top">
                 <p class="text-sm">Add YouTube video urls to assosciate with this product or service.</p>
                 <div class="input-group">
                     <ArrayInput @data={{this.product.youtube_urls}} @placeholder="Enter youtube video url" @onDataChanged={{fn (mut this.product.youtube_urls)}} @disabled={{unauthorized}}>

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.4.1",
+    "version": "0.4.3",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
@@ -44,9 +44,9 @@
     },
     "dependencies": {
         "@babel/core": "^7.23.2",
-        "@fleetbase/ember-core": "latest",
-        "@fleetbase/ember-ui": "latest",
-        "@fleetbase/fleetops-data": "^0.1.19",
+        "@fleetbase/ember-core": "^0.3.4",
+        "@fleetbase/ember-ui": "^0.3.6",
+        "@fleetbase/fleetops-data": "^0.1.20",
         "@fortawesome/ember-fontawesome": "^2.0.0",
         "@fortawesome/fontawesome-svg-core": "6.4.0",
         "@fortawesome/free-brands-svg-icons": "6.4.0",

package/server/src/Console/Commands/MigrateStripeSandboxCustomers.php

@@ -6,6 +6,9 @@ use Fleetbase\Storefront\Models\Customer;
 use Fleetbase\Storefront\Models\Gateway;
 use Fleetbase\Storefront\Models\Store;
 use Illuminate\Console\Command;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Session;
 use Stripe\Customer as StripeCustomer;
 use Stripe\Exception\InvalidRequestException;
 use Stripe\Stripe;
@@ -30,6 +33,7 @@ class MigrateStripeSandboxCustomers extends Command
         $dryRun     = $this->option('dry-run');
         $storeInput = $this->option('store');
 
+        $this->startSession();
         $this->info('Starting Stripe customer migration...');
 
         // If a single store is specified, load that store by UUID or public_id.
@@ -147,4 +151,15 @@ class MigrateStripeSandboxCustomers extends Command
 
         return Command::SUCCESS;
     }
+
+    private function startSession()
+    {
+        if (!App::bound('request')) {
+            App::instance('request', Request::create('/'));
+        }
+        if (!Session::isStarted()) {
+            Session::start();
+            request()->setLaravelSession(Session::getFacadeRoot());
+        }
+    }
 }

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

@@ -2,6 +2,8 @@
 
 namespace Fleetbase\Storefront\Http\Controllers;
 
+use Illuminate\Database\Eloquent\Builder;
+
 class FoodTruckController extends StorefrontController
 {
     /**
@@ -10,4 +12,12 @@ class FoodTruckController extends StorefrontController
      * @var string
      */
     public $resource = 'food_truck';
+
+    /**
+     * Additional query hook.
+     */
+    public function onQueryRecord(Builder $builder)
+    {
+        $builder->with(['vehicle']);
+    }
 }

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

@@ -901,13 +901,22 @@ 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 = [
+            ...$orderInput,
             'company_uuid'      => $store->company_uuid ?? session('company'),
             'payload_uuid'      => $payload->uuid,
             'customer_uuid'     => $customer->uuid,
@@ -933,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);
 

package/server/src/Http/Filter/FoodTruckFilter.php

@@ -12,6 +12,12 @@ class FoodTruckFilter extends FleetOpsOrderFilter
         $this->builder->where('company_uuid', $this->session->get('company'));
     }
 
+    public function queryForPublic()
+    {
+        $this->builder->where('company_uuid', $this->session->get('company'));
+        $this->builder->whereHas('vehicle');
+    }
+
     public function storefront($storefront)
     {
         $this->builder->whereHas(
@@ -34,4 +40,9 @@ class FoodTruckFilter extends FleetOpsOrderFilter
 
         $this->builder->whereIn('service_area_uuid', $matchingServiceAreaIds);
     }
+
+    public function withDeleted()
+    {
+        $this->builder->withTrashed();
+    }
 }

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,