From 846f613d29f132a81c558c267fac5c2e923b350f Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 20 Dec 2023 16:45:07 +0800
Subject: [PATCH] few patches and minor fixes for oss compatability

---
 .eslintrc.js                                  |   2 +-
 addon/components/schedule-manager.hbs         |   4 +--
 .../products/index/category/new.js            |   6 +++++
 addon/templates/networks/index/network.hbs    |   2 +-
 .../networks/index/network/stores.hbs         |   4 +--
 addon/templates/products/index/category.hbs   |  23 +++++++++++++++---
 .../templates/products/index/category/new.hbs |   2 +-
 assets/sounds/storefront_order_alert.mp3      | Bin 0 -> 18807 bytes
 package.json                                  |   1 +
 server/src/Http/Resources/Cart.php            |  10 +++++++-
 server/src/Http/Resources/Network.php         |   4 +++
 server/src/Http/Resources/Product.php         |   5 ++++
 server/src/Http/Resources/Store.php           |   4 +++
 13 files changed, 56 insertions(+), 11 deletions(-)
 create mode 100755 assets/sounds/storefront_order_alert.mp3

diff --git a/.eslintrc.js b/.eslintrc.js
index 45b88f5..4277237 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -32,7 +32,7 @@ module.exports = {
         'n/no-unpublished-require': [
             'error',
             {
-                allowModules: ['resolve', 'broccoli-funnel'],
+                allowModules: ['resolve', 'broccoli-funnel', 'broccoli-merge-trees'],
             },
         ],
     },
diff --git a/addon/components/schedule-manager.hbs b/addon/components/schedule-manager.hbs
index a51b4b0..8a41d10 100644
--- a/addon/components/schedule-manager.hbs
+++ b/addon/components/schedule-manager.hbs
@@ -2,9 +2,9 @@
     {{#each-in this.schedule as |day hours|}}
         <div class="content-panel {{@contentPanelClass}} shadow-sm">
             <div class="content-panel-header items-center {{@contentPanelHeaderClass}}">
-                <h4 class="font-semibold dark:text-gray-100">{{day}}</h4>
+                <h4 class="font-semibold text-sm dark:text-gray-100">{{day}}</h4>
                 <div>
-                    <Button @icon="calendar-week" @text="Add Hours" @onClick={{fn this.addHours @subject day}} class="{{@addHoursButtonClass}}" />
+                    <Button @icon="calendar-week" @text="Add Hours" @textClass="truncate text-xs" @size="sm" @onClick={{fn this.addHours @subject day}} class="{{@addHoursButtonClass}}" />
                 </div>
             </div>
             <div class="content-panel-body {{@contentPanelBodyClass}}">
diff --git a/addon/controllers/products/index/category/new.js b/addon/controllers/products/index/category/new.js
index d33f6e0..e6cb6e5 100644
--- a/addon/controllers/products/index/category/new.js
+++ b/addon/controllers/products/index/category/new.js
@@ -90,6 +90,12 @@ export default class ProductsIndexCategoryNewController extends BaseController {
     }
 
     @action queueFile(file) {
+        // since we have dropzone and upload button within dropzone validate the file state first
+        // as this method can be called twice from both functions
+        if (['queued', 'failed', 'timed_out', 'aborted'].indexOf(file.state) === -1) {
+            return;
+        }
+
         this.uploadQueue.pushObject(file);
         this.fetch.uploadFile.perform(
             file,
diff --git a/addon/templates/networks/index/network.hbs b/addon/templates/networks/index/network.hbs
index d159223..7e7ad4b 100644
--- a/addon/templates/networks/index/network.hbs
+++ b/addon/templates/networks/index/network.hbs
@@ -1,4 +1,4 @@
-<Overlay @position="right" @isResizable={{true}} @noBackdrop={{true}} @width="800px" @minResizeWidth={{700}} @fullHeight={{true}}>
+<Overlay @position="right" @isResizable={{true}} @noBackdrop={{true}} @width="570px" @minResizeWidth={{570}} @fullHeight={{true}}>
     <Overlay::Header @title="Manage Network" @onPressCancel={{this.transitionBack}} />
     <Overlay::Body class="p-0i" @increaseInnerBodyHeightBy="0" @wrapperClass="space-y-4 pt-4">
         <div class="flex flex-col">
diff --git a/addon/templates/networks/index/network/stores.hbs b/addon/templates/networks/index/network/stores.hbs
index 3321b6a..51de942 100644
--- a/addon/templates/networks/index/network/stores.hbs
+++ b/addon/templates/networks/index/network/stores.hbs
@@ -1,6 +1,6 @@
 <Layout::Section::Header @title="Stores" @searchQuery={{this.storeQuery}} @onSearch={{perform this.search}}>
-    <Button @type="primary" @icon="plus" @text="Add Stores" @onClick={{this.addStores}} @wrapperClass="mr-2" />
-    <Button @type="primary" @icon="envelope-open-text" @text="Invite Stores" @onClick={{this.invite}} />
+    <Button @type="primary" @icon="plus" @text="Add Stores" @textClass="truncate" @size="sm" @onClick={{this.addStores}} @wrapperClass="mr-2" />
+    <Button @type="primary" @icon="envelope-open-text" @textClass="truncate" @size="sm" @text="Invite Stores" @onClick={{this.invite}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>
diff --git a/addon/templates/products/index/category.hbs b/addon/templates/products/index/category.hbs
index 90982b0..01596fd 100644
--- a/addon/templates/products/index/category.hbs
+++ b/addon/templates/products/index/category.hbs
@@ -1,6 +1,23 @@
-<Layout::Section::Header @title={{concat this.category.name " Products"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <Button @type="default" @text="Edit this category" @icon="edit" @onClick={{fn this.editCategory this.category}} @disabled={{not this.category}} @wrapperClass="mr-2" />
-    <Button @type="danger" @text="Delete this category" @icon="trash" @onClick={{this.deleteCategory}} @disabled={{not this.category}} />
+<Layout::Section::Header @title={{concat this.category.name " Products"}} @titleClass="truncate" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    {{!-- <Button @type="default" @text="Edit this category" @textClass="truncate" @icon="edit" @onClick={{fn this.editCategory this.category}} @disabled={{not this.category}} @wrapperClass="mr-2" />
+    <Button @type="danger" @text="Delete this category" @textClass="truncate" @icon="trash" @onClick={{this.deleteCategory}} @disabled={{not this.category}} /> --}}
+
+    {{#if this.category}}
+        <DropdownButton @icon="gear" @text="Category" @type="default" @size="sm" @contentClass="dropdown-menu" as |dd|>
+            <div class="next-dd-menu">
+                <div class="px-1">
+                    <a href="#" class="next-dd-item" {{on "click" (dropdown-fn dd this.editCategory this.category)}}>
+                        Edit this category...
+                    </a>
+                </div>
+                <div class="px-1">
+                    <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.deleteCategory)}}>
+                        Delete this category...
+                    </a>
+                </div>
+            </div>
+        </DropdownButton>
+    {{/if}}
 </Layout::Section::Header>
 
 <div class="h-screen overflow-y-scroll p-6">
diff --git a/addon/templates/products/index/category/new.hbs b/addon/templates/products/index/category/new.hbs
index 6fa5af3..64bbee2 100644
--- a/addon/templates/products/index/category/new.hbs
+++ b/addon/templates/products/index/category/new.hbs
@@ -1,4 +1,4 @@
-<Overlay @position="right" @noBackdrop={{true}} @width="700px" @fullHeight={{true}} @containerClass="border-l border-transparent dark:border-gray-700">
+<Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @width="570px" @fullHeight={{true}} @containerClass="border-l border-transparent dark:border-gray-700">
     <Overlay::Header @title={{this.overlayTitle}} @titleClass="truncate" @titleWrapperClass="w-3/4" @headerLeftClass="w-70pc" @headerLeftInnerClass="w-full flex-1" @onPressCancel={{this.transitionBack}}>
         <Button @icon={{this.overlayActionButtonIcon}} @type="primary" @text={{this.overlayActionButtonTitle}} @onClick={{this.saveProduct}} @isLoading={{this.isSaving}} @isSubscriptionRequired={{true}} />
     </Overlay::Header>
diff --git a/assets/sounds/storefront_order_alert.mp3 b/assets/sounds/storefront_order_alert.mp3
new file mode 100755
index 0000000000000000000000000000000000000000..30c2a32f2d863fec7c1bf588acc4382df1f989e1
GIT binary patch
literal 18807
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
IYAYlJ02dB0(EtDd

literal 0
HcmV?d00001

diff --git a/package.json b/package.json
index 44280fa..2c692e9 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
     "broccoli-funnel": "^3.0.8",
+    "broccoli-merge-trees": "^4.2.0",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.6.3",
     "ember-classic-decorator": "^3.0.0",
diff --git a/server/src/Http/Resources/Cart.php b/server/src/Http/Resources/Cart.php
index 1a8d6c6..ed3f25c 100644
--- a/server/src/Http/Resources/Cart.php
+++ b/server/src/Http/Resources/Cart.php
@@ -3,6 +3,7 @@
 namespace Fleetbase\Storefront\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
 
 class Cart extends FleetbaseResource
 {
@@ -15,7 +16,14 @@ class Cart extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id' => $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),
+            'company_uuid' => $this->when(Http::isInternalRequest(), $this->company_uuid),
+            'user_uuid' => $this->when(Http::isInternalRequest(), $this->user_uuid),
+            'checkout_uuid' => $this->when(Http::isInternalRequest(), $this->checkout_uuid),
+            'checkout_uuid' => $this->when(Http::isInternalRequest(), $this->checkout_uuid),
+            'customer_id' => $this->customer_id,
             'currency' => $this->currency,
             'subtotal' => $this->subtotal,
             'total_items' => $this->total_items,
diff --git a/server/src/Http/Resources/Network.php b/server/src/Http/Resources/Network.php
index 957a122..40df270 100644
--- a/server/src/Http/Resources/Network.php
+++ b/server/src/Http/Resources/Network.php
@@ -20,6 +20,10 @@ public function toArray($request)
             '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 ?? [],
diff --git a/server/src/Http/Resources/Product.php b/server/src/Http/Resources/Product.php
index f57d4f0..93f243c 100644
--- a/server/src/Http/Resources/Product.php
+++ b/server/src/Http/Resources/Product.php
@@ -21,6 +21,11 @@ public function toArray($request)
             '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),
+            'store_uuid' => $this->when(Http::isInternalRequest(), $this->store_uuid),
+            'category_uuid' => $this->when(Http::isInternalRequest(), $this->category_uuid),
+            'created_by_uuid' => $this->when(Http::isInternalRequest(), $this->created_by_uuid),
+            'primary_image_uuid' => $this->when(Http::isInternalRequest(), $this->primary_image_uuid),
             'name' => $this->name,
             'description' => $this->description,
             'sku' => $this->sku,
diff --git a/server/src/Http/Resources/Store.php b/server/src/Http/Resources/Store.php
index 097ac7d..a1b2dfb 100644
--- a/server/src/Http/Resources/Store.php
+++ b/server/src/Http/Resources/Store.php
@@ -20,6 +20,10 @@ public function toArray($request)
             '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 ?? [],