From 2a959e98073303b07c47d66960bf13a1a94c1e88 Mon Sep 17 00:00:00 2001
From: TemuulenBM <temuulen.developer@gmail.com>
Date: Wed, 6 Dec 2023 17:58:40 +0800
Subject: [PATCH] completed Product,Sales and Purchases page

---
 addon/components/inventory-form-panel.hbs     |  5 ++-
 addon/components/inventory-form-panel.js      | 11 +++--
 addon/components/inventory-panel/details.hbs  |  8 ++++
 addon/components/product-panel.js             | 10 ++++-
 .../components/purchase-order-form-panel.hbs  | 25 +++++++++--
 addon/components/purchase-order-form-panel.js | 12 +++---
 .../purchase-order-panel/details.hbs          | 28 +------------
 addon/components/sales-order-form-panel.hbs   |  8 ++--
 addon/components/sales-order-form-panel.js    |  8 ++++
 addon/components/supplier-form-panel.hbs      |  2 +-
 addon/controllers/products/index.js           | 12 ++----
 addon/controllers/purchase-orders/index.js    |  2 +-
 .../controllers/purchase-orders/index/new.js  |  2 +-
 addon/controllers/sales-orders/index.js       |  5 +--
 addon/controllers/sales-orders/index/new.js   |  2 +-
 addon/models/inventory.js                     | 30 ++++++++++++++
 addon/models/purchase-order.js                | 34 ++++++++++++---
 addon/models/sales-order.js                   | 30 ++++++++++++++
 addon/routes/inventory/index.js               |  2 +-
 addon/routes/products/index/details.js        |  2 +-
 addon/routes/sales-orders/index.js            |  1 -
 addon/serializers/pallet-product.js           | 11 +++++
 addon/serializers/purchase-order.js           | 13 +++++-
 ..._manufactured_date_column_on_inventory.php | 30 ++++++++++++++
 .../Http/Controllers/InventoryController.php  |  8 ++--
 .../Controllers/PurchaseOrderController.php   | 41 +++++++++++++++++++
 .../Http/Controllers/SalesOrderController.php | 41 +++++++++++++++++++
 server/src/Http/Resources/IndexInventory.php  |  2 +
 server/src/Http/Resources/Inventory.php       | 33 ++++++++-------
 server/src/Http/Resources/PurchaseOrder.php   | 37 +++++++++++++++++
 server/src/Http/Resources/SalesOrder.php      |  2 +-
 server/src/Models/Inventory.php               | 26 ++++++++++++
 server/src/Models/PurchaseOrder.php           | 21 ++++++++--
 server/src/Models/SalesOrder.php              | 24 ++++++++++-
 34 files changed, 435 insertions(+), 93 deletions(-)
 create mode 100644 server/migrations/2023_12_06_090936_add_manufactured_date_column_on_inventory.php
 create mode 100644 server/src/Http/Resources/PurchaseOrder.php

diff --git a/addon/components/inventory-form-panel.hbs b/addon/components/inventory-form-panel.hbs
index d00f7a8d..a30bc745 100644
--- a/addon/components/inventory-form-panel.hbs
+++ b/addon/components/inventory-form-panel.hbs
@@ -95,8 +95,9 @@
             </ContentPanel>
             <ContentPanel @title="Batch" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <InputGroup @name="Batch Number" @type="text" @value={{this.inventory.batch.batch_number}} />
-                <InputGroup @name="Expiry Date" @type="date" @value={{this.inventory.batch.expiry_date_at}} />
-                <InputGroup @name="Manufactured Date" @type="date" @value={{this.inventory.batch.manufacture_date_at}} />
+                <InputGroup @name="Expiry Date">
+                    <input value={{this.inventory.expiryDate}} type="date" class="form-input w-full" {{on "change" this.setExpiryDate}} />
+                </InputGroup>
             </ContentPanel>
         </div>
     </Overlay::Body>
diff --git a/addon/components/inventory-form-panel.js b/addon/components/inventory-form-panel.js
index 4db412a3..ea8c63b3 100644
--- a/addon/components/inventory-form-panel.js
+++ b/addon/components/inventory-form-panel.js
@@ -152,13 +152,18 @@ export default class InventoryFormPanelComponent extends Component {
     @action setDefaultBatchValues() {
         const currentDate = new Date().toISOString().split('T')[0];
 
-        // unlikely to need but incase batch isn't initialized, do it here
         if (!this.inventory.batch) {
             this.inventory.batch = this.store.createRecord('batch');
         }
 
         this.inventory.batch.set('batch_number', currentDate);
-        this.inventory.batch.set('expiry_date_at', currentDate);
-        this.inventory.batch.set('manufacture_date_at', currentDate);
+    }
+
+    @action setExpiryDate(event) {
+        const {
+            target: { value },
+        } = event;
+
+        this.inventory.set('expiry_date_at', new Date(value));
     }
 }
diff --git a/addon/components/inventory-panel/details.hbs b/addon/components/inventory-panel/details.hbs
index afa9998c..b01fc142 100644
--- a/addon/components/inventory-panel/details.hbs
+++ b/addon/components/inventory-panel/details.hbs
@@ -17,6 +17,14 @@
                 <div class="field-name">Batch</div>
                 <div class="field-value">{{n-a @inventory.batch.batch_number}}</div>
             </div>
+            <div class="field-info-container">
+                <div class="field-name">Expiry Date</div>
+                <div class="field-value">{{n-a @inventory.expiry_date_at}}</div>
+            </div>
+            <div class="field-info-container">
+                <div class="field-name">Manufactured Date</div>
+                <div class="field-value">{{n-a @inventory.created_at}}</div>
+            </div>
         </div>
     </ContentPanel>
 </div>
\ No newline at end of file
diff --git a/addon/components/product-panel.js b/addon/components/product-panel.js
index a18642b0..d6e47057 100644
--- a/addon/components/product-panel.js
+++ b/addon/components/product-panel.js
@@ -89,11 +89,19 @@ export default class ProductPanelComponent extends Component {
     constructor() {
         super(...arguments);
         this.product = this.args.product;
-        console.log('[this.product]', this.product);
+        this.getProductSupplier();
         this.tab = this.getTabUsingSlug(this.args.tab);
         applyContextComponentArguments(this);
     }
 
+    getProductSupplier() {
+        if (this.product.supplier_uuid) {
+            this.store.findRecord('vendor', this.product.supplier_uuid).then((vendor) => {
+                this.product.set('supplier', vendor);
+            });
+        }
+    }
+
     /**
      * Sets the overlay context.
      *
diff --git a/addon/components/purchase-order-form-panel.hbs b/addon/components/purchase-order-form-panel.hbs
index ae236dbc..93535239 100644
--- a/addon/components/purchase-order-form-panel.hbs
+++ b/addon/components/purchase-order-form-panel.hbs
@@ -30,6 +30,21 @@
 
     <Overlay::Body @wrapperClass="new-service-rate-overlay-body px-4 space-y-4 pt-4" @increaseInnerBodyHeightBy={{1000}}>
         <div class="grid grid-cols-1 text-xs dark:text-gray-100">
+            <InputGroup @name="Supplier">
+                <ModelSelect
+                    @modelName="vendor"
+                    @selectedModel={{this.purchaseOrder.supplier}}
+                    @placeholder="Select Supplier"
+                    @triggerClass="form-select form-input"
+                    @infiniteScroll={{false}}
+                    @renderInPlace={{true}}
+                    @onChange={{fn (mut this.purchaseOrder.supplier)}}
+                    @onChangeId={{fn (mut this.purchaseOrder.supplier_uuid)}}
+                    as |model|
+                >
+                    {{model.name}}
+                </ModelSelect>
+            </InputGroup>
             <InputGroup @name="Status">
                 <div class="fleetbase-model-select fleetbase-power-select ember-model-select">
                     <PowerSelect
@@ -44,13 +59,17 @@
                     </PowerSelect>
                 </div>
             </InputGroup>
-            <InputGroup @name="Purchase order description">
+            <InputGroup @name="Reference Code" @type="text" @value={{this.purchaseOrder.reference_code}} />
+            <InputGroup @name="Reference URL" @type="text" @value={{this.purchaseOrder.reference_url}} />
+            <InputGroup @name="Description">
                 <Textarea @value={{this.purchaseOrder.description}} aria-label="Description" class="w-full form-input" placeholder="Description" rows={{5}} />
             </InputGroup>
-            <InputGroup @name="Purchase order comments">
+            <InputGroup @name="Comments">
                 <Textarea @value={{this.purchaseOrder.comments}} aria-label="Comments" class="w-full form-input" placeholder="Comments" rows={{5}} />
             </InputGroup>
-            <InputGroup @name="Delivery date" @type="date" @value={{this.purchaseOrder.deliveredAt}} />
+            <InputGroup @name="Expected Delivery Date">
+                <input value={{this.purchaseOrder.expectedDeliveryDate}} type="date" class="form-input w-full" {{on "change" this.setExpectedDeliveryDate}} />
+            </InputGroup>
         </div>
     </Overlay::Body>
 </Overlay>
\ No newline at end of file
diff --git a/addon/components/purchase-order-form-panel.js b/addon/components/purchase-order-form-panel.js
index fe77cddb..7d21da2e 100644
--- a/addon/components/purchase-order-form-panel.js
+++ b/addon/components/purchase-order-form-panel.js
@@ -143,10 +143,12 @@ export default class PurchaseOrderFormPanelComponent extends Component {
     @action onPressCancel() {
         return contextComponentCallback(this, 'onPressCancel', this.purchaseOrder);
     }
+    
+    @action setExpectedDeliveryDate(event) {
+        const {
+            target: { value },
+        } = event;
 
-    /**
-     * Uploads a file to the server for the purchaseOrder.
-     *
-     * @param {File} file
-     */
+        this.purchaseOrder.set('expected_delivery_at', new Date(value));
+    }
 }
diff --git a/addon/components/purchase-order-panel/details.hbs b/addon/components/purchase-order-panel/details.hbs
index 63173762..632dcad0 100644
--- a/addon/components/purchase-order-panel/details.hbs
+++ b/addon/components/purchase-order-panel/details.hbs
@@ -5,30 +5,10 @@
                 <div class="field-name">ID</div>
                 <div class="field-value">{{n-a @purchaseOrder.public_id}}</div>
             </div>
-            <div class="field-info-container col-span-2">
-                <div class="field-name">Company</div>
-                <div class="field-value">{{n-a @purchaseOrder.company.name}}</div>
-            </div>
-            <div class="field-info-container">
-                <div class="field-name">Created By</div>
-                <div class="field-value">{{n-a @purchaseOrder.createdBy.name}}</div>
-            </div>
             <div class="field-info-container">
                 <div class="field-name">Supplier</div>
                 <div class="field-value">{{n-a @purchaseOrder.supplier.name}}</div>
             </div>
-            <div class="field-info-container">
-                <div class="field-name">Transaction</div>
-                <div class="field-value">{{n-a @purchaseOrder.transaction.name}}</div>
-            </div>
-            <div class="field-info-container">
-                <div class="field-name">Assigned To</div>
-                <div class="field-value">{{n-a @purchaseOrder.assignedTo.name}}</div>
-            </div>
-            <div class="field-info-container">
-                <div class="field-name">Point of Contact</div>
-                <div class="field-value">{{n-a @purchaseOrder.pointOfContact.name}}</div>
-            </div>
             <div class="field-info-container">
                 <div class="field-name">Reference Code</div>
                 <div class="field-value">{{n-a @purchaseOrder.reference_code}}</div>
@@ -45,21 +25,17 @@
                 <div class="field-name">Comments</div>
                 <div class="field-value">{{n-a @purchaseOrder.comments}}</div>
             </div>
-            <div class="field-info-container">
-                <div class="field-name">Currency</div>
-                <div class="field-value">{{n-a @purchaseOrder.currency}}</div>
-            </div>
             <div class="field-info-container">
                 <div class="field-name">Status</div>
                 <div class="field-value">{{n-a @purchaseOrder.status}}</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">Order Created At</div>
-                <div class="field-value">{{n-a @purchaseOrder.orderCreatedAt}}</div>
+                <div class="field-value">{{n-a @purchaseOrder.created_at}}</div>
             </div>
             <div class="field-info-container">
                 <div class="field-name">Expected Delivery At</div>
-                <div class="field-value">{{n-a @purchaseOrder.expectedDeliveryAt}}</div>
+                <div class="field-value">{{n-a @purchaseOrder.expected_delivery_at}}</div>
             </div>
         </div>
     </ContentPanel>
diff --git a/addon/components/sales-order-form-panel.hbs b/addon/components/sales-order-form-panel.hbs
index fc13295e..5c744f94 100644
--- a/addon/components/sales-order-form-panel.hbs
+++ b/addon/components/sales-order-form-panel.hbs
@@ -61,13 +61,15 @@
             </InputGroup>
             <InputGroup @name="Reference Code" @type="text" @value={{this.salesOrder.reference_code}} />
             <InputGroup @name="Reference URL" @type="text" @value={{this.salesOrder.reference_url}} />
-            <InputGroup @name="Sales order description">
+            <InputGroup @name="Sale Description">
                 <Textarea @value={{this.salesOrder.description}} aria-label="Description" class="w-full form-input" placeholder="Description" rows={{5}} />
             </InputGroup>
-            <InputGroup @name="Sales order comments">
+            <InputGroup @name="Comments">
                 <Textarea @value={{this.salesOrder.comments}} aria-label="Comments" class="w-full form-input" placeholder="Comments" rows={{5}} />
             </InputGroup>
-            <InputGroup @name="Delivery date" @type="date" @value={{this.salesOrder.expected_delivery_at}} />
+            <InputGroup @name="Expected Delivery Date">
+                <input value={{this.salesOrder.expectedDeliveryDate}} type="date" class="form-input w-full" {{on "change" this.setExpectedDeliveryDate}} />
+            </InputGroup>
         </div>
     </Overlay::Body>
 </Overlay>
\ No newline at end of file
diff --git a/addon/components/sales-order-form-panel.js b/addon/components/sales-order-form-panel.js
index f3d6c806..52c07fe9 100644
--- a/addon/components/sales-order-form-panel.js
+++ b/addon/components/sales-order-form-panel.js
@@ -2,6 +2,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import { isValid as isValidDate } from 'date-fns';
 import contextComponentCallback from '../utils/context-component-callback';
 import applyContextComponentArguments from '../utils/apply-context-component-arguments';
 
@@ -149,4 +150,11 @@ export default class SalesOrderFormPanelComponent extends Component {
      *
      * @param {File} file
      */
+    @action setExpectedDeliveryDate(event) {
+        const {
+            target: { value },
+        } = event;
+
+        this.salesOrder.set('expected_delivery_at', new Date(value));
+    }
 }
diff --git a/addon/components/supplier-form-panel.hbs b/addon/components/supplier-form-panel.hbs
index bc01c0b8..ab99f884 100644
--- a/addon/components/supplier-form-panel.hbs
+++ b/addon/components/supplier-form-panel.hbs
@@ -54,7 +54,7 @@
                         @triggerClass="form-select form-input"
                         @infiniteScroll={{false}}
                         @renderInPlace={{true}}
-                        @onChange={{this.selectSupplierAddress}}
+                        @onChange={{this.supplier.place.address}}
                         as |model|
                     >
                         <div class="flex items-center flex-row justify-between">
diff --git a/addon/controllers/products/index.js b/addon/controllers/products/index.js
index 3f3aea1e..f39c1a9b 100644
--- a/addon/controllers/products/index.js
+++ b/addon/controllers/products/index.js
@@ -74,7 +74,6 @@ export default class ProductsIndexController extends Controller {
         'query',
         'internal_id',
         'public_id',
-        'supplier',
         'sku',
         'created_at',
         'updated_at',
@@ -130,13 +129,6 @@ export default class ProductsIndexController extends Controller {
      */
     @tracked product_id;
 
-    /**
-     * The filterable param `supplier`
-     *
-     * @var {String}
-     */
-    @tracked supplier;
-
     /**
      * The filterable param `internal_id`
      *
@@ -291,6 +283,10 @@ export default class ProductsIndexController extends Controller {
                     label: 'Edit Product',
                     fn: this.editProduct,
                 },
+                {
+                    label: 'Delete Product',
+                    fn: this.deleteProduct,
+                },
             ],
             sortable: false,
             filterable: false,
diff --git a/addon/controllers/purchase-orders/index.js b/addon/controllers/purchase-orders/index.js
index c91e4f0c..6a8184bc 100644
--- a/addon/controllers/purchase-orders/index.js
+++ b/addon/controllers/purchase-orders/index.js
@@ -68,7 +68,7 @@ export default class PurchaseOrdersIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'created_by', 'updated_by', 'status', 'delivered_at'];
+    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'created_by', 'updated_by', 'status', 'delivery_date_at'];
 
     /**
      * The current page of data being viewed
diff --git a/addon/controllers/purchase-orders/index/new.js b/addon/controllers/purchase-orders/index/new.js
index 0fade89c..0e245694 100644
--- a/addon/controllers/purchase-orders/index/new.js
+++ b/addon/controllers/purchase-orders/index/new.js
@@ -42,7 +42,7 @@ export default class PurchaseOrdersIndexNewController extends Controller {
     /**
      * The fuel report being created.
      *
-     * @var {FuelReportModel}
+     * @var {SalesOrderModel}
      */
     @tracked purchaseOrder = this.store.createRecord('purchase-order');
 
diff --git a/addon/controllers/sales-orders/index.js b/addon/controllers/sales-orders/index.js
index af70dee9..904d080b 100644
--- a/addon/controllers/sales-orders/index.js
+++ b/addon/controllers/sales-orders/index.js
@@ -68,7 +68,7 @@ export default class SalesOrdersIndexController extends Controller {
      *
      * @var {Array}
      */
-    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'created_by', 'updated_by', 'status', 'delivered_at', 'supplier'];
+    queryParams = ['page', 'limit', 'sort', 'query', 'public_id', 'created_by', 'updated_by', 'status', 'delivered_at'];
 
     /**
      * The current page of data being viewed
@@ -77,7 +77,6 @@ export default class SalesOrdersIndexController extends Controller {
      */
     @tracked page = 1;
 
-    @tracked supplier;
 
     /**
      * The maximum number of items to show per page
@@ -292,7 +291,7 @@ export default class SalesOrdersIndexController extends Controller {
 
         this.crud.bulkDelete(selected, {
             modelNamePath: 'public_id',
-            acceptButtonText: "Delete Sales Order's",
+            acceptButtonText: "Delete Sales Orders",
             fetchOptions: {
                 namespace: 'pallet/int/v1',
             },
diff --git a/addon/controllers/sales-orders/index/new.js b/addon/controllers/sales-orders/index/new.js
index 69f26bcb..1c86b09b 100644
--- a/addon/controllers/sales-orders/index/new.js
+++ b/addon/controllers/sales-orders/index/new.js
@@ -42,7 +42,7 @@ export default class SalesOrdersIndexNewController extends Controller {
     /**
      * The fuel report being created.
      *
-     * @var {FuelReportModel}
+     * @var {SalesOrderModel}
      */
     @tracked salesOrder = this.store.createRecord('sales-order');
 
diff --git a/addon/models/inventory.js b/addon/models/inventory.js
index 30025c79..04b322c5 100644
--- a/addon/models/inventory.js
+++ b/addon/models/inventory.js
@@ -32,6 +32,7 @@ export default class InventoryModel extends Model {
     @attr('date') created_at;
     @attr('date') updated_at;
     @attr('date') expiry_date_at;
+    @attr('date') manufactured_date_at;
 
     /** @computed */
     @computed('created_at') get createdAgo() {
@@ -41,6 +42,20 @@ export default class InventoryModel extends Model {
         return formatDistanceToNow(this.created_at);
     }
 
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+        return formatDate(this.created_at, 'PPP p');
+    }
+
+    @computed('created_at') get createdAtShort() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+        return formatDate(this.created_at, 'PP');
+    }
+
     @computed('updated_at') get updatedAgo() {
         if (!isValidDate(this.updated_at)) {
             return null;
@@ -54,4 +69,19 @@ export default class InventoryModel extends Model {
         }
         return formatDate(this.updated_at, 'PPP p');
     }
+
+    @computed('updated_at') get updatedAtShort() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+        return formatDate(this.updated_at, 'PP');
+    }
+
+    @computed('expiry_date_at') get expiryDate() {
+        if (!isValidDate(this.expiry_date_at)) {
+            return null;
+        }
+
+        return formatDate(this.expiry_date_at, 'yyyy-MM-dd');
+    }
 }
diff --git a/addon/models/purchase-order.js b/addon/models/purchase-order.js
index 9f267f20..51c63ae3 100644
--- a/addon/models/purchase-order.js
+++ b/addon/models/purchase-order.js
@@ -39,18 +39,25 @@ export default class PurchaseOrderModel extends Model {
     @attr('boolean') isDeleted;
 
     /** @computed */
-    @computed('order_created_at') get orderCreatedAt() {
-        if (!isValidDate(this.order_created_at)) {
+    @computed('created_at') get createdAgo() {
+        if (!isValidDate(this.created_at)) {
             return null;
         }
-        return formatDate(this.order_created_at, 'PPP p');
+        return formatDistanceToNow(this.created_at);
     }
 
-    @computed('expected_delivery_at') get expectedDeliveryAt() {
-        if (!isValidDate(this.expected_delivery_at)) {
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+        return formatDate(this.created_at, 'PPP p');
+    }
+
+    @computed('created_at') get createdAtShort() {
+        if (!isValidDate(this.created_at)) {
             return null;
         }
-        return formatDate(this.expected_delivery_at, 'PPP p');
+        return formatDate(this.created_at, 'PP');
     }
 
     @computed('updated_at') get updatedAgo() {
@@ -66,4 +73,19 @@ export default class PurchaseOrderModel extends Model {
         }
         return formatDate(this.updated_at, 'PPP p');
     }
+
+    @computed('updated_at') get updatedAtShort() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+        return formatDate(this.updated_at, 'PP');
+    }
+
+    @computed('expected_delivery_at') get expectedDeliveryDate() {
+        if (!isValidDate(this.expected_delivery_at)) {
+            return null;
+        }
+
+        return formatDate(this.expected_delivery_at, 'yyyy-MM-dd');
+    }
 }
diff --git a/addon/models/sales-order.js b/addon/models/sales-order.js
index a6529b5d..4aa14530 100644
--- a/addon/models/sales-order.js
+++ b/addon/models/sales-order.js
@@ -34,6 +34,7 @@ export default class SalesOrderModel extends Model {
     @attr('date') updated_at;
 
     /** @computed */
+
     @computed('created_at') get createdAgo() {
         if (!isValidDate(this.created_at)) {
             return null;
@@ -41,6 +42,20 @@ export default class SalesOrderModel extends Model {
         return formatDistanceToNow(this.created_at);
     }
 
+    @computed('created_at') get createdAt() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+        return formatDate(this.created_at, 'PPP p');
+    }
+
+    @computed('created_at') get createdAtShort() {
+        if (!isValidDate(this.created_at)) {
+            return null;
+        }
+        return formatDate(this.created_at, 'PP');
+    }
+
     @computed('updated_at') get updatedAgo() {
         if (!isValidDate(this.updated_at)) {
             return null;
@@ -54,4 +69,19 @@ export default class SalesOrderModel extends Model {
         }
         return formatDate(this.updated_at, 'PPP p');
     }
+
+    @computed('updated_at') get updatedAtShort() {
+        if (!isValidDate(this.updated_at)) {
+            return null;
+        }
+        return formatDate(this.updated_at, 'PP');
+    }
+
+    @computed('expected_delivery_at') get expectedDeliveryDate() {
+        if (!isValidDate(this.expected_delivery_at)) {
+            return null;
+        }
+
+        return formatDate(this.expected_delivery_at, 'yyyy-MM-dd');
+    }
 }
diff --git a/addon/routes/inventory/index.js b/addon/routes/inventory/index.js
index fc3e01dc..d66b325f 100644
--- a/addon/routes/inventory/index.js
+++ b/addon/routes/inventory/index.js
@@ -15,6 +15,6 @@ export default class InventoryIndexRoute extends Route {
     };
 
     model(params) {
-        return this.store.query('inventory', { ...params, with: ['product', 'warehouse', 'batch'] });
+        return this.store.query('inventory', { ...params, with: ['product', 'warehouse', 'batch', 'supplier'] });
     }
 }
diff --git a/addon/routes/products/index/details.js b/addon/routes/products/index/details.js
index 4343499d..01d3bbff 100644
--- a/addon/routes/products/index/details.js
+++ b/addon/routes/products/index/details.js
@@ -9,6 +9,6 @@ export default class ProductsIndexDetailsRoute extends Route {
     };
 
     model({ public_id }) {
-        return this.store.queryRecord('pallet-product', { public_id, single: true, with: ['supplier'] });
+        return this.store.findRecord('pallet-product', public_id);
     }
 }
diff --git a/addon/routes/sales-orders/index.js b/addon/routes/sales-orders/index.js
index cc137bb5..f0e4bc8b 100644
--- a/addon/routes/sales-orders/index.js
+++ b/addon/routes/sales-orders/index.js
@@ -10,7 +10,6 @@ export default class SalesOrdersIndexRoute extends Route {
         sort: { refreshModel: true },
         query: { refreshModel: true },
         status: { refreshModel: true },
-        supplier: { refreshModel: true },
     };
 
     model(params) {
diff --git a/addon/serializers/pallet-product.js b/addon/serializers/pallet-product.js
index a1445674..a677e950 100644
--- a/addon/serializers/pallet-product.js
+++ b/addon/serializers/pallet-product.js
@@ -15,4 +15,15 @@ export default class PalletProductSerializer extends ApplicationSerializer.exten
     payloadKeyFromModelName() {
         return 'product';
     }
+
+    /**
+     * Embedded relationship attributes
+     *
+     * @var {Object}
+     */
+    get attrs() {
+        return {
+            supplier: { embedded: 'always' },
+        };
+    }
 }
diff --git a/addon/serializers/purchase-order.js b/addon/serializers/purchase-order.js
index bf275a1f..6bcb95c1 100644
--- a/addon/serializers/purchase-order.js
+++ b/addon/serializers/purchase-order.js
@@ -1,4 +1,15 @@
 import ApplicationSerializer from '@fleetbase/ember-core/serializers/application';
 import { EmbeddedRecordsMixin } from '@ember-data/serializer/rest';
 
-export default class PurchaseOrderSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {}
+export default class PurchaseOrderSerializer extends ApplicationSerializer.extend(EmbeddedRecordsMixin) {
+    /**
+     * Embedded relationship attributes
+     *
+     * @var {Object}
+     */
+    get attrs() {
+        return {
+            supplier: { embedded: 'always' },
+        };
+    }
+}
diff --git a/server/migrations/2023_12_06_090936_add_manufactured_date_column_on_inventory.php b/server/migrations/2023_12_06_090936_add_manufactured_date_column_on_inventory.php
new file mode 100644
index 00000000..ca36aab6
--- /dev/null
+++ b/server/migrations/2023_12_06_090936_add_manufactured_date_column_on_inventory.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddManufacturedDateColumnOnInventory extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('pallet_inventories', function (Blueprint $table) {
+            $table->timestamp('manufactured_date_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('pallet_inventories');
+    }
+}
diff --git a/server/src/Http/Controllers/InventoryController.php b/server/src/Http/Controllers/InventoryController.php
index 6bdcf462..d0ba6038 100644
--- a/server/src/Http/Controllers/InventoryController.php
+++ b/server/src/Http/Controllers/InventoryController.php
@@ -64,10 +64,8 @@ public function createRecord(Request $request)
                 'company_uuid' => session('company'),
                 'created_by_uuid' => session('user'),
                 'product_uuid' => data_get($data, 'product_uuid'),
-                'batch_number' => data_get($data, 'batch.batch_number', now()->format('Y-m-d')),
+                'batch_number' => data_get($data, 'batch_number', now()->format('Y-m-d')),
                 'quantity' => data_get($data, 'quantity', 0),
-                'expiry_date_at' => data_get($data, 'batch.expiry_date_at'),
-                'manufacture_date_at' => data_get($data, 'batch.manufacture_date_at'),
             ]);
             $batch->save();
 
@@ -80,7 +78,9 @@ public function createRecord(Request $request)
                 'status' => data_get($data, 'status'),
                 'quantity' => data_get($data, 'quantity', 0),
                 'min_quantity' => data_get($data, 'min_quantity', 0),
-                'comments' => data_get($data, 'commetns')
+                'comments' => data_get($data, 'comments'),
+                'expiry_date_at' => data_get($data, 'expiry_date_at'),
+                'manufactured_date_at' => data_get($data, 'manufactured_date_at')
             ]);
 
             $inventory->batch()->associate($batch);
diff --git a/server/src/Http/Controllers/PurchaseOrderController.php b/server/src/Http/Controllers/PurchaseOrderController.php
index bad8916d..070d68d7 100644
--- a/server/src/Http/Controllers/PurchaseOrderController.php
+++ b/server/src/Http/Controllers/PurchaseOrderController.php
@@ -2,6 +2,12 @@
 
 namespace Fleetbase\Pallet\Http\Controllers;
 
+use Fleetbase\Pallet\Models\PurchaseOrder;
+use Fleetbase\Exceptions\FleetbaseRequestValidationException;
+use Fleetbase\Support\Http;
+use Illuminate\Http\Request;
+use Illuminate\Database\QueryException;
+
 class PurchaseOrderController extends PalletResourceController
 {
     /**
@@ -10,4 +16,39 @@ class PurchaseOrderController extends PalletResourceController
      * @var string
      */
     public $resource = 'purchase-order';
+
+    public function createRecord(Request $request)
+    {
+        try {
+            $this->validateRequest($request);
+            $data = $request->input('purchaseOrder');
+
+            $salesOrder = new PurchaseOrder([
+                'company_uuid' => session('company'),
+                'created_by_uuid' => session('user'),
+                'supplier_uuid' => data_get($data, 'supplier_uuid'),
+                'transaction_uuid' => data_get($data, 'transaction_uuid'),
+                'assigned_to_uuid' => data_get($data, 'user'),
+                'status' => data_get($data, 'status'),
+                'reference_code' => data_get($data, 'reference_code'),
+                'reference_url' => data_get($data, 'reference_url'),
+                'description' => data_get($data, 'description'),
+                'comments' => data_get($data, 'comments'),
+                'expected_delivery_at' => data_get($data, 'expected_delivery_at'),
+                'order_date_at' => data_get($data, 'order_date_at'),
+            ]);
+            $salesOrder->save();
+
+            if (Http::isInternalRequest($request)) {
+                $this->resource::wrap($this->resourceSingularlName);
+            }
+            return new $this->resource($salesOrder);
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
+        } catch (QueryException $e) {
+            return response()->error($e->getMessage());
+        } catch (FleetbaseRequestValidationException $e) {
+            return response()->error($e->getErrors());
+        }
+    }
 }
diff --git a/server/src/Http/Controllers/SalesOrderController.php b/server/src/Http/Controllers/SalesOrderController.php
index d7dd47eb..354eb974 100644
--- a/server/src/Http/Controllers/SalesOrderController.php
+++ b/server/src/Http/Controllers/SalesOrderController.php
@@ -2,6 +2,12 @@
 
 namespace Fleetbase\Pallet\Http\Controllers;
 
+use Fleetbase\Pallet\Models\SalesOrder;
+use Fleetbase\Exceptions\FleetbaseRequestValidationException;
+use Fleetbase\Support\Http;
+use Illuminate\Http\Request;
+use Illuminate\Database\QueryException;
+
 class SalesOrderController extends PalletResourceController
 {
     /**
@@ -10,4 +16,39 @@ class SalesOrderController extends PalletResourceController
      * @var string
      */
     public $resource = 'sales-order';
+
+    public function createRecord(Request $request)
+    {
+        try {
+            $this->validateRequest($request);
+            $data = $request->input('salesOrder');
+
+            $salesOrder = new SalesOrder([
+                'company_uuid' => session('company'),
+                'created_by_uuid' => session('user'),
+                'supplier_uuid' => data_get($data, 'supplier_uuid'),
+                'transaction_uuid' => data_get($data, 'transaction_uuid'),
+                'assigned_to_uuid' => data_get($data, 'user'),
+                'status' => data_get($data, 'status'),
+                'reference_code' => data_get($data, 'reference_code'),
+                'reference_url' => data_get($data, 'reference_url'),
+                'description' => data_get($data, 'description'),
+                'comments' => data_get($data, 'comments'),
+                'expected_delivery_at' => data_get($data, 'expected_delivery_at'),
+                'order_date_at' => data_get($data, 'order_date_at'),
+            ]);
+            $salesOrder->save();
+
+            if (Http::isInternalRequest($request)) {
+                $this->resource::wrap($this->resourceSingularlName);
+            }
+            return new $this->resource($salesOrder);
+        } catch (\Exception $e) {
+            return response()->error($e->getMessage());
+        } catch (QueryException $e) {
+            return response()->error($e->getMessage());
+        } catch (FleetbaseRequestValidationException $e) {
+            return response()->error($e->getErrors());
+        }
+    }
 }
diff --git a/server/src/Http/Resources/IndexInventory.php b/server/src/Http/Resources/IndexInventory.php
index 74d360aa..7115dea5 100644
--- a/server/src/Http/Resources/IndexInventory.php
+++ b/server/src/Http/Resources/IndexInventory.php
@@ -22,6 +22,8 @@ public function toArray($request)
             'product'          => $this->whenLoaded('product', $this->product),
             'batch'            => $this->whenLoaded('batch', new Batch($this->batch)),
             'batch_uuid'       => $this->batch_uuid,
+            'supplier_uuid'    => $this->supplier_uuid,
+            'supplier'         => $this->whenLoaded('supplier', $this->supplier),
             'quantity'         => (int) $this->total_quantity,
             'min_quantity'     => (int) $this->minimum_quantity,
             'comments'         => $this->latest_comments,
diff --git a/server/src/Http/Resources/Inventory.php b/server/src/Http/Resources/Inventory.php
index 60659871..09d01c54 100644
--- a/server/src/Http/Resources/Inventory.php
+++ b/server/src/Http/Resources/Inventory.php
@@ -17,21 +17,24 @@ class Inventory extends FleetbaseResource
     public function toArray($request)
     {
         return [
-            'id'                   => $this->when(Http::isInternalRequest(), $this->incrementing_id, $this->public_id),
-            'uuid'                 => $this->when(Http::isInternalRequest(), $this->uuid),
-            'public_id'            => $this->when(Http::isInternalRequest(), $this->public_id),
-            'product_uuid'     => $this->product_uuid,
-            'batch_uuid'       => $this->batch_uuid,
-            'warehouse_uuid'   => $this->warehouse_uuid,
-            'product'          => $this->whenLoaded('product', $this->product),
-            'batch'            => $this->whenLoaded('batch', new Batch($this->batch)),
-            'warehouse'        => $this->whenLoaded('warehouse', new Warehouse($this->warehouse)),
-            'quantity'         => (int) $this->quantity,
-            'min_quantity'     => (int) $this->min_quantity,
-            'comments'         => $this->comments,
-            'expiry_date_at'   => $this->expiry_date_at,
-            'updated_at'       => $this->updated_at,
-            'created_at'       => $this->created_at,
+            'id'                    => $this->when(Http::isInternalRequest(), $this->incrementing_id, $this->public_id),
+            'uuid'                  => $this->when(Http::isInternalRequest(), $this->uuid),
+            'public_id'             => $this->when(Http::isInternalRequest(), $this->public_id),
+            'product_uuid'          => $this->product_uuid,
+            'batch_uuid'            => $this->batch_uuid,
+            'warehouse_uuid'        => $this->warehouse_uuid,
+            'supplier_uuid'         => $this->supplier_uuid,
+            'supplier'              => $this->whenLoaded('supplier', $this->supplier),
+            'product'               => $this->whenLoaded('product', $this->product),
+            'batch'                 => $this->whenLoaded('batch', new Batch($this->batch)),
+            'warehouse'             => $this->whenLoaded('warehouse', new Warehouse($this->warehouse)),
+            'quantity'              => (int) $this->quantity,
+            'min_quantity'          => (int) $this->min_quantity,
+            'comments'              => $this->comments,
+            'expiry_date_at'        => $this->expiry_date_at,
+            'manufactured_date_at'  => $this->manufactured_date_at,
+            'updated_at'            => $this->updated_at,
+            'created_at'            => $this->created_at,
         ];
     }
 }
diff --git a/server/src/Http/Resources/PurchaseOrder.php b/server/src/Http/Resources/PurchaseOrder.php
new file mode 100644
index 00000000..1d35f47d
--- /dev/null
+++ b/server/src/Http/Resources/PurchaseOrder.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Fleetbase\Pallet\Http\Resources;
+
+use Fleetbase\Http\Resources\FleetbaseResource;
+use Fleetbase\Support\Http;
+
+class PurchaseOrder extends FleetbaseResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     *
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    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),
+            'supplier_uuid'             => $this->supplier_uuid,
+            'supplier'                  => $this->whenLoaded('supplier', $this->supplier),
+            'status'                    => $this->status,
+            'comments'                  => $this->comments,
+            'description'               => $this->description,
+            'reference_code'            => $this->reference_code,
+            'reference_url'             => $this->reference_url,
+            'customer_reference_code'   => $this->customer_reference_code,
+            'order_date_at'             => $this->orde_date_at,
+            'expected_delivery_at'      => $this->expected_delivery_at,
+            'updated_at'                => $this->updated_at,
+            'created_at'                => $this->created_at,
+        ];
+    }
+}
diff --git a/server/src/Http/Resources/SalesOrder.php b/server/src/Http/Resources/SalesOrder.php
index f10f9768..d3725878 100644
--- a/server/src/Http/Resources/SalesOrder.php
+++ b/server/src/Http/Resources/SalesOrder.php
@@ -3,7 +3,6 @@
 namespace Fleetbase\Pallet\Http\Resources;
 
 use Fleetbase\Http\Resources\FleetbaseResource;
-use Fleetbase\Pallet\Models\WarehouseRack;
 use Fleetbase\Support\Http;
 
 class SalesOrder extends FleetbaseResource
@@ -22,6 +21,7 @@ public function toArray($request)
             'uuid'                      => $this->when(Http::isInternalRequest(), $this->uuid),
             'public_id'                 => $this->when(Http::isInternalRequest(), $this->public_id),
             'supplier_uuid'             => $this->supplier_uuid,
+            'supplier'                  => $this->whenLoaded('supplier', $this->supplier),
             'status'                    => $this->status,
             'comments'                  => $this->comments,
             'description'               => $this->description,
diff --git a/server/src/Models/Inventory.php b/server/src/Models/Inventory.php
index 30856191..8d7581dd 100644
--- a/server/src/Models/Inventory.php
+++ b/server/src/Models/Inventory.php
@@ -48,6 +48,10 @@ class Inventory extends Model
      * @var array
      */
     protected $fillable = [
+        'manufactured_date_at',
+        'expiry_date_at',
+        'created_at',
+        'updated_at',
         'product_uuid',
         'warehouse_uuid',
         'batch_uuid',
@@ -57,6 +61,10 @@ class Inventory extends Model
         'status',
     ];
 
+    public $timestamps = true;
+
+    protected $dates = ['expiry_date_at'];
+
     /**
      * The attributes that should be cast to native types.
      *
@@ -99,6 +107,14 @@ public function product()
         return $this->belongsTo(Product::class);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
+    public function supplier()
+    {
+        return $this->belongsTo(Supplier::class, 'supplier_uuid', 'uuid');
+    }
+
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
@@ -141,4 +157,14 @@ public function scopeSummarizeByProduct($query)
             ->leftJoin('pallet_batches', 'pallet_inventories.batch_uuid', '=', 'pallet_batches.uuid')
             ->groupBy('pallet_inventories.product_uuid');
     }
+    
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->created_at = now();
+            $model->manufactured_date_at = now();
+        });
+    }
 }
diff --git a/server/src/Models/PurchaseOrder.php b/server/src/Models/PurchaseOrder.php
index 8d2adb90..669ea467 100644
--- a/server/src/Models/PurchaseOrder.php
+++ b/server/src/Models/PurchaseOrder.php
@@ -2,6 +2,7 @@
 
 namespace Fleetbase\Pallet\Models;
 
+use Fleetbase\Casts\Json;
 use Fleetbase\Models\Model;
 use Fleetbase\Traits\HasApiModelBehavior;
 use Fleetbase\Traits\HasPublicId;
@@ -39,7 +40,7 @@ class PurchaseOrder extends Model
      *
      * @var array
      */
-    protected $searchableColumns = ['uuid', 'public_id', 'company_uuid', 'created_by_uuid', 'supplier_uuid', 'transaction_uuid', 'assigned_to_uuid', 'point_of_contact_uuid', 'reference_code', 'reference_url', 'description', 'comments', 'currency', 'status', 'order_created_at', 'expected_delivery_at', 'created_at'];
+    protected $searchableColumns = ['reference_code', 'reference_url', 'description', 'comments', 'currency', 'status'];
 
     /**
      * The attributes that are mass assignable.
@@ -67,13 +68,17 @@ class PurchaseOrder extends Model
         'updated_at',
     ];
 
+    public $timestamps = true;
+
+    protected $dates = ['expected_delivery_at'];
+
     /**
      * The attributes that should be cast to native types.
      *
      * @var array
      */
     protected $casts = [
-        'meta' => 'json',
+        'meta' => JSON::class,
     ];
 
     /**
@@ -117,7 +122,7 @@ public function createdBy()
      */
     public function supplier()
     {
-        return $this->belongsTo(Vendor::class, 'supplier_uuid', 'uuid');
+        return $this->belongsTo(Supplier::class, 'supplier_uuid', 'uuid');
     }
 
     /**
@@ -149,4 +154,14 @@ public function pointOfContact()
     {
         return $this->belongsTo(Contact::class, 'point_of_contact_uuid', 'uuid');
     }
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->created_at = now();
+            $model->order_created_at = now();
+        });
+    }
 }
diff --git a/server/src/Models/SalesOrder.php b/server/src/Models/SalesOrder.php
index 142cc4fc..751d7d33 100644
--- a/server/src/Models/SalesOrder.php
+++ b/server/src/Models/SalesOrder.php
@@ -40,7 +40,7 @@ class SalesOrder extends Model
      *
      * @var array
      */
-    protected $searchableColumns = [ 'customer_type', 'status', 'reference_code', 'reference_url', 'description', 'comments'];
+    protected $searchableColumns = ['customer_type', 'status', 'reference_code', 'reference_url', 'description', 'comments'];
 
     /**
      * The attributes that are mass assignable.
@@ -69,6 +69,10 @@ class SalesOrder extends Model
         'updated_at',
     ];
 
+    public $timestamps = true;
+
+    protected $dates = ['expected_delivery_at'];
+
     /**
      * The attributes that should be cast to native types.
      *
@@ -147,8 +151,24 @@ public function pointOfContact()
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
+    
+    /**
+     * Relationship with the supplier associated with the purchase order.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
+     */
     public function supplier()
     {
-        return $this->belongsTo(Supplier::class, 'uuid');
+        return $this->belongsTo(Supplier::class, 'supplier_uuid', 'uuid');
+    }
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::creating(function ($model) {
+            $model->created_at = now();
+            $model->order_date_at = now();
+        });
     }
 }