From cd78448bb2d5875f9bc758d84a4dda604ae7e67e Mon Sep 17 00:00:00 2001
From: "Ronald A. Richardson" <me@ron.dev>
Date: Wed, 27 Nov 2024 10:06:58 +0800
Subject: [PATCH] patched addon category, added product status selection, other
 patches

---
 .stylelintrc.js                               |  5 ++++
 addon/components/modals/manage-addons.js      |  8 +++--
 .../products/index/category/new.js            |  3 +-
 addon/controllers/products/index/index.js     | 23 --------------
 addon/models/product-addon-category.js        |  3 ++
 addon/styles/storefront-engine.css            |  7 +++++
 .../templates/products/index/category/new.hbs |  5 +++-
 composer.json                                 |  2 +-
 extension.json                                |  2 +-
 package.json                                  |  2 +-
 .../Http/Controllers/ProductController.php    |  2 ++
 server/src/Models/AddonCategory.php           | 30 +++++++++----------
 server/src/Models/Product.php                 | 19 ++++++------
 server/src/Models/ProductAddonCategory.php    |  2 ++
 14 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/.stylelintrc.js b/.stylelintrc.js
index 62d4554..f1804fe 100644
--- a/.stylelintrc.js
+++ b/.stylelintrc.js
@@ -2,4 +2,9 @@
 
 module.exports = {
     extends: ['stylelint-config-standard', 'stylelint-prettier/recommended'],
+    rules: {
+        'selector-class-pattern': null,
+        'no-descending-specificity': null,
+        'color-function-notation': null,
+    },
 };
diff --git a/addon/components/modals/manage-addons.js b/addon/components/modals/manage-addons.js
index 6af7325..2b2e634 100644
--- a/addon/components/modals/manage-addons.js
+++ b/addon/components/modals/manage-addons.js
@@ -117,8 +117,12 @@ export default class ModalsManageAddonsComponent extends Component {
             owner_uuid: this.activeStore.id,
         });
 
-        yield category.save();
-        this.categories.pushObject(category);
+        try {
+            yield category.save();
+            this.categories.pushObject(category);
+        } catch (error) {
+            this.notifications.serverError(error);
+        }
     }
 
     /**
diff --git a/addon/controllers/products/index/category/new.js b/addon/controllers/products/index/category/new.js
index c8dd0f2..345971c 100644
--- a/addon/controllers/products/index/category/new.js
+++ b/addon/controllers/products/index/category/new.js
@@ -21,11 +21,12 @@ 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: [] });
+    @tracked product = this.store.createRecord('product', { store_uuid: this.activeStore.id, currency: this.activeStore.currency, tags: [], meta_array: [], status: 'published' });
     @tracked uploadQueue = [];
     @tracked uploadedFiles = [];
     @tracked primaryFile = null;
     @tracked isSaving = false;
+    @tracked statusOptions = ['published', 'draft'];
     abilityPermission = 'storefront create product';
 
     /** overlay options */
diff --git a/addon/controllers/products/index/index.js b/addon/controllers/products/index/index.js
index dddefe5..3c2bc09 100644
--- a/addon/controllers/products/index/index.js
+++ b/addon/controllers/products/index/index.js
@@ -7,32 +7,9 @@ import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';
 
 export default class ProductsIndexIndexController extends BaseController {
-    /**
-     * Inject the `filters` service
-     *
-     * @var {Service}
-     */
     @service filters;
-
-    /**
-     * Inject the `intl` service
-     *
-     * @var {Service}
-     */
     @service intl;
-
-    /**
-     * Inject the `currentUser` service
-     *
-     * @var {Service}
-     */
     @service currentUser;
-
-    /**
-     * Inject the `currentUser` service
-     *
-     * @var {Service}
-     */
     @service modalsManager;
 
     /**
diff --git a/addon/models/product-addon-category.js b/addon/models/product-addon-category.js
index f029a23..fa8c0a6 100644
--- a/addon/models/product-addon-category.js
+++ b/addon/models/product-addon-category.js
@@ -12,6 +12,8 @@ export default class ProductAddonCategoryModel extends Model {
 
     /** @attributes */
     @attr('string') name;
+    @attr('number') max_selectable;
+    @attr('boolean') is_required;
     @attr('raw') excluded_addons;
 
     /** @dates */
@@ -25,6 +27,7 @@ export default class ProductAddonCategoryModel extends Model {
             category_uuid: this.category_uuid,
             product_uuid: this.product_uuid,
             name: this.name,
+            max_selectable: this.max_selectable,
             excluded_addons: getWithDefault(this, 'excluded_addons', []),
             updated_at: this.updated_at,
             created_at: this.created_at,
diff --git a/addon/styles/storefront-engine.css b/addon/styles/storefront-engine.css
index 0796010..ba47bbd 100644
--- a/addon/styles/storefront-engine.css
+++ b/addon/styles/storefront-engine.css
@@ -4,3 +4,10 @@
 .ui-combo-box .selected-list a.combo-box-option.selected:hover {
     background-color: #76a9fa !important;
 }
+
+/** hotfix tag input */
+.emberTagInput.form-input {
+    flex-wrap: wrap !important;
+    gap: 0.35rem !important;
+    height: auto !important;
+}
diff --git a/addon/templates/products/index/category/new.hbs b/addon/templates/products/index/category/new.hbs
index 3295b7b..1328c22 100644
--- a/addon/templates/products/index/category/new.hbs
+++ b/addon/templates/products/index/category/new.hbs
@@ -23,6 +23,9 @@
             <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"
@@ -261,7 +264,7 @@
                                                 {{addon.description}}
                                             </div>
                                             <div class="col-span-2">
-                                                {{format-currency addon.price}}
+                                                {{format-currency addon.price this.product.currency}}
                                             </div>
                                         </div>
                                     {{/each}}
diff --git a/composer.json b/composer.json
index 25fcdf4..b397b99 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/storefront-api",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
diff --git a/extension.json b/extension.json
index 0f36dca..da1fbe9 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Storefront",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/storefront",
     "license": "AGPL-3.0-or-later",
diff --git a/package.json b/package.json
index ec3aa1a..98bda89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/storefront-engine",
-    "version": "0.3.17",
+    "version": "0.3.18",
     "description": "Headless Commerce & Marketplace Extension for Fleetbase",
     "fleetbase": {
         "route": "storefront",
diff --git a/server/src/Http/Controllers/ProductController.php b/server/src/Http/Controllers/ProductController.php
index b4df27e..d445527 100644
--- a/server/src/Http/Controllers/ProductController.php
+++ b/server/src/Http/Controllers/ProductController.php
@@ -41,6 +41,8 @@ public function updateRecord(Request $request, string $id)
                 $variants        = $request->array('product.variants');
                 $files           = $request->array('product.files');
 
+                // dd($addonCategories);
+
                 // save addon categories
                 $product->setAddonCategories($addonCategories);
 
diff --git a/server/src/Models/AddonCategory.php b/server/src/Models/AddonCategory.php
index e6e61d1..551297c 100644
--- a/server/src/Models/AddonCategory.php
+++ b/server/src/Models/AddonCategory.php
@@ -2,8 +2,8 @@
 
 namespace Fleetbase\Storefront\Models;
 
+use Fleetbase\Casts\Money as MoneyCast;
 use Fleetbase\Models\Category;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class AddonCategory extends Category
@@ -34,29 +34,27 @@ public function setAddons(array $addons = []): AddonCategory
             // get uuid if set
             $id = data_get($addon, 'uuid');
 
-            // make sure the cateogry is set to this current
-            data_set($addon, 'category_uuid', $this->uuid);
-
-            // make sure sale price is 0 if null
-            if (data_get($addon, 'sale_price') === null) {
-                data_set($addon, 'sale_price', 0);
-            }
+            // create an upsertable array
+            $upsertableProductAddon = [
+                'category_uuid'    => $this->uuid,
+                'name'             => data_get($addon, 'name'),
+                'description'      => data_get($addon, 'description'),
+                'translations'     => data_get($addon, 'translations', []),
+                'price'            => MoneyCast::apply($addon['price'] ?? 0),
+                'sale_price'       => MoneyCast::apply($addon['sale_price'] ?? 0),
+                'is_on_sale'       => data_get($addon, 'is_on_sale'),
+            ];
 
             // update product addon category
             if (Str::isUuid($id)) {
-                ProductAddon::where('uuid', $id)->update(Arr::except($addon, ['uuid', 'created_at', 'updated_at']));
+                ProductAddon::where('uuid', $id)->update($upsertableProductAddon);
                 continue;
             }
 
             // create new product addon category
             ProductAddon::create([
-                'category_uuid'    => $this->uuid,
-                'name'             => data_get($addon, 'name'),
-                'description'      => data_get($addon, 'description'),
-                'translations'     => data_get($addon, 'translations', []),
-                'price'            => data_get($addon, 'price'),
-                'sale_price'       => data_get($addon, 'sale_price'),
-                'is_on_sale'       => data_get($addon, 'is_on_sale'),
+                ...$upsertableProductAddon,
+                'created_by_uuid' => session('user'),
             ]);
         }
 
diff --git a/server/src/Models/Product.php b/server/src/Models/Product.php
index f209465..66ae52d 100644
--- a/server/src/Models/Product.php
+++ b/server/src/Models/Product.php
@@ -305,23 +305,22 @@ public function setAddonCategories(array $addonCategories = []): Product
             // get uuid if set
             $id = data_get($addonCategory, 'uuid');
 
-            // Make sure product is set
-            data_set($addonCategory, 'product_uuid', $this->uuid);
+            $upsertableAddonCategory = [
+                'product_uuid'    => $this->uuid,
+                'category_uuid'   => data_get($addonCategory, 'category_uuid'),
+                'excluded_addons' => data_get($addonCategory, 'excluded_addons'),
+                'max_selectable'  => data_get($addonCategory, 'max_selectable'),
+                'is_required'     => data_get($addonCategory, 'is_required'),
+            ];
 
             // update product addon category
             if (Str::isUuid($id)) {
-                ProductAddonCategory::where('uuid', $id)->update(Arr::except($addonCategory, ['uuid', 'created_at', 'updated_at', 'name', 'category']));
+                ProductAddonCategory::where('uuid', $id)->update($upsertableAddonCategory);
                 continue;
             }
 
             // create new product addon category
-            ProductAddonCategory::create([
-                'product_uuid'    => $this->uuid,
-                'category_uuid'   => data_get($addonCategory, 'category_uuid'),
-                'excluded_addons' => data_get($addonCategory, 'excluded_addons'),
-                'max_selectable'  => data_get($addonCategory, 'max_selectable'),
-                'is_required'     => data_get($addonCategory, 'is_required'),
-            ]);
+            ProductAddonCategory::create($upsertableAddonCategory);
         }
 
         return $this;
diff --git a/server/src/Models/ProductAddonCategory.php b/server/src/Models/ProductAddonCategory.php
index 58d3d35..46584b0 100644
--- a/server/src/Models/ProductAddonCategory.php
+++ b/server/src/Models/ProductAddonCategory.php
@@ -35,6 +35,7 @@ class ProductAddonCategory extends StorefrontModel
         'category_uuid',
         'excluded_addons',
         'max_selectable',
+        'is_required',
     ];
 
     /**
@@ -44,6 +45,7 @@ class ProductAddonCategory extends StorefrontModel
      */
     protected $casts = [
         'excluded_addons' => Json::class,
+        'is_required'     => 'boolean',
     ];
 
     /**