tin-spa 20.3.6 → 20.3.8

package/fesm2022/tin-spa.mjs

@@ -1529,6 +1529,7 @@ class DataServiceLib {
         this.capAccounts = new CapItem;
         this.capAggregates = new CapItem; // Added: Capability for aggregates view
         this.capAging = new CapItem; // Added: Capability for aging report
+        this.capTaxRates = new CapItem; // Changed: Capability for tax rates management
         this.capTransactionTypes = new CapItem;
         this.capTransactions = new CapItem;
         this.capAccountingInvoices = new CapItem;
@@ -2224,7 +2225,7 @@ class DataServiceLib {
         this.capAccounting.name = "cap27";
         this.capAccounting.display = "Accounting";
         this.capAccounting.icon = "account_balance";
-        this.capAccounting.capSubItems = [this.capAccounts, this.capTransactions, this.capAggregates, this.capTransactionTypes,];
+        this.capAccounting.capSubItems = [this.capAccounts, this.capTransactions, this.capAggregates, this.capTransactionTypes, this.capTaxRates,]; // Changed: Added Tax Rates to Accounting submenu
         this.capAccounts.name = "cap52"; // Changed: Fixed conflict with capBrands (was cap14)
         this.capAccounts.display = "Accounts";
         this.capAccounts.link = "home/admin/accounting-accounts";
@@ -2233,6 +2234,10 @@ class DataServiceLib {
         this.capAggregates.display = "Aggregates";
         this.capAggregates.link = "home/admin/accounting-aggregates";
         this.capAggregates.icon = "bar_chart";
+        this.capTaxRates.name = "cap60"; // Changed: Tax rates capability
+        this.capTaxRates.display = "Tax Rates";
+        this.capTaxRates.link = "home/admin/accounting-tax-rates";
+        this.capTaxRates.icon = "percent";
         this.capTransactionTypes.name = "cap28";
         this.capTransactionTypes.display = "Transaction Types";
         this.capTransactionTypes.link = "home/admin/accounting-transaction-types";
@@ -2823,6 +2828,8 @@ class AccountingService {
                 { name: 'paymentTerms', type: 'select', alias: 'Payment Terms', required: true, defaultValue: 30, loadAction: { url: 'invoices/list/payment-terms' } },
                 { name: 'dueDate', type: 'date', alias: 'Due Date', readonly: true, hideOnCreate: true },
                 { name: 'status', type: 'select', hideOnCreate: true, readonly: true, loadAction: { url: 'invoices/list/statuses' } },
+                { name: 'subTotal', type: 'money', alias: 'Sub Total', readonly: true, hideOnCreate: true }, // Changed: Show SubTotal (before tax)
+                { name: 'taxTotal', type: 'money', alias: 'VAT', readonly: true, hideOnCreate: true }, // Changed: Show TaxTotal (VAT amount)
                 { name: 'totalDisplay', type: 'label', alias: 'Total', format: 'text', readonly: true, hideOnCreate: true },
                 { name: 'paidAmount', type: 'label', alias: 'Paid', readonly: true, hideOnCreate: true },
                 { name: 'outstandingAmount', type: 'label', alias: 'Outstanding', readonly: true, hideOnCreate: true }
@@ -2856,11 +2863,20 @@ class AccountingService {
                 { name: 'description', type: 'text', required: true, alias: 'Description', span: true }, // Changed: Description field (backend will populate for Product/Service)
                 { name: 'quantity', type: 'number', required: true, defaultValue: 1 },
                 { name: 'unitPrice', type: 'money', alias: 'Unit Price', required: true }, // Changed: Unit price field (backend will populate for Product/Service)
-                { name: 'poNumber', type: 'text', alias: 'PO Number', hint: 'Purchase Order Number' }, // Added: PO Number for invoice bundling
+                { name: 'poNumber', type: 'text', alias: 'PO Number', }, // Added: PO Number for invoice bundling
             ],
             loadAction: { url: 'invoiceitems/id/{invoiceItemID}' },
             heroField: 'invoiceItemID',
         };
+        this.invoiceItemEditButton = { name: 'edit', dialog: true, action: { url: 'invoiceitems?action=edit', method: 'post' }, disabled: x => x.status != InvoiceStatus.Draft };
+        // Invoice item details dialog config
+        this.invoiceItemDetailsConfig = {
+            formConfig: this.invoiceItemsFormConfig,
+            heroField: 'invoiceItemID',
+            buttons: [
+                this.invoiceItemEditButton
+            ]
+        };
         // Added: Move item form configuration - select destination invoice
         this.invoiceMoveItemFormConfig = {
             title: 'Move Item',
@@ -2890,15 +2906,17 @@ class AccountingService {
             causeFormRefresh: true,
             columns: [
                 { name: 'invoiceItemID', type: 'number', alias: 'ID', hiddenCondition: () => true },
-                { name: 'description', type: 'text', alias: 'Description' },
+                { name: 'description', type: 'chip', alias: 'Description', detailsConfig: this.invoiceItemDetailsConfig },
                 { name: 'poNumber', type: 'text', alias: 'PO#' }, // Added: Purchase Order Number column
                 { name: 'quantity', type: 'number', alias: 'Qty' },
                 { name: 'unitPrice', type: 'money', alias: 'Unit Price' },
-                { name: 'amount', type: 'money', alias: 'Amount' }
+                { name: 'amount', type: 'money', alias: 'Amount' },
+                { name: 'taxAmount', type: 'money', alias: 'Tax' }, // Changed: Show per-item tax amount
+                { name: 'lineTotal', type: 'money', alias: 'Total' } // Changed: Computed line total (amount + tax)
             ],
             buttons: [
                 { name: 'create', display: 'Add Item', dialog: true, action: { url: 'invoiceitems?action=create', method: 'post' }, disabled: x => x.status != InvoiceStatus.Draft },
-                { name: 'edit', dialog: true, action: { url: 'invoiceitems?action=edit', method: 'post' }, disabled: x => x.status != InvoiceStatus.Draft },
+                this.invoiceItemEditButton,
                 { name: 'move', display: 'Move', dialog: true, icon: { name: 'swap_horiz' }, detailsConfig: this.invoiceMoveItemDetailsConfig, disabled: x => x.status != InvoiceStatus.Draft }, // Added: Move item button
                 { name: 'delete', inDialog: true, icon: { name: 'delete', color: 'red' }, action: { url: 'invoiceitems?action=delete', method: 'post', successMessage: 'Deleted' }, confirm: { message: 'Delete this item?' }, disabled: x => x.status != InvoiceStatus.Draft },
             ],
@@ -2913,7 +2931,13 @@ class AccountingService {
         this.invoiceDiscardButton = { name: 'discard', inDialog: true, display: 'Discard', icon: { name: 'close', color: 'red' },
             action: { url: 'invoices?action=discard', method: 'post', successMessage: 'Discarded' },
             confirm: { message: 'Invoice will be marked as cancelled?' },
-            visible: x => x.status == InvoiceStatus.Draft || x.status == InvoiceStatus.Submitted // Changed: Only allow on Draft and Submitted
+            visible: x => x.status == InvoiceStatus.Draft // Changed: Only allow on Draft (use Return for Submitted)
+        };
+        // Changed: Return button — reverts submitted invoice back to draft, reverses accounting transactions
+        this.invoiceReturnButton = { name: 'return', inDialog: true, display: 'Return', icon: { name: 'undo', color: 'orange' },
+            action: { url: 'invoices?action=return', method: 'post', successMessage: 'Returned to Draft' },
+            confirm: { message: 'Return invoice to draft? This will reverse the receivable and VAT transactions.' },
+            visible: x => x.status == InvoiceStatus.Submitted
         };
         this.invoiceSubmitButton = { name: 'submit', inDialog: true, display: 'Submit', icon: { name: 'send', },
             action: { url: 'invoices?action=submit', method: 'post', successMessage: 'Submitted' },
@@ -2934,6 +2958,7 @@ class AccountingService {
             buttons: [
                 this.invoiceSubmitButton,
                 this.invoiceRecordPaymentButton,
+                this.invoiceReturnButton, // Changed: Return submitted invoice to draft
                 this.invoiceDiscardButton,
                 this.invoiceEditButton
             ]
@@ -2984,6 +3009,7 @@ class AccountingService {
                 // { name: 'view', dialog: true, detailsConfig: this.invoiceDetailsDialogConfig },
                 this.invoiceSubmitButton,
                 this.invoiceRecordPaymentButton,
+                this.invoiceReturnButton, // Changed: Return submitted invoice to draft
                 // this.invoicePayButton,
                 this.invoiceDiscardButton,
                 // this.invoiceEditButton,
@@ -3098,6 +3124,47 @@ class AccountingService {
             formConfig: this.outstandingInvoicesFormConfig,
             tileConfig: this.outstandingInvoicesTileConfig
         };
+        //--------------------------Tax Rates-------------------------
+        // Changed: Tax Rate form configuration for VAT management
+        this.taxRateFormConfig = {
+            title: 'Tax Rate',
+            includeAudit: true,
+            fields: [
+                { name: 'name', type: 'text', required: true, alias: 'Name' },
+                { name: 'rate', type: 'number', required: true, alias: 'Rate (%)' },
+                { name: 'isDefault', type: 'checkbox', alias: 'Default Rate' },
+                { name: 'isActive', type: 'checkbox', alias: 'Active', defaultValue: true }
+            ],
+            loadAction: { url: 'taxrates/id' },
+            heroField: 'taxRateID'
+        };
+        this.taxRateCreateButton = { name: 'create', display: 'Create Tax Rate', dialog: true, action: { url: 'taxrates?action=create', method: 'post' } };
+        this.taxRateEditButton = { name: 'edit', dialog: true, action: { url: 'taxrates?action=edit', method: 'post' } };
+        this.taxRateDeleteButton = { name: 'delete', dialog: true, action: { url: 'taxrates?action=delete', method: 'post' } };
+        this.taxRateDetailsConfig = {
+            formConfig: this.taxRateFormConfig,
+            heroField: 'taxRateID',
+            buttons: [this.taxRateCreateButton, this.taxRateEditButton, this.taxRateDeleteButton]
+        };
+        this.taxRatesTableConfig = {
+            showFilter: true,
+            flatButtons: true,
+            minColumns: ['name', 'rate', 'isActive'],
+            columns: [
+                { name: 'name', type: 'text', alias: 'Name' },
+                { name: 'rate', type: 'number', alias: 'Rate (%)' },
+                { name: 'isDefault', type: 'checkbox', alias: 'Default' },
+                { name: 'isActive', type: 'checkbox', alias: 'Active' }
+            ],
+            buttons: [
+                this.taxRateCreateButton,
+                { name: 'view', dialog: true, detailsConfig: this.taxRateDetailsConfig },
+                this.taxRateEditButton,
+                this.taxRateDeleteButton
+            ],
+            loadAction: { url: 'taxrates/all/x' },
+            formConfig: this.taxRateFormConfig
+        };
         //--------------------------Transaction Types-------------------------
         this.transactionTypeFormConfig = {
             security: { allow: [this.dataService.capTransactionTypes] },
@@ -3807,6 +3874,8 @@ class InventoryService {
                 { name: 'isBundle', type: 'checkbox', alias: 'Bundle Product', span: true, section: 'productInfo', infoMessage: 'Check if this is a bundle/combo product made up of other products' }, // Added: Bundle product flag
                 { name: 'pricingInfo', type: 'section', alias: 'Pricing' },
                 { name: 'sellingPrice', type: 'money', required: true, alias: 'Selling Price', section: 'pricingInfo', infoMessage: 'Default selling price per unit' },
+                { name: 'taxRateID', type: 'select', alias: 'Tax Rate', nullable: true, section: 'pricingInfo', loadAction: { url: 'products/list/tax-rates' }, infoMessage: 'VAT rate applied to this product' }, // Changed: Tax rate selector
+                { name: 'isTaxInclusive', type: 'checkbox', alias: 'Price includes Tax', section: 'pricingInfo', infoMessage: 'If checked, the selling price already includes tax' }, // Changed: Tax-inclusive flag
                 { name: 'inventoryInfo', type: 'section', alias: 'Inventory Settings', collapsedCondition: x => x.productID },
                 { name: 'isSerialized', type: 'checkbox', alias: 'Serialized Product', span: true, section: 'inventoryInfo', infoMessage: 'Track individual items by serial number', hiddenCondition: x => x.isBundle }, // Changed: Hide for bundles
                 { name: 'baseUnit', type: 'select', required: true, alias: 'Base Unit', section: 'inventoryInfo', loadAction: { url: 'products/list/base-unit' }, defaultFirstValue: true, infoMessage: 'Unit of measure for inventory tracking' }, // Changed: Added defaultFirstValue flag
@@ -3834,8 +3903,11 @@ class InventoryService {
                 { name: 'brandName', type: 'text', alias: 'Brand' },
                 { name: 'currentInventoryLevel', type: 'number', alias: 'Current Stock', icon: { name: 'warning', color: 'orange', condition: (x) => x.isLowInventory } }, // Changed: Removed separate columns, added low stock icon to current stock
                 { name: 'minimumInventoryLevel', type: 'number', alias: 'Min Stock' },
-                { name: 'sellingPrice', type: 'money', }
-            ], // Changed: Removed isSerialized, baseUnit, currentAverageCost, isLowInventory columns
+                { name: 'sellingPrice', type: 'money' },
+                { name: 'taxRateName', type: 'text', alias: 'Tax Rate' }, // Changed: Tax rate display with N/A fallback
+                { name: 'priceExclTax', type: 'text', alias: 'Price (Excl)' }, // Changed: Computed price excluding tax
+                { name: 'priceInclTax', type: 'text', alias: 'Price (Incl)' }, // Changed: Computed price including tax
+            ],
             buttons: [
                 this.productCreateButton,
                 this.productViewButton,
@@ -3951,6 +4023,8 @@ class InventoryService {
                 { name: 'isActive', type: 'checkbox', alias: 'Active', defaultValue: true },
                 { name: 'description', type: 'text', alias: 'Description' },
                 { name: 'unitPrice', type: 'money', required: true, alias: 'Unit Price' },
+                { name: 'taxRateID', type: 'select', alias: 'Tax Rate', nullable: true, loadAction: { url: 'serviceitems/list/tax-rates' }, infoMessage: 'VAT rate applied to this service' }, // Changed: Tax rate selector
+                { name: 'isTaxInclusive', type: 'checkbox', alias: 'Price includes Tax', infoMessage: 'If checked, the unit price already includes tax' }, // Changed: Tax-inclusive flag
             ],
             loadAction: { url: 'serviceitems/id' },
             heroField: 'serviceItemID'
@@ -3971,6 +4045,9 @@ class InventoryService {
                 { name: 'name', type: 'text', alias: 'Service Name' },
                 { name: 'description', type: 'text', alias: 'Description' },
                 { name: 'unitPrice', type: 'money', alias: 'Unit Price' },
+                { name: 'taxRateName', type: 'text', alias: 'Tax Rate' }, // Changed: Tax rate display with N/A fallback
+                { name: 'priceExclTax', type: 'text', alias: 'Price (Excl)' }, // Changed: Computed price excluding tax
+                { name: 'priceInclTax', type: 'text', alias: 'Price (Incl)' }, // Changed: Computed price including tax
                 { name: 'statusName', type: 'text', alias: 'Status' }
             ],
             buttons: [
@@ -4778,6 +4855,8 @@ class InventoryService {
                         { name: 'check_circle', color: '#4CAF50', condition: (x) => x.paymentStatus === 1, tip: 'Paid' } // Changed: Use status enum
                     ]
                 },
+                { name: 'subTotal', type: 'money', alias: 'Sub Total' }, // Changed: Show subtotal before tax
+                { name: 'taxAmount', type: 'money', alias: 'Tax' }, // Changed: Show tax amount
                 { name: 'totalAmount', type: 'money', alias: 'Total' }
             ],
             buttons: [
@@ -16740,6 +16819,28 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
                 }]
         }] });
 
+// Tax Rates management page - CRUD for VAT tax rates
+class TaxRatesComponent {
+    constructor() {
+        this.accountingService = inject(AccountingService);
+        this.pageConfig = {
+            title: 'Tax Rates',
+            tableConfig: this.accountingService.taxRatesTableConfig
+        };
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TaxRatesComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.14", type: TaxRatesComponent, isStandalone: true, selector: "spa-tax-rates", ngImport: i0, template: '<spa-page [config]="pageConfig"></spa-page>', isInline: true, dependencies: [{ kind: "ngmodule", type: TinSpaModule }, { kind: "component", type: PageComponent, selector: "spa-page", inputs: ["config"], outputs: ["searchModeActivated", "searchModeDeactivated", "refreshClick", "actionClick", "actionResponse", "inputChange", "createClick", "searchClick", "dataLoad", "titleActionChange"] }] }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TaxRatesComponent, decorators: [{
+            type: Component,
+            args: [{
+                    selector: 'spa-tax-rates',
+                    standalone: true,
+                    imports: [TinSpaModule],
+                    template: '<spa-page [config]="pageConfig"></spa-page>'
+                }]
+        }] });
+
 class GptCachesComponent {
     constructor() {
         this.dataService = inject(DataServiceLib);
@@ -16796,6 +16897,7 @@ const routes$1 = [
     { path: "accounting-invoices", component: InvoicesComponent },
     { path: "accounting-aging", component: AgingComponent }, // Added: Aging route
     { path: "accounting-outstanding-invoices", component: OutstandingInvoicesComponent },
+    { path: "accounting-tax-rates", component: TaxRatesComponent }, // Changed: Tax rates management route
     { path: "loans-products", component: LoanProductsComponent },
     { path: "loans", component: LoansComponent },
     { path: "loans-payments", component: LoanPaymentsComponent },