tin-spa 20.2.6 → 20.2.8

package/fesm2022/tin-spa.mjs

@@ -2862,8 +2862,7 @@ class AccountingService {
                     detailsConfig: this.accountBaseDetailsConfig
                 },
                 { name: 'description', type: 'text', required: true, span: true },
-                { name: 'amount', type: 'label', format: 'money', required: true, hideOnCreate: true, readonly: true },
-                { name: 'amount', type: 'money', required: true, hideOnExists: true, span: true },
+                { name: 'amount', type: 'money', required: true, span: true },
             ],
         };
         this.transactionEditButton = { name: 'edit', dialog: true,
@@ -2905,7 +2904,6 @@ class AccountingService {
             buttons: [
                 { name: 'create', display: 'Create', dialog: true, action: { url: 'transactions/dto?action=create', method: 'post' } },
                 { name: 'view', dialog: true, detailsConfig: this.transactionDetailsConfig },
-                // { name: 'edit', dialog: true, detailsConfig: this.transactionDetailsConfig },
                 this.transactionEditButton,
                 this.transactionVoidButton,
             ],
@@ -2917,6 +2915,10 @@ class AccountingService {
             causeFormRefresh: true,
             tabTitle: 'Account Transactions',
             loadAction: { url: 'transactions/account/x' }, loadCriteria: 'account', loadIDField: 'accountID',
+            columns: [
+                ...this.transactionsTableConfig.columns,
+                { name: 'runningBalance', type: 'money', alias: 'Balance' } // Added running balance column
+            ],
         };
         //--------------------------Accounts-------------------------
         this.accountDetailsConfig = {
@@ -2966,7 +2968,6 @@ class AccountingService {
                 { name: 'profit', type: 'money', alias: 'Profit', colors: [{ name: 'green', condition: x => x.profit > 0 }, { name: 'red', condition: x => x.profit < 0 }] },
                 { name: 'equity', type: 'money', alias: 'Equity' }
             ],
-            buttons: [{ name: 'refresh' }],
             loadAction: { url: 'accounts/aggregates/monthly' }
         };
         // Cumulative aggregates table showing running totals over time
@@ -2985,7 +2986,6 @@ class AccountingService {
                 { name: 'expensesYTD', type: 'money', alias: 'Expenses YTD' },
                 { name: 'profitYTD', type: 'money', alias: 'Profit YTD', colors: [{ name: 'green', condition: x => x.profitYTD > 0 }, { name: 'red', condition: x => x.profitYTD < 0 }] }
             ],
-            buttons: [{ name: 'refresh' }],
             loadAction: { url: 'accounts/aggregates/cumulative' }
         };
         // Cash flow aggregates table showing inflows, outflows and running balance
@@ -3001,7 +3001,6 @@ class AccountingService {
                 { name: 'netCashFlow', type: 'money', alias: 'Net Cash Flow', colors: [{ name: 'green', condition: x => x.netCashFlow > 0 }, { name: 'red', condition: x => x.netCashFlow < 0 }] },
                 { name: 'runningBalance', type: 'money', alias: 'Running Balance', colors: [{ name: 'green', condition: x => x.runningBalance > 0 }, { name: 'red', condition: x => x.runningBalance < 0 }] }
             ],
-            buttons: [{ name: 'refresh' }],
             loadAction: { url: 'accounts/aggregates/cashflow' }
         };
         // Balance sheet aggregates table showing Assets, Liabilities, and Equity by month
@@ -3017,7 +3016,6 @@ class AccountingService {
                 { name: 'totalEquity', type: 'money', alias: 'Total Equity' },
                 { name: 'netWorth', type: 'money', alias: 'Net Worth', colors: [{ name: 'green', condition: x => x.netWorth > 0 }, { name: 'red', condition: x => x.netWorth < 0 }] }
             ],
-            buttons: [{ name: 'refresh' }],
             loadAction: { url: 'accounts/aggregates/balancesheet' }
         };
     }
@@ -3443,7 +3441,7 @@ 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', alias: 'Price' }
+                { name: 'sellingPrice', type: 'money', }
             ], // Changed: Removed isSerialized, baseUnit, currentAverageCost, isLowInventory columns
             buttons: [
                 this.productCreateButton,
@@ -3796,9 +3794,10 @@ class InventoryService {
             flatButtons: true,
             minColumns: ['receiptNumber', 'supplierName', 'receiptDate'],
             columns: [
-                { name: 'receiptNumber', type: 'text', alias: 'Receipt #', icon: { name: 'hourglass_empty', color: 'orange', condition: (x) => x.pendingApproval, tip: 'Pending Approval' } },
-                { name: 'supplierName', type: 'text', alias: 'Supplier' },
                 { name: 'receiptDate', type: 'date', alias: 'Date' },
+                { name: 'supplierName', type: 'text', alias: 'Supplier' },
+                { name: 'productsDisplay', type: 'text', alias: 'Products' }, // Added: Display product names or count
+                { name: 'paymentTypeName', type: 'text', alias: 'Payment' },
                 { name: 'status', type: 'icon', alias: 'Status', detailsConfig: this.inventoryReceiptDetailsConfig, // Changed: Use status instead of statusName
                     icons: [
                         { name: 'article', color: '#9E9E9E', condition: (x) => x.status === InventoryReceiptStatus.Draft, tip: 'Draft' }, // Changed: Use status enum
@@ -3806,7 +3805,6 @@ class InventoryService {
                         { name: 'check_circle', color: '#4CAF50', condition: (x) => x.status === InventoryReceiptStatus.Completed, tip: 'Completed' } // Changed: Use status enum
                     ]
                 },
-                { name: 'paymentTypeName', type: 'text', alias: 'Payment' },
                 { name: 'totalAmount', type: 'money', alias: 'Total Value' }
             ],
             buttons: [
@@ -4168,21 +4166,15 @@ class InventoryService {
             flatButtons: true,
             minColumns: ['saleNumber', 'displayCustomerName', 'totalAmount'],
             columns: [
-                { name: 'saleNumber', type: 'text', alias: 'Sale #' },
-                { name: 'saleTypeName', type: 'chip', alias: 'Type', detailsConfig: this.saleDetailsConfig,
-                    colors: [
-                        { name: '#4CAF50', condition: x => x.saleType === 0 },
-                        { name: '#2196F3', condition: x => x.saleType === 1 }
-                    ]
-                },
-                { name: 'displayCustomerName', type: 'text', alias: 'Customer' },
                 { name: 'saleDate', type: 'date', alias: 'Date' },
-                { name: 'paymentMethodName', type: 'text', alias: 'Payment Method' },
-                { name: 'paymentStatusName', type: 'chip', alias: 'Payment Status', detailsConfig: this.saleDetailsConfig,
-                    colors: [
-                        { name: '#F44336', condition: x => x.paymentStatus === 0 },
-                        { name: '#4CAF50', condition: x => x.paymentStatus === 1 },
-                        { name: '#FF9800', condition: x => x.paymentStatus === 2 }
+                { name: 'displayCustomerName', type: 'text', alias: 'Customer' },
+                { name: 'productsDisplay', type: 'text', alias: 'Products' }, // Added: Display product names or count
+                { name: 'paymentMethodName', type: 'text', alias: 'Payment' },
+                { name: 'paymentStatus', type: 'icon', alias: 'Status', detailsConfig: this.inventoryReceiptDetailsConfig, // Changed: Use status instead of statusName
+                    icons: [
+                        { name: 'article', color: '#9E9E9E', condition: (x) => x.paymentStatus === 0, tip: 'Unpaid' }, // Changed: Use status enum
+                        { name: 'inventory_2', color: '#2196F3', condition: (x) => x.paymentStatus === 2, tip: 'Partial' }, // Changed: Use status enum
+                        { name: 'check_circle', color: '#4CAF50', condition: (x) => x.paymentStatus === 1, tip: 'Paid' } // Changed: Use status enum
                     ]
                 },
                 { name: 'totalAmount', type: 'money', alias: 'Total' }
@@ -14847,7 +14839,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
                 }]
         }] });
 
-// Migrated from Shift src/app/home/default/fin-accounts/fin-accounts.component.ts
 class AccountsComponent {
     constructor(dataServiceLib, accountingService) {
         this.dataServiceLib = dataServiceLib;
@@ -14993,7 +14984,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
                 }]
         }], ctorParameters: () => [{ type: DataServiceLib }, { type: AccountingService }] });
 
-// Migrated from Shift src/app/home/default/fin-transaction-types/fin-transaction-types.component.ts
 class TransactionTypesComponent {
     constructor() {
         this.accountingService = inject(AccountingService);
@@ -15016,7 +15006,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
                 }]
         }] });
 
-// Migrated from Shift src/app/home/default/fin-transactions/fin-transactions.component.ts
 class TransactionsComponent {
     constructor() {
         this.accountingService = inject(AccountingService);